From 5c14c38178081f1a6ea3c0029ce90ffed3fcfa02 Mon Sep 17 00:00:00 2001
From: RDMStreet <RDMStreetOne@gmail.com>
Date: Sat, 20 Mar 2021 15:50:45 +0000
Subject: [PATCH 1/2] Fix scroll section item detection

---
 .../ScrollSections/SScrollSectionItem.vue     |  4 +-
 .../ScrollSections/SScrollSections.vue        | 43 +++++++++++++------
 2 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/src/components/ScrollSections/SScrollSectionItem.vue b/src/components/ScrollSections/SScrollSectionItem.vue
index d3e5b4b6..7756d5bc 100644
--- a/src/components/ScrollSections/SScrollSectionItem.vue
+++ b/src/components/ScrollSections/SScrollSectionItem.vue
@@ -1,7 +1,7 @@
 <template>
   <section :id="section" class="s-scroll-section-item">
-    <span v-if="title" class="title">{{ title }}</span>
-    <slot v-if="this.$slots.title && !title" name="title"></slot>
+    <span v-if="title && !this.$slots.title" class="title">{{ title }}</span>
+    <slot v-if="this.$slots.title" name="title"></slot>
     <slot></slot>
     <s-divider v-if="withDivider" type="primary" style="margin: 20px 0 0 0;"></s-divider>
   </section>
diff --git a/src/components/ScrollSections/SScrollSections.vue b/src/components/ScrollSections/SScrollSections.vue
index ec999958..1cafe9a9 100644
--- a/src/components/ScrollSections/SScrollSections.vue
+++ b/src/components/ScrollSections/SScrollSections.vue
@@ -87,20 +87,17 @@ export default class SScrollSections extends Vue {
 
   menuItems: Vue[] = []
   activeSection = ''
+  isComponentDestroyed = false
 
   mounted (): void {
-    this.$nextTick(() => {
-      if (this.$children.length === 0) {
-        return
-      }
-      let children = this.$children
-      while (!children.every((item: any) => item.section)) {
-        children = children[0].$children
+    const setState = () => {
+      this.setState()
+      if (!this.isComponentDestroyed) {
+        window.requestAnimationFrame(setState)
       }
-      this.menuItems = children
-      this.scrollableParent.addEventListener('scroll', this.handleScroll)
-      this.handleInitialState()
-    })
+    }
+    setState()
+    this.scrollableParent.addEventListener('scroll', this.handleScroll)
   }
 
   destroyed (): void {
@@ -138,7 +135,29 @@ export default class SScrollSections extends Vue {
     return this.parent ? this.$parent.$el : window
   }
 
-  private handleInitialState (): void {
+  private setState (): void {
+    if (this.$children.length === 0) {
+      return
+    }
+    function findScrollSectionItems (children: Vue[]) {
+      return children.map((component: Vue) => {
+        if (component && component.$options && (component.$options as any)._componentTag === 's-scroll-section-item') {
+          return [component]
+        } else if (component && component.$children && component.$children.length) {
+          return findScrollSectionItems(component.$children)
+        }
+        return null
+      }).filter(component => component !== null).flat()
+    }
+    const menuItems = findScrollSectionItems(this.$children)
+    const isChanged = menuItems.length !== this.menuItems.length || menuItems.some((item: Vue, index: number) => item !== this.menuItems[index])
+    if (isChanged) {
+      this.menuItems = menuItems
+      this.handleState()
+    }
+  }
+
+  private handleState (): void {
     if (this.router && this.router.currentRoute.hash) {
       this.menuItems.forEach((sectionComponent: any) => {
         if (this.router.currentRoute.hash === `#${sectionComponent.section}`) {

From ce82f52b65d36a87bab89ac1d465fdac3d322867 Mon Sep 17 00:00:00 2001
From: RDMStreet <RDMStreetOne@gmail.com>
Date: Mon, 22 Mar 2021 11:47:58 +0000
Subject: [PATCH 2/2] Update version to 0.8.3

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4e9d6759..32b30215 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@soramitsu/soramitsu-js-ui",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "private": false,
   "publishConfig": {
     "registry": "https://nexus.iroha.tech/repository/npm-soramitsu-private/"