From 89c42a685a814604c91f7246f8ed3cc78674bb49 Mon Sep 17 00:00:00 2001
From: RDMStreet <RDMStreetOne@gmail.com>
Date: Fri, 11 Jun 2021 20:50:59 +0300
Subject: [PATCH 1/4] Fix pagination text reactivity

---
 src/components/Pagination/SPagination.vue | 18 ++++++++----------
 src/stories/SPagination.stories.ts        |  8 ++++++++
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/components/Pagination/SPagination.vue b/src/components/Pagination/SPagination.vue
index 68a18057..8b496493 100644
--- a/src/components/Pagination/SPagination.vue
+++ b/src/components/Pagination/SPagination.vue
@@ -25,8 +25,6 @@
 
 <script lang="ts">
 import { Component, Mixins, Prop, Ref, Watch } from 'vue-property-decorator'
-import { ElPagination } from 'element-ui/types/pagination'
-import cloneDeep from 'lodash/fp/cloneDeep'
 
 import BorderRadiusMixin from '../../mixins/BorderRadiusMixin'
 
@@ -154,16 +152,18 @@ export default class SPagination extends Mixins(BorderRadiusMixin) {
         this.totalItem.textContent = `${this.totalText} ${this.total}`
       }
     }
-    if (this.sizesItem && !this.sizesLabelItem) {
-      const itemsPerPageText = document.createElement('span')
-      itemsPerPageText.textContent = this.perPageText
-      itemsPerPageText.classList.add('per-page-text')
-      this.pagination.$el.insertBefore(itemsPerPageText, this.sizesItem)
+    if (this.sizesItem) {
+      if (!this.sizesLabelItem) {
+        this.sizesLabelItem = document.createElement('span')
+        this.sizesLabelItem.classList.add('per-page-text')
+        this.pagination.$el.insertBefore(this.sizesLabelItem, this.sizesItem)
+      }
+      this.sizesLabelItem.textContent = this.perPageText
     }
   }
 
   @Watch('perPageText')
-  private handlePerPageTextChange () {
+  private handlePerPageTextChange (text) {
     this.renderPaginationItems()
   }
 
@@ -218,8 +218,6 @@ export default class SPagination extends Mixins(BorderRadiusMixin) {
   mounted (): void {
     this.initPaginationItems()
     this.renderPaginationItems()
-    this.sizesLabelItem = (Array.from(this.pagination.$el.childNodes) as Array<any>)
-      .find(item => item.className === 'per-page-text')
   }
 
   updated (): void {
diff --git a/src/stories/SPagination.stories.ts b/src/stories/SPagination.stories.ts
index 39628d4d..c879d49d 100644
--- a/src/stories/SPagination.stories.ts
+++ b/src/stories/SPagination.stories.ts
@@ -22,6 +22,8 @@ export const configurable = () => ({
                  :popper-class="borderRadius"
                  :prev-text="prevText"
                  :next-text="nextText"
+                 :per-page-text="perPageText"
+                 :total-text="totalText"
                  @size-change="handleSizeChange"
                  @current-change="handleCurrentChange"
                  @prev-click="handlePrevClick"
@@ -53,6 +55,12 @@ export const configurable = () => ({
     },
     nextText: {
       default: text('Next text', '')
+    },
+    perPageText: {
+      default: text('Per page text', '')
+    },
+    totalText: {
+      default: text('Total text', '')
     }
   },
   methods: {

From 4e9b3acea1c8b2553dedb1a5653daf0536a2a2e6 Mon Sep 17 00:00:00 2001
From: RDMStreet <RDMStreetOne@gmail.com>
Date: Fri, 11 Jun 2021 20:57:27 +0300
Subject: [PATCH 2/4] fix

---
 src/components/Pagination/SPagination.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Pagination/SPagination.vue b/src/components/Pagination/SPagination.vue
index 8b496493..b7044a0a 100644
--- a/src/components/Pagination/SPagination.vue
+++ b/src/components/Pagination/SPagination.vue
@@ -163,7 +163,7 @@ export default class SPagination extends Mixins(BorderRadiusMixin) {
   }
 
   @Watch('perPageText')
-  private handlePerPageTextChange (text) {
+  private handlePerPageTextChange () {
     this.renderPaginationItems()
   }
 

From c77693ade3eac46a651f6eab91316b2dd1720b9b Mon Sep 17 00:00:00 2001
From: RDMStreet <RDMStreetOne@gmail.com>
Date: Fri, 11 Jun 2021 21:30:08 +0300
Subject: [PATCH 3/4] Style fix for json editor

---
 src/styles/json-input.scss | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/styles/json-input.scss b/src/styles/json-input.scss
index 696fb7b8..9e0689cd 100644
--- a/src/styles/json-input.scss
+++ b/src/styles/json-input.scss
@@ -38,7 +38,7 @@ $footer-height: 26px;
     width: $footer-height;
     bottom: 0;
     right: 0;
-    cursor: pointer;
+    cursor: ns-resize;
   }
   // TODO: think about hover and focus
 }
@@ -46,6 +46,11 @@ $footer-height: 26px;
 .jsoneditor {
   border: none !important;
   font-family: $s-font-family-mono;
+  .jsoneditor-outer {
+    height: calc(100% - #{$footer-height});
+    margin-bottom: -1px !important;
+    padding-bottom: 1px !important;
+  }
   .ace-jsoneditor {
     *, textarea.jsoneditor-text * {
       font-family: $s-font-family-mono;

From a0ba8e7d57abd2dbfc39956da7aa21e692eb7598 Mon Sep 17 00:00:00 2001
From: RDMStreet <RDMStreetOne@gmail.com>
Date: Tue, 15 Jun 2021 10:23:26 +0300
Subject: [PATCH 4/4] Update pakackage version to 0.9.6

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

diff --git a/package.json b/package.json
index 0ea65308..a56f1866 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@soramitsu/soramitsu-js-ui",
-  "version": "0.9.5",
+  "version": "0.9.6",
   "private": false,
   "publishConfig": {
     "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/"