From ecec57ede66cd3cb8b64f2584cb2e56826800603 Mon Sep 17 00:00:00 2001 From: Nikita Zaporozhets Date: Thu, 3 Feb 2022 14:05:13 +0300 Subject: [PATCH 01/28] Change Dockefile Signed-off-by: Nikita Zaporozhets --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 457470cf..5b526a1e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,2 +1,3 @@ -FROM nginx:stable-alpine -COPY ./storybook-static /usr/share/nginx/html \ No newline at end of file +FROM nginxinc/nginx-unprivileged:1.20.0-alpine +COPY ./storybook-static /usr/share/nginx/html +EXPOSE 80 \ No newline at end of file From 0411c9126a4975eff45e3b0849c5990a1daa84c2 Mon Sep 17 00:00:00 2001 From: Nikita Zaporozhets Date: Mon, 7 Feb 2022 09:37:25 +0300 Subject: [PATCH 02/28] Delete EXPOSE from Dockerfile Signed-off-by: Nikita Zaporozhets --- Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 5b526a1e..80847ac7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,3 +1,2 @@ FROM nginxinc/nginx-unprivileged:1.20.0-alpine -COPY ./storybook-static /usr/share/nginx/html -EXPOSE 80 \ No newline at end of file +COPY ./storybook-static /usr/share/nginx/html \ No newline at end of file From 2b5db0115f4949e052b4ed473660cdfb8186ba47 Mon Sep 17 00:00:00 2001 From: Nikita Polyakov <53777036+Nikita-Polyakov@users.noreply.github.com> Date: Thu, 24 Feb 2022 17:22:13 +0300 Subject: [PATCH 03/28] fix leading dot (#385) --- package.json | 2 +- src/components/Input/SFloatInput/SFloatInput.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index cf2e363a..3a8075e4 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "1.0.27", + "version": "1.0.28", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/" diff --git a/src/components/Input/SFloatInput/SFloatInput.vue b/src/components/Input/SFloatInput/SFloatInput.vue index 88942c90..a7202b04 100644 --- a/src/components/Input/SFloatInput/SFloatInput.vue +++ b/src/components/Input/SFloatInput/SFloatInput.vue @@ -172,6 +172,7 @@ export default class SFloatInput extends Vue { // Add prefix zero if needed if (formatted.indexOf(DEFAULT_DECIMAL_DELIMITER) === 0) { formatted = '0' + formatted + this.charsCountBeforeSelection++ } // Avoid several decimal delimiters From 8842a08b45ecaa5573ebfa3a783365576f6fe23e Mon Sep 17 00:00:00 2001 From: Stefan Popov Date: Thu, 3 Mar 2022 13:47:14 +0400 Subject: [PATCH 04/28] Fix dialog structure search for computed props (#392) --- package.json | 2 +- src/components/Dialog/SDialog.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 3a8075e4..fbe74841 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "1.0.28", + "version": "1.0.29", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/" diff --git a/src/components/Dialog/SDialog.vue b/src/components/Dialog/SDialog.vue index 5d5ab598..007f628d 100644 --- a/src/components/Dialog/SDialog.vue +++ b/src/components/Dialog/SDialog.vue @@ -238,7 +238,7 @@ export default class SDialog extends Mixins(BorderRadiusMixin, DesignSystemInjec this.computedTop = this.top return } - const dialog = wrapper.children[0] as HTMLElement + const dialog = wrapper.getElementsByClassName('el-dialog')[0] as HTMLElement const top = wrapper.clientHeight - dialog.clientHeight > 0 ? Math.floor((wrapper.clientHeight - dialog.clientHeight) / 2) : 0 From f858cba2e95fd2b97a27660df1bf2ac2887fb3e7 Mon Sep 17 00:00:00 2001 From: Rustem Date: Tue, 29 Mar 2022 11:56:00 +0300 Subject: [PATCH 05/28] Feature/add preview image option (#399) * Add preview option * Update package.json * fix defaults * add whitespace * Update SImage.vue --- package.json | 2 +- src/components/Image/SImage/SImage.vue | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index fbe74841..279a334f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "1.0.29", + "version": "1.0.30", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/" diff --git a/src/components/Image/SImage/SImage.vue b/src/components/Image/SImage/SImage.vue index 8ac33fa2..0718d2fb 100644 --- a/src/components/Image/SImage/SImage.vue +++ b/src/components/Image/SImage/SImage.vue @@ -6,6 +6,7 @@ :fit="fit" :alt="alt" :lazy="lazy" + :preview-src-list="srcList" :scroll-container="scrollContainer" :z-ndex="zIndex" > @@ -55,6 +56,10 @@ export default class SImage extends Vue { * Posssible value is the nearest parent container whose overflow property is auto or scroll */ @Prop({ type: [String, HTMLElement] }) readonly scrollContainer!: string | HTMLElement + /** + * Allow big image preview. It accepts list of image URLs + */ + @Prop({ default: () => [], type: Array }) readonly srcList!: Array /** * Set image preview z-index */ From f806bb140d3e938f3f668512e3984f47bd6cf79e Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Apr 2022 13:09:40 +0200 Subject: [PATCH 06/28] Bump minimist from 1.2.5 to 1.2.6 (#402) Bumps [minimist](https://github.com/substack/minimist) from 1.2.5 to 1.2.6. - [Release notes](https://github.com/substack/minimist/releases) - [Commits](https://github.com/substack/minimist/compare/1.2.5...1.2.6) --- updated-dependencies: - dependency-name: minimist dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index fb34c304..f77e84af 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10639,9 +10639,9 @@ minimatch@3.0.4, minimatch@^3.0.2, minimatch@^3.0.4, minimatch@~3.0.2: brace-expansion "^1.1.7" minimist@^1.1.1, minimist@^1.1.3, minimist@^1.2.0, minimist@^1.2.5: - version "1.2.5" - resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" - integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== + version "1.2.6" + resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.6.tgz#8637a5b759ea0d6e98702cfb3a9283323c93af44" + integrity sha512-Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q== minipass-collect@^1.0.2: version "1.0.2" From 456825d9a5f087a31fd9b05539e36d2180f92a61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Apr 2022 13:16:38 +0200 Subject: [PATCH 07/28] Bump lodash from 4.17.15 to 4.17.21 (#400) Bumps [lodash](https://github.com/lodash/lodash) from 4.17.15 to 4.17.21. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](https://github.com/lodash/lodash/compare/4.17.15...4.17.21) --- updated-dependencies: - dependency-name: lodash dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 279a334f..24b0fd94 100644 --- a/package.json +++ b/package.json @@ -29,7 +29,7 @@ "core-js": "^3.6.4", "element-resize-detector": "^1.2.1", "element-ui": "^2.15.5", - "lodash": "^4.17.15", + "lodash": "^4.17.21", "throttle-debounce": "^1.0.1", "v-jsoneditor": "^1.4.1", "vue": "^2.6.11", diff --git a/yarn.lock b/yarn.lock index f77e84af..959ec4a0 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10207,10 +10207,10 @@ lodash.uniq@4.5.0, lodash.uniq@^4.5.0: resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M= -lodash@^4.0.0, lodash@^4.0.1, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.3, lodash@^4.17.4, lodash@~4.17.12: - version "4.17.15" - resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548" - integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A== +lodash@^4.0.0, lodash@^4.0.1, lodash@^4.17.11, lodash@^4.17.12, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.21, lodash@^4.17.3, lodash@^4.17.4, lodash@~4.17.12: + version "4.17.21" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" + integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== log-symbols@^1.0.2: version "1.0.2" From 0fc14e71af8df0f78a951846666cca875649e47a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 14 Apr 2022 14:46:12 +0200 Subject: [PATCH 08/28] Bump nanoid from 3.1.23 to 3.3.2 (#401) Bumps [nanoid](https://github.com/ai/nanoid) from 3.1.23 to 3.3.2. - [Release notes](https://github.com/ai/nanoid/releases) - [Changelog](https://github.com/ai/nanoid/blob/main/CHANGELOG.md) - [Commits](https://github.com/ai/nanoid/compare/3.1.23...3.3.2) --- updated-dependencies: - dependency-name: nanoid dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 959ec4a0..83c24a7e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10777,9 +10777,9 @@ nan@^2.12.1, nan@^2.13.2: integrity sha512-isWHgVjnFjh2x2yuJ/tj3JbwoHu3UC2dX5G/88Cm24yB6YopVgxvBObDY7n5xW6ExmFhJpSEQqFPvq9zaXc8Jw== nanoid@^3.1.22: - version "3.1.23" - resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.23.tgz#f744086ce7c2bc47ee0a8472574d5c78e4183a81" - integrity sha512-FiB0kzdP0FFVGDKlRLEQ1BgDzU87dy5NnzjeW9YZNt+/c3+q82EQDUwniSAUxp/F0gFNI1ZhKU1FqYsMuqZVnw== + version "3.3.2" + resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.2.tgz#c89622fafb4381cd221421c69ec58547a1eec557" + integrity sha512-CuHBogktKwpm5g2sRgv83jEy2ijFzBwMoYA60orPDR7ynsLijJDqgsi4RDGj3OJpy3Ieb+LYwiRmIOGyytgITA== nanomatch@^1.2.9: version "1.2.13" From dc8321977aeb23781063cce7e0350745c946d2e9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Apr 2022 01:44:43 +0200 Subject: [PATCH 09/28] Bump follow-redirects from 1.11.0 to 1.14.9 (#387) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.11.0 to 1.14.9. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.11.0...v1.14.9) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/yarn.lock b/yarn.lock index 83c24a7e..242b2e5f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7010,11 +7010,9 @@ focus-lock@^0.6.7: integrity sha512-vkHTluRCoq9FcsrldC0ulQHiyBYgVJB2CX53I8r0nTC6KnEij7Of0jpBspjt3/CuNb6fyoj3aOh9J2HgQUM0og== follow-redirects@^1.0.0: - version "1.11.0" - resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.11.0.tgz#afa14f08ba12a52963140fe43212658897bc0ecb" - integrity sha512-KZm0V+ll8PfBrKwMzdo5D13b1bur9Iq9Zd/RMmAoQQcl2PxxFml8cxXPaaPYVbV0RjNjq1CU7zIzAOqtUPudmA== - dependencies: - debug "^3.0.0" + version "1.14.9" + resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.9.tgz#dd4ea157de7bfaf9ea9b3fbd85aa16951f78d8d7" + integrity sha512-MQDfihBQYMcyy5dhRDJUHcw7lb2Pv/TuE6xP1vyraLukNDHKbDxDNaOE3NbCAdKQApno+GPRyo1YAp89yCjK4w== for-in@^1.0.2: version "1.0.2" From 4b8c8c5adedbb713b9e9e1fa24164482e1f0666a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Apr 2022 01:54:56 +0200 Subject: [PATCH 10/28] Bump postcss from 8.2.10 to 8.2.13 (#364) * Bump postcss from 8.2.10 to 8.2.13 Bumps [postcss](https://github.com/postcss/postcss) from 8.2.10 to 8.2.13. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.2.10...8.2.13) --- updated-dependencies: - dependency-name: postcss dependency-type: direct:development ... Signed-off-by: dependabot[bot] * Bump postcss from 8.2.10 to 8.2.13 Bumps [postcss](https://github.com/postcss/postcss) from 8.2.10 to 8.2.13. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](https://github.com/postcss/postcss/compare/8.2.10...8.2.13) --- updated-dependencies: - dependency-name: postcss dependency-type: direct:development ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Stefan Popov --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 24b0fd94..4e95f040 100644 --- a/package.json +++ b/package.json @@ -70,7 +70,7 @@ "jest": "^26.0.1", "lint-staged": "^9.5.0", "node-sass": "^4.12.0", - "postcss": "^8.2.10", + "postcss": "^8.2.13", "rollup": "^1.27.8", "rollup-plugin-commonjs": "^10.1.0", "rollup-plugin-copy": "^3.4.0", diff --git a/yarn.lock b/yarn.lock index 242b2e5f..882d45b2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12169,10 +12169,10 @@ postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.16, postcss@^7.0.2 source-map "^0.6.1" supports-color "^6.1.0" -postcss@^8.2.10: - version "8.2.10" - resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.10.tgz#ca7a042aa8aff494b334d0ff3e9e77079f6f702b" - integrity sha512-b/h7CPV7QEdrqIxtAf2j31U5ef05uBDuvoXv6L51Q4rcS1jdlXAVKJv+atCFdUXYl9dyTHGyoMzIepwowRJjFw== +postcss@^8.2.13: + version "8.2.13" + resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.13.tgz#dbe043e26e3c068e45113b1ed6375d2d37e2129f" + integrity sha512-FCE5xLH+hjbzRdpbRb1IMCvPv9yZx2QnDarBEYSN0N0HYk+TcXsEhwdFcFb+SRWOKzKGErhIEbBK2ogyLdTtfQ== dependencies: colorette "^1.2.2" nanoid "^3.1.22" From 6417492afea86b23722bda90760ed06f8fd9f393 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Apr 2022 02:01:03 +0200 Subject: [PATCH 11/28] Bump node-fetch from 2.6.0 to 2.6.7 (#366) Bumps [node-fetch](https://github.com/node-fetch/node-fetch) from 2.6.0 to 2.6.7. - [Release notes](https://github.com/node-fetch/node-fetch/releases) - [Commits](https://github.com/node-fetch/node-fetch/compare/v2.6.0...v2.6.7) --- updated-dependencies: - dependency-name: node-fetch dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 26 +++++++++++++++++++++++--- 1 file changed, 23 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 882d45b2..90ed74a7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10847,9 +10847,11 @@ node-dir@^0.1.17: minimatch "^3.0.2" node-fetch@^2.6.0: - version "2.6.0" - resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd" - integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA== + version "2.6.7" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.7.tgz#24de9fba827e3b4ae44dc8b20256a379160052ad" + integrity sha512-ZjMPFEfVx5j+y2yF35Kzx5sF7kDzxuDj6ziH4FFbOp87zKDZNx8yExJIb05OGF4Nlt9IHFIMBkRl41VdvcNdbQ== + dependencies: + whatwg-url "^5.0.0" node-forge@0.9.0: version "0.9.0" @@ -14949,6 +14951,11 @@ tr46@^2.0.2: dependencies: punycode "^2.1.1" +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha1-gYT9NH2snNwYWZLzpmIuFLnZq2o= + trim-lines@^1.0.0: version "1.1.3" resolved "https://registry.yarnpkg.com/trim-lines/-/trim-lines-1.1.3.tgz#839514be82428fd9e7ec89e35081afe8f6f93115" @@ -15810,6 +15817,11 @@ web-namespaces@^1.0.0, web-namespaces@^1.1.2: resolved "https://registry.yarnpkg.com/web-namespaces/-/web-namespaces-1.1.4.tgz#bc98a3de60dadd7faefc403d1076d529f5e030ec" integrity sha512-wYxSGajtmoP4WxfejAPIr4l0fVh+jeMXZb08wNc0tMg6xsfZXj3cECqIK0G7ZAqUq0PP8WlMDtaOGVBTAWztNw== +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha1-JFNCdeKnvGvnvIZhHMFq4KVlSHE= + webidl-conversions@^4.0.2: version "4.0.2" resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-4.0.2.tgz#a855980b1f0b6b359ba1d5d9fb39ae941faa63ad" @@ -16004,6 +16016,14 @@ whatwg-mimetype@^2.1.0, whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0: resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha1-lmRU6HZUYuN2RNNib2dCzotwll0= + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + whatwg-url@^6.4.1: version "6.5.0" resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-6.5.0.tgz#f2df02bff176fd65070df74ad5ccbb5a199965a8" From 225bb6b7e1b6a102a7b0be1677a2bce4534d4533 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Apr 2022 02:09:30 +0200 Subject: [PATCH 12/28] Bump tmpl from 1.0.4 to 1.0.5 (#331) Bumps [tmpl](https://github.com/daaku/nodejs-tmpl) from 1.0.4 to 1.0.5. - [Release notes](https://github.com/daaku/nodejs-tmpl/releases) - [Commits](https://github.com/daaku/nodejs-tmpl/commits/v1.0.5) --- updated-dependencies: - dependency-name: tmpl dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 90ed74a7..c138680e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -14849,9 +14849,9 @@ tmp@^0.0.33: os-tmpdir "~1.0.2" tmpl@1.0.x: - version "1.0.4" - resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.4.tgz#23640dd7b42d00433911140820e5cf440e521dd1" - integrity sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE= + version "1.0.5" + resolved "https://registry.yarnpkg.com/tmpl/-/tmpl-1.0.5.tgz#8683e0b902bb9c20c4f726e3c0b69f36518c07cc" + integrity sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw== to-arraybuffer@^1.0.0: version "1.0.1" From ac1dc0e22d4354de833866cf54cfc95f921e164b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Apr 2022 07:38:57 +0200 Subject: [PATCH 13/28] Bump ws from 5.2.2 to 5.2.3 (#332) Bumps [ws](https://github.com/websockets/ws) from 5.2.2 to 5.2.3. - [Release notes](https://github.com/websockets/ws/releases) - [Commits](https://github.com/websockets/ws/compare/5.2.2...5.2.3) --- updated-dependencies: - dependency-name: ws dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index c138680e..8f2d21b1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -16188,9 +16188,9 @@ write@1.0.3: mkdirp "^0.5.1" ws@^5.2.0: - version "5.2.2" - resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.2.tgz#dffef14866b8e8dc9133582514d1befaf96e980f" - integrity sha512-jaHFD6PFv6UgoIVda6qZllptQsMlDEJkTQcybzzXDYM1XO9Y8em691FGMPmM46WGyLU4z9KMgQN+qrux/nhlHA== + version "5.2.3" + resolved "https://registry.yarnpkg.com/ws/-/ws-5.2.3.tgz#05541053414921bc29c63bee14b8b0dd50b07b3d" + integrity sha512-jZArVERrMsKUatIdnLzqvcfydI85dvd/Fp1u/VOpfdDWQ4c9qWXe+VIeAbQ5FrDwciAkr+lzofXLz3Kuf26AOA== dependencies: async-limiter "~1.0.0" From b57d244cdea81e2f48e1a4f8009b88642dff1a77 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 15 Apr 2022 11:49:41 +0200 Subject: [PATCH 14/28] Bump ajv from 6.12.2 to 6.12.6 (#388) Bumps [ajv](https://github.com/ajv-validator/ajv) from 6.12.2 to 6.12.6. - [Release notes](https://github.com/ajv-validator/ajv/releases) - [Commits](https://github.com/ajv-validator/ajv/compare/v6.12.2...v6.12.6) --- updated-dependencies: - dependency-name: ajv dependency-type: indirect ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/yarn.lock b/yarn.lock index 8f2d21b1..00046ddd 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3126,9 +3126,9 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1: integrity sha512-RO1ibKvd27e6FEShVFfPALuHI3WjSVNeK5FIsmme/LYRNxjKuNj+Dt7bucLa6NdSv3JcVTyMlm9kGR84z1XpaQ== ajv@^6.1.0, ajv@^6.10.0, ajv@^6.10.2, ajv@^6.12.2, ajv@^6.5.5: - version "6.12.2" - resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.2.tgz#c629c5eced17baf314437918d2da88c99d5958cd" - integrity sha512-k+V+hzjm5q/Mr8ef/1Y9goCmlsK4I6Sm74teeyGvFk1XrOsbsKLjEdrvny42CZ+a8sXbk8KWpY/bDwS+FLL2UQ== + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== dependencies: fast-deep-equal "^3.1.1" fast-json-stable-stringify "^2.0.0" @@ -15404,9 +15404,9 @@ upper-case@^1.1.1: integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg= uri-js@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" - integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ== + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== dependencies: punycode "^2.1.0" From 14bea291a59bb60bbe10b4b06ecaec6475a2c118 Mon Sep 17 00:00:00 2001 From: Stefan Popov Date: Fri, 15 Apr 2022 13:30:40 +0300 Subject: [PATCH 15/28] Fix image preview (#407) * Fix image preview styles * Update SImage.stories.ts * Bump version * Update image.scss * Update image.scss --- package.json | 2 +- src/stories/SImage.stories.ts | 6 +++- src/styles/common.scss | 8 +++++ src/styles/neumorphism/dialog.scss | 5 +-- src/styles/neumorphism/image.scss | 53 ++++++++++++++++++++++++++++++ src/styles/neumorphism/index.scss | 1 + 6 files changed, 69 insertions(+), 6 deletions(-) create mode 100644 src/styles/neumorphism/image.scss diff --git a/package.json b/package.json index 4e95f040..6624b9c2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "1.0.30", + "version": "1.0.32", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/" diff --git a/src/stories/SImage.stories.ts b/src/stories/SImage.stories.ts index 3150d3d9..06d1f05c 100644 --- a/src/stories/SImage.stories.ts +++ b/src/stories/SImage.stories.ts @@ -1,4 +1,4 @@ -import { text, boolean, number, select, withKnobs } from '@storybook/addon-knobs' +import { text, boolean, number, select, withKnobs, array } from '@storybook/addon-knobs' import { SImage, ImageFit } from '../components/Image' @@ -16,6 +16,7 @@ export const configurable = () => ({ :fit="fit" :alt="alt" :lazy="lazy" + :src-list="srcList" :z-index="zIndex" :has-skeleton="hasSkeleton" :animated="animated" @@ -42,6 +43,9 @@ export const configurable = () => ({ }, animated: { default: boolean('Skeleton has Animation', true) + }, + srcList: { + default: array('Src List', ['https://picsum.photos/1024', 'https://picsum.photos/1024/300']) } } }) diff --git a/src/styles/common.scss b/src/styles/common.scss index c42f2bc0..a2693664 100644 --- a/src/styles/common.scss +++ b/src/styles/common.scss @@ -251,6 +251,14 @@ button > span { } } +@mixin use-blur { + background-color: var(--s-color-utility-overlay); + opacity: 0.75; + backdrop-filter: blur(4px); + // TODO: Fix FF behaviour + filter: blur(4px); +} + .el-message-box { background-color: var(--s-color-base-on-accent); border-radius: var(--s-border-radius-small); diff --git a/src/styles/neumorphism/dialog.scss b/src/styles/neumorphism/dialog.scss index 48bd27b2..5f690617 100644 --- a/src/styles/neumorphism/dialog.scss +++ b/src/styles/neumorphism/dialog.scss @@ -4,8 +4,5 @@ } } [design-system="neumorphic"] .v-modal { - opacity: 0.75; - backdrop-filter: blur(4px); - // TODO: Fix FF behaviour - filter: blur(4px); + @include use-blur; } diff --git a/src/styles/neumorphism/image.scss b/src/styles/neumorphism/image.scss new file mode 100644 index 00000000..bbcfb669 --- /dev/null +++ b/src/styles/neumorphism/image.scss @@ -0,0 +1,53 @@ +[design-system="neumorphic"] { + $class: '.el-image-viewer'; + + #{$class}__mask { + @include use-blur; + } + #{$class}__btn { + &#{$class} { + &__close, &__next, &__prev, &__actions { + background: var(--s-color-utility-body); + border-color: transparent; + border-style: solid; + border-width: 0; + color: var(--s-color-base-content-tertiary); + transition: opacity .3s; + &:hover { + opacity: 1; + } + } + &__close, &__next, &__prev { + &:hover { + background: var(--s-color-utility-body); + border-color: transparent; + color: var(--s-color-base-content-secondary); + } + } + &__actions { + cursor: default; + } + } + #{$class}__actions__inner { + color: inherit; + .el-icon { + &-zoom-in, + &-zoom-out, + &-full-screen, + &-refresh-left, + &-refresh-right, + &-c-scale-to-original { + cursor: pointer; + &:hover { + color: var(--s-color-base-content-secondary); + } + } + } + } + .el-icon-close { + font-family: var(--s-font-family-icons) !important; + @extend .s-icon-x-16; + font-size: var(--s-icon-font-size-mini); + } + } +} diff --git a/src/styles/neumorphism/index.scss b/src/styles/neumorphism/index.scss index 54e77027..6088d16b 100644 --- a/src/styles/neumorphism/index.scss +++ b/src/styles/neumorphism/index.scss @@ -7,3 +7,4 @@ @import "./switch"; @import "./tooltip"; @import "./dialog"; +@import "./image"; From 9dc135b50ae286edc1d990a48e66d616686ba672 Mon Sep 17 00:00:00 2001 From: Pavel Varfolomeev Date: Wed, 25 May 2022 08:17:31 +0300 Subject: [PATCH 16/28] add Sonar --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c8e045b5..58b6e5c2 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,5 +2,7 @@ def pipeline = new org.js.LibPipeline(steps: this, dockerImageName: 'soramitsu/soramitsu-js-ui-library', - libExamplesBuildCmds: ['yarn storybook:build']) + libExamplesBuildCmds: ['yarn storybook:build']), + sonarProjectName: 'soramitsu-js-ui-library', + sonarProjectKey: 'jp.co.soramitsu:soramitsu-js-ui-library' pipeline.runPipeline() From 90bf40c4e790245bc8d1259f15b0316af2c523ba Mon Sep 17 00:00:00 2001 From: Pavel Varfolomeev Date: Wed, 25 May 2022 08:27:14 +0300 Subject: [PATCH 17/28] fix --- Jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 58b6e5c2..5222ab1d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -2,7 +2,8 @@ def pipeline = new org.js.LibPipeline(steps: this, dockerImageName: 'soramitsu/soramitsu-js-ui-library', - libExamplesBuildCmds: ['yarn storybook:build']), + libExamplesBuildCmds: ['yarn storybook:build'], sonarProjectName: 'soramitsu-js-ui-library', - sonarProjectKey: 'jp.co.soramitsu:soramitsu-js-ui-library' + sonarProjectKey: 'jp.co.soramitsu:soramitsu-js-ui-library', + ) pipeline.runPipeline() From 06bd95f4678014f0196accbe868da06d9dcc5057 Mon Sep 17 00:00:00 2001 From: Alex Natalia <38787212+alexnatalia@users.noreply.github.com> Date: Mon, 30 May 2022 10:47:17 +0100 Subject: [PATCH 18/28] STooltip: Added center alignment for the arrow. (#416) --- package.json | 2 +- src/styles/neumorphism/tooltip.scss | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 6624b9c2..45314430 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "1.0.32", + "version": "1.0.33", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/" diff --git a/src/styles/neumorphism/tooltip.scss b/src/styles/neumorphism/tooltip.scss index c4eafbfc..d2daf2cf 100644 --- a/src/styles/neumorphism/tooltip.scss +++ b/src/styles/neumorphism/tooltip.scss @@ -19,6 +19,10 @@ $neu-tooltip-arrow-width: 8px; .popper__arrow { border-bottom-color: $neu-tooltip-background-color; + right: 0 !important; + left: 0 !important; + margin-right: auto !important; + margin-left: auto !important; &::after { border-bottom-color: inherit; } From 7f95ca3cbef213c65e15e51bc1c5b1133e451b4b Mon Sep 17 00:00:00 2001 From: Alex Natalia <38787212+alexnatalia@users.noreply.github.com> Date: Tue, 31 May 2022 09:16:28 +0100 Subject: [PATCH 19/28] STooltip: Reverted Popper Arrow Styles Update (#418) * STooltip: Updated Popper Arrow Styles. * Reverted the prev PR changes. Co-authored-by: alexnatalia --- package.json | 2 +- src/styles/neumorphism/tooltip.scss | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/package.json b/package.json index 45314430..6624b9c2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "1.0.33", + "version": "1.0.32", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/" diff --git a/src/styles/neumorphism/tooltip.scss b/src/styles/neumorphism/tooltip.scss index d2daf2cf..c4eafbfc 100644 --- a/src/styles/neumorphism/tooltip.scss +++ b/src/styles/neumorphism/tooltip.scss @@ -19,10 +19,6 @@ $neu-tooltip-arrow-width: 8px; .popper__arrow { border-bottom-color: $neu-tooltip-background-color; - right: 0 !important; - left: 0 !important; - margin-right: auto !important; - margin-left: auto !important; &::after { border-bottom-color: inherit; } From 1b4225358eaf8b8c4e04c18b36b74a2d9b92cf6d Mon Sep 17 00:00:00 2001 From: Alex Natalia <38787212+alexnatalia@users.noreply.github.com> Date: Thu, 2 Jun 2022 09:39:14 +0100 Subject: [PATCH 20/28] STooltip: Decreased Open Delay. (#419) --- package.json | 2 +- src/components/Tooltip/STooltip.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 6624b9c2..45314430 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "1.0.32", + "version": "1.0.33", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/" diff --git a/src/components/Tooltip/STooltip.vue b/src/components/Tooltip/STooltip.vue index 8e402d09..cc88fa98 100644 --- a/src/components/Tooltip/STooltip.vue +++ b/src/components/Tooltip/STooltip.vue @@ -85,9 +85,9 @@ export default class STooltip extends Mixins(BorderRadiusMixin, DesignSystemInje /** * Delay of the tooltip appearance, in millisecond. * - * `1000` by default + * `500` by default */ - @Prop({ default: 1000, type: Number }) readonly openDelay!: number + @Prop({ default: 500, type: Number }) readonly openDelay!: number /** * Custom class name for tooltip's popper */ From 9feb3ea9099dc5b336364a1ca93f6cca27e02625 Mon Sep 17 00:00:00 2001 From: Alex Natalia <38787212+alexnatalia@users.noreply.github.com> Date: Thu, 14 Jul 2022 23:41:39 +0300 Subject: [PATCH 21/28] Fixed Receive Misspelling. (#444) --- package.json | 2 +- src/components/Icon/consts.ts | 2 +- src/styles/icons.scss | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 45314430..3e1ece37 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "1.0.33", + "version": "1.0.34", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/" diff --git a/src/components/Icon/consts.ts b/src/components/Icon/consts.ts index 8f2168e1..2128d123 100644 --- a/src/components/Icon/consts.ts +++ b/src/components/Icon/consts.ts @@ -202,7 +202,7 @@ export enum Icons24 { CallCallNumbers = 'call-call-numbers-24', CallCallOutcoming = 'call-call-outcoming-24', CallCallPhone = 'call-call-phone-24', - CallCallRecieved = 'call-call-recieved-24', + CallCallReceived = 'call-call-received-24', CallCallVoicemail = 'call-call-voicemail-24', ChattingComment = 'chatting-comment-24', ChattingCommentChecked = 'chatting-comment-checked-24', diff --git a/src/styles/icons.scss b/src/styles/icons.scss index b6e3fd31..d4c9a0fe 100644 --- a/src/styles/icons.scss +++ b/src/styles/icons.scss @@ -484,7 +484,7 @@ $s-icon-call-call-no-24: "\ea8b"; $s-icon-call-call-numbers-24: "\ea8c"; $s-icon-call-call-outcoming-24: "\ea8d"; $s-icon-call-call-phone-24: "\ea8e"; -$s-icon-call-call-recieved-24: "\ea8f"; +$s-icon-call-call-received-24: "\ea8f"; $s-icon-call-call-voicemail-24: "\ea90"; $s-icon-chatting-comment-24: "\ea91"; $s-icon-chatting-comment-checked-24: "\ea92"; @@ -2948,9 +2948,9 @@ $s-icon-various-toy-horse-24: "\eae9"; content: $s-icon-call-call-phone-24; } } -.s-icon-call-call-recieved-24 { +.s-icon-call-call-received-24 { &:before { - content: $s-icon-call-call-recieved-24; + content: $s-icon-call-call-received-24; } } .s-icon-call-call-voicemail-24 { From 4b688f6d7cb1654bde041fed142c18901ce4d6b6 Mon Sep 17 00:00:00 2001 From: Bao Tran Date: Sun, 17 Jul 2022 11:50:00 +0700 Subject: [PATCH 22/28] [DOPS-1857] Add publish button for all libraries PRs & branches in Jenkins --- Jenkinsfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index 5222ab1d..e59fbb5e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,9 +1,15 @@ @Library('jenkins-library' ) _ +// Job properties +def jobParams = [ + booleanParam(defaultValue: false, description: 'publish packages', name: 'publish'), +] + def pipeline = new org.js.LibPipeline(steps: this, dockerImageName: 'soramitsu/soramitsu-js-ui-library', libExamplesBuildCmds: ['yarn storybook:build'], sonarProjectName: 'soramitsu-js-ui-library', sonarProjectKey: 'jp.co.soramitsu:soramitsu-js-ui-library', + jobParams: jobParams ) pipeline.runPipeline() From 3389b1c49e697b4aff928798d23ad88ae1405ae0 Mon Sep 17 00:00:00 2001 From: Bao Tran Date: Thu, 4 Aug 2022 21:43:38 +0700 Subject: [PATCH 23/28] [DOPS-1857] Add publish button for all libraries PRs & branches in Jenkins --- Jenkinsfile | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e59fbb5e..c1afa51d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,15 +1,9 @@ @Library('jenkins-library' ) _ -// Job properties -def jobParams = [ - booleanParam(defaultValue: false, description: 'publish packages', name: 'publish'), -] - def pipeline = new org.js.LibPipeline(steps: this, dockerImageName: 'soramitsu/soramitsu-js-ui-library', libExamplesBuildCmds: ['yarn storybook:build'], sonarProjectName: 'soramitsu-js-ui-library', - sonarProjectKey: 'jp.co.soramitsu:soramitsu-js-ui-library', - jobParams: jobParams + sonarProjectKey: 'jp.co.soramitsu:soramitsu-js-ui-library' ) pipeline.runPipeline() From 8022d6cf7d82a057ef343550e23f2fc27502caba Mon Sep 17 00:00:00 2001 From: Nikita Polyakov <53777036+Nikita-Polyakov@users.noreply.github.com> Date: Tue, 9 Aug 2022 11:22:11 +0300 Subject: [PATCH 24/28] add neu select styles (#458) --- package.json | 2 +- src/components/Select/SSelect/SSelect.vue | 9 ++++- src/styles/dropdown.scss | 1 + src/styles/neumorphism/index.scss | 1 + src/styles/neumorphism/select.scss | 48 +++++++++++++++++++++++ src/styles/select.scss | 3 +- 6 files changed, 61 insertions(+), 3 deletions(-) create mode 100644 src/styles/neumorphism/select.scss diff --git a/package.json b/package.json index 3e1ece37..597c3456 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "1.0.34", + "version": "1.0.35", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/" diff --git a/src/components/Select/SSelect/SSelect.vue b/src/components/Select/SSelect/SSelect.vue index 4bcc7c8e..8e998c21 100644 --- a/src/components/Select/SSelect/SSelect.vue +++ b/src/components/Select/SSelect/SSelect.vue @@ -35,13 +35,14 @@ import { ElFormItem } from 'element-ui/types/form-item' import SizeMixin from '../../../mixins/SizeMixin' import BorderRadiusMixin from '../../../mixins/BorderRadiusMixin' +import DesignSystemInject from '../../DesignSystem/DesignSystemInject' import { Autocomplete } from '../../Input/consts' import { InputTypes } from '../consts' @Component({ components: { ElSelect } }) -export default class SSelect extends Mixins(SizeMixin, BorderRadiusMixin) { +export default class SSelect extends Mixins(SizeMixin, BorderRadiusMixin, DesignSystemInject) { /** * Selected value. Can be used with `v-model` */ @@ -163,6 +164,9 @@ export default class SSelect extends Mixins(SizeMixin, BorderRadiusMixin) { get computedPopperClass (): string { const cssClasses: Array = [] + if (this.designSystemClass) { + cssClasses.push(this.designSystemClass) + } if (this.popperClass) { cssClasses.push(this.popperClass) } @@ -174,6 +178,9 @@ export default class SSelect extends Mixins(SizeMixin, BorderRadiusMixin) { get computedClasses (): Array { const cssClasses: Array = [] + if (this.designSystemClass) { + cssClasses.push(this.designSystemClass) + } if (this.inputType === 'select') { if ((this.elForm || this.elFormItem || {}).size) { cssClasses.push(`s-${(this.elForm || this.elFormItem).size}`) diff --git a/src/styles/dropdown.scss b/src/styles/dropdown.scss index a71874a5..5ccb436f 100644 --- a/src/styles/dropdown.scss +++ b/src/styles/dropdown.scss @@ -55,6 +55,7 @@ .el-dropdown-menu.el-popper { background-color: var(--s-color-base-on-accent); border-color: var(--s-color-base-on-accent); + overflow: hidden; @include with-popper-arrows; } .el-dropdown-menu__item { diff --git a/src/styles/neumorphism/index.scss b/src/styles/neumorphism/index.scss index 6088d16b..27a04027 100644 --- a/src/styles/neumorphism/index.scss +++ b/src/styles/neumorphism/index.scss @@ -8,3 +8,4 @@ @import "./tooltip"; @import "./dialog"; @import "./image"; +@import "./select"; diff --git a/src/styles/neumorphism/select.scss b/src/styles/neumorphism/select.scss new file mode 100644 index 00000000..baa9ff57 --- /dev/null +++ b/src/styles/neumorphism/select.scss @@ -0,0 +1,48 @@ +$arrow-placements: 'top', 'bottom', 'left', 'right'; + +$neu-select-background: var(--s-color-base-background) !default; +$neu-select-dropdown-background: var(--s-color-base-on-accent) !default; +$neu-select-border-width: 0 !default; +$neu-select-box-shadow: var(--s-shadow-element) !default; +$neu-select-color: var(--s-color-base-content-primary) !default; + +.s-select.neumorphic { + &.s-select-type, + &.s-input-type { + .el-select { + .el-input__inner { + border-width: $neu-select-border-width; + background-color: $neu-select-background; + box-shadow: $neu-select-box-shadow; + color: $neu-select-color; + font-weight: 400; + } + } + } +} + +.el-select-dropdown.el-popper.neumorphic { + background-color: $neu-select-dropdown-background; + border-color: $neu-select-dropdown-background; + + .el-scrollbar, + .el-select-dropdown__list, + .el-select-dropdown__wrap { + border-radius: inherit; + } + + .el-select-dropdown__item { + &:not(.selected) { + color: $neu-select-color; + } + } + + @each $placement in $arrow-placements { + &[x-placement^='#{$placement}'] .popper__arrow { + border-#{$placement}-color: $neu-select-dropdown-background; + &:after { + border-#{$placement}-color: $neu-select-dropdown-background; + } + } + } +} \ No newline at end of file diff --git a/src/styles/select.scss b/src/styles/select.scss index 81fa5628..5769fb65 100644 --- a/src/styles/select.scss +++ b/src/styles/select.scss @@ -4,7 +4,8 @@ ) { &.s-border-radius { &-#{$suffix} { - border-radius: 0; + border-radius: $border-radius; + .s-placeholder { border-top-left-radius: $border-radius; } From a4c87bff03c0f0d3a1c7ddf0788f95369ec0640b Mon Sep 17 00:00:00 2001 From: Alex Natalia <38787212+alexnatalia@users.noreply.github.com> Date: Mon, 29 Aug 2022 13:24:51 +0700 Subject: [PATCH 25/28] Differences in Tabindex Types Fix, V-Button Directive (#462) * SInput, SButton, SDropdown, STooltip: Fixed differences in Tabindex types. Added V-Button Directive. --- package.json | 2 +- src/components/Button/SButton/SButton.vue | 4 +-- .../Dropdown/SDropdown/SDropdown.vue | 8 +++-- src/components/Input/SInput/SInput.vue | 8 +++-- src/components/Tooltip/STooltip.vue | 8 +++-- src/directives/button.ts | 33 +++++++++++++++++++ src/directives/index.ts | 1 + src/directives/number.ts | 20 +++++------ src/index.ts | 3 +- src/types/directives.ts | 3 +- src/utils/KeyValues.ts | 5 +++ 11 files changed, 74 insertions(+), 21 deletions(-) create mode 100644 src/directives/button.ts diff --git a/package.json b/package.json index 597c3456..ad884445 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "1.0.35", + "version": "1.0.36", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/" diff --git a/src/components/Button/SButton/SButton.vue b/src/components/Button/SButton/SButton.vue index 03a03e06..baee08f9 100644 --- a/src/components/Button/SButton/SButton.vue +++ b/src/components/Button/SButton/SButton.vue @@ -103,7 +103,7 @@ export default class SButton extends Mixins(SizeMixin, BorderRadiusMixin, Design /** * Button tabindex */ - @Prop({ default: '0', type: String }) readonly tabindex!: string + @Prop({ default: 0, type: [Number, String] }) readonly tabindex!: number | string /** * Placement of the tooltip. You can use any value from the `TooltipPlacement` enum. * @@ -202,7 +202,7 @@ export default class SButton extends Mixins(SizeMixin, BorderRadiusMixin, Design } mounted (): void { - this.$el.setAttribute('tabindex', this.tabindex) + this.$el.setAttribute('tabindex', this.tabindex.toString()) this.$watch('loading', (value) => { if (!value) { return diff --git a/src/components/Dropdown/SDropdown/SDropdown.vue b/src/components/Dropdown/SDropdown/SDropdown.vue index 033f019e..d0e1e1cb 100644 --- a/src/components/Dropdown/SDropdown/SDropdown.vue +++ b/src/components/Dropdown/SDropdown/SDropdown.vue @@ -10,7 +10,7 @@ :hide-on-click="hideOnClick" :show-timeout="showTimeout" :hide-timeout="hideTimeout" - :tabindex="tabindex" + :tabindex="tabindexFormatted" @click="handleClick" @command="handleSelect" @visible-change="handleVisibleChange" @@ -129,7 +129,7 @@ export default class SDropdown extends Mixins(SizeMixin, BorderRadiusMixin) { * * `0` by default */ - @Prop({ type: Number, default: 0 }) readonly tabindex!: number + @Prop({ type: [Number, String], default: 0 }) readonly tabindex!: number | string /** * Popper class */ @@ -139,6 +139,10 @@ export default class SDropdown extends Mixins(SizeMixin, BorderRadiusMixin) { willTooltipBeDisabled = false + get tabindexFormatted (): number { + return +this.tabindex + } + get computedClasses (): Array { const cssClasses: Array = [] if (this.isStandardBorderRadius) { diff --git a/src/components/Input/SInput/SInput.vue b/src/components/Input/SInput/SInput.vue index 6c4da661..656a8cf4 100644 --- a/src/components/Input/SInput/SInput.vue +++ b/src/components/Input/SInput/SInput.vue @@ -28,7 +28,7 @@ :form="form" :label="label" :accept="accept" - :tabindex="tabindex" + :tabindex="tabindexFormatted" :prefix-icon="prefix" :suffix-icon="suffix" :rows="rows" @@ -154,7 +154,7 @@ export default class SInput extends Mixins(BorderRadiusMixin, DesignSystemInject /** * Input tabindex */ - @Prop({ default: '', type: String }) readonly tabindex!: string + @Prop({ default: 0, type: [Number, String] }) readonly tabindex!: number | string /** * Icon prefix, works only with medium input */ @@ -214,6 +214,10 @@ export default class SInput extends Mixins(BorderRadiusMixin, DesignSystemInject return (this.type === InputType.TEXT && this.size === InputSize.BIG) || (this.type === InputType.TEXTAREA) } + get tabindexFormatted (): string { + return this.tabindex.toString() + } + get computedClasses (): Array { const cssClasses: Array = [] if (this.designSystemClass) { diff --git a/src/components/Tooltip/STooltip.vue b/src/components/Tooltip/STooltip.vue index cc88fa98..0ae7ab0e 100644 --- a/src/components/Tooltip/STooltip.vue +++ b/src/components/Tooltip/STooltip.vue @@ -14,7 +14,7 @@ :popper-class="computedPopperClass" :manual="manual" :hide-after="hideAfter" - :tabindex="tabindex" + :tabindex="tabindexFormatted" > @@ -116,12 +116,16 @@ export default class STooltip extends Mixins(BorderRadiusMixin, DesignSystemInje * * `0` by default */ - @Prop({ default: 0, type: Number }) readonly tabindex!: number + @Prop({ default: 0, type: [Number, String] }) readonly tabindex!: number | string @Ref('tooltip') tooltip!: any @Getter libraryTheme!: Theme + get tabindexFormatted (): number { + return +this.tabindex + } + get computedPopperClass (): string { const cssClasses: Array = [] if (this.designSystemClass) { diff --git a/src/directives/button.ts b/src/directives/button.ts new file mode 100644 index 00000000..1c8a5e61 --- /dev/null +++ b/src/directives/button.ts @@ -0,0 +1,33 @@ +import { DirectiveOptions } from 'vue' + +import KeyValues from '../utils/KeyValues' + +const onEnterKeyDown = (e: any) => { + if (KeyValues.isEnter(e.key)) { + e.preventDefault() + e.target.click() + } +} + +export const Button = { + bind (el, binding, vnode) { + if (binding.value || typeof binding.value === 'undefined') { + const button = el as HTMLDivElement + button.setAttribute('role', 'button') + button.addEventListener( + 'keydown', + onEnterKeyDown + ) + } + }, + unbind (el, binding, vnode) { + if (binding.value || typeof binding.value === 'undefined') { + const button = el as HTMLDivElement + button.removeAttribute('role') + button.removeEventListener( + 'keydown', + onEnterKeyDown + ) + } + } +} as DirectiveOptions diff --git a/src/directives/index.ts b/src/directives/index.ts index 6f5f144e..86744225 100644 --- a/src/directives/index.ts +++ b/src/directives/index.ts @@ -1 +1,2 @@ export { Float, Integer } from './number' +export { Button } from './button' diff --git a/src/directives/number.ts b/src/directives/number.ts index 637e476c..7379cffb 100644 --- a/src/directives/number.ts +++ b/src/directives/number.ts @@ -2,7 +2,7 @@ import { DirectiveOptions } from 'vue' import KeyValues from '../utils/KeyValues' -const onDigitKeyPress = (e: any) => { +const onDigitKeyDown = (e: any) => { if (!KeyValues.isDigit(e.key)) { e.preventDefault() } else { @@ -10,7 +10,7 @@ const onDigitKeyPress = (e: any) => { } } -const onNumberKeyPress = (e: any) => { +const onNumberKeyDown = (e: any) => { if (!KeyValues.isNumber(e.key) || (!KeyValues.isDigit(e.key) && e.target.value.includes('.'))) { e.preventDefault() } else { @@ -23,8 +23,8 @@ export const Integer = { const input = el.querySelector('input[type="text"]') as HTMLInputElement if (input) { input.addEventListener( - 'keypress', - onDigitKeyPress + 'keydown', + onDigitKeyDown ) } }, @@ -32,8 +32,8 @@ export const Integer = { const input = el.querySelector('input[type="text"]') as HTMLInputElement if (input) { input.removeEventListener( - 'keypress', - onDigitKeyPress + 'keydown', + onDigitKeyDown ) } } @@ -44,8 +44,8 @@ export const Float = { const input = el.querySelector('input[type="text"]') as HTMLInputElement if (input) { input.addEventListener( - 'keypress', - onNumberKeyPress + 'keydown', + onNumberKeyDown ) } }, @@ -53,8 +53,8 @@ export const Float = { const input = el.querySelector('input[type="text"]') as HTMLInputElement if (input) { input.removeEventListener( - 'keypress', - onNumberKeyPress + 'keydown', + onNumberKeyDown ) } } diff --git a/src/index.ts b/src/index.ts index 62348afe..47352684 100644 --- a/src/index.ts +++ b/src/index.ts @@ -54,7 +54,7 @@ import { STableColumn, STooltip } from './components' -import { Float, Integer } from './directives' +import { Float, Integer, Button } from './directives' import { Components } from './types/components' import { Directives } from './types/directives' import { setTheme, setDesignSystem, setLocale } from './utils' @@ -72,6 +72,7 @@ const SoramitsuElements = { vue.use(ElementUIPlugin) vue.directive(Directives.Float, Float) vue.directive(Directives.Integer, Integer) + vue.directive(Directives.Button, Button) vue.use(SApp) vue.use(SAside) vue.use(SBreadcrumb) diff --git a/src/types/directives.ts b/src/types/directives.ts index b1b8a4bd..7b002d5b 100644 --- a/src/types/directives.ts +++ b/src/types/directives.ts @@ -1,4 +1,5 @@ export enum Directives { Float = 'Float', - Integer = 'Integer' + Integer = 'Integer', + Button = 'Button' } diff --git a/src/utils/KeyValues.ts b/src/utils/KeyValues.ts index f9e2ff8e..4149272d 100644 --- a/src/utils/KeyValues.ts +++ b/src/utils/KeyValues.ts @@ -1,6 +1,7 @@ export default class KeyValues { private static readonly digits = /[0-9]/ private static readonly numbers = /[0-9.]/ + private static readonly Enter = 'Enter' public static isDigit (digit: string): boolean { return this.digits.test(digit) @@ -9,4 +10,8 @@ export default class KeyValues { public static isNumber (number: string): boolean { return this.numbers.test(number) } + + public static isEnter (key: string): boolean { + return key === this.Enter + } } From 5c899e677747988ea2abb2a35cd56cba75cf9b72 Mon Sep 17 00:00:00 2001 From: Stefan Popov Date: Tue, 30 Aug 2022 11:27:00 +0400 Subject: [PATCH 26/28] Fix directives (#464) --- build/rollup.config.js | 1 + package.json | 2 +- src/components/Input/SFloatInput/SFloatInput.vue | 2 +- src/index.ts | 2 +- src/types/directives.ts | 4 +++- 5 files changed, 7 insertions(+), 4 deletions(-) diff --git a/build/rollup.config.js b/build/rollup.config.js index 94c6f948..b1695b2c 100644 --- a/build/rollup.config.js +++ b/build/rollup.config.js @@ -22,6 +22,7 @@ export default { 'src/types/Locale.ts', 'src/types/Theme.ts', 'src/types/components.ts', + 'src/types/directives.ts', 'src/types/index.ts', 'src/locale/index.ts', 'src/plugins/*.ts', diff --git a/package.json b/package.json index ad884445..73687cd5 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "1.0.36", + "version": "1.0.37", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/" diff --git a/src/components/Input/SFloatInput/SFloatInput.vue b/src/components/Input/SFloatInput/SFloatInput.vue index a7202b04..1e1f7105 100644 --- a/src/components/Input/SFloatInput/SFloatInput.vue +++ b/src/components/Input/SFloatInput/SFloatInput.vue @@ -41,7 +41,7 @@ const decimalsValidator = x => x === undefined || x >= 0 SInput }, directives: { - float: Float as any // TODO: fix type + float: Float } }) export default class SFloatInput extends Vue { diff --git a/src/index.ts b/src/index.ts index 47352684..4ae72434 100644 --- a/src/index.ts +++ b/src/index.ts @@ -56,9 +56,9 @@ import { } from './components' import { Float, Integer, Button } from './directives' import { Components } from './types/components' -import { Directives } from './types/directives' import { setTheme, setDesignSystem, setLocale } from './utils' import DesignSystem from './types/DesignSystem' +import Directives from './types/directives' import Theme from './types/Theme' import Locale from './types/Locale' import { SoramitsuUIStorePlugin, ElementUIPlugin } from './plugins' diff --git a/src/types/directives.ts b/src/types/directives.ts index 7b002d5b..6ce842cd 100644 --- a/src/types/directives.ts +++ b/src/types/directives.ts @@ -1,5 +1,7 @@ -export enum Directives { +enum Directives { Float = 'Float', Integer = 'Integer', Button = 'Button' } + +export default Directives From 757157ddf05355e79c1625cfea43035387adabdf Mon Sep 17 00:00:00 2001 From: Alex Natalia <38787212+alexnatalia@users.noreply.github.com> Date: Tue, 20 Sep 2022 13:35:13 +0300 Subject: [PATCH 27/28] Focus Behaviour Improvements (#466) * Improved focus behaviour. --- config/storybook/neu-theme-variables.scss | 2 ++ package.json | 2 +- src/styles/neumorphism/button.scss | 4 ++++ src/styles/neumorphism/index.scss | 1 + src/styles/neumorphism/input.scss | 2 ++ src/styles/neumorphism/mixins.scss | 11 +++++++++++ src/styles/root.scss | 3 +++ src/styles/theme/dark.scss | 1 + src/styles/variables.scss | 1 + 9 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 src/styles/neumorphism/mixins.scss diff --git a/config/storybook/neu-theme-variables.scss b/config/storybook/neu-theme-variables.scss index b06470e3..04e56408 100644 --- a/config/storybook/neu-theme-variables.scss +++ b/config/storybook/neu-theme-variables.scss @@ -24,6 +24,7 @@ $s-color-base-background-hover: #F7F3F4; $s-color-base-disabled: #FDF7FB; $s-color-base-on-disabled: #A19A9D; $s-color-base-on-accent: #FFFFFF; +$s-color-outline: rgba(0, 0, 0, 0.5); // Utility colors $s-color-utility-body: #F7F3F4; $s-color-utility-surface: #FDF7FB; @@ -63,6 +64,7 @@ $s-size-mini: 24px; --s-color-base-disabled: #{$s-color-base-disabled}; --s-color-base-on-disabled: #{$s-color-base-on-disabled}; --s-color-base-on-accent: #{$s-color-base-on-accent}; + --s-color-outline: #{$s-color-outline}; --s-color-utility-body: #{$s-color-utility-body}; --s-color-utility-surface: #{$s-color-utility-surface}; --s-color-utility-overlay: #{$s-color-utility-overlay}; diff --git a/package.json b/package.json index 73687cd5..19d1f380 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "1.0.37", + "version": "1.0.38", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/" diff --git a/src/styles/neumorphism/button.scss b/src/styles/neumorphism/button.scss index ce1b6dc5..d6ca3ab6 100644 --- a/src/styles/neumorphism/button.scss +++ b/src/styles/neumorphism/button.scss @@ -173,6 +173,10 @@ $neu-button-padding-mini: 3px 6px !default; transition: $neu-button-transition; text-transform: uppercase; + &.s-primary, &.s-secondary, &.s-tertiary, &.s-action, &.s-link { + @include focus-outline; + } + @include size('big', $neu-button-padding-big); @include size('medium', $neu-button-padding-medium); @include size('small', $neu-button-padding-small); diff --git a/src/styles/neumorphism/index.scss b/src/styles/neumorphism/index.scss index 27a04027..6d4142a1 100644 --- a/src/styles/neumorphism/index.scss +++ b/src/styles/neumorphism/index.scss @@ -1,3 +1,4 @@ +@import "./mixins"; @import "./button"; @import "./input"; @import "./card"; diff --git a/src/styles/neumorphism/input.scss b/src/styles/neumorphism/input.scss index 8efbb605..ada5764c 100644 --- a/src/styles/neumorphism/input.scss +++ b/src/styles/neumorphism/input.scss @@ -16,6 +16,8 @@ $neu-input-padding: $s-basic-spacing $s-basic-spacing * 2 !default; height: initial; min-height: $s-size-big; + @include focus-outline(true); + &.s-size-small { padding-top: $s-basic-spacing / 2; padding-bottom: $s-basic-spacing / 2; diff --git a/src/styles/neumorphism/mixins.scss b/src/styles/neumorphism/mixins.scss new file mode 100644 index 00000000..f206630f --- /dev/null +++ b/src/styles/neumorphism/mixins.scss @@ -0,0 +1,11 @@ +@mixin focus-outline($focusWithin: false) { + @if $focusWithin == true { + &:focus-within { + outline: 1px solid var(--s-color-outline); + } + } @else { + &:focus { + outline: 1px solid var(--s-color-outline); + } + } +} diff --git a/src/styles/root.scss b/src/styles/root.scss index 2bba693e..8ec23d64 100644 --- a/src/styles/root.scss +++ b/src/styles/root.scss @@ -20,6 +20,7 @@ --s-color-base-disabled: #{$s-color-base-disabled}; --s-color-base-on-disabled: #{$s-color-base-on-disabled}; --s-color-base-on-accent: #{$s-color-base-on-accent}; + --s-color-outline: #{$s-color-outline}; --s-color-utility-body: #{$s-color-utility-body}; --s-color-utility-surface: #{$s-color-utility-surface}; --s-color-utility-overlay: #{$s-color-utility-overlay}; @@ -50,6 +51,7 @@ --s-color-base-disabled--dark: #{$s-color-base-disabled--dark}; --s-color-base-on-disabled--dark: #{$s-color-base-on-disabled--dark}; --s-color-base-on-accent--dark: #{$s-color-base-on-accent--dark}; + --s-color-outline--dark: #{$s-color-outline--dark}; --s-color-utility-body--dark: #{$s-color-utility-body--dark}; --s-color-utility-surface--dark: #{$s-color-utility-surface--dark}; --s-color-utility-overlay--dark: #{$s-color-utility-overlay--dark}; @@ -170,6 +172,7 @@ --s-color-base-disabled: var(--s-color-base-disabled--dark); --s-color-base-on-disabled: var(--s-color-base-on-disabled--dark); --s-color-base-on-accent: var(--s-color-base-on-accent--dark); + --s-color-outline: var(--s-color-outline--dark); --s-color-utility-body: var(--s-color-utility-body--dark); --s-color-utility-surface: var(--s-color-utility-surface--dark); --s-color-utility-overlay: var(--s-color-utility-overlay--dark); diff --git a/src/styles/theme/dark.scss b/src/styles/theme/dark.scss index eb39a569..97a688ee 100644 --- a/src/styles/theme/dark.scss +++ b/src/styles/theme/dark.scss @@ -22,6 +22,7 @@ $s-color-base-background-hover--dark: #693D81 !default; // ???? $s-color-base-disabled--dark: rgba(#391057, .5) !default; // ???? $s-color-base-on-disabled--dark: #5D2F73 !default; // ???? $s-color-base-on-accent--dark: #391057 !default; +$s-color-outline--dark: rgba(255, 255, 255, 0.5); // Utility colors $s-color-utility-body--dark: #5D2F73 !default; $s-color-utility-surface--dark: #592D71 !default; diff --git a/src/styles/variables.scss b/src/styles/variables.scss index 37bf72ca..442215dc 100644 --- a/src/styles/variables.scss +++ b/src/styles/variables.scss @@ -22,6 +22,7 @@ $s-color-base-background-hover: #ECEFF0 !default; $s-color-base-disabled: #F5F7F8 !default; $s-color-base-on-disabled: #75787B !default; $s-color-base-on-accent: #FFFFFF !default; +$s-color-outline: rgba(0, 0, 0, 0.5); // Utility colors $s-color-utility-body: #FFFFFF !default; $s-color-utility-surface: #FFFFFF !default; From 2a8062222a431118c69202c5fc237d3c6d29f711 Mon Sep 17 00:00:00 2001 From: Alex Natalia <38787212+alexnatalia@users.noreply.github.com> Date: Mon, 26 Sep 2022 14:35:55 +0300 Subject: [PATCH 28/28] Improved Focus Outline Mixin. (#468) --- package.json | 2 +- src/styles/neumorphism/mixins.scss | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 19d1f380..cde7eda6 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@soramitsu/soramitsu-js-ui", - "version": "1.0.38", + "version": "1.0.39", "private": false, "publishConfig": { "registry": "https://nexus.iroha.tech/repository/npm-soramitsu/" diff --git a/src/styles/neumorphism/mixins.scss b/src/styles/neumorphism/mixins.scss index f206630f..2753d692 100644 --- a/src/styles/neumorphism/mixins.scss +++ b/src/styles/neumorphism/mixins.scss @@ -1,11 +1,12 @@ @mixin focus-outline($focusWithin: false) { + $outline: 1px solid var(--s-color-outline); @if $focusWithin == true { &:focus-within { - outline: 1px solid var(--s-color-outline); + outline: $outline; } } @else { - &:focus { - outline: 1px solid var(--s-color-outline); + &:focus:not(:active) { + outline: $outline; } } }