From d48611487436db4c4e37385c5a917000c8e1b721 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 25 Jan 2024 15:47:53 +0300 Subject: [PATCH 001/291] fix: listing item selected item hover #1280 --- ...em-with-instruments-example.component.html | 9 ++++-- .../listing-item-example.component.html | 32 ++++++++++++++++++- .../listing-item-example.component.ts | 3 ++ .../listing-item-example.module.ts | 2 ++ .../listing-item/listing-item.component.less | 4 +-- 5 files changed, 45 insertions(+), 5 deletions(-) diff --git a/apps/doc/src/app/components/listing-item/examples/with-instrumnets/listing-item-with-instruments-example.component.html b/apps/doc/src/app/components/listing-item/examples/with-instrumnets/listing-item-with-instruments-example.component.html index 26a3f38cf7..404d2d8181 100644 --- a/apps/doc/src/app/components/listing-item/examples/with-instrumnets/listing-item-with-instruments-example.component.html +++ b/apps/doc/src/app/components/listing-item/examples/with-instrumnets/listing-item-with-instruments-example.component.html @@ -1,7 +1,12 @@
- + - + diff --git a/apps/doc/src/app/components/listing-item/listing-item-example.component.html b/apps/doc/src/app/components/listing-item/listing-item-example.component.html index 5923284a2a..f333b62fd5 100644 --- a/apps/doc/src/app/components/listing-item/listing-item-example.component.html +++ b/apps/doc/src/app/components/listing-item/listing-item-example.component.html @@ -23,12 +23,42 @@
- + {{ title }}
+ + Listing item row hover color + + + Listing item selected row hover color + + + Listing item height + Date: Tue, 30 Jan 2024 17:50:20 +0300 Subject: [PATCH 002/291] chore: version 1.14.0 up tp 1.15.0 --- .github/workflows/beta-publish-ng14.yml | 2 +- .github/workflows/main-publish-ng14.yml | 2 +- .github/workflows/pre-release-publish-ng14.yml | 2 +- apps/doc/src/app/version-manager/current.const.ts | 2 +- libs/ast/package.json.ng14 | 2 +- libs/charts/base/package.json.ng14 | 6 +++--- libs/components/package.json.ng14 | 10 +++++----- libs/core/package.json.ng14 | 2 +- libs/helpers/package.json.ng14 | 2 +- libs/i18n/package.json.ng14 | 2 +- libs/icons/base/package.json.ng14 | 4 ++-- libs/icons/flags/package.json.ng14 | 4 ++-- libs/nxmv/package.json.ng14 | 2 +- libs/plugin/package.json.ng14 | 4 ++-- libs/schematics/package.json.ng14 | 2 +- libs/theme/package.json.ng14 | 6 +++--- package.json.ng14 | 2 +- 17 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/beta-publish-ng14.yml b/.github/workflows/beta-publish-ng14.yml index 1621c82154..a4e1067a78 100644 --- a/.github/workflows/beta-publish-ng14.yml +++ b/.github/workflows/beta-publish-ng14.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng14beta --json 2>/dev/null || echo '1.14.0-ng14beta.0') | jq '([.[] | select(startswith("1.14.0-ng14beta"))] | last // "1.14.0-ng14beta.0")' 2>/dev/null || echo '1.14.0-ng14beta.0' + (npm view @prizm-ui/components versions --tag ng14beta --json 2>/dev/null || echo '1.15.0-ng14beta.0') | jq '([.[] | select(startswith("1.15.0-ng14beta"))] | last // "1.15.0-ng14beta.0")' 2>/dev/null || echo '1.15.0-ng14beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng14.yml b/.github/workflows/main-publish-ng14.yml index c82a8c2bc2..84a211871a 100644 --- a/.github/workflows/main-publish-ng14.yml +++ b/.github/workflows/main-publish-ng14.yml @@ -58,7 +58,7 @@ jobs: - name: Set up environment variables run: | last_v1_version=$( - echo '1.14.0' + echo '1.15.0' ) echo "LAST_V1_VERSION=${last_v1_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng14.yml b/.github/workflows/pre-release-publish-ng14.yml index dc3f2d566c..b20a1e50db 100644 --- a/.github/workflows/pre-release-publish-ng14.yml +++ b/.github/workflows/pre-release-publish-ng14.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng14next --json 2>/dev/null || echo '1.14.0-ng14next.0') | jq '([.[] | select(startswith("1.14.0-ng14next"))] | last // "1.14.0-ng14next.0")' 2>/dev/null || echo '1.14.0-ng14next.0' + (npm view @prizm-ui/components versions --tag ng14next --json 2>/dev/null || echo '1.15.0-ng14next.0') | jq '([.[] | select(startswith("1.15.0-ng14next"))] | last // "1.15.0-ng14next.0")' 2>/dev/null || echo '1.15.0-ng14next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/apps/doc/src/app/version-manager/current.const.ts b/apps/doc/src/app/version-manager/current.const.ts index e67a621d6c..c548790b68 100644 --- a/apps/doc/src/app/version-manager/current.const.ts +++ b/apps/doc/src/app/version-manager/current.const.ts @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '1.14.0'; +export const PRIZM_CURRENT_VERSION = '1.15.0'; diff --git a/libs/ast/package.json.ng14 b/libs/ast/package.json.ng14 index ea0efe8172..98a9be114b 100644 --- a/libs/ast/package.json.ng14 +++ b/libs/ast/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "1.14.0", + "version": "1.15.0", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json.ng14 b/libs/charts/base/package.json.ng14 index c3774d869a..4b519d3924 100644 --- a/libs/charts/base/package.json.ng14 +++ b/libs/charts/base/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "1.14.0", + "version": "1.15.0", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/theme": "^1.14.0", - "@prizm-ui/helpers": "^1.14.0", + "@prizm-ui/theme": "^1.15.0", + "@prizm-ui/helpers": "^1.15.0", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/package.json.ng14 b/libs/components/package.json.ng14 index 6edcc443a7..2d462d74fc 100644 --- a/libs/components/package.json.ng14 +++ b/libs/components/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "1.14.0", + "version": "1.15.0", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -17,10 +17,10 @@ "@ng-web-apis/resize-observer": "2.0.0", "@ng-web-apis/intersection-observer": "2.0.0", "@ng-web-apis/mutation-observer": "2.0.0", - "@prizm-ui/helpers": "^1.14.0", - "@prizm-ui/core": "^1.14.0", - "@prizm-ui/i18n": "^1.14.0", - "@prizm-ui/theme": "^1.14.0" + "@prizm-ui/helpers": "^1.15.0", + "@prizm-ui/core": "^1.15.0", + "@prizm-ui/i18n": "^1.15.0", + "@prizm-ui/theme": "^1.15.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json.ng14 b/libs/core/package.json.ng14 index 1b1d0b28e8..179f0d9b88 100644 --- a/libs/core/package.json.ng14 +++ b/libs/core/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "1.14.0", + "version": "1.15.0", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json.ng14 b/libs/helpers/package.json.ng14 index e08dd3f7fa..2551bf27d4 100644 --- a/libs/helpers/package.json.ng14 +++ b/libs/helpers/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "1.14.0", + "version": "1.15.0", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json.ng14 b/libs/i18n/package.json.ng14 index 885e83239a..2837e0a236 100644 --- a/libs/i18n/package.json.ng14 +++ b/libs/i18n/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "1.14.0", + "version": "1.15.0", "peerDependencies": { "@angular/core": "^14.2.0" }, diff --git a/libs/icons/base/package.json.ng14 b/libs/icons/base/package.json.ng14 index d6ca9fb69d..cc1243d17e 100644 --- a/libs/icons/base/package.json.ng14 +++ b/libs/icons/base/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "1.14.0", + "version": "1.15.0", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/core": "^1.14.0" + "@prizm-ui/core": "^1.15.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json.ng14 b/libs/icons/flags/package.json.ng14 index 4bb6f105e6..4fe2b6fe18 100644 --- a/libs/icons/flags/package.json.ng14 +++ b/libs/icons/flags/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "1.14.0", + "version": "1.15.0", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/core": "^1.14.0" + "@prizm-ui/core": "^1.15.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json.ng14 b/libs/nxmv/package.json.ng14 index 9311171c9f..c68798b507 100644 --- a/libs/nxmv/package.json.ng14 +++ b/libs/nxmv/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "1.14.0", + "version": "1.15.0", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json.ng14 b/libs/plugin/package.json.ng14 index f3df8c81ad..23c315edc8 100644 --- a/libs/plugin/package.json.ng14 +++ b/libs/plugin/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "1.14.0", + "version": "1.15.0", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^1.14.0" + "@prizm-ui/ast": "^1.15.0" } } diff --git a/libs/schematics/package.json.ng14 b/libs/schematics/package.json.ng14 index e1ea4523b7..9484e08e69 100644 --- a/libs/schematics/package.json.ng14 +++ b/libs/schematics/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "1.14.0", + "version": "1.15.0", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json.ng14 b/libs/theme/package.json.ng14 index b3c1d3bae2..db76d7b781 100644 --- a/libs/theme/package.json.ng14 +++ b/libs/theme/package.json.ng14 @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "1.14.0", + "version": "1.15.0", "peerDependencies": { "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/core": "^1.14.0", - "@prizm-ui/helpers": "^1.14.0" + "@prizm-ui/core": "^1.15.0", + "@prizm-ui/helpers": "^1.15.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json.ng14 b/package.json.ng14 index afa0a05006..2056c4777c 100644 --- a/package.json.ng14 +++ b/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "1.14.0", + "version": "1.15.0", "license": "MIT", "husky": { "hooks": { From a5a6dc2b58967fbcf7aec0028a7db78de3417618 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 30 Jan 2024 18:01:45 +0300 Subject: [PATCH 003/291] chore: version 2.11.0 up tp 2.12.0 --- .github/workflows/beta-publish-ng15.yml | 2 +- .github/workflows/main-publish-ng15.yml | 2 +- .github/workflows/pre-release-publish-ng15.yml | 2 +- apps/doc/src/app/version-manager/current.const.ts.ng15 | 2 +- libs/ast/package.json.ng15 | 2 +- libs/charts/base/package.json.ng15 | 6 +++--- libs/components/package.json.ng15 | 10 +++++----- libs/core/package.json.ng15 | 2 +- libs/helpers/package.json.ng15 | 2 +- libs/i18n/package.json.ng15 | 2 +- libs/icons/base/package.json.ng15 | 4 ++-- libs/icons/flags/package.json.ng15 | 4 ++-- libs/nxmv/package.json.ng15 | 2 +- libs/plugin/package.json.ng15 | 4 ++-- libs/schematics/package.json.ng15 | 2 +- libs/theme/package.json.ng15 | 6 +++--- package.json.ng15 | 2 +- 17 files changed, 28 insertions(+), 28 deletions(-) diff --git a/.github/workflows/beta-publish-ng15.yml b/.github/workflows/beta-publish-ng15.yml index adb28c517a..cc29082903 100644 --- a/.github/workflows/beta-publish-ng15.yml +++ b/.github/workflows/beta-publish-ng15.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng15beta --json 2>/dev/null || echo '2.11.0-ng15beta.0') | jq '([.[] | select(startswith("2.11.0-ng15beta"))] | last // "2.11.0-ng15beta.0")' 2>/dev/null || echo '2.11.0-ng15beta.0' + (npm view @prizm-ui/components versions --tag ng15beta --json 2>/dev/null || echo '2.12.0-ng15beta.0') | jq '([.[] | select(startswith("2.12.0-ng15beta"))] | last // "2.12.0-ng15beta.0")' 2>/dev/null || echo '2.12.0-ng15beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng15.yml b/.github/workflows/main-publish-ng15.yml index d505686470..e7d2368f77 100644 --- a/.github/workflows/main-publish-ng15.yml +++ b/.github/workflows/main-publish-ng15.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_v2_version=$( - echo '2.11.0' + echo '2.12.0' ) echo "LAST_V2_VERSION=${last_v2_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng15.yml b/.github/workflows/pre-release-publish-ng15.yml index f3cb5b7980..c21b35b2fb 100644 --- a/.github/workflows/pre-release-publish-ng15.yml +++ b/.github/workflows/pre-release-publish-ng15.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng15next --json 2>/dev/null || echo '2.11.0-ng15next.0') | jq '([.[] | select(startswith("2.11.0-ng15next"))] | last // "2.11.0-ng15next.0")' 2>/dev/null || echo '2.11.0-ng15next.0' + (npm view @prizm-ui/components versions --tag ng15next --json 2>/dev/null || echo '2.12.0-ng15next.0') | jq '([.[] | select(startswith("2.12.0-ng15next"))] | last // "2.12.0-ng15next.0")' 2>/dev/null || echo '2.12.0-ng15next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/apps/doc/src/app/version-manager/current.const.ts.ng15 b/apps/doc/src/app/version-manager/current.const.ts.ng15 index 59fc163711..972582c517 100644 --- a/apps/doc/src/app/version-manager/current.const.ts.ng15 +++ b/apps/doc/src/app/version-manager/current.const.ts.ng15 @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '2.11.0'; +export const PRIZM_CURRENT_VERSION = '2.12.0'; diff --git a/libs/ast/package.json.ng15 b/libs/ast/package.json.ng15 index abd77bb58f..b29ea148bd 100644 --- a/libs/ast/package.json.ng15 +++ b/libs/ast/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "2.11.0", + "version": "2.12.0", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json.ng15 b/libs/charts/base/package.json.ng15 index 97c9175a86..17e7cbed0a 100644 --- a/libs/charts/base/package.json.ng15 +++ b/libs/charts/base/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "2.11.0", + "version": "2.12.0", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/theme": "^2.11.0", - "@prizm-ui/helpers": "^2.11.0", + "@prizm-ui/theme": "^2.12.0", + "@prizm-ui/helpers": "^2.12.0", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/package.json.ng15 b/libs/components/package.json.ng15 index 45fc9a1859..dc35050266 100644 --- a/libs/components/package.json.ng15 +++ b/libs/components/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "2.11.0", + "version": "2.12.0", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -18,10 +18,10 @@ "@ng-web-apis/resize-observer": "2.0.0", "@ng-web-apis/intersection-observer": "2.0.0", "@ng-web-apis/mutation-observer": "2.0.0", - "@prizm-ui/helpers": "^2.11.0", - "@prizm-ui/core": "^2.11.0", - "@prizm-ui/i18n": "^2.11.0", - "@prizm-ui/theme": "^2.11.0" + "@prizm-ui/helpers": "^2.12.0", + "@prizm-ui/core": "^2.12.0", + "@prizm-ui/i18n": "^2.12.0", + "@prizm-ui/theme": "^2.12.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json.ng15 b/libs/core/package.json.ng15 index 1be908aa58..7cc63d6128 100644 --- a/libs/core/package.json.ng15 +++ b/libs/core/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "2.11.0", + "version": "2.12.0", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json.ng15 b/libs/helpers/package.json.ng15 index 4d1377afc3..bc6d329251 100644 --- a/libs/helpers/package.json.ng15 +++ b/libs/helpers/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "2.11.0", + "version": "2.12.0", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json.ng15 b/libs/i18n/package.json.ng15 index 20b3672355..b20c03381e 100644 --- a/libs/i18n/package.json.ng15 +++ b/libs/i18n/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "2.11.0", + "version": "2.12.0", "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0" diff --git a/libs/icons/base/package.json.ng15 b/libs/icons/base/package.json.ng15 index ec23762e4f..a6569b3403 100644 --- a/libs/icons/base/package.json.ng15 +++ b/libs/icons/base/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "2.11.0", + "version": "2.12.0", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/core": "^2.11.0" + "@prizm-ui/core": "^2.12.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json.ng15 b/libs/icons/flags/package.json.ng15 index 92d6d789e8..c63522f9fe 100644 --- a/libs/icons/flags/package.json.ng15 +++ b/libs/icons/flags/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "2.11.0", + "version": "2.12.0", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/core": "^2.11.0" + "@prizm-ui/core": "^2.12.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json.ng15 b/libs/nxmv/package.json.ng15 index 9be9d944d5..e51afad300 100644 --- a/libs/nxmv/package.json.ng15 +++ b/libs/nxmv/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "2.11.0", + "version": "2.12.0", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json.ng15 b/libs/plugin/package.json.ng15 index 767c743638..e076e85c27 100644 --- a/libs/plugin/package.json.ng15 +++ b/libs/plugin/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "2.11.0", + "version": "2.12.0", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^2.11.0" + "@prizm-ui/ast": "^2.12.0" } } diff --git a/libs/schematics/package.json.ng15 b/libs/schematics/package.json.ng15 index b24b841522..ddbcc00179 100644 --- a/libs/schematics/package.json.ng15 +++ b/libs/schematics/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "2.11.0", + "version": "2.12.0", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json.ng15 b/libs/theme/package.json.ng15 index 76593cfd9f..d737f9d13a 100644 --- a/libs/theme/package.json.ng15 +++ b/libs/theme/package.json.ng15 @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "2.11.0", + "version": "2.12.0", "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/core": "^2.11.0", - "@prizm-ui/helpers": "^2.11.0" + "@prizm-ui/core": "^2.12.0", + "@prizm-ui/helpers": "^2.12.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json.ng15 b/package.json.ng15 index 6465c95c63..5b0315b233 100644 --- a/package.json.ng15 +++ b/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "2.11.0", + "version": "2.12.0", "license": "MIT", "husky": { "hooks": { From cb94769695223fa392c7ea43497709e47f78f9bc Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 30 Jan 2024 18:27:37 +0300 Subject: [PATCH 004/291] chore: version 3.10.0 up tp 3.11.0 --- .github/workflows/beta-publish-ng16.yml | 2 +- .github/workflows/main-publish-ng16.yml | 2 +- .../workflows/pre-release-publish-ng16.yml | 2 +- .../app/version-manager/current.const.ts.ng16 | 2 +- .../app/version-manager/versions.constants.ts | 36 +++++++++---------- libs/ast/package.json | 2 +- libs/ast/package.json.ng16 | 2 +- libs/charts/base/package.json | 6 ++-- libs/charts/base/package.json.ng16 | 6 ++-- libs/components/package.json | 10 +++--- libs/components/package.json.ng16 | 10 +++--- libs/core/package.json | 2 +- libs/core/package.json.ng16 | 2 +- libs/helpers/package.json | 2 +- libs/helpers/package.json.ng16 | 2 +- libs/i18n/package.json | 2 +- libs/i18n/package.json.ng16 | 2 +- libs/icons/base/package.json | 4 +-- libs/icons/base/package.json.ng16 | 4 +-- libs/icons/flags/package.json | 4 +-- libs/icons/flags/package.json.ng16 | 4 +-- libs/nxmv/package.json | 2 +- libs/nxmv/package.json.ng16 | 2 +- libs/plugin/package.json | 4 +-- libs/plugin/package.json.ng16 | 4 +-- libs/schematics/package.json | 2 +- libs/schematics/package.json.ng16 | 2 +- libs/theme/package.json | 6 ++-- libs/theme/package.json.ng16 | 6 ++-- package.json | 2 +- package.json.ng16 | 2 +- 31 files changed, 70 insertions(+), 70 deletions(-) diff --git a/.github/workflows/beta-publish-ng16.yml b/.github/workflows/beta-publish-ng16.yml index ee55ee327b..f91fcba240 100644 --- a/.github/workflows/beta-publish-ng16.yml +++ b/.github/workflows/beta-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag beta --json 2>/dev/null || echo '3.10.0-beta.0') | jq '([.[] | select(startswith("3.10.0-beta"))] | last // "3.10.0-beta.0")' 2>/dev/null || echo '3.10.0-beta.0' + (npm view @prizm-ui/components versions --tag beta --json 2>/dev/null || echo '3.11.0-beta.0') | jq '([.[] | select(startswith("3.11.0-beta"))] | last // "3.11.0-beta.0")' 2>/dev/null || echo '3.11.0-beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng16.yml b/.github/workflows/main-publish-ng16.yml index 069a99b437..8f47068f1f 100644 --- a/.github/workflows/main-publish-ng16.yml +++ b/.github/workflows/main-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_v3_version=$( - echo '3.10.0' + echo '3.11.0' ) echo "LAST_V3_VERSION=${last_v3_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng16.yml b/.github/workflows/pre-release-publish-ng16.yml index 1c5d098ca0..0e5306fd3b 100644 --- a/.github/workflows/pre-release-publish-ng16.yml +++ b/.github/workflows/pre-release-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag next --json 2>/dev/null || echo '3.10.0-next.0') | jq '([.[] | select(startswith("3.10.0-next"))] | last // "3.10.0-next.0")' 2>/dev/null || echo '3.10.0-next.0' + (npm view @prizm-ui/components versions --tag next --json 2>/dev/null || echo '3.11.0-next.0') | jq '([.[] | select(startswith("3.11.0-next"))] | last // "3.11.0-next.0")' 2>/dev/null || echo '3.11.0-next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/apps/doc/src/app/version-manager/current.const.ts.ng16 b/apps/doc/src/app/version-manager/current.const.ts.ng16 index 37253f64fd..1bd44ff0ff 100644 --- a/apps/doc/src/app/version-manager/current.const.ts.ng16 +++ b/apps/doc/src/app/version-manager/current.const.ts.ng16 @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '3.10.0'; +export const PRIZM_CURRENT_VERSION = '3.11.0'; diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index 1470db81b0..e1a89b0dee 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -10,8 +10,8 @@ export interface PrizmVersionMeta { export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ { - label: '3.10.0 (ng16)', - version: '3.10.0', + label: '3.11.0 (ng16)', + version: '3.11.0', stackblitz: 'https://stackblitz.com/edit/prizm-v3-demo', link: new URL('http://prizm.site'), otherLinks: [new URL('https://prizm-v3.web.app')], @@ -20,8 +20,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ }, }, { - label: '2.11.0 (ng15)', - version: '2.11.0', + label: '2.12.0 (ng15)', + version: '2.12.0', stackblitz: 'https://stackblitz.com/edit/prizm-v2-demo', link: new URL('https://prizm-v2.web.app'), otherLinks: [], @@ -30,8 +30,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ }, }, { - label: '1.14.0 (ng14)', - version: '1.14.0', + label: '1.15.0 (ng14)', + version: '1.15.0', stackblitz: 'https://stackblitz.com/edit/prizm-v1-demo', link: new URL('https://prizm-v1.web.app'), otherLinks: [], @@ -40,43 +40,43 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ }, }, { - label: '3.10.0-next (ng16)', - version: '3.10.0-next', + label: '3.11.0-next (ng16)', + version: '3.11.0-next', stackblitz: 'https://stackblitz.com/edit/prizm-v3-next-demo', link: new URL('https://prizm-v3-next.web.app'), otherLinks: [], }, { - label: '2.11.0-next (ng15)', + label: '2.12.0-next (ng15)', stackblitz: 'https://stackblitz.com/edit/prizm-v2-next-demo', - version: '2.11.0-next', + version: '2.12.0-next', link: new URL('https://prizm-v2-next.web.app'), otherLinks: [], }, { - label: '1.14.0-next (ng14)', - version: '1.14.0-next', + label: '1.15.0-next (ng14)', + version: '1.15.0-next', stackblitz: 'https://stackblitz.com/edit/prizm-v1-next-demo', link: new URL('https://prizm-v1-next.web.app'), otherLinks: [], }, { - label: '3.10.0-beta (ng16)', - version: '3.10.0-beta', + label: '3.11.0-beta (ng16)', + version: '3.11.0-beta', stackblitz: 'https://stackblitz.com/edit/prizm-v3-beta-demo', link: new URL('https://prizm-v3-beta.web.app'), otherLinks: [], }, { - label: '2.11.0-beta (ng15)', - version: '2.11.0-beta', + label: '2.12.0-beta (ng15)', + version: '2.12.0-beta', stackblitz: 'https://stackblitz.com/edit/prizm-v2-beta-demo', link: new URL('https://prizm-v2-beta.web.app'), otherLinks: [], }, { - label: '1.14.0-beta (ng14)', - version: '1.14.0-beta', + label: '1.15.0-beta (ng14)', + version: '1.15.0-beta', stackblitz: 'https://stackblitz.com/edit/prizm-v1-beta-demo', link: new URL('https://prizm-v1-beta.web.app'), otherLinks: [], diff --git a/libs/ast/package.json b/libs/ast/package.json index 13b2af52bb..6be58f2176 100644 --- a/libs/ast/package.json +++ b/libs/ast/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "3.10.0", + "version": "3.11.0", "private": false, "publishConfig": { "access": "public", diff --git a/libs/ast/package.json.ng16 b/libs/ast/package.json.ng16 index 13b2af52bb..6be58f2176 100644 --- a/libs/ast/package.json.ng16 +++ b/libs/ast/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "3.10.0", + "version": "3.11.0", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json b/libs/charts/base/package.json index e449c06dc0..6ff13e4109 100644 --- a/libs/charts/base/package.json +++ b/libs/charts/base/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "3.10.0", + "version": "3.11.0", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/theme": "^3.10.0", - "@prizm-ui/helpers": "^3.10.0", + "@prizm-ui/theme": "^3.11.0", + "@prizm-ui/helpers": "^3.11.0", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/charts/base/package.json.ng16 b/libs/charts/base/package.json.ng16 index e449c06dc0..6ff13e4109 100644 --- a/libs/charts/base/package.json.ng16 +++ b/libs/charts/base/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "3.10.0", + "version": "3.11.0", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/theme": "^3.10.0", - "@prizm-ui/helpers": "^3.10.0", + "@prizm-ui/theme": "^3.11.0", + "@prizm-ui/helpers": "^3.11.0", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/package.json b/libs/components/package.json index 884d475725..9bae131f7f 100644 --- a/libs/components/package.json +++ b/libs/components/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "3.10.0", + "version": "3.11.0", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -18,10 +18,10 @@ "@ng-web-apis/resize-observer": "^3.0.0", "@ng-web-apis/intersection-observer": "^3.0.0", "@ng-web-apis/mutation-observer": "^3.0.0", - "@prizm-ui/helpers": "^3.10.0", - "@prizm-ui/core": "^3.10.0", - "@prizm-ui/i18n": "^3.10.0", - "@prizm-ui/theme": "^3.10.0" + "@prizm-ui/helpers": "^3.11.0", + "@prizm-ui/core": "^3.11.0", + "@prizm-ui/i18n": "^3.11.0", + "@prizm-ui/theme": "^3.11.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/components/package.json.ng16 b/libs/components/package.json.ng16 index 884d475725..9bae131f7f 100644 --- a/libs/components/package.json.ng16 +++ b/libs/components/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "3.10.0", + "version": "3.11.0", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -18,10 +18,10 @@ "@ng-web-apis/resize-observer": "^3.0.0", "@ng-web-apis/intersection-observer": "^3.0.0", "@ng-web-apis/mutation-observer": "^3.0.0", - "@prizm-ui/helpers": "^3.10.0", - "@prizm-ui/core": "^3.10.0", - "@prizm-ui/i18n": "^3.10.0", - "@prizm-ui/theme": "^3.10.0" + "@prizm-ui/helpers": "^3.11.0", + "@prizm-ui/core": "^3.11.0", + "@prizm-ui/i18n": "^3.11.0", + "@prizm-ui/theme": "^3.11.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json b/libs/core/package.json index 32650b5531..9ab953022d 100644 --- a/libs/core/package.json +++ b/libs/core/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "3.10.0", + "version": "3.11.0", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/core/package.json.ng16 b/libs/core/package.json.ng16 index 32650b5531..9ab953022d 100644 --- a/libs/core/package.json.ng16 +++ b/libs/core/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "3.10.0", + "version": "3.11.0", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json b/libs/helpers/package.json index 4d3e44e939..55b85145de 100644 --- a/libs/helpers/package.json +++ b/libs/helpers/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "3.10.0", + "version": "3.11.0", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/helpers/package.json.ng16 b/libs/helpers/package.json.ng16 index 4d3e44e939..55b85145de 100644 --- a/libs/helpers/package.json.ng16 +++ b/libs/helpers/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "3.10.0", + "version": "3.11.0", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json b/libs/i18n/package.json index 13ef7dd35f..0071eba228 100644 --- a/libs/i18n/package.json +++ b/libs/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "3.10.0", + "version": "3.11.0", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0" diff --git a/libs/i18n/package.json.ng16 b/libs/i18n/package.json.ng16 index 13ef7dd35f..0071eba228 100644 --- a/libs/i18n/package.json.ng16 +++ b/libs/i18n/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "3.10.0", + "version": "3.11.0", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0" diff --git a/libs/icons/base/package.json b/libs/icons/base/package.json index 90b63200b4..0f1689fb1d 100644 --- a/libs/icons/base/package.json +++ b/libs/icons/base/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "3.10.0", + "version": "3.11.0", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.10.0" + "@prizm-ui/core": "^3.11.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/base/package.json.ng16 b/libs/icons/base/package.json.ng16 index 90b63200b4..0f1689fb1d 100644 --- a/libs/icons/base/package.json.ng16 +++ b/libs/icons/base/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "3.10.0", + "version": "3.11.0", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.10.0" + "@prizm-ui/core": "^3.11.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json b/libs/icons/flags/package.json index 07b5897eba..8bd26d816a 100644 --- a/libs/icons/flags/package.json +++ b/libs/icons/flags/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "3.10.0", + "version": "3.11.0", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.10.0" + "@prizm-ui/core": "^3.11.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json.ng16 b/libs/icons/flags/package.json.ng16 index 07b5897eba..8bd26d816a 100644 --- a/libs/icons/flags/package.json.ng16 +++ b/libs/icons/flags/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "3.10.0", + "version": "3.11.0", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.10.0" + "@prizm-ui/core": "^3.11.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json b/libs/nxmv/package.json index 8dd82df6ab..17d25f65b3 100644 --- a/libs/nxmv/package.json +++ b/libs/nxmv/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "3.10.0", + "version": "3.11.0", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/nxmv/package.json.ng16 b/libs/nxmv/package.json.ng16 index 8dd82df6ab..17d25f65b3 100644 --- a/libs/nxmv/package.json.ng16 +++ b/libs/nxmv/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "3.10.0", + "version": "3.11.0", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json b/libs/plugin/package.json index 437e8ee986..b2e6454faa 100644 --- a/libs/plugin/package.json +++ b/libs/plugin/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "3.10.0", + "version": "3.11.0", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^3.10.0" + "@prizm-ui/ast": "^3.11.0" } } diff --git a/libs/plugin/package.json.ng16 b/libs/plugin/package.json.ng16 index 437e8ee986..b2e6454faa 100644 --- a/libs/plugin/package.json.ng16 +++ b/libs/plugin/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "3.10.0", + "version": "3.11.0", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^3.10.0" + "@prizm-ui/ast": "^3.11.0" } } diff --git a/libs/schematics/package.json b/libs/schematics/package.json index 1f5c9aa99d..e4f3037546 100644 --- a/libs/schematics/package.json +++ b/libs/schematics/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "3.10.0", + "version": "3.11.0", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/schematics/package.json.ng16 b/libs/schematics/package.json.ng16 index 1f5c9aa99d..e4f3037546 100644 --- a/libs/schematics/package.json.ng16 +++ b/libs/schematics/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "3.10.0", + "version": "3.11.0", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json b/libs/theme/package.json index 9561b3b081..d63d4e1b64 100644 --- a/libs/theme/package.json +++ b/libs/theme/package.json @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "3.10.0", + "version": "3.11.0", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.10.0", - "@prizm-ui/helpers": "^3.10.0" + "@prizm-ui/core": "^3.11.0", + "@prizm-ui/helpers": "^3.11.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/theme/package.json.ng16 b/libs/theme/package.json.ng16 index 9561b3b081..d63d4e1b64 100644 --- a/libs/theme/package.json.ng16 +++ b/libs/theme/package.json.ng16 @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "3.10.0", + "version": "3.11.0", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.10.0", - "@prizm-ui/helpers": "^3.10.0" + "@prizm-ui/core": "^3.11.0", + "@prizm-ui/helpers": "^3.11.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json b/package.json index e9442726ec..a72138a1a2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "3.10.0", + "version": "3.11.0", "license": "MIT", "husky": { "hooks": { diff --git a/package.json.ng16 b/package.json.ng16 index e9442726ec..a72138a1a2 100644 --- a/package.json.ng16 +++ b/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "3.10.0", + "version": "3.11.0", "license": "MIT", "husky": { "hooks": { From 388e4834528b0bbdcd59e9681e0e6e15cc7a0ab1 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 30 Jan 2024 18:35:58 +0300 Subject: [PATCH 005/291] chore: current const for 1.15.0 update --- apps/doc/src/app/version-manager/current.const.ts.ng14 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/doc/src/app/version-manager/current.const.ts.ng14 b/apps/doc/src/app/version-manager/current.const.ts.ng14 index e67a621d6c..c548790b68 100644 --- a/apps/doc/src/app/version-manager/current.const.ts.ng14 +++ b/apps/doc/src/app/version-manager/current.const.ts.ng14 @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '1.14.0'; +export const PRIZM_CURRENT_VERSION = '1.15.0'; From 38ba9ccffe33678d6d85bf7a99632aa776070ec5 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 30 Jan 2024 18:43:46 +0300 Subject: [PATCH 006/291] chore: update changelog --- .../src/app/about-prizm/changelog/CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index 64e7c260b8..34cd036273 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -2,6 +2,22 @@ All notable changes to this project will be documented in this file. +## [1.15.0, 2.13.0, 3.11.0](https://github.com/zyfra/Prizm) (30-01-2023) + +## Features + +- feat(components/navigation-menu): add hint to navigation menu items and titles when text overflows #1216, #1312 +- feat(components/accordion): add hint to accordion title when text overflows #1216, #1312 + +### Bug fixes + +- fix(components/listing-item): listing item selected item hover #1280 +- fix(components/input-dat-relative): selected item hover #1280 +- fix(components/accordion): accordion focus shadow overlaps on hover #1116, +- fix(components/accordion): accordion incorrect background color #1236, +- fix(components/accordion): nested accordion button incorect behavior #1285 +- fix(components/accordion): custom title accordion example fix #1240 + ## [1.14.0, 2.11.0, 3.10.0](https://github.com/zyfra/Prizm) (19-01-2023) ## Features From ac608ffdddb3946643d3e36344443ad3a631ea62 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Wed, 31 Jan 2024 12:51:16 +0300 Subject: [PATCH 007/291] fix: accordion examples line height changed according to markup values --- .../accordion-basic-example.component.less | 2 +- .../accordion-multiple-expand-example.component.less | 2 +- .../accordion-single-expand-example.component.less | 2 +- .../accordion-with-instruments-example.component.less | 2 +- .../accordion/examples/custom-title/custom-title.component.less | 2 +- .../components/accordion/examples/nested/nested.component.less | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/apps/doc/src/app/components/accordion/examples/accordion-basic-example/accordion-basic-example.component.less b/apps/doc/src/app/components/accordion/examples/accordion-basic-example/accordion-basic-example.component.less index 4777b046b6..89940b96b6 100644 --- a/apps/doc/src/app/components/accordion/examples/accordion-basic-example/accordion-basic-example.component.less +++ b/apps/doc/src/app/components/accordion/examples/accordion-basic-example/accordion-basic-example.component.less @@ -1,5 +1,5 @@ :host { font-size: 14px; - line-height: 16px; + line-height: 20px; color: var(--prizm-v3-text-icon-secondary); } diff --git a/apps/doc/src/app/components/accordion/examples/accordion-multiple-expand-example/accordion-multiple-expand-example.component.less b/apps/doc/src/app/components/accordion/examples/accordion-multiple-expand-example/accordion-multiple-expand-example.component.less index 4777b046b6..89940b96b6 100644 --- a/apps/doc/src/app/components/accordion/examples/accordion-multiple-expand-example/accordion-multiple-expand-example.component.less +++ b/apps/doc/src/app/components/accordion/examples/accordion-multiple-expand-example/accordion-multiple-expand-example.component.less @@ -1,5 +1,5 @@ :host { font-size: 14px; - line-height: 16px; + line-height: 20px; color: var(--prizm-v3-text-icon-secondary); } diff --git a/apps/doc/src/app/components/accordion/examples/accordion-single-expand-example/accordion-single-expand-example.component.less b/apps/doc/src/app/components/accordion/examples/accordion-single-expand-example/accordion-single-expand-example.component.less index 4777b046b6..89940b96b6 100644 --- a/apps/doc/src/app/components/accordion/examples/accordion-single-expand-example/accordion-single-expand-example.component.less +++ b/apps/doc/src/app/components/accordion/examples/accordion-single-expand-example/accordion-single-expand-example.component.less @@ -1,5 +1,5 @@ :host { font-size: 14px; - line-height: 16px; + line-height: 20px; color: var(--prizm-v3-text-icon-secondary); } diff --git a/apps/doc/src/app/components/accordion/examples/accordion-with-instruments-example/accordion-with-instruments-example.component.less b/apps/doc/src/app/components/accordion/examples/accordion-with-instruments-example/accordion-with-instruments-example.component.less index 4777b046b6..89940b96b6 100644 --- a/apps/doc/src/app/components/accordion/examples/accordion-with-instruments-example/accordion-with-instruments-example.component.less +++ b/apps/doc/src/app/components/accordion/examples/accordion-with-instruments-example/accordion-with-instruments-example.component.less @@ -1,5 +1,5 @@ :host { font-size: 14px; - line-height: 16px; + line-height: 20px; color: var(--prizm-v3-text-icon-secondary); } diff --git a/apps/doc/src/app/components/accordion/examples/custom-title/custom-title.component.less b/apps/doc/src/app/components/accordion/examples/custom-title/custom-title.component.less index b21162b45d..934a7b9b21 100644 --- a/apps/doc/src/app/components/accordion/examples/custom-title/custom-title.component.less +++ b/apps/doc/src/app/components/accordion/examples/custom-title/custom-title.component.less @@ -1,6 +1,6 @@ :host { font-size: 14px; - line-height: 16px; + line-height: 20px; color: var(--prizm-v3-text-icon-secondary); } diff --git a/apps/doc/src/app/components/accordion/examples/nested/nested.component.less b/apps/doc/src/app/components/accordion/examples/nested/nested.component.less index 4777b046b6..89940b96b6 100644 --- a/apps/doc/src/app/components/accordion/examples/nested/nested.component.less +++ b/apps/doc/src/app/components/accordion/examples/nested/nested.component.less @@ -1,5 +1,5 @@ :host { font-size: 14px; - line-height: 16px; + line-height: 20px; color: var(--prizm-v3-text-icon-secondary); } From c962be957de505bd05f7e40bc6b258e8a14d2169 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 1 Feb 2024 13:54:16 +0300 Subject: [PATCH 008/291] fix: search label for inout select and input multiselect added #1323 --- .../multi-select/input-multi-select.component.html | 3 ++- .../dropdowns/multi-select/input-multi-select.component.ts | 4 ++++ .../components/dropdowns/select/input-select.component.html | 3 ++- .../components/dropdowns/select/input-select.component.ts | 6 +++++- libs/components/src/lib/tokens/i18n.ts | 4 ++++ libs/i18n/src/lib/interfaces/language.ts | 2 ++ libs/i18n/src/lib/languages/russian/kit.ts | 1 + 7 files changed, 20 insertions(+), 3 deletions(-) diff --git a/libs/components/src/lib/components/dropdowns/multi-select/input-multi-select.component.html b/libs/components/src/lib/components/dropdowns/multi-select/input-multi-select.component.html index b3e2ef8c1d..f34da2d969 100644 --- a/libs/components/src/lib/components/dropdowns/multi-select/input-multi-select.component.html +++ b/libs/components/src/lib/components/dropdowns/multi-select/input-multi-select.component.html @@ -32,7 +32,8 @@ [style.--prizm-data-list-border]="0" >
- + + extends PrizmInputNgControl implements AfterViewInit { @@ -218,6 +221,7 @@ export class PrizmInputMultiSelectComponent extends PrizmInputNgControl return !this.value?.length; } constructor( + @Inject(PRIZM_SEARCH_TEXT) readonly searchLabelTranslation$: Observable, @Inject(PRIZM_MULTI_SELECT_OPTIONS) private readonly options: PrizmMultiSelectOptions, @Inject(Injector) injector: Injector ) { diff --git a/libs/components/src/lib/components/dropdowns/select/input-select.component.html b/libs/components/src/lib/components/dropdowns/select/input-select.component.html index a8ab52d17d..584034fcc9 100644 --- a/libs/components/src/lib/components/dropdowns/select/input-select.component.html +++ b/libs/components/src/lib/components/dropdowns/select/input-select.component.html @@ -105,7 +105,8 @@ [style.--prizm-data-list-border]="0" >
- + + extends PrizmInputNgControl impleme }); constructor( @Inject(PRIZM_SELECT_OPTIONS) private readonly options: PrizmSelectOptions, - @Inject(Injector) injector: Injector + @Inject(Injector) injector: Injector, + @Inject(PRIZM_SEARCH_TEXT) readonly searchLabelTranslation$: Observable ) { super(injector); } diff --git a/libs/components/src/lib/tokens/i18n.ts b/libs/components/src/lib/tokens/i18n.ts index cc6c5250a2..373bbb66ad 100644 --- a/libs/components/src/lib/tokens/i18n.ts +++ b/libs/components/src/lib/tokens/i18n.ts @@ -56,3 +56,7 @@ export const PRIZM_COLUMN_SETTINGS = new InjectionToken< export const PRIZM_PAGINATOR = new InjectionToken>( `paginator texts` ); + +export const PRIZM_SEARCH_TEXT = new InjectionToken>( + `search i18n text` +); diff --git a/libs/i18n/src/lib/interfaces/language.ts b/libs/i18n/src/lib/interfaces/language.ts index ab1632578a..ebcf0d1b4d 100644 --- a/libs/i18n/src/lib/interfaces/language.ts +++ b/libs/i18n/src/lib/interfaces/language.ts @@ -137,6 +137,8 @@ export interface PrizmLanguageKit { drop: string; dropMultiple: string; }; + // TODO: 4.0 remove optional sign, bc #dr + search?: string; } export interface PrizmLanguageEditor { diff --git a/libs/i18n/src/lib/languages/russian/kit.ts b/libs/i18n/src/lib/languages/russian/kit.ts index 2905228368..0035eac6ff 100644 --- a/libs/i18n/src/lib/languages/russian/kit.ts +++ b/libs/i18n/src/lib/languages/russian/kit.ts @@ -53,4 +53,5 @@ export const PRIZM_RUSSIAN_LANGUAGE_KIT: PrizmLanguageKit = { drop: `Поместите файл сюда`, dropMultiple: `Поместите файлы сюда`, }, + search: `Поиск`, }; From f1495389ef197f4ecc0fc6fc3192a24f695633d7 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 1 Feb 2024 15:19:53 +0300 Subject: [PATCH 009/291] fix: extra title in input select #1286 --- .../lib/components/dropdowns/select/input-select.component.html | 1 - 1 file changed, 1 deletion(-) diff --git a/libs/components/src/lib/components/dropdowns/select/input-select.component.html b/libs/components/src/lib/components/dropdowns/select/input-select.component.html index a8ab52d17d..081443e312 100644 --- a/libs/components/src/lib/components/dropdowns/select/input-select.component.html +++ b/libs/components/src/lib/components/dropdowns/select/input-select.component.html @@ -41,7 +41,6 @@ [placeholder]="placeholder" [disabled]="disabled" [tabIndex]="!disabled ? 0 : -1" - [title]="val" [readonly]="true" [prizmHintDirection]="prizmHintDirection" [prizmHintCanShow]="prizmHintCanShow" From 622cc62e154d6cd0ac7b90d7f583ad4da7a61404 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Sun, 4 Feb 2024 16:51:27 +0300 Subject: [PATCH 010/291] fix: dropdown select panel example fix #1283 --- .../dropdowns/dropdown-host/dropdown-host.module.ts | 2 ++ .../select-panel-example.component.html | 2 +- .../select-panel-example.component.less | 8 -------- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/apps/doc/src/app/components/dropdowns/dropdown-host/dropdown-host.module.ts b/apps/doc/src/app/components/dropdowns/dropdown-host/dropdown-host.module.ts index 7f4b279916..141ac7a97d 100644 --- a/apps/doc/src/app/components/dropdowns/dropdown-host/dropdown-host.module.ts +++ b/apps/doc/src/app/components/dropdowns/dropdown-host/dropdown-host.module.ts @@ -6,6 +6,7 @@ import { PolymorphModule, PrizmButtonModule, PrizmCheckboxModule, + PrizmChipsModule, PrizmDataListModule, PrizmDropdownHostModule, PrizmIconModule, @@ -44,6 +45,7 @@ import { PrizmDropdownHostExampleByMethodComponent } from './examples/by-method/ PrizmLetModule, PrizmButtonModule, FormsModule, + PrizmChipsModule, ], declarations: [ PrizmDropdownHostExampleByMethodComponent, diff --git a/apps/doc/src/app/components/dropdowns/dropdown-host/examples/select-panel-example/select-panel-example.component.html b/apps/doc/src/app/components/dropdowns/dropdown-host/examples/select-panel-example/select-panel-example.component.html index f765cb2474..35426075c4 100644 --- a/apps/doc/src/app/components/dropdowns/dropdown-host/examples/select-panel-example/select-panel-example.component.html +++ b/apps/doc/src/app/components/dropdowns/dropdown-host/examples/select-panel-example/select-panel-example.component.html @@ -45,7 +45,7 @@
  • - {{ option.label.title }} + {{ option.label.title }} {{ option.label.subtitle }}
    diff --git a/apps/doc/src/app/components/dropdowns/dropdown-host/examples/select-panel-example/select-panel-example.component.less b/apps/doc/src/app/components/dropdowns/dropdown-host/examples/select-panel-example/select-panel-example.component.less index ba54d798ca..5606a9072f 100644 --- a/apps/doc/src/app/components/dropdowns/dropdown-host/examples/select-panel-example/select-panel-example.component.less +++ b/apps/doc/src/app/components/dropdowns/dropdown-host/examples/select-panel-example/select-panel-example.component.less @@ -56,14 +56,6 @@ flex-direction: column; } - &__title { - font-size: 13px; - line-height: 20px; - color: var(--prizm-v3-text-icon-primary); - padding: 0 8px; - border-radius: 2px; - } - &__subtitle { font-size: 10px; line-height: 17px; From 327b6d1f5a4ee497a62c2fb548cb636be5fdfcf9 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Wed, 7 Feb 2024 18:31:43 +0300 Subject: [PATCH 011/291] fix: custom error message is not displayed in input layout date time #185 --- .../dialog-with-parent-example.component.html | 2 +- ...ayout-date-time-required-example.component.html | 9 +++++++++ ...-layout-date-time-required-example.component.ts | 5 +++++ .../input-mask/input-mask-example.component.html | 2 +- .../input-number-example.component.html | 5 +++-- .../input-password-example.component.html | 2 +- .../input-validation-custom-texts.service.ts | 2 +- .../common/input-layout/input-layout.component.ts | 2 +- .../input-status-text.directive.ts | 4 ++-- .../input-layout-date-time.component.html | 5 ++++- .../input-layout-date-time.component.ts | 14 +++++++++++--- libs/components/src/lib/tokens/i18n.ts | 5 +++++ libs/i18n/src/lib/interfaces/language.ts | 6 ++++++ .../languages/russian/input-layout-date-time.ts | 7 +++++++ libs/i18n/src/lib/languages/russian/russian.ts | 2 ++ 15 files changed, 59 insertions(+), 13 deletions(-) create mode 100644 libs/i18n/src/lib/languages/russian/input-layout-date-time.ts diff --git a/apps/doc/src/app/components/dialogs/dialog/examples/with-parent/dialog-with-parent-example.component.html b/apps/doc/src/app/components/dialogs/dialog/examples/with-parent/dialog-with-parent-example.component.html index 2d9a484173..6b4291fb43 100644 --- a/apps/doc/src/app/components/dialogs/dialog/examples/with-parent/dialog-with-parent-example.component.html +++ b/apps/doc/src/app/components/dialogs/dialog/examples/with-parent/dialog-with-parent-example.component.html @@ -15,7 +15,7 @@

    Check Dropdown Host Parent Container And Position

    - dddd + diff --git a/apps/doc/src/app/components/input/input-layout-date-time/examples/required/input-layout-date-time-required-example.component.html b/apps/doc/src/app/components/input/input-layout-date-time/examples/required/input-layout-date-time-required-example.component.html index 7d25ddc54e..c874ee202e 100644 --- a/apps/doc/src/app/components/input/input-layout-date-time/examples/required/input-layout-date-time-required-example.component.html +++ b/apps/doc/src/app/components/input/input-layout-date-time/examples/required/input-layout-date-time-required-example.component.html @@ -1,3 +1,12 @@ + +
    + +

    With custom error text

    + + + + Warning text + diff --git a/apps/doc/src/app/components/input/input-layout-date-time/examples/required/input-layout-date-time-required-example.component.ts b/apps/doc/src/app/components/input/input-layout-date-time/examples/required/input-layout-date-time-required-example.component.ts index 87ff14bfb7..98adddbc36 100644 --- a/apps/doc/src/app/components/input/input-layout-date-time/examples/required/input-layout-date-time-required-example.component.ts +++ b/apps/doc/src/app/components/input/input-layout-date-time/examples/required/input-layout-date-time-required-example.component.ts @@ -19,4 +19,9 @@ export class PrizmInputLayoutDateTimeRequiredExampleComponent { [new PrizmDay(2017, 2, 15), new PrizmTime(12, 30)], [Validators.required] ); + + public readonly customErrorValue = new UntypedFormControl( + [new PrizmDay(2017, 2, 15), new PrizmTime(12, 30)], + [Validators.required] + ); } diff --git a/apps/doc/src/app/components/input/input-mask/input-mask-example.component.html b/apps/doc/src/app/components/input/input-mask/input-mask-example.component.html index 3235a69ceb..c9c5b54954 100644 --- a/apps/doc/src/app/components/input/input-mask/input-mask-example.component.html +++ b/apps/doc/src/app/components/input/input-mask/input-mask-example.component.html @@ -30,7 +30,7 @@ prizmDocHostElementKey="PrizmInputText" prizmInput /> - Текст статуса + diff --git a/apps/doc/src/app/components/input/input-number/input-number-example.component.html b/apps/doc/src/app/components/input/input-number/input-number-example.component.html index 034852737b..2cdb04ac09 100644 --- a/apps/doc/src/app/components/input/input-number/input-number-example.component.html +++ b/apps/doc/src/app/components/input/input-number/input-number-example.component.html @@ -66,7 +66,7 @@

    Number

    prizm-input-right > - Текст статуса +
    • @@ -93,6 +93,7 @@

    Counter

    > Counter prizm-input-right > - Текст статуса +
    diff --git a/apps/doc/src/app/components/input/input-password/input-password-example.component.html b/apps/doc/src/app/components/input/input-password/input-password-example.component.html index 6d55c5c9b4..933edeb37e 100644 --- a/apps/doc/src/app/components/input/input-password/input-password-example.component.html +++ b/apps/doc/src/app/components/input/input-password/input-password-example.component.html @@ -27,7 +27,7 @@ prizmDocHostElementKey="inputPasswordAuxiliaryControl" prizm-input-right > - Текст статуса + diff --git a/apps/doc/src/app/components/input/input-text/examples/input-validation-custom-example/input-validation-custom-texts.service.ts b/apps/doc/src/app/components/input/input-text/examples/input-validation-custom-example/input-validation-custom-texts.service.ts index 07400c66b6..5b0085828c 100644 --- a/apps/doc/src/app/components/input/input-text/examples/input-validation-custom-example/input-validation-custom-texts.service.ts +++ b/apps/doc/src/app/components/input/input-text/examples/input-validation-custom-example/input-validation-custom-texts.service.ts @@ -3,7 +3,7 @@ import { PrizmInputControl, PrizmInputValidationTexts } from '@prizm-ui/componen @Injectable() export class InputValidationCustomTextsService extends PrizmInputValidationTexts { - private readonly invalidTextCustomMap = new Map([['required', 'Обязательное поле']]); + private readonly invalidTextCustomMap = new Map([['required', 'Самое обязательное поле']]); public override getText(key: string, control?: PrizmInputControl): string | undefined { return this.invalidTextCustomMap.get(key); diff --git a/libs/components/src/lib/components/input/common/input-layout/input-layout.component.ts b/libs/components/src/lib/components/input/common/input-layout/input-layout.component.ts index 6870fb9d5f..abcc5e43a2 100644 --- a/libs/components/src/lib/components/input/common/input-layout/input-layout.component.ts +++ b/libs/components/src/lib/components/input/common/input-layout/input-layout.component.ts @@ -20,7 +20,7 @@ import { PrizmInputControl } from '../base/input-control.class'; import { PrizmInputStatusTextDirective } from '../input-status-text/input-status-text.directive'; import { PrizmInputPosition, PrizmInputSize, PrizmInputStatus } from '../models/prizm-input.models'; import { debounceTime, map, startWith, takeUntil, tap } from 'rxjs/operators'; -import { isPolymorphPrimitive, PolymorphComponent, PolymorphContent } from '../../../../directives/polymorph'; +import { isPolymorphPrimitive, PolymorphContent } from '../../../../directives/polymorph'; import { Compare, filterTruthy, PrizmDestroyService, PrizmLetDirective } from '@prizm-ui/helpers'; import { PrizmAbstractTestId } from '../../../../abstract/interactive'; diff --git a/libs/components/src/lib/components/input/common/input-status-text/input-status-text.directive.ts b/libs/components/src/lib/components/input/common/input-status-text/input-status-text.directive.ts index 330b47d4db..2f39a57e82 100644 --- a/libs/components/src/lib/components/input/common/input-status-text/input-status-text.directive.ts +++ b/libs/components/src/lib/components/input/common/input-status-text/input-status-text.directive.ts @@ -23,11 +23,11 @@ export class PrizmInputStatusTextDirective extends DefaultInputInvalidTextClass protected override setInvalidText(text: string): void { super.setInvalidText(text); - this.changed.next(); } public getStatusMessage(): PolymorphContent { - return this.invalidText || this.templateRef; + const isTemplateEmpty = !this.templateRef.createEmbeddedView(null).rootNodes[0]; + return isTemplateEmpty ? this.invalidText : this.templateRef; } } diff --git a/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.html b/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.html index 7863346c0d..f108b4d5db 100644 --- a/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.html +++ b/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.html @@ -10,7 +10,6 @@ [closeByEsc]="true" (isOpenChange)="onOpenChange($event); $event && prizmDropdownHostComponent.reCalculatePositions()" > - Ошибка! Неправильный формат
    + + + {{ dictionary$ | async | prizmPluck : 'wrongFormat' }} + diff --git a/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.ts b/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.ts index 404330f2d0..dd0296afff 100644 --- a/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.ts +++ b/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.ts @@ -23,7 +23,7 @@ import { PRIZM_ALWAYS_FALSE_HANDLER } from '../../../constants/always-false-hand import { PRIZM_DATE_TIME_SEPARATOR } from '../../../constants/date-time-separator'; import { prizmDefaultProp, prizmPure } from '@prizm-ui/core'; import { PRIZM_DATE_TIME_VALUE_TRANSFORMER } from '../../../tokens/date-inputs-value-transformers'; -import { PRIZM_DATE_TEXTS, PRIZM_TIME_TEXTS } from '../../../tokens/i18n'; +import { PRIZM_DATE_TEXTS, PRIZM_INPUT_LAYOUT_DATE_TIME, PRIZM_TIME_TEXTS } from '../../../tokens/i18n'; import { PrizmContextWithImplicit } from '../../../types/context-with-implicit'; import { PrizmControlValueTransformer } from '../../../types/control-value-transformer'; import { PrizmDateMode } from '../../../types/date-mode'; @@ -36,8 +36,8 @@ import { prizmClamp } from '../../../util/math/clamp'; import { PRIZM_DATE_RIGHT_BUTTONS } from '../../../tokens/date-extra-buttons'; import { PrizmDateButton } from '../../../types/date-button'; import { PRIZM_STRICT_MATCHER } from '../../../constants'; -import { filterTruthy, PrizmDestroyService } from '@prizm-ui/helpers'; -import { PrizmInputControl, PrizmInputNgControl } from '../common'; +import { filterTruthy, PrizmDestroyService, PrizmPluckPipe } from '@prizm-ui/helpers'; +import { PrizmInputControl, PrizmInputNgControl, PrizmInputStatusTextDirective } from '../common'; import { PrizmInputZoneDirective, PrizmInputZoneModule } from '../../../directives/input-zone'; import { debounceTime, delay, map, takeUntil } from 'rxjs/operators'; import { PrizmLifecycleModule } from '../../../directives/lifecycle'; @@ -58,6 +58,7 @@ import { PrizmCalendarComponent } from '../../calendar'; import { PrizmLinkComponent } from '../../link'; import { PrizmValueAccessorModule } from '../../../directives/value-accessor/value-accessor.module'; import { PrizmListingItemComponent } from '../../listing-item'; +import { PrizmLanguageInputLayoutDateTime } from '@prizm-ui/i18n'; @Component({ selector: `prizm-input-layout-date-time`, @@ -71,6 +72,7 @@ import { PrizmListingItemComponent } from '../../listing-item'; ...prizmI18nInitWithKeys({ time: PRIZM_TIME_TEXTS, dateTexts: PRIZM_DATE_TEXTS, + inputLayoutDateTime: PRIZM_INPUT_LAYOUT_DATE_TIME, }), ...PRIZM_INPUT_DATE_TIME_PROVIDERS, { @@ -103,6 +105,7 @@ import { PrizmListingItemComponent } from '../../listing-item'; PrizmValueAccessorModule, PrizmInputNativeValueModule, PrizmListingItemComponent, + PrizmPluckPipe, ], }) export class PrizmInputLayoutDateTimeComponent @@ -118,6 +121,9 @@ export class PrizmInputLayoutDateTimeComponent @ViewChild('focusableElementRef', { read: PrizmInputZoneDirective }) public override readonly focusableElement?: PrizmInputZoneDirective; + @ViewChild(PrizmInputStatusTextDirective, { static: true }) + override statusText!: PrizmInputStatusTextDirective; + @Input() @prizmDefaultProp() timeItems: readonly PrizmTime[] = new Array(24).fill(null).map((_, i) => new PrizmTime(i, 0, 0, 0)); @@ -182,6 +188,8 @@ export class PrizmInputLayoutDateTimeComponent injector: Injector, @Inject(PRIZM_DATE_TEXTS) readonly dateTexts$: Observable>, + @Inject(PRIZM_INPUT_LAYOUT_DATE_TIME) + public readonly dictionary$: Observable, @Optional() @Inject(PRIZM_DATE_TIME_VALUE_TRANSFORMER) valueTransformer: PrizmControlValueTransformer<[PrizmDay | null, PrizmTime | null] | null> | null diff --git a/libs/components/src/lib/tokens/i18n.ts b/libs/components/src/lib/tokens/i18n.ts index cc6c5250a2..013a519831 100644 --- a/libs/components/src/lib/tokens/i18n.ts +++ b/libs/components/src/lib/tokens/i18n.ts @@ -7,6 +7,7 @@ import { PrizmLanguageCron, PrizmLanguageFileUpload, PrizmLanguageInputLayoutDateRelative, + PrizmLanguageInputLayoutDateTime, PrizmLanguageKit, PrizmLanguagePaginator, } from '@prizm-ui/i18n'; @@ -19,6 +20,10 @@ export const PRIZM_INPUT_LAYOUT_DATE_RELATIVE = new InjectionToken< Observable >(`Localized for input layout date relative component`); +export const PRIZM_INPUT_LAYOUT_DATE_TIME = new InjectionToken< + Observable +>(`Localized for input layout date time component`); + export const PRIZM_CRON = new InjectionToken>( `Localized for cron component` ); diff --git a/libs/i18n/src/lib/interfaces/language.ts b/libs/i18n/src/lib/interfaces/language.ts index ab1632578a..016d9c865e 100644 --- a/libs/i18n/src/lib/interfaces/language.ts +++ b/libs/i18n/src/lib/interfaces/language.ts @@ -21,6 +21,11 @@ export interface PrizmLanguageInputLayoutDateRelative { wrongFormat: string; }; } +export interface PrizmLanguageInputLayoutDateTime { + inputLayoutDateTime: { + wrongFormat: string; + }; +} export interface PrizmLanguageCron { cron: { title: string; @@ -219,6 +224,7 @@ export interface PrizmLanguage PrizmLanguageMeta, PrizmLanguageCron, PrizmLanguageInputLayoutDateRelative, + PrizmLanguageInputLayoutDateTime, PrizmLanguageFileUpload, PrizmLanguageColumnSettings, PrizmLanguagePaginator {} diff --git a/libs/i18n/src/lib/languages/russian/input-layout-date-time.ts b/libs/i18n/src/lib/languages/russian/input-layout-date-time.ts new file mode 100644 index 0000000000..2ed50480f8 --- /dev/null +++ b/libs/i18n/src/lib/languages/russian/input-layout-date-time.ts @@ -0,0 +1,7 @@ +import { PrizmLanguageInputLayoutDateTime } from '../../interfaces'; + +export const PRIZM_RUSSIAN_INPUT_LAYOUT_DATE_TIME: PrizmLanguageInputLayoutDateTime = { + inputLayoutDateTime: { + wrongFormat: 'Неправильный формат данных', + }, +}; diff --git a/libs/i18n/src/lib/languages/russian/russian.ts b/libs/i18n/src/lib/languages/russian/russian.ts index 4574770e1a..e8db4cbf2a 100644 --- a/libs/i18n/src/lib/languages/russian/russian.ts +++ b/libs/i18n/src/lib/languages/russian/russian.ts @@ -6,6 +6,7 @@ import { PRIZM_RUSSIAN_CRON } from './cron'; import { PRIZM_RUSSIAN_INPUT_LAYOUT_DATE_RELATIVE } from './input-date-layout-relative'; import { PRIZM_RUSSIAN_COLUMN_SETTINGS } from './column-settings'; import { PRIZM_RUSSIAN_PAGINATOR } from './paginator'; +import { PRIZM_RUSSIAN_INPUT_LAYOUT_DATE_TIME } from './input-layout-date-time'; export const PRIZM_RUSSIAN_LANGUAGE = { name: `russian`, @@ -14,6 +15,7 @@ export const PRIZM_RUSSIAN_LANGUAGE = { ...PRIZM_RUSSIAN_LANGUAGE_KIT, ...PRIZM_RUSSIAN_FILE_UPLOAD, ...PRIZM_RUSSIAN_INPUT_LAYOUT_DATE_RELATIVE, + ...PRIZM_RUSSIAN_INPUT_LAYOUT_DATE_TIME, ...PRIZM_RUSSIAN_CRON, ...PRIZM_RUSSIAN_COLUMN_SETTINGS, ...PRIZM_RUSSIAN_PAGINATOR, From 80b5a4a62c017970fe72ea070b20318fa69faf41 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Wed, 7 Feb 2024 19:12:54 +0300 Subject: [PATCH 012/291] fix: input select example update --- .../examples/base/select-base-example.component.html | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/apps/doc/src/app/components/input/input-select/examples/base/select-base-example.component.html b/apps/doc/src/app/components/input/input-select/examples/base/select-base-example.component.html index 5a24665f04..ed335507d1 100644 --- a/apps/doc/src/app/components/input/input-select/examples/base/select-base-example.component.html +++ b/apps/doc/src/app/components/input/input-select/examples/base/select-base-example.component.html @@ -1,5 +1,10 @@ - + From 962b9d6be7e21b221e5c12a73803663435af96c2 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Wed, 7 Feb 2024 19:19:52 +0300 Subject: [PATCH 013/291] fix: input select examples prizm input status text fix #185 --- .../examples/base/select-base-example.component.html | 8 +------- .../full-width/select-full-width-example.component.html | 1 - .../select-virtual-scroll-example.component.html | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/apps/doc/src/app/components/input/input-select/examples/base/select-base-example.component.html b/apps/doc/src/app/components/input/input-select/examples/base/select-base-example.component.html index 5a24665f04..868b39539e 100644 --- a/apps/doc/src/app/components/input/input-select/examples/base/select-base-example.component.html +++ b/apps/doc/src/app/components/input/input-select/examples/base/select-base-example.component.html @@ -1,12 +1,6 @@ - - - - - - - dddd +

    diff --git a/apps/doc/src/app/components/input/input-select/examples/full-width/select-full-width-example.component.html b/apps/doc/src/app/components/input/input-select/examples/full-width/select-full-width-example.component.html index 27c524349f..d497218bd7 100644 --- a/apps/doc/src/app/components/input/input-select/examples/full-width/select-full-width-example.component.html +++ b/apps/doc/src/app/components/input/input-select/examples/full-width/select-full-width-example.component.html @@ -1,7 +1,6 @@ -

    diff --git a/apps/doc/src/app/components/input/input-select/examples/virtual-scroll/select-virtual-scroll-example.component.html b/apps/doc/src/app/components/input/input-select/examples/virtual-scroll/select-virtual-scroll-example.component.html index 4fad677f95..ccbbcdf6dc 100644 --- a/apps/doc/src/app/components/input/input-select/examples/virtual-scroll/select-virtual-scroll-example.component.html +++ b/apps/doc/src/app/components/input/input-select/examples/virtual-scroll/select-virtual-scroll-example.component.html @@ -9,7 +9,7 @@ - dddd +

    From ad77bdca3570be5e1a62f13a910ee23daa951615 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 8 Feb 2024 11:35:46 +0300 Subject: [PATCH 014/291] fix: switcher active disable state regress fixed #1348 --- .../components/switcher-item/switcher-item.component.html | 1 + .../components/switcher-item/switcher-item.component.less | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/libs/components/src/lib/components/switcher/components/switcher-item/switcher-item.component.html b/libs/components/src/lib/components/switcher/components/switcher-item/switcher-item.component.html index d580adcdd1..58ac800e99 100644 --- a/libs/components/src/lib/components/switcher/components/switcher-item/switcher-item.component.html +++ b/libs/components/src/lib/components/switcher/components/switcher-item/switcher-item.component.html @@ -6,6 +6,7 @@ [size]="size" [appearanceType]="data?.appearanceType ?? 'ghost'" [appearance]="data?.appearance ?? 'secondary'" + [class.switcher_active_disabled]="isActive && isDisabled" [pseudoPressed]="isActive" prizmButton > diff --git a/libs/components/src/lib/components/switcher/components/switcher-item/switcher-item.component.less b/libs/components/src/lib/components/switcher/components/switcher-item/switcher-item.component.less index a8951424b0..aa5793122d 100644 --- a/libs/components/src/lib/components/switcher/components/switcher-item/switcher-item.component.less +++ b/libs/components/src/lib/components/switcher/components/switcher-item/switcher-item.component.less @@ -49,6 +49,11 @@ transition: 400ms; overflow: hidden; + &_active_disabled { + background: var(--prizm-v3-button-secondary-ghost-active); + color: var(--prizm-v3-button-secondary-solid-active); + } + &_icon { min-width: 50px; } From d2a7609b287b626dcd70cf7c2782a20684cddebc Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 8 Feb 2024 13:37:55 +0300 Subject: [PATCH 015/291] fix: prizm navigation menu search error #1344 --- .../prizm-navigation-menu-group.service.ts | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/libs/components/src/lib/components/navigation-menu/services/prizm-navigation-menu-group.service.ts b/libs/components/src/lib/components/navigation-menu/services/prizm-navigation-menu-group.service.ts index 4f6c42b15c..833117b8d6 100644 --- a/libs/components/src/lib/components/navigation-menu/services/prizm-navigation-menu-group.service.ts +++ b/libs/components/src/lib/components/navigation-menu/services/prizm-navigation-menu-group.service.ts @@ -103,15 +103,16 @@ export class PrizmNavigationMenuGroupService< this.searchState$$, ]).pipe( map(([modeBasedItems, searchState]) => { - if (searchState.enabled && searchState.value === '') { - return []; - } - if (searchState.enabled) { - const filtered = filterItems(modeBasedItems, item => - item.text.toLowerCase().includes(searchState.value.toLowerCase()) - ); - traverseAllDeep(filtered, item => this.temporaryExpandedItemsMap.set(item, true)); + const searchValue = + searchState.value !== null && searchState.value !== undefined + ? searchState.value.toLowerCase() + : ''; + + const filtered = filterItems(modeBasedItems, item => item.text.toLowerCase().includes(searchValue)); + if (searchValue !== '') { + traverseAllDeep(filtered, item => this.temporaryExpandedItemsMap.set(item, true)); + } return filtered; } From 5e582c5fddadd8bb4ee3dcbcde443575edea1862 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 9 Feb 2024 18:02:27 +0300 Subject: [PATCH 016/291] fix: navigation menu active item setter fix #1213 --- .../navigation-menu-basic-example.component.html | 1 + .../prizm-navigation-menu/prizm-navigation-menu.component.ts | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/apps/doc/src/app/components/navigation-menu/examples/navigation-menu-basic-example/navigation-menu-basic-example.component.html b/apps/doc/src/app/components/navigation-menu/examples/navigation-menu-basic-example/navigation-menu-basic-example.component.html index 17f7db600b..d31eefa43d 100644 --- a/apps/doc/src/app/components/navigation-menu/examples/navigation-menu-basic-example/navigation-menu-basic-example.component.html +++ b/apps/doc/src/app/components/navigation-menu/examples/navigation-menu-basic-example/navigation-menu-basic-example.component.html @@ -4,6 +4,7 @@ [title]="'Basic props'" [toolbarConfig]="toolbarConfig" [items]="items" + [activeItem]="items[0]" [emptyDataMessageConfig]="{ title: 'Нет никаких данных', subtitle: diff --git a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.ts b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.ts index 6a3c771e21..d77eeeda8a 100644 --- a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.ts +++ b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.ts @@ -79,7 +79,9 @@ export class PrizmNavigationMenuComponent< @Input() headerExtraTemplate!: TemplateRef; @Input() set activeItem(activeItem: UserItem | null) { - this.menuService.setActiveItem(activeItem as UserItem); + queueMicrotask(() => { + this.menuService.setActiveItem(activeItem as UserItem); + }); } @Input() set itemKeyName(keyName: string) { this.menuService.setItemKeyName(keyName); From d966b59312eef2103829d9300c35caa85b4f258f Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Sun, 11 Feb 2024 18:01:56 +0300 Subject: [PATCH 017/291] fix: breadcrumbs force update for content projection use case #1282 --- .../breadcrumbs-example-projection.component.html | 4 ++-- .../breadcrumbs-example-projection.component.ts | 10 +++++++++- .../components/breadcrumbs/breadcrumbs.component.ts | 4 ++++ 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/apps/doc/src/app/components/breadcrumbs/examples/breadcrumbs-projection-basic/breadcrumbs-example-projection.component.html b/apps/doc/src/app/components/breadcrumbs/examples/breadcrumbs-projection-basic/breadcrumbs-example-projection.component.html index 6d38f7b235..8aec2b163e 100644 --- a/apps/doc/src/app/components/breadcrumbs/examples/breadcrumbs-projection-basic/breadcrumbs-example-projection.component.html +++ b/apps/doc/src/app/components/breadcrumbs/examples/breadcrumbs-projection-basic/breadcrumbs-example-projection.component.html @@ -1,5 +1,5 @@ - - + + {{ item.name }} diff --git a/apps/doc/src/app/components/breadcrumbs/examples/breadcrumbs-projection-basic/breadcrumbs-example-projection.component.ts b/apps/doc/src/app/components/breadcrumbs/examples/breadcrumbs-projection-basic/breadcrumbs-example-projection.component.ts index 6d9d3536f5..03359f5a1a 100644 --- a/apps/doc/src/app/components/breadcrumbs/examples/breadcrumbs-projection-basic/breadcrumbs-example-projection.component.ts +++ b/apps/doc/src/app/components/breadcrumbs/examples/breadcrumbs-projection-basic/breadcrumbs-example-projection.component.ts @@ -1,5 +1,6 @@ -import { Component, ChangeDetectionStrategy } from '@angular/core'; +import { Component, ChangeDetectionStrategy, ViewChild } from '@angular/core'; import { IBreadcrumb } from '@prizm-ui/components'; +import { map, tap, timer } from 'rxjs'; @Component({ selector: 'prizm-breadcrumbs-example-projection', @@ -8,12 +9,19 @@ import { IBreadcrumb } from '@prizm-ui/components'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class BreadcrumbsExampleProjectionComponent { + @ViewChild('crumbs') public crumbs!: any; + public breadcrumbs = [ { link: '/components/button', name: 'Button' }, { link: '/components/split-button', name: 'Split' }, { link: '/components/icon-button', name: 'Icon' }, ]; + breadcrumbs$ = timer(2000).pipe( + map(() => this.breadcrumbs), + tap(() => this.crumbs.forceUpdateView()) + ); + private currentBreadcrumb: IBreadcrumb | null = null; public breadcrumbChange(current: IBreadcrumb): void { diff --git a/libs/components/src/lib/components/breadcrumbs/breadcrumbs.component.ts b/libs/components/src/lib/components/breadcrumbs/breadcrumbs.component.ts index e46533a8ef..81984b2df9 100644 --- a/libs/components/src/lib/components/breadcrumbs/breadcrumbs.component.ts +++ b/libs/components/src/lib/components/breadcrumbs/breadcrumbs.component.ts @@ -119,6 +119,10 @@ export class PrizmBreadcrumbsComponent this.mutationDetector$.complete(); } + public forceUpdateView() { + setTimeout(() => this.cdRef.detectChanges()); + } + private calculateOverflowState(): void { const containerWidth = this.containerRef.nativeElement.clientWidth; const contentWidth = this.breadcrumbsElementsWidth; From 85a29d58167fcca3b823959946c55aede72ab53f Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 12 Feb 2024 12:30:16 +0300 Subject: [PATCH 018/291] fix: navigation active node styles changed #1213 --- .../navigation-menu-basic-example.component.html | 2 +- .../navigation-menu-basic-example.component.ts | 4 ++++ .../prizm-navigation-menu-item.component.html | 1 + .../prizm-navigation-menu-item.component.less | 5 ++++- .../prizm-navigation-menu-item.component.ts | 1 + .../prizm-navigation-menu-items.component.html | 1 + .../prizm-navigation-menu-items.component.ts | 8 +++++++- 7 files changed, 19 insertions(+), 3 deletions(-) diff --git a/apps/doc/src/app/components/navigation-menu/examples/navigation-menu-basic-example/navigation-menu-basic-example.component.html b/apps/doc/src/app/components/navigation-menu/examples/navigation-menu-basic-example/navigation-menu-basic-example.component.html index d31eefa43d..df8a257f77 100644 --- a/apps/doc/src/app/components/navigation-menu/examples/navigation-menu-basic-example/navigation-menu-basic-example.component.html +++ b/apps/doc/src/app/components/navigation-menu/examples/navigation-menu-basic-example/navigation-menu-basic-example.component.html @@ -4,7 +4,7 @@ [title]="'Basic props'" [toolbarConfig]="toolbarConfig" [items]="items" - [activeItem]="items[0]" + [activeItem]="activeItem" [emptyDataMessageConfig]="{ title: 'Нет никаких данных', subtitle: diff --git a/apps/doc/src/app/components/navigation-menu/examples/navigation-menu-basic-example/navigation-menu-basic-example.component.ts b/apps/doc/src/app/components/navigation-menu/examples/navigation-menu-basic-example/navigation-menu-basic-example.component.ts index f1ab94dbfa..450d90e0ce 100644 --- a/apps/doc/src/app/components/navigation-menu/examples/navigation-menu-basic-example/navigation-menu-basic-example.component.ts +++ b/apps/doc/src/app/components/navigation-menu/examples/navigation-menu-basic-example/navigation-menu-basic-example.component.ts @@ -18,9 +18,13 @@ export class NavigationMenuBasicExampleComponent { }; items: PrizmNavigationMenuItem[] = MOKED_ITEMS; + activeItem: PrizmNavigationMenuItem; constructor(private readonly iconRegistry: PrizmIconsSvgRegistry, private cdr: ChangeDetectorRef) { this.iconRegistry.registerIcons(PRIZM_ICONS_SVG_SET); + + const childItemsArray = this.items[0].children as PrizmNavigationMenuItem[]; + this.activeItem = childItemsArray[1]; } public toggleLoading(): void { diff --git a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-item/prizm-navigation-menu-item.component.html b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-item/prizm-navigation-menu-item.component.html index 4cae267a7e..582d93d747 100644 --- a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-item/prizm-navigation-menu-item.component.html +++ b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-item/prizm-navigation-menu-item.component.html @@ -1,5 +1,6 @@
    extends PrizmAbstractTestId { @Input() itemExtraTemplate!: TemplateRef; @Input() isExpandable!: boolean; @Input() isExpanded!: boolean; + @Input() isActiveNode!: boolean; @Input() isActive!: boolean; @Input() item!: InternalPrizmNavigationMenuItem; @Input() mode!: ViewMode; diff --git a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-items/prizm-navigation-menu-items.component.html b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-items/prizm-navigation-menu-items.component.html index ab7b18f5e3..cf4086055b 100644 --- a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-items/prizm-navigation-menu-items.component.html +++ b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-items/prizm-navigation-menu-items.component.html @@ -13,6 +13,7 @@ [item]="item" [mode]="mode" [itemExtraTemplate]="itemExtraTemplate" + [isActiveNode]="getItemIsActiveNode(item)" [isActive]="getItemIsActive(item)" [isExpandable]="menuItemsChildrenHandler(item).length > 0" [isExpanded]="getItemIsExpanded(item)" diff --git a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-items/prizm-navigation-menu-items.component.ts b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-items/prizm-navigation-menu-items.component.ts index cdfab37933..c62193aded 100644 --- a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-items/prizm-navigation-menu-items.component.ts +++ b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-items/prizm-navigation-menu-items.component.ts @@ -96,7 +96,7 @@ export class PrizmNavigationMenuItemsComponent< return this.expandedItemsMap.get(item) ?? false; } - public getItemIsActive(item: InternalPrizmNavigationMenuItem): boolean { + public getItemIsActiveNode(item: InternalPrizmNavigationMenuItem): boolean { if (item === this.activeItem) return true; if (!this.getItemIsExpanded(item) && item.children && this.mode !== 'rubricator') { @@ -107,6 +107,12 @@ export class PrizmNavigationMenuItemsComponent< return false; } + public getItemIsActive(item: InternalPrizmNavigationMenuItem): boolean { + if (item === this.activeItem) return true; + + return false; + } + public triggerCdr(): void { this.cdr.markForCheck(); this.menuItemsList?.forEach(itemComponent => itemComponent.cdr.markForCheck()); From 37a1cd659967778c2d56c507f3dd8ffe7b1e9323 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 12 Feb 2024 14:26:55 +0300 Subject: [PATCH 019/291] fix: breadcrumbs update for content projection use case #1282 --- .../breadcrumbs-example-projection.component.ts | 7 ++----- .../components/breadcrumbs/breadcrumbs.component.ts | 11 ++++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/apps/doc/src/app/components/breadcrumbs/examples/breadcrumbs-projection-basic/breadcrumbs-example-projection.component.ts b/apps/doc/src/app/components/breadcrumbs/examples/breadcrumbs-projection-basic/breadcrumbs-example-projection.component.ts index 03359f5a1a..48288c6a27 100644 --- a/apps/doc/src/app/components/breadcrumbs/examples/breadcrumbs-projection-basic/breadcrumbs-example-projection.component.ts +++ b/apps/doc/src/app/components/breadcrumbs/examples/breadcrumbs-projection-basic/breadcrumbs-example-projection.component.ts @@ -1,6 +1,6 @@ import { Component, ChangeDetectionStrategy, ViewChild } from '@angular/core'; import { IBreadcrumb } from '@prizm-ui/components'; -import { map, tap, timer } from 'rxjs'; +import { map, timer } from 'rxjs'; @Component({ selector: 'prizm-breadcrumbs-example-projection', @@ -17,10 +17,7 @@ export class BreadcrumbsExampleProjectionComponent { { link: '/components/icon-button', name: 'Icon' }, ]; - breadcrumbs$ = timer(2000).pipe( - map(() => this.breadcrumbs), - tap(() => this.crumbs.forceUpdateView()) - ); + breadcrumbs$ = timer(2000).pipe(map(() => this.breadcrumbs)); private currentBreadcrumb: IBreadcrumb | null = null; diff --git a/libs/components/src/lib/components/breadcrumbs/breadcrumbs.component.ts b/libs/components/src/lib/components/breadcrumbs/breadcrumbs.component.ts index 81984b2df9..061aa13f10 100644 --- a/libs/components/src/lib/components/breadcrumbs/breadcrumbs.component.ts +++ b/libs/components/src/lib/components/breadcrumbs/breadcrumbs.component.ts @@ -109,7 +109,12 @@ export class PrizmBreadcrumbsComponent }) ); - merge($breadcrumbsChange, $mutation) + const $templateChage = this.breadcrumbsItem.changes.pipe( + debounceTime(200), + observeOn(animationFrameScheduler) + ); + + merge($breadcrumbsChange, $mutation, $templateChage) .pipe(debounceTime(200), takeUntil(this.destroy)) .subscribe(() => this.cdRef.detectChanges()); } @@ -119,10 +124,6 @@ export class PrizmBreadcrumbsComponent this.mutationDetector$.complete(); } - public forceUpdateView() { - setTimeout(() => this.cdRef.detectChanges()); - } - private calculateOverflowState(): void { const containerWidth = this.containerRef.nativeElement.clientWidth; const contentWidth = this.breadcrumbsElementsWidth; From 730d039794737baffa311b6cc7976c2a188e6540 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 12 Feb 2024 15:28:38 +0300 Subject: [PATCH 020/291] fix: style fixes --- .../breadcrumbs-example-projection.component.html | 2 +- .../breadcrumbs-example-projection.component.ts | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/doc/src/app/components/breadcrumbs/examples/breadcrumbs-projection-basic/breadcrumbs-example-projection.component.html b/apps/doc/src/app/components/breadcrumbs/examples/breadcrumbs-projection-basic/breadcrumbs-example-projection.component.html index 8aec2b163e..8c41779a67 100644 --- a/apps/doc/src/app/components/breadcrumbs/examples/breadcrumbs-projection-basic/breadcrumbs-example-projection.component.html +++ b/apps/doc/src/app/components/breadcrumbs/examples/breadcrumbs-projection-basic/breadcrumbs-example-projection.component.html @@ -1,4 +1,4 @@ - + {{ item.name }} diff --git a/apps/doc/src/app/components/breadcrumbs/examples/breadcrumbs-projection-basic/breadcrumbs-example-projection.component.ts b/apps/doc/src/app/components/breadcrumbs/examples/breadcrumbs-projection-basic/breadcrumbs-example-projection.component.ts index 48288c6a27..84eae895bc 100644 --- a/apps/doc/src/app/components/breadcrumbs/examples/breadcrumbs-projection-basic/breadcrumbs-example-projection.component.ts +++ b/apps/doc/src/app/components/breadcrumbs/examples/breadcrumbs-projection-basic/breadcrumbs-example-projection.component.ts @@ -1,4 +1,4 @@ -import { Component, ChangeDetectionStrategy, ViewChild } from '@angular/core'; +import { Component, ChangeDetectionStrategy } from '@angular/core'; import { IBreadcrumb } from '@prizm-ui/components'; import { map, timer } from 'rxjs'; @@ -9,8 +9,6 @@ import { map, timer } from 'rxjs'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class BreadcrumbsExampleProjectionComponent { - @ViewChild('crumbs') public crumbs!: any; - public breadcrumbs = [ { link: '/components/button', name: 'Button' }, { link: '/components/split-button', name: 'Split' }, From 90e92e6dd2544c526b619a70f00f24e70eeb3ee4 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 13 Feb 2024 12:58:26 +0300 Subject: [PATCH 021/291] fix: input height fixes #1179, #1308 --- ...input-carousel-auxiliary-left.component.ts | 1 + ...nput-carousel-auxiliary-right.component.ts | 1 + .../input-icon-button.component.less | 1 + .../input-layout/input-layout.component.less | 31 +++++++++++++++++++ ...t-number-auxiliary-controls.component.less | 8 +++++ 5 files changed, 42 insertions(+) diff --git a/libs/components/src/lib/components/input/carousel/input-carousel-auxiliary-left.component.ts b/libs/components/src/lib/components/input/carousel/input-carousel-auxiliary-left.component.ts index 6427db091e..2ea128fedd 100644 --- a/libs/components/src/lib/components/input/carousel/input-carousel-auxiliary-left.component.ts +++ b/libs/components/src/lib/components/input/carousel/input-carousel-auxiliary-left.component.ts @@ -26,6 +26,7 @@ import { PrizmInputCommonModule } from '../common'; :host { display: flex; align-items: center; + height: 100%; } `, ], diff --git a/libs/components/src/lib/components/input/carousel/input-carousel-auxiliary-right.component.ts b/libs/components/src/lib/components/input/carousel/input-carousel-auxiliary-right.component.ts index 62eb34cbbf..fbaad43f70 100644 --- a/libs/components/src/lib/components/input/carousel/input-carousel-auxiliary-right.component.ts +++ b/libs/components/src/lib/components/input/carousel/input-carousel-auxiliary-right.component.ts @@ -26,6 +26,7 @@ import { PrizmInputCommonModule } from '../common'; :host { display: flex; align-items: center; + height: 100%; } `, ], diff --git a/libs/components/src/lib/components/input/common/input-icon-button/input-icon-button.component.less b/libs/components/src/lib/components/input/common/input-icon-button/input-icon-button.component.less index 03c9bdbc9e..1c19bac1af 100644 --- a/libs/components/src/lib/components/input/common/input-icon-button/input-icon-button.component.less +++ b/libs/components/src/lib/components/input/common/input-icon-button/input-icon-button.component.less @@ -31,6 +31,7 @@ } cursor: pointer; + height: 100%; } color: var(--prizm-v3-button-secondary-solid-default); diff --git a/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less b/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less index 8376dfbef1..c69969f8f1 100644 --- a/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less +++ b/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less @@ -118,6 +118,9 @@ display: flex; align-items: center; flex-grow: 1; + + // Hack for height in percents for buttons inside controls + height: 1px; } &-body { @@ -204,11 +207,23 @@ &-inner { min-height: 44px; + &:not(:has(prizm-chips)) { + max-height: 44px; + } + &[data-size='l'] { min-height: 44px; + + &:not(:has(prizm-chips)) { + max-height: 44px; + } } &[data-size='m'] { min-height: 36px; + + &:not(:has(prizm-chips)) { + max-height: 36px; + } } } @@ -218,14 +233,30 @@ &-outer { min-height: 32px; + &:not(:has(prizm-chips)) { + max-height: 32px; + } + &[data-size='l'] { min-height: 40px; + + &:not(:has(prizm-chips)) { + max-height: 40px; + } } &[data-size='m'] { min-height: 32px; + + &:not(:has(prizm-chips)) { + max-height: 32px; + } } &[data-size='s'] { min-height: 24px; + + &:not(:has(prizm-chips)) { + max-height: 24px; + } } } diff --git a/libs/components/src/lib/components/input/input-number/input-number-auxiliary-controls.component.less b/libs/components/src/lib/components/input/input-number/input-number-auxiliary-controls.component.less index e48e611c0c..90e2f4767f 100644 --- a/libs/components/src/lib/components/input/input-number/input-number-auxiliary-controls.component.less +++ b/libs/components/src/lib/components/input/input-number/input-number-auxiliary-controls.component.less @@ -1,6 +1,14 @@ +:host { + height: 100%; +} .container { display: flex; flex-direction: column; + height: 100%; + + [prizmInputIconButton] { + height: 50%; + } } :host-context(.prizm-input-form-outer[data-size='m']) { From ee938a065f95adde679aaa8c3e199686261f5c15 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 13 Feb 2024 14:26:05 +0300 Subject: [PATCH 022/291] fix: debounce time removed from template update function --- .../src/lib/components/breadcrumbs/breadcrumbs.component.ts | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libs/components/src/lib/components/breadcrumbs/breadcrumbs.component.ts b/libs/components/src/lib/components/breadcrumbs/breadcrumbs.component.ts index 061aa13f10..40e692de1c 100644 --- a/libs/components/src/lib/components/breadcrumbs/breadcrumbs.component.ts +++ b/libs/components/src/lib/components/breadcrumbs/breadcrumbs.component.ts @@ -109,10 +109,7 @@ export class PrizmBreadcrumbsComponent }) ); - const $templateChage = this.breadcrumbsItem.changes.pipe( - debounceTime(200), - observeOn(animationFrameScheduler) - ); + const $templateChage = this.breadcrumbsItem.changes.pipe(observeOn(animationFrameScheduler)); merge($breadcrumbsChange, $mutation, $templateChage) .pipe(debounceTime(200), takeUntil(this.destroy)) From 5c8295669f497ba13929c62ca736f378f3f8925a Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Wed, 14 Feb 2024 17:43:26 +0300 Subject: [PATCH 023/291] fix: navigation example litle fix --- .../navigation-menu-basic-example.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/doc/src/app/components/navigation-menu/examples/navigation-menu-basic-example/navigation-menu-basic-example.component.ts b/apps/doc/src/app/components/navigation-menu/examples/navigation-menu-basic-example/navigation-menu-basic-example.component.ts index 450d90e0ce..881e89f2d3 100644 --- a/apps/doc/src/app/components/navigation-menu/examples/navigation-menu-basic-example/navigation-menu-basic-example.component.ts +++ b/apps/doc/src/app/components/navigation-menu/examples/navigation-menu-basic-example/navigation-menu-basic-example.component.ts @@ -24,7 +24,7 @@ export class NavigationMenuBasicExampleComponent { this.iconRegistry.registerIcons(PRIZM_ICONS_SVG_SET); const childItemsArray = this.items[0].children as PrizmNavigationMenuItem[]; - this.activeItem = childItemsArray[1]; + this.activeItem = childItemsArray[0]; } public toggleLoading(): void { From 35fa0bb44672ec0171e0e8608ee09eeac9e94ea9 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 15 Feb 2024 09:28:46 +0300 Subject: [PATCH 024/291] fix: date time range transformer token error #1364 --- .../input-layout-date-time-range.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/components/src/lib/components/input/input-date-time-range/input-layout-date-time-range.component.ts b/libs/components/src/lib/components/input/input-date-time-range/input-layout-date-time-range.component.ts index ba37e15770..46578e9504 100644 --- a/libs/components/src/lib/components/input/input-date-time-range/input-layout-date-time-range.component.ts +++ b/libs/components/src/lib/components/input/input-date-time-range/input-layout-date-time-range.component.ts @@ -30,7 +30,7 @@ import { PrizmDialogService } from '../../dialogs/dialog/dialog.service'; import { PRIZM_DATE_FORMAT } from '../../../@core/date-time/date-format'; import { PrizmDateMode } from '../../../types/date-mode'; import { PRIZM_DATE_TEXTS, PRIZM_TIME_TEXTS } from '../../../tokens/i18n'; -import { PRIZM_DATE_RANGE_VALUE_TRANSFORMER } from '../../../tokens/date-inputs-value-transformers'; +import { PRIZM_DATE_TIME_RANGE_VALUE_TRANSFORMER } from '../../../tokens/date-inputs-value-transformers'; import { PrizmControlValueTransformer } from '../../../types/control-value-transformer'; import { prizmNullableSame } from '../../../util/common/nullable-same'; import { filterTruthy, PrizmDestroyService, PrizmLetDirective } from '@prizm-ui/helpers'; @@ -247,7 +247,7 @@ export class PrizmInputLayoutDateTimeRangeComponent @Inject(PRIZM_DATE_TEXTS) readonly dateTexts$: Observable>, @Optional() - @Inject(PRIZM_DATE_RANGE_VALUE_TRANSFORMER) + @Inject(PRIZM_DATE_TIME_RANGE_VALUE_TRANSFORMER) override readonly valueTransformer: PrizmControlValueTransformer | null ) { super(injector); From 7f50dd0a29be915a309e3c287be078b8ce52b035 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 15 Feb 2024 10:44:41 +0300 Subject: [PATCH 025/291] fix: fix styles for input chips --- .../input/common/input-layout/input-layout.component.less | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less b/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less index c69969f8f1..0adf370b71 100644 --- a/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less +++ b/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less @@ -118,7 +118,9 @@ display: flex; align-items: center; flex-grow: 1; + } + &:not(:has([prizm-input-bottom])) &__first { // Hack for height in percents for buttons inside controls height: 1px; } From f9c6d0be693db9912f0082854fcc9757021ba671 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 15 Feb 2024 11:42:44 +0300 Subject: [PATCH 026/291] fix: input chips styles fix --- .../input/input-text/input-example.module.ts | 2 -- .../input-layout/input-layout.component.less | 14 +++++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/apps/doc/src/app/components/input/input-text/input-example.module.ts b/apps/doc/src/app/components/input/input-text/input-example.module.ts index 41918d548c..376cece390 100644 --- a/apps/doc/src/app/components/input/input-text/input-example.module.ts +++ b/apps/doc/src/app/components/input/input-text/input-example.module.ts @@ -4,9 +4,7 @@ import { RouterModule } from '@angular/router'; import { PrizmButtonModule, PrizmHintDirective, - PrizmHintModule, PrizmIconComponent, - PrizmIconModule, PrizmInputTextModule, } from '@prizm-ui/components'; import { PrizmAddonDocModule, prizmDocGenerateRoutes } from '@prizm-ui/doc'; diff --git a/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less b/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less index 0adf370b71..d6b137e38f 100644 --- a/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less +++ b/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less @@ -209,21 +209,21 @@ &-inner { min-height: 44px; - &:not(:has(prizm-chips)) { + &:not(:has(prizm-chips > .chips-list)) { max-height: 44px; } &[data-size='l'] { min-height: 44px; - &:not(:has(prizm-chips)) { + &:not(:has(prizm-chips > .chips-list)) { max-height: 44px; } } &[data-size='m'] { min-height: 36px; - &:not(:has(prizm-chips)) { + &:not(:has(prizm-chips > .chips-list)) { max-height: 36px; } } @@ -235,28 +235,28 @@ &-outer { min-height: 32px; - &:not(:has(prizm-chips)) { + &:not(:has(prizm-chips > .chips-list)) { max-height: 32px; } &[data-size='l'] { min-height: 40px; - &:not(:has(prizm-chips)) { + &:not(:has(prizm-chips > .chips-list)) { max-height: 40px; } } &[data-size='m'] { min-height: 32px; - &:not(:has(prizm-chips)) { + &:not(:has(prizm-chips > .chips-list)) { max-height: 32px; } } &[data-size='s'] { min-height: 24px; - &:not(:has(prizm-chips)) { + &:not(:has(prizm-chips > .chips-list)) { max-height: 24px; } } From d0cc9ce0c8fcf7084e32388f94a0a6c8e1d6434b Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 15 Feb 2024 12:12:05 +0300 Subject: [PATCH 027/291] fix: clear search result map for navigation menu --- .../services/prizm-navigation-menu-group.service.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/libs/components/src/lib/components/navigation-menu/services/prizm-navigation-menu-group.service.ts b/libs/components/src/lib/components/navigation-menu/services/prizm-navigation-menu-group.service.ts index 833117b8d6..2f5db37004 100644 --- a/libs/components/src/lib/components/navigation-menu/services/prizm-navigation-menu-group.service.ts +++ b/libs/components/src/lib/components/navigation-menu/services/prizm-navigation-menu-group.service.ts @@ -70,6 +70,7 @@ export class PrizmNavigationMenuGroupService< this.viewMode$$, ]).pipe( switchMap(([internalItems, viewMode]) => { + console.log(22222); if (viewMode === 'rubricator') { const rubricatorItems = toRubricatorItems(internalItems); rubricatorItems.forEach(rootLevelItem => this.temporaryExpandedItemsMap.set(rootLevelItem, false)); @@ -116,6 +117,10 @@ export class PrizmNavigationMenuGroupService< return filtered; } + if (!searchState.enabled) { + this.temporaryExpandedItemsMap.clear(); + } + return modeBasedItems; }) ); From 78c3f636b3dabde5f3eb95273107ef945267e0d0 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 15 Feb 2024 14:38:57 +0300 Subject: [PATCH 028/291] fix: fix styles for textarea --- .../input/common/input-layout/input-layout.component.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less b/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less index d6b137e38f..ed39b4f045 100644 --- a/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less +++ b/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less @@ -120,7 +120,7 @@ flex-grow: 1; } - &:not(:has([prizm-input-bottom])) &__first { + &:not(:has([prizm-input-bottom])):not(.prizm-input-form-textarea) &__first { // Hack for height in percents for buttons inside controls height: 1px; } From a275f1642d4fb2f76b139a0ca2720353a33d622c Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 15 Feb 2024 15:16:26 +0300 Subject: [PATCH 029/291] fix: input buttons overflow fix --- .../input/common/input-layout/input-layout.component.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less b/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less index ed39b4f045..2d1243e77a 100644 --- a/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less +++ b/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less @@ -6,7 +6,6 @@ .prizm-input-form-status-button, .prizm-input-button-default { flex-shrink: 0; - height: 100%; } .prizm-input-button-default { @@ -269,6 +268,7 @@ position: absolute; z-index: 100; background-color: var(--prizm-v3-form-fill-default); + height: auto; } .prizm-input-button-default { From 952bde3acd2314e615389649638a4496d4d6a67a Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 15 Feb 2024 16:08:27 +0300 Subject: [PATCH 030/291] fix: debounce replaced by asyncShceduler in breadcrumbs --- .../src/lib/components/breadcrumbs/breadcrumbs.component.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/components/src/lib/components/breadcrumbs/breadcrumbs.component.ts b/libs/components/src/lib/components/breadcrumbs/breadcrumbs.component.ts index 40e692de1c..1dfdf7b964 100644 --- a/libs/components/src/lib/components/breadcrumbs/breadcrumbs.component.ts +++ b/libs/components/src/lib/components/breadcrumbs/breadcrumbs.component.ts @@ -15,7 +15,7 @@ import { ViewChildren, } from '@angular/core'; import { IBreadcrumb } from './breadcrumb.interface'; -import { animationFrameScheduler, BehaviorSubject, merge, Subject } from 'rxjs'; +import { animationFrameScheduler, asyncScheduler, BehaviorSubject, merge, Subject } from 'rxjs'; import { PrizmDestroyService, prizmEmptyQueryList } from '@prizm-ui/helpers'; import { debounceTime, observeOn, takeUntil, tap } from 'rxjs/operators'; import { PrizmAbstractTestId } from '../../abstract/interactive'; @@ -112,7 +112,7 @@ export class PrizmBreadcrumbsComponent const $templateChage = this.breadcrumbsItem.changes.pipe(observeOn(animationFrameScheduler)); merge($breadcrumbsChange, $mutation, $templateChage) - .pipe(debounceTime(200), takeUntil(this.destroy)) + .pipe(observeOn(asyncScheduler), takeUntil(this.destroy)) .subscribe(() => this.cdRef.detectChanges()); } From d941b00950d4d0e08be49cad911c6792ee0cf0be Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 16 Feb 2024 09:50:32 +0300 Subject: [PATCH 031/291] fix: status button for inputs style fix --- .../input/common/input-layout/input-layout.component.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less b/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less index 2d1243e77a..dd0280b89e 100644 --- a/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less +++ b/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less @@ -8,6 +8,10 @@ flex-shrink: 0; } + .prizm-input-form-status-button { + align-self: center; + } + .prizm-input-button-default { display: none; } From e417a18260ab22d92de43c407ebfce42f933f7ba Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 16 Feb 2024 13:56:33 +0300 Subject: [PATCH 032/291] fix: switcher styles fix --- .../components/switcher-item/switcher-item.component.less | 7 +++++-- .../components/switcher-item/switcher-item.component.ts | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libs/components/src/lib/components/switcher/components/switcher-item/switcher-item.component.less b/libs/components/src/lib/components/switcher/components/switcher-item/switcher-item.component.less index aa5793122d..4f175c2ed0 100644 --- a/libs/components/src/lib/components/switcher/components/switcher-item/switcher-item.component.less +++ b/libs/components/src/lib/components/switcher/components/switcher-item/switcher-item.component.less @@ -50,8 +50,11 @@ overflow: hidden; &_active_disabled { - background: var(--prizm-v3-button-secondary-ghost-active); - color: var(--prizm-v3-button-secondary-solid-active); + ::ng-deep prizm-wrapper { + &[data-state='disabled'][data-state='disabled'] { + background: var(--prizm-v3-button-disable); + } + } } &_icon { diff --git a/libs/components/src/lib/components/switcher/components/switcher-item/switcher-item.component.ts b/libs/components/src/lib/components/switcher/components/switcher-item/switcher-item.component.ts index df79a2a039..b1839ce5db 100644 --- a/libs/components/src/lib/components/switcher/components/switcher-item/switcher-item.component.ts +++ b/libs/components/src/lib/components/switcher/components/switcher-item/switcher-item.component.ts @@ -9,7 +9,7 @@ import { prizmDefaultProp } from '@prizm-ui/core'; import { PrizmAbstractTestId } from '../../../../abstract/interactive'; import { PrizmHintDirective } from '../../../../directives'; import { CommonModule } from '@angular/common'; -import { PrizmButtonComponent, PrizmButtonModule } from '../../../button'; +import { PrizmButtonComponent } from '../../../button'; @Component({ selector: 'prizm-switcher-item', From 8a45acb342b2cd2f61351fea7641ee3ad3cab039 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 16 Feb 2024 15:20:02 +0300 Subject: [PATCH 033/291] fix: input chips demo styles fix --- .../input/input-chips/input-chips-example.component.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/doc/src/app/components/input/input-chips/input-chips-example.component.less b/apps/doc/src/app/components/input/input-chips/input-chips-example.component.less index feaac48f41..f7f08e265a 100644 --- a/apps/doc/src/app/components/input/input-chips/input-chips-example.component.less +++ b/apps/doc/src/app/components/input/input-chips/input-chips-example.component.less @@ -1,3 +1,3 @@ -prizm-chips.single-line { +prizm-chips.single-line:not(empty) { margin-bottom: 11px; } From e818180b848014f0e96ca55ec4dfbe981100f86e Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Fri, 16 Feb 2024 15:25:43 +0300 Subject: [PATCH 034/291] fix(components/tabs): issue with close tabs logic #1360 --- .../components/tabs/components/tab.component.ts | 17 +++++++---------- .../src/lib/components/tabs/tabs.component.html | 2 +- .../src/lib/components/tabs/tabs.service.ts | 10 +++++++++- 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/libs/components/src/lib/components/tabs/components/tab.component.ts b/libs/components/src/lib/components/tabs/components/tab.component.ts index 4d21290e06..033b3e2890 100644 --- a/libs/components/src/lib/components/tabs/components/tab.component.ts +++ b/libs/components/src/lib/components/tabs/components/tab.component.ts @@ -160,16 +160,13 @@ export class PrizmTabComponent extends PrizmAbstractTestId implements OnInit, On ); } - public onClose(event: MouseEvent): void { - event.stopPropagation(); - this.tab$.pipe( - first(), - tap(tab => { - tab.closeTab.emit(); - }), - takeUntil(this.destroy) - ); - + public close(): void { + this.tabsService.removeTab(this); this.closeTab.emit(); } + + protected onClose(event: MouseEvent): void { + event.stopPropagation(); + this.close(); + } } diff --git a/libs/components/src/lib/components/tabs/tabs.component.html b/libs/components/src/lib/components/tabs/tabs.component.html index 00d82b60e4..4d338161af 100644 --- a/libs/components/src/lib/components/tabs/tabs.component.html +++ b/libs/components/src/lib/components/tabs/tabs.component.html @@ -105,7 +105,7 @@ [class.hidden]="!tab.closable" [iconClass]="'cancel-close'" [size]="16" - (click)="closeTab($any(tabElement.idx))" + (click)="closeTab(tabElement.idx!)" > diff --git a/libs/components/src/lib/components/tabs/tabs.service.ts b/libs/components/src/lib/components/tabs/tabs.service.ts index 51bf283e3a..95511a8f06 100644 --- a/libs/components/src/lib/components/tabs/tabs.service.ts +++ b/libs/components/src/lib/components/tabs/tabs.service.ts @@ -1,6 +1,6 @@ import { Injectable, OnDestroy } from '@angular/core'; import { BehaviorSubject, combineLatest, concat, Observable, of, Subject } from 'rxjs'; -import { distinctUntilChanged, filter, map, startWith, take, takeUntil, tap } from 'rxjs/operators'; +import { distinctUntilChanged, map, take, takeUntil, tap } from 'rxjs/operators'; import { PrizmTabComponent } from './components/tab.component'; import { filterTruthy, PrizmDestroyService, prizmFromMutationObserver$ } from '@prizm-ui/helpers'; import { PrizmTabCanOpen } from './tabs.model'; @@ -48,6 +48,14 @@ export class PrizmTabsService implements OnDestroy { return this.tabs.get(idx) as PrizmTabComponent; } + public close(tabIdx: number): boolean { + const tab = this.getTabByIdx(tabIdx); + if (!tab) return false; + + tab.close(); + return true; + } + public moveTab(idx: number, toIndex: number, tab: PrizmTabComponent): void { if (tab !== this.getTabByIdx(idx)) return; this.tabs.delete(idx); From 63311ae886154c36293850d98ea33e3edd824159 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Fri, 16 Feb 2024 16:39:43 +0300 Subject: [PATCH 035/291] feat(components/tabs): added tests --- .../tabs/components/tabs.component.spec.ts | 70 +++++++++++++++++++ .../src/lib/components/tabs/tabs.service.ts | 8 ++- 2 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 libs/components/src/lib/components/tabs/components/tabs.component.spec.ts diff --git a/libs/components/src/lib/components/tabs/components/tabs.component.spec.ts b/libs/components/src/lib/components/tabs/components/tabs.component.spec.ts new file mode 100644 index 0000000000..4ba6eeaeb3 --- /dev/null +++ b/libs/components/src/lib/components/tabs/components/tabs.component.spec.ts @@ -0,0 +1,70 @@ +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { PrizmTabComponent } from './tab.component'; +import { PrizmTabsService } from '../tabs.service'; +import { PrizmDestroyService } from '@prizm-ui/helpers'; + +describe('PrizmTabComponent', () => { + let component: PrizmTabComponent; + let fixture: ComponentFixture; + let tabsService: PrizmTabsService; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + imports: [PrizmTabComponent], + providers: [PrizmTabsService, PrizmDestroyService], // Используем реальный сервис + }).compileComponents(); + }); + + beforeEach(() => { + fixture = TestBed.createComponent(PrizmTabComponent); + component = fixture.componentInstance; + tabsService = TestBed.inject(PrizmTabsService); + fixture.detectChanges(); // Инициируем обнаружение изменений + }); + + it('should remove the selected tab and update activeTabIdx accordingly', () => { + // Создаем и добавляем 3 таба в сервис + const tab1 = TestBed.createComponent(PrizmTabComponent).componentInstance; + const tab2 = TestBed.createComponent(PrizmTabComponent).componentInstance; + const tab3 = TestBed.createComponent(PrizmTabComponent).componentInstance; + + tabsService.addTab(tab1, 0); + tabsService.addTab(tab2, 1); + tabsService.addTab(tab3, 2); + + // Выбираем последний таб + tabsService.selectTab(tab3); + + // Проверяем, что последний таб теперь активный + expect(tabsService.activeTabIdx).toBe(2); // Предполагая, что индексы начинаются с 0 + + // Закрываем последний таб + tab3.close(); + + // Проверяем, что активный таб изменился после закрытия последнего таба + expect(tabsService.activeTabIdx).not.toBe(2); + }); + + it('should remove the unselected tab and update activeTabIdx accordingly', () => { + // Создаем и добавляем 3 таба в сервис + const tab1 = TestBed.createComponent(PrizmTabComponent).componentInstance; + const tab2 = TestBed.createComponent(PrizmTabComponent).componentInstance; + const tab3 = TestBed.createComponent(PrizmTabComponent).componentInstance; + + tabsService.addTab(tab1, 0); + tabsService.addTab(tab2, 1); + tabsService.addTab(tab3, 2); + + // Выбираем последний таб + tabsService.selectTab(tab2); + + // Проверяем, что последний таб теперь активный + expect(tabsService.activeTabIdx).toBe(1); // Предполагая, что индексы начинаются с 0 + + // Закрываем последний таб + tab3.close(); + + // Проверяем, что активный таб не изменился после закрытия последнего таба + expect(tabsService.activeTabIdx).toBe(1); + }); +}); diff --git a/libs/components/src/lib/components/tabs/tabs.service.ts b/libs/components/src/lib/components/tabs/tabs.service.ts index 95511a8f06..4eb993f5ab 100644 --- a/libs/components/src/lib/components/tabs/tabs.service.ts +++ b/libs/components/src/lib/components/tabs/tabs.service.ts @@ -15,7 +15,7 @@ export class PrizmTabsService implements OnDestroy { return this.changeParent$_; } readonly closeTab$$ = new Subject>(); - private readonly activeTabIdx$$ = new BehaviorSubject(0); + public readonly activeTabIdx$$ = new BehaviorSubject(0); readonly activeTabIdx$ = this.activeTabIdx$$.pipe(distinctUntilChanged()); get activeTabIdx() { @@ -72,6 +72,11 @@ export class PrizmTabsService implements OnDestroy { this.changes$$.next(this.tabs); } + public addTab(tab: PrizmTabComponent, tabIdx: number): void { + this.tabs.set(tabIdx, tab); + this.changes$$.next(this.tabs); + } + public removeTab(tab: PrizmTabComponent): void { const idx = this.findTabIdx(tab); this.tabs.delete(idx); @@ -94,7 +99,6 @@ export class PrizmTabsService implements OnDestroy { } public selectTab(tab: PrizmTabComponent): void { const idx = this.findTabIdx(tab); - if (idx === -1) { return; } From 3011aa91a28551be9e2300c7246e9f24e7d0f89c Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 19 Feb 2024 11:12:49 +0300 Subject: [PATCH 036/291] fix: demo styles fix --- .../input/input-chips/input-chips-example.component.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/doc/src/app/components/input/input-chips/input-chips-example.component.less b/apps/doc/src/app/components/input/input-chips/input-chips-example.component.less index f7f08e265a..3fda37b155 100644 --- a/apps/doc/src/app/components/input/input-chips/input-chips-example.component.less +++ b/apps/doc/src/app/components/input/input-chips/input-chips-example.component.less @@ -1,3 +1,3 @@ -prizm-chips.single-line:not(empty) { +prizm-chips.single-line:not(:empty) { margin-bottom: 11px; } From 63df3c32e452daaab17bdb262fc7b3107a6b6eb0 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Mon, 19 Feb 2024 11:13:35 +0300 Subject: [PATCH 037/291] fix(componets/tab): modificator --- libs/components/src/lib/components/tabs/tabs.service.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/components/src/lib/components/tabs/tabs.service.ts b/libs/components/src/lib/components/tabs/tabs.service.ts index 4eb993f5ab..f5d9bf66d4 100644 --- a/libs/components/src/lib/components/tabs/tabs.service.ts +++ b/libs/components/src/lib/components/tabs/tabs.service.ts @@ -15,7 +15,7 @@ export class PrizmTabsService implements OnDestroy { return this.changeParent$_; } readonly closeTab$$ = new Subject>(); - public readonly activeTabIdx$$ = new BehaviorSubject(0); + private readonly activeTabIdx$$ = new BehaviorSubject(0); readonly activeTabIdx$ = this.activeTabIdx$$.pipe(distinctUntilChanged()); get activeTabIdx() { From c57c1f63c12d8838db62593c8dbe16f7680b8415 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 19 Feb 2024 11:45:19 +0300 Subject: [PATCH 038/291] chore: update changelog 3.11.1 --- .../app/about-prizm/changelog/CHANGELOG.md | 21 ++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index 34cd036273..bd4851e71e 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -2,7 +2,26 @@ All notable changes to this project will be documented in this file. -## [1.15.0, 2.13.0, 3.11.0](https://github.com/zyfra/Prizm) (30-01-2023) +## [1.15.1, 2.12.1, 3.11.1](https://github.com/zyfra/Prizm) (19-02-2023) + +### Bug fixes + +- fix(components/input-select) search label translation added #1323 +- fix(components/input-multiselect) search label translation added #1323 +- fix(components/input-select): extra title in input select #1286 +- fix(components/input-layout-date-time): custom error not shown for inputLayoutDateTime #185 +- fix(doc/inputStatusText): inputStatusText examples fixed +- fix(components/switcher): switcher active item disabled statate colors changed #1348 +- fix(components/navigation-menu): navigation menu search error #1344 +- fix(components/navigation): navigation menu active item setter error #1213 +- fix(components/breadcrumbs): breadcrumbs force update for content projection usage #1282 +- fix(components/input-number): incorrect height of InputNumberDefaultControlsComponent #1308 +- fix(components/inputs): incorrect controls height #1179 +- fix(components/input-button): input button size set to 100% height of container +- fix(components/input-date-time-range): incorrect injection token for date time value transformer #1364 +- fix(components/tabs): issue with close tabs logic #1360 + +## [1.15.0, 2.12.0, 3.11.0](https://github.com/zyfra/Prizm) (30-01-2023) ## Features From 1c82208af89295910dcec2decd9db7936a06f508 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 19 Feb 2024 13:14:27 +0300 Subject: [PATCH 039/291] chore: version 1.15.0 up tp 1.15.1 --- .github/workflows/beta-publish-ng14.yml | 2 +- .github/workflows/main-publish-ng14.yml | 2 +- .github/workflows/pre-release-publish-ng14.yml | 2 +- apps/doc/src/app/version-manager/current.const.ts | 2 +- .../src/app/version-manager/current.const.ts.ng14 | 2 +- .../src/app/version-manager/versions.constants.ts | 12 ++++++------ libs/ast/package.json.ng14 | 2 +- libs/charts/base/package.json.ng14 | 6 +++--- libs/components/package.json.ng14 | 10 +++++----- libs/core/package.json.ng14 | 2 +- libs/helpers/package.json.ng14 | 2 +- libs/i18n/package.json.ng14 | 2 +- libs/icons/base/package.json.ng14 | 4 ++-- libs/icons/flags/package.json.ng14 | 4 ++-- libs/nxmv/package.json.ng14 | 2 +- libs/plugin/package.json.ng14 | 4 ++-- libs/schematics/package.json.ng14 | 2 +- libs/theme/package.json.ng14 | 6 +++--- package.json.ng14 | 2 +- 19 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/workflows/beta-publish-ng14.yml b/.github/workflows/beta-publish-ng14.yml index a4e1067a78..d9a665d1fa 100644 --- a/.github/workflows/beta-publish-ng14.yml +++ b/.github/workflows/beta-publish-ng14.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng14beta --json 2>/dev/null || echo '1.15.0-ng14beta.0') | jq '([.[] | select(startswith("1.15.0-ng14beta"))] | last // "1.15.0-ng14beta.0")' 2>/dev/null || echo '1.15.0-ng14beta.0' + (npm view @prizm-ui/components versions --tag ng14beta --json 2>/dev/null || echo '1.15.1-ng14beta.0') | jq '([.[] | select(startswith("1.15.1-ng14beta"))] | last // "1.15.1-ng14beta.0")' 2>/dev/null || echo '1.15.1-ng14beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng14.yml b/.github/workflows/main-publish-ng14.yml index 84a211871a..0a82cb239d 100644 --- a/.github/workflows/main-publish-ng14.yml +++ b/.github/workflows/main-publish-ng14.yml @@ -58,7 +58,7 @@ jobs: - name: Set up environment variables run: | last_v1_version=$( - echo '1.15.0' + echo '1.15.1' ) echo "LAST_V1_VERSION=${last_v1_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng14.yml b/.github/workflows/pre-release-publish-ng14.yml index b20a1e50db..038354c5e0 100644 --- a/.github/workflows/pre-release-publish-ng14.yml +++ b/.github/workflows/pre-release-publish-ng14.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng14next --json 2>/dev/null || echo '1.15.0-ng14next.0') | jq '([.[] | select(startswith("1.15.0-ng14next"))] | last // "1.15.0-ng14next.0")' 2>/dev/null || echo '1.15.0-ng14next.0' + (npm view @prizm-ui/components versions --tag ng14next --json 2>/dev/null || echo '1.15.1-ng14next.0') | jq '([.[] | select(startswith("1.15.1-ng14next"))] | last // "1.15.1-ng14next.0")' 2>/dev/null || echo '1.15.1-ng14next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/apps/doc/src/app/version-manager/current.const.ts b/apps/doc/src/app/version-manager/current.const.ts index c548790b68..092f3ce545 100644 --- a/apps/doc/src/app/version-manager/current.const.ts +++ b/apps/doc/src/app/version-manager/current.const.ts @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '1.15.0'; +export const PRIZM_CURRENT_VERSION = '1.15.1'; diff --git a/apps/doc/src/app/version-manager/current.const.ts.ng14 b/apps/doc/src/app/version-manager/current.const.ts.ng14 index c548790b68..092f3ce545 100644 --- a/apps/doc/src/app/version-manager/current.const.ts.ng14 +++ b/apps/doc/src/app/version-manager/current.const.ts.ng14 @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '1.15.0'; +export const PRIZM_CURRENT_VERSION = '1.15.1'; diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index e1a89b0dee..9e021ed094 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -30,8 +30,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ }, }, { - label: '1.15.0 (ng14)', - version: '1.15.0', + label: '1.15.1 (ng14)', + version: '1.15.1', stackblitz: 'https://stackblitz.com/edit/prizm-v1-demo', link: new URL('https://prizm-v1.web.app'), otherLinks: [], @@ -54,8 +54,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '1.15.0-next (ng14)', - version: '1.15.0-next', + label: '1.15.1-next (ng14)', + version: '1.15.1-next', stackblitz: 'https://stackblitz.com/edit/prizm-v1-next-demo', link: new URL('https://prizm-v1-next.web.app'), otherLinks: [], @@ -75,8 +75,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '1.15.0-beta (ng14)', - version: '1.15.0-beta', + label: '1.15.1-beta (ng14)', + version: '1.15.1-beta', stackblitz: 'https://stackblitz.com/edit/prizm-v1-beta-demo', link: new URL('https://prizm-v1-beta.web.app'), otherLinks: [], diff --git a/libs/ast/package.json.ng14 b/libs/ast/package.json.ng14 index 98a9be114b..a80ff60446 100644 --- a/libs/ast/package.json.ng14 +++ b/libs/ast/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "1.15.0", + "version": "1.15.1", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json.ng14 b/libs/charts/base/package.json.ng14 index 4b519d3924..df692cde2e 100644 --- a/libs/charts/base/package.json.ng14 +++ b/libs/charts/base/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "1.15.0", + "version": "1.15.1", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/theme": "^1.15.0", - "@prizm-ui/helpers": "^1.15.0", + "@prizm-ui/theme": "^1.15.1", + "@prizm-ui/helpers": "^1.15.1", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/package.json.ng14 b/libs/components/package.json.ng14 index 2d462d74fc..18e5066df6 100644 --- a/libs/components/package.json.ng14 +++ b/libs/components/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "1.15.0", + "version": "1.15.1", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -17,10 +17,10 @@ "@ng-web-apis/resize-observer": "2.0.0", "@ng-web-apis/intersection-observer": "2.0.0", "@ng-web-apis/mutation-observer": "2.0.0", - "@prizm-ui/helpers": "^1.15.0", - "@prizm-ui/core": "^1.15.0", - "@prizm-ui/i18n": "^1.15.0", - "@prizm-ui/theme": "^1.15.0" + "@prizm-ui/helpers": "^1.15.1", + "@prizm-ui/core": "^1.15.1", + "@prizm-ui/i18n": "^1.15.1", + "@prizm-ui/theme": "^1.15.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json.ng14 b/libs/core/package.json.ng14 index 179f0d9b88..067afa27b8 100644 --- a/libs/core/package.json.ng14 +++ b/libs/core/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "1.15.0", + "version": "1.15.1", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json.ng14 b/libs/helpers/package.json.ng14 index 2551bf27d4..96e99cf9d6 100644 --- a/libs/helpers/package.json.ng14 +++ b/libs/helpers/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "1.15.0", + "version": "1.15.1", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json.ng14 b/libs/i18n/package.json.ng14 index 2837e0a236..234d743949 100644 --- a/libs/i18n/package.json.ng14 +++ b/libs/i18n/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "1.15.0", + "version": "1.15.1", "peerDependencies": { "@angular/core": "^14.2.0" }, diff --git a/libs/icons/base/package.json.ng14 b/libs/icons/base/package.json.ng14 index cc1243d17e..aae5c481f3 100644 --- a/libs/icons/base/package.json.ng14 +++ b/libs/icons/base/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "1.15.0", + "version": "1", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/core": "^1.15.0" + "@prizm-ui/core": "^1.15.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json.ng14 b/libs/icons/flags/package.json.ng14 index 4fe2b6fe18..3a48421a8c 100644 --- a/libs/icons/flags/package.json.ng14 +++ b/libs/icons/flags/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "1.15.0", + "version": "1.15.1", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/core": "^1.15.0" + "@prizm-ui/core": "^1.15.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json.ng14 b/libs/nxmv/package.json.ng14 index c68798b507..aeb41bbfc6 100644 --- a/libs/nxmv/package.json.ng14 +++ b/libs/nxmv/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "1.15.0", + "version": "1.15.1", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json.ng14 b/libs/plugin/package.json.ng14 index 23c315edc8..827ae0fec9 100644 --- a/libs/plugin/package.json.ng14 +++ b/libs/plugin/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "1.15.0", + "version": "1.15.1", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^1.15.0" + "@prizm-ui/ast": "^1.15.1" } } diff --git a/libs/schematics/package.json.ng14 b/libs/schematics/package.json.ng14 index 9484e08e69..260abea0ed 100644 --- a/libs/schematics/package.json.ng14 +++ b/libs/schematics/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "1.15.0", + "version": "1.15.1", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json.ng14 b/libs/theme/package.json.ng14 index db76d7b781..77c5f70a59 100644 --- a/libs/theme/package.json.ng14 +++ b/libs/theme/package.json.ng14 @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "1.15.0", + "version": "1.15.1", "peerDependencies": { "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/core": "^1.15.0", - "@prizm-ui/helpers": "^1.15.0" + "@prizm-ui/core": "^1.15.1", + "@prizm-ui/helpers": "^1.15.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json.ng14 b/package.json.ng14 index 2056c4777c..38132ab4bc 100644 --- a/package.json.ng14 +++ b/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "1.15.0", + "version": "1.15.1", "license": "MIT", "husky": { "hooks": { From c80f0acf8f997c1e96be2496d467e87bdd111f48 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 19 Feb 2024 13:23:45 +0300 Subject: [PATCH 040/291] chore: version 2.12.0 up tp 2.12.1 --- .github/workflows/beta-publish-ng15.yml | 2 +- .github/workflows/main-publish-ng15.yml | 2 +- .github/workflows/pre-release-publish-ng15.yml | 2 +- .../src/app/version-manager/current.const.ts.ng15 | 2 +- .../src/app/version-manager/versions.constants.ts | 12 ++++++------ libs/ast/package.json.ng15 | 2 +- libs/charts/base/package.json.ng15 | 6 +++--- libs/components/package.json.ng15 | 10 +++++----- libs/core/package.json.ng15 | 2 +- libs/helpers/package.json.ng15 | 2 +- libs/i18n/package.json.ng15 | 2 +- libs/icons/base/package.json.ng15 | 4 ++-- libs/icons/flags/package.json.ng15 | 4 ++-- libs/nxmv/package.json.ng15 | 2 +- libs/plugin/package.json.ng15 | 4 ++-- libs/schematics/package.json.ng15 | 2 +- libs/theme/package.json.ng15 | 6 +++--- package.json.ng15 | 2 +- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/beta-publish-ng15.yml b/.github/workflows/beta-publish-ng15.yml index cc29082903..415e89b276 100644 --- a/.github/workflows/beta-publish-ng15.yml +++ b/.github/workflows/beta-publish-ng15.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng15beta --json 2>/dev/null || echo '2.12.0-ng15beta.0') | jq '([.[] | select(startswith("2.12.0-ng15beta"))] | last // "2.12.0-ng15beta.0")' 2>/dev/null || echo '2.12.0-ng15beta.0' + (npm view @prizm-ui/components versions --tag ng15beta --json 2>/dev/null || echo '2.12.1-ng15beta.0') | jq '([.[] | select(startswith("2.12.1-ng15beta"))] | last // "2.12.1-ng15beta.0")' 2>/dev/null || echo '2.12.1-ng15beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng15.yml b/.github/workflows/main-publish-ng15.yml index e7d2368f77..76abe9611e 100644 --- a/.github/workflows/main-publish-ng15.yml +++ b/.github/workflows/main-publish-ng15.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_v2_version=$( - echo '2.12.0' + echo '2.12.1' ) echo "LAST_V2_VERSION=${last_v2_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng15.yml b/.github/workflows/pre-release-publish-ng15.yml index c21b35b2fb..879e9f1fb6 100644 --- a/.github/workflows/pre-release-publish-ng15.yml +++ b/.github/workflows/pre-release-publish-ng15.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng15next --json 2>/dev/null || echo '2.12.0-ng15next.0') | jq '([.[] | select(startswith("2.12.0-ng15next"))] | last // "2.12.0-ng15next.0")' 2>/dev/null || echo '2.12.0-ng15next.0' + (npm view @prizm-ui/components versions --tag ng15next --json 2>/dev/null || echo '2.12.1-ng15next.0') | jq '([.[] | select(startswith("2.12.1-ng15next"))] | last // "2.12.1-ng15next.0")' 2>/dev/null || echo '2.12.1-ng15next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/apps/doc/src/app/version-manager/current.const.ts.ng15 b/apps/doc/src/app/version-manager/current.const.ts.ng15 index 972582c517..05e8058e38 100644 --- a/apps/doc/src/app/version-manager/current.const.ts.ng15 +++ b/apps/doc/src/app/version-manager/current.const.ts.ng15 @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '2.12.0'; +export const PRIZM_CURRENT_VERSION = '2.12.1'; diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index 9e021ed094..3d5e32591d 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -20,8 +20,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ }, }, { - label: '2.12.0 (ng15)', - version: '2.12.0', + label: '2.12.1 (ng15)', + version: '2.12.1', stackblitz: 'https://stackblitz.com/edit/prizm-v2-demo', link: new URL('https://prizm-v2.web.app'), otherLinks: [], @@ -47,9 +47,9 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '2.12.0-next (ng15)', + label: '2.12.1-next (ng15)', stackblitz: 'https://stackblitz.com/edit/prizm-v2-next-demo', - version: '2.12.0-next', + version: '2.12.1-next', link: new URL('https://prizm-v2-next.web.app'), otherLinks: [], }, @@ -68,8 +68,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '2.12.0-beta (ng15)', - version: '2.12.0-beta', + label: '2.12.1-beta (ng15)', + version: '2.12.1-beta', stackblitz: 'https://stackblitz.com/edit/prizm-v2-beta-demo', link: new URL('https://prizm-v2-beta.web.app'), otherLinks: [], diff --git a/libs/ast/package.json.ng15 b/libs/ast/package.json.ng15 index b29ea148bd..cd6b0c539d 100644 --- a/libs/ast/package.json.ng15 +++ b/libs/ast/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "2.12.0", + "version": "2.12.1", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json.ng15 b/libs/charts/base/package.json.ng15 index 17e7cbed0a..a271e91b5d 100644 --- a/libs/charts/base/package.json.ng15 +++ b/libs/charts/base/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "2.12.0", + "version": "2.12.1", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/theme": "^2.12.0", - "@prizm-ui/helpers": "^2.12.0", + "@prizm-ui/theme": "^2.12.1", + "@prizm-ui/helpers": "^2.12.1", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/package.json.ng15 b/libs/components/package.json.ng15 index dc35050266..3fca5a1a73 100644 --- a/libs/components/package.json.ng15 +++ b/libs/components/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "2.12.0", + "version": "2.12.1", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -18,10 +18,10 @@ "@ng-web-apis/resize-observer": "2.0.0", "@ng-web-apis/intersection-observer": "2.0.0", "@ng-web-apis/mutation-observer": "2.0.0", - "@prizm-ui/helpers": "^2.12.0", - "@prizm-ui/core": "^2.12.0", - "@prizm-ui/i18n": "^2.12.0", - "@prizm-ui/theme": "^2.12.0" + "@prizm-ui/helpers": "^2.12.1", + "@prizm-ui/core": "^2.12.1", + "@prizm-ui/i18n": "^2.12.1", + "@prizm-ui/theme": "^2.12.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json.ng15 b/libs/core/package.json.ng15 index 7cc63d6128..e245884263 100644 --- a/libs/core/package.json.ng15 +++ b/libs/core/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "2.12.0", + "version": "2.12.1", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json.ng15 b/libs/helpers/package.json.ng15 index bc6d329251..f64244b971 100644 --- a/libs/helpers/package.json.ng15 +++ b/libs/helpers/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "2.12.0", + "version": "2.12.1", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json.ng15 b/libs/i18n/package.json.ng15 index b20c03381e..4eb5ec9a9f 100644 --- a/libs/i18n/package.json.ng15 +++ b/libs/i18n/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "2.12.0", + "version": "2.12.1", "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0" diff --git a/libs/icons/base/package.json.ng15 b/libs/icons/base/package.json.ng15 index a6569b3403..cb826540bc 100644 --- a/libs/icons/base/package.json.ng15 +++ b/libs/icons/base/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "2.12.0", + "version": "2.12.1", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/core": "^2.12.0" + "@prizm-ui/core": "^2.12.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json.ng15 b/libs/icons/flags/package.json.ng15 index c63522f9fe..f349ca5b1b 100644 --- a/libs/icons/flags/package.json.ng15 +++ b/libs/icons/flags/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "2.12.0", + "version": "2.12.1", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/core": "^2.12.0" + "@prizm-ui/core": "^2.12.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json.ng15 b/libs/nxmv/package.json.ng15 index e51afad300..8602f5cbec 100644 --- a/libs/nxmv/package.json.ng15 +++ b/libs/nxmv/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "2.12.0", + "version": "2.12.1", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json.ng15 b/libs/plugin/package.json.ng15 index e076e85c27..c1de88ee74 100644 --- a/libs/plugin/package.json.ng15 +++ b/libs/plugin/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "2.12.0", + "version": "2.12.1", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^2.12.0" + "@prizm-ui/ast": "^2.12.1" } } diff --git a/libs/schematics/package.json.ng15 b/libs/schematics/package.json.ng15 index ddbcc00179..4b5cc894b2 100644 --- a/libs/schematics/package.json.ng15 +++ b/libs/schematics/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "2.12.0", + "version": "2.12.1", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json.ng15 b/libs/theme/package.json.ng15 index d737f9d13a..2c3a8b22f7 100644 --- a/libs/theme/package.json.ng15 +++ b/libs/theme/package.json.ng15 @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "2.12.0", + "version": "2.12.1", "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/core": "^2.12.0", - "@prizm-ui/helpers": "^2.12.0" + "@prizm-ui/core": "^2.12.1", + "@prizm-ui/helpers": "^2.12.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json.ng15 b/package.json.ng15 index 5b0315b233..17ed86f0fe 100644 --- a/package.json.ng15 +++ b/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "2.12.0", + "version": "2.12.1", "license": "MIT", "husky": { "hooks": { From 3a1d66407408d79a2da283da8f05b7de0667f6df Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 19 Feb 2024 13:29:23 +0300 Subject: [PATCH 041/291] chore: version 3.11.0 up tp 3.11.1 --- .github/workflows/beta-publish-ng16.yml | 2 +- .github/workflows/main-publish-ng16.yml | 2 +- .github/workflows/pre-release-publish-ng16.yml | 2 +- .../src/app/version-manager/current.const.ts.ng16 | 2 +- .../src/app/version-manager/versions.constants.ts | 12 ++++++------ libs/ast/package.json | 2 +- libs/ast/package.json.ng16 | 2 +- libs/charts/base/package.json | 6 +++--- libs/charts/base/package.json.ng16 | 6 +++--- libs/components/package.json | 10 +++++----- libs/components/package.json.ng16 | 10 +++++----- libs/core/package.json | 2 +- libs/core/package.json.ng16 | 2 +- libs/helpers/package.json | 2 +- libs/helpers/package.json.ng16 | 2 +- libs/i18n/package.json | 2 +- libs/i18n/package.json.ng16 | 2 +- libs/icons/base/package.json | 4 ++-- libs/icons/base/package.json.ng16 | 4 ++-- libs/icons/flags/package.json | 4 ++-- libs/icons/flags/package.json.ng16 | 4 ++-- libs/nxmv/package.json | 2 +- libs/nxmv/package.json.ng16 | 2 +- libs/plugin/package.json | 4 ++-- libs/plugin/package.json.ng16 | 4 ++-- libs/schematics/package.json | 2 +- libs/schematics/package.json.ng16 | 2 +- libs/theme/package.json | 6 +++--- libs/theme/package.json.ng16 | 6 +++--- package.json | 2 +- package.json.ng16 | 2 +- 31 files changed, 58 insertions(+), 58 deletions(-) diff --git a/.github/workflows/beta-publish-ng16.yml b/.github/workflows/beta-publish-ng16.yml index f91fcba240..d23c1aa624 100644 --- a/.github/workflows/beta-publish-ng16.yml +++ b/.github/workflows/beta-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag beta --json 2>/dev/null || echo '3.11.0-beta.0') | jq '([.[] | select(startswith("3.11.0-beta"))] | last // "3.11.0-beta.0")' 2>/dev/null || echo '3.11.0-beta.0' + (npm view @prizm-ui/components versions --tag beta --json 2>/dev/null || echo '3.11.1-beta.0') | jq '([.[] | select(startswith("3.11.1-beta"))] | last // "3.11.1-beta.0")' 2>/dev/null || echo '3.11.1-beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng16.yml b/.github/workflows/main-publish-ng16.yml index 8f47068f1f..bb1ba399ff 100644 --- a/.github/workflows/main-publish-ng16.yml +++ b/.github/workflows/main-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_v3_version=$( - echo '3.11.0' + echo '3.11.1' ) echo "LAST_V3_VERSION=${last_v3_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng16.yml b/.github/workflows/pre-release-publish-ng16.yml index 0e5306fd3b..0a85deeb91 100644 --- a/.github/workflows/pre-release-publish-ng16.yml +++ b/.github/workflows/pre-release-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag next --json 2>/dev/null || echo '3.11.0-next.0') | jq '([.[] | select(startswith("3.11.0-next"))] | last // "3.11.0-next.0")' 2>/dev/null || echo '3.11.0-next.0' + (npm view @prizm-ui/components versions --tag next --json 2>/dev/null || echo '3.11.1-next.0') | jq '([.[] | select(startswith("3.11.1-next"))] | last // "3.11.1-next.0")' 2>/dev/null || echo '3.11.1-next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/apps/doc/src/app/version-manager/current.const.ts.ng16 b/apps/doc/src/app/version-manager/current.const.ts.ng16 index 1bd44ff0ff..567a9c0b88 100644 --- a/apps/doc/src/app/version-manager/current.const.ts.ng16 +++ b/apps/doc/src/app/version-manager/current.const.ts.ng16 @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '3.11.0'; +export const PRIZM_CURRENT_VERSION = '3.11.1'; diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index 3d5e32591d..d1cf29490a 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -10,8 +10,8 @@ export interface PrizmVersionMeta { export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ { - label: '3.11.0 (ng16)', - version: '3.11.0', + label: '3.11.1 (ng16)', + version: '3.11.1', stackblitz: 'https://stackblitz.com/edit/prizm-v3-demo', link: new URL('http://prizm.site'), otherLinks: [new URL('https://prizm-v3.web.app')], @@ -40,8 +40,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ }, }, { - label: '3.11.0-next (ng16)', - version: '3.11.0-next', + label: '3.11.1-next (ng16)', + version: '3.11.1-next', stackblitz: 'https://stackblitz.com/edit/prizm-v3-next-demo', link: new URL('https://prizm-v3-next.web.app'), otherLinks: [], @@ -61,8 +61,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '3.11.0-beta (ng16)', - version: '3.11.0-beta', + label: '3.11.1-beta (ng16)', + version: '3.11.1-beta', stackblitz: 'https://stackblitz.com/edit/prizm-v3-beta-demo', link: new URL('https://prizm-v3-beta.web.app'), otherLinks: [], diff --git a/libs/ast/package.json b/libs/ast/package.json index 6be58f2176..964b76d358 100644 --- a/libs/ast/package.json +++ b/libs/ast/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "3.11.0", + "version": "3.11.1", "private": false, "publishConfig": { "access": "public", diff --git a/libs/ast/package.json.ng16 b/libs/ast/package.json.ng16 index 6be58f2176..964b76d358 100644 --- a/libs/ast/package.json.ng16 +++ b/libs/ast/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "3.11.0", + "version": "3.11.1", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json b/libs/charts/base/package.json index 6ff13e4109..9ae760771e 100644 --- a/libs/charts/base/package.json +++ b/libs/charts/base/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "3.11.0", + "version": "3.11.1", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/theme": "^3.11.0", - "@prizm-ui/helpers": "^3.11.0", + "@prizm-ui/theme": "^3.11.1", + "@prizm-ui/helpers": "^3.11.1", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/charts/base/package.json.ng16 b/libs/charts/base/package.json.ng16 index 6ff13e4109..9ae760771e 100644 --- a/libs/charts/base/package.json.ng16 +++ b/libs/charts/base/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "3.11.0", + "version": "3.11.1", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/theme": "^3.11.0", - "@prizm-ui/helpers": "^3.11.0", + "@prizm-ui/theme": "^3.11.1", + "@prizm-ui/helpers": "^3.11.1", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/package.json b/libs/components/package.json index 9bae131f7f..b9e14116ac 100644 --- a/libs/components/package.json +++ b/libs/components/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "3.11.0", + "version": "3.11.1", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -18,10 +18,10 @@ "@ng-web-apis/resize-observer": "^3.0.0", "@ng-web-apis/intersection-observer": "^3.0.0", "@ng-web-apis/mutation-observer": "^3.0.0", - "@prizm-ui/helpers": "^3.11.0", - "@prizm-ui/core": "^3.11.0", - "@prizm-ui/i18n": "^3.11.0", - "@prizm-ui/theme": "^3.11.0" + "@prizm-ui/helpers": "^3.11.1", + "@prizm-ui/core": "^3.11.1", + "@prizm-ui/i18n": "^3.11.1", + "@prizm-ui/theme": "^3.11.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/components/package.json.ng16 b/libs/components/package.json.ng16 index 9bae131f7f..b9e14116ac 100644 --- a/libs/components/package.json.ng16 +++ b/libs/components/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "3.11.0", + "version": "3.11.1", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -18,10 +18,10 @@ "@ng-web-apis/resize-observer": "^3.0.0", "@ng-web-apis/intersection-observer": "^3.0.0", "@ng-web-apis/mutation-observer": "^3.0.0", - "@prizm-ui/helpers": "^3.11.0", - "@prizm-ui/core": "^3.11.0", - "@prizm-ui/i18n": "^3.11.0", - "@prizm-ui/theme": "^3.11.0" + "@prizm-ui/helpers": "^3.11.1", + "@prizm-ui/core": "^3.11.1", + "@prizm-ui/i18n": "^3.11.1", + "@prizm-ui/theme": "^3.11.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json b/libs/core/package.json index 9ab953022d..5b0894b880 100644 --- a/libs/core/package.json +++ b/libs/core/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "3.11.0", + "version": "3.11.1", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/core/package.json.ng16 b/libs/core/package.json.ng16 index 9ab953022d..5b0894b880 100644 --- a/libs/core/package.json.ng16 +++ b/libs/core/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "3.11.0", + "version": "3.11.1", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json b/libs/helpers/package.json index 55b85145de..9b4be6b274 100644 --- a/libs/helpers/package.json +++ b/libs/helpers/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "3.11.0", + "version": "3.11.1", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/helpers/package.json.ng16 b/libs/helpers/package.json.ng16 index 55b85145de..9b4be6b274 100644 --- a/libs/helpers/package.json.ng16 +++ b/libs/helpers/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "3.11.0", + "version": "3.11.1", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json b/libs/i18n/package.json index 0071eba228..8961bea8df 100644 --- a/libs/i18n/package.json +++ b/libs/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "3.11.0", + "version": "3.11.1", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0" diff --git a/libs/i18n/package.json.ng16 b/libs/i18n/package.json.ng16 index 0071eba228..8961bea8df 100644 --- a/libs/i18n/package.json.ng16 +++ b/libs/i18n/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "3.11.0", + "version": "3.11.1", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0" diff --git a/libs/icons/base/package.json b/libs/icons/base/package.json index 0f1689fb1d..44d49146a8 100644 --- a/libs/icons/base/package.json +++ b/libs/icons/base/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "3.11.0", + "version": "3.11.1", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.11.0" + "@prizm-ui/core": "^3.11.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/base/package.json.ng16 b/libs/icons/base/package.json.ng16 index 0f1689fb1d..44d49146a8 100644 --- a/libs/icons/base/package.json.ng16 +++ b/libs/icons/base/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "3.11.0", + "version": "3.11.1", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.11.0" + "@prizm-ui/core": "^3.11.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json b/libs/icons/flags/package.json index 8bd26d816a..51ffced2da 100644 --- a/libs/icons/flags/package.json +++ b/libs/icons/flags/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "3.11.0", + "version": "3.11.1", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.11.0" + "@prizm-ui/core": "^3.11.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json.ng16 b/libs/icons/flags/package.json.ng16 index 8bd26d816a..51ffced2da 100644 --- a/libs/icons/flags/package.json.ng16 +++ b/libs/icons/flags/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "3.11.0", + "version": "3.11.1", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.11.0" + "@prizm-ui/core": "^3.11.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json b/libs/nxmv/package.json index 17d25f65b3..d3f6cd4ca1 100644 --- a/libs/nxmv/package.json +++ b/libs/nxmv/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "3.11.0", + "version": "3.11.1", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/nxmv/package.json.ng16 b/libs/nxmv/package.json.ng16 index 17d25f65b3..d3f6cd4ca1 100644 --- a/libs/nxmv/package.json.ng16 +++ b/libs/nxmv/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "3.11.0", + "version": "3.11.1", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json b/libs/plugin/package.json index b2e6454faa..1e2c1257f0 100644 --- a/libs/plugin/package.json +++ b/libs/plugin/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "3.11.0", + "version": "3.11.1", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^3.11.0" + "@prizm-ui/ast": "^3.11.1" } } diff --git a/libs/plugin/package.json.ng16 b/libs/plugin/package.json.ng16 index b2e6454faa..1e2c1257f0 100644 --- a/libs/plugin/package.json.ng16 +++ b/libs/plugin/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "3.11.0", + "version": "3.11.1", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^3.11.0" + "@prizm-ui/ast": "^3.11.1" } } diff --git a/libs/schematics/package.json b/libs/schematics/package.json index e4f3037546..cf61d009fc 100644 --- a/libs/schematics/package.json +++ b/libs/schematics/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "3.11.0", + "version": "3.11.1", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/schematics/package.json.ng16 b/libs/schematics/package.json.ng16 index e4f3037546..cf61d009fc 100644 --- a/libs/schematics/package.json.ng16 +++ b/libs/schematics/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "3.11.0", + "version": "3.11.1", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json b/libs/theme/package.json index d63d4e1b64..e9d8c29ca1 100644 --- a/libs/theme/package.json +++ b/libs/theme/package.json @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "3.11.0", + "version": "3.11.1", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.11.0", - "@prizm-ui/helpers": "^3.11.0" + "@prizm-ui/core": "^3.11.1", + "@prizm-ui/helpers": "^3.11.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/theme/package.json.ng16 b/libs/theme/package.json.ng16 index d63d4e1b64..e9d8c29ca1 100644 --- a/libs/theme/package.json.ng16 +++ b/libs/theme/package.json.ng16 @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "3.11.0", + "version": "3.11.1", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.11.0", - "@prizm-ui/helpers": "^3.11.0" + "@prizm-ui/core": "^3.11.1", + "@prizm-ui/helpers": "^3.11.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json b/package.json index a72138a1a2..bb999e475b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "3.11.0", + "version": "3.11.1", "license": "MIT", "husky": { "hooks": { diff --git a/package.json.ng16 b/package.json.ng16 index a72138a1a2..bb999e475b 100644 --- a/package.json.ng16 +++ b/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "3.11.0", + "version": "3.11.1", "license": "MIT", "husky": { "hooks": { From 3cd84290e4a2f5d9c21ae3764703035d7740921b Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 20 Feb 2024 15:18:39 +0300 Subject: [PATCH 042/291] feat: changelog update --- apps/doc/src/app/about-prizm/changelog/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index bd4851e71e..bad5bb19b8 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -15,7 +15,7 @@ All notable changes to this project will be documented in this file. - fix(components/navigation-menu): navigation menu search error #1344 - fix(components/navigation): navigation menu active item setter error #1213 - fix(components/breadcrumbs): breadcrumbs force update for content projection usage #1282 -- fix(components/input-number): incorrect height of InputNumberDefaultControlsComponent #1308 +- fix(components/input-number): incorrect height of InputNumberDefaultControlsComponent #1308, #1383 - fix(components/inputs): incorrect controls height #1179 - fix(components/input-button): input button size set to 100% height of container - fix(components/input-date-time-range): incorrect injection token for date time value transformer #1364 From ce0ac61539867bbb70f658707f47ce55be2ea5ca Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 20 Feb 2024 16:05:56 +0300 Subject: [PATCH 043/291] fix: input clear button position for centered values #1385 --- apps/doc/src/app/about-prizm/changelog/CHANGELOG.md | 1 + .../input-custom-clear-button-example.component.html | 2 -- .../input/common/input-layout/input-layout.component.html | 1 + .../input/common/input-layout/input-layout.component.less | 2 +- .../services/prizm-navigation-menu-group.service.ts | 1 - 5 files changed, 3 insertions(+), 4 deletions(-) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index bad5bb19b8..11f56019e0 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -10,6 +10,7 @@ All notable changes to this project will be documented in this file. - fix(components/input-multiselect) search label translation added #1323 - fix(components/input-select): extra title in input select #1286 - fix(components/input-layout-date-time): custom error not shown for inputLayoutDateTime #185 +- fix(components/input-layout): clear button in inputs with position=center has incorrect placement #1385 - fix(doc/inputStatusText): inputStatusText examples fixed - fix(components/switcher): switcher active item disabled statate colors changed #1348 - fix(components/navigation-menu): navigation menu search error #1344 diff --git a/apps/doc/src/app/components/input/input-text/examples/input-custom-clear-button-example/input-custom-clear-button-example.component.html b/apps/doc/src/app/components/input/input-text/examples/input-custom-clear-button-example/input-custom-clear-button-example.component.html index e3e57ccad0..4d2a4b2ffa 100644 --- a/apps/doc/src/app/components/input/input-text/examples/input-custom-clear-button-example/input-custom-clear-button-example.component.html +++ b/apps/doc/src/app/components/input/input-text/examples/input-custom-clear-button-example/input-custom-clear-button-example.component.html @@ -12,7 +12,6 @@

    Custom Button

    let-clear="clear" >
    @@ -121,110 +31,20 @@
    H1050
    -
    - Light: -
    -
    - #401c14 -
    -
    -
    -
    - Dark: -
    -
    - #fae9e4 -
    -
    -
    -
    - Light: -
    -
    - rgb(64,28,20) -
    -
    -
    -
    - Dark: -
    -
    - rgb(250,233,228) -
    +
    Light:
    +
    #401c14
    +
    +
    +
    Dark:
    +
    #fae9e4
    +
    +
    +
    Light:
    +
    rgb(64,28,20)
    +
    +
    +
    Dark:
    +
    rgb(250,233,228)
    @@ -234,110 +54,20 @@
    H950
    -
    - Light: -
    -
    - #4d2017 -
    -
    -
    -
    - Dark: -
    -
    - #f4cec3 -
    -
    -
    -
    - Light: -
    -
    - rgb(77,32,23) -
    -
    -
    -
    - Dark: -
    -
    - rgb(244,206,195) -
    +
    Light:
    +
    #4d2017
    +
    +
    +
    Dark:
    +
    #f4cec3
    +
    +
    +
    Light:
    +
    rgb(77,32,23)
    +
    +
    +
    Dark:
    +
    rgb(244,206,195)
    @@ -347,110 +77,20 @@
    H850
    -
    - Light: -
    -
    - #6a291e -
    -
    -
    -
    - Dark: -
    -
    - #eeab99 -
    -
    -
    -
    - Light: -
    -
    - rgb(106,41,30) -
    -
    -
    -
    - Dark: -
    -
    - rgb(238,171,153) -
    +
    Light:
    +
    #6a291e
    +
    +
    +
    Dark:
    +
    #eeab99
    +
    +
    +
    Light:
    +
    rgb(106,41,30)
    +
    +
    +
    Dark:
    +
    rgb(238,171,153)
    @@ -460,110 +100,20 @@
    H750
    -
    - Light: -
    -
    - #943427 -
    -
    -
    -
    - Dark: -
    -
    - #e9836f -
    -
    -
    -
    - Light: -
    -
    - rgb(148,52,39) -
    -
    -
    -
    - Dark: -
    -
    - rgb(233,131,111) -
    +
    Light:
    +
    #943427
    +
    +
    +
    Dark:
    +
    #e9836f
    +
    +
    +
    Light:
    +
    rgb(148,52,39)
    +
    +
    +
    Dark:
    +
    rgb(233,131,111)
    @@ -573,110 +123,20 @@
    H650
    -
    - Light: -
    -
    - #c13f2f -
    -
    -
    -
    - Dark: -
    -
    - #df5a46 -
    -
    -
    -
    - Light: -
    -
    - rgb(193,63,47) -
    -
    -
    -
    - Dark: -
    -
    - rgb(223,90,70) -
    +
    Light:
    +
    #c13f2f
    +
    +
    +
    Dark:
    +
    #df5a46
    +
    +
    +
    Light:
    +
    rgb(193,63,47)
    +
    +
    +
    Dark:
    +
    rgb(223,90,70)
    @@ -686,110 +146,20 @@
    H550
    -
    - Light: -
    -
    - #df5a46 -
    -
    -
    -
    - Dark: -
    -
    - #c13f2f -
    -
    -
    -
    - Light: -
    -
    - rgb(223,90,70) -
    -
    -
    -
    - Dark: -
    -
    - rgb(193,63,47) -
    +
    Light:
    +
    #df5a46
    +
    +
    +
    Dark:
    +
    #c13f2f
    +
    +
    +
    Light:
    +
    rgb(223,90,70)
    +
    +
    +
    Dark:
    +
    rgb(193,63,47)
    @@ -799,110 +169,20 @@
    H450
    -
    - Light: -
    -
    - #e9836f -
    -
    -
    -
    - Dark: -
    -
    - #943427 -
    -
    -
    -
    - Light: -
    -
    - rgb(233,131,111) -
    -
    -
    -
    - Dark: -
    -
    - rgb(148,52,39) -
    +
    Light:
    +
    #e9836f
    +
    +
    +
    Dark:
    +
    #943427
    +
    +
    +
    Light:
    +
    rgb(233,131,111)
    +
    +
    +
    Dark:
    +
    rgb(148,52,39)
    @@ -912,110 +192,20 @@
    H350
    -
    - Light: -
    -
    - #eeab99 -
    -
    -
    -
    - Dark: -
    -
    - #6a291e -
    -
    -
    -
    - Light: -
    -
    - rgb(238,171,153) -
    -
    -
    -
    - Dark: -
    -
    - rgb(106,41,30) -
    +
    Light:
    +
    #eeab99
    +
    +
    +
    Dark:
    +
    #6a291e
    +
    +
    +
    Light:
    +
    rgb(238,171,153)
    +
    +
    +
    Dark:
    +
    rgb(106,41,30)
    @@ -1025,110 +215,20 @@
    H250
    -
    - Light: -
    -
    - #f4cec3 -
    -
    -
    -
    - Dark: -
    -
    - #4d2017 -
    -
    -
    -
    - Light: -
    -
    - rgb(244,206,195) -
    -
    -
    -
    - Dark: -
    -
    - rgb(77,32,23) -
    +
    Light:
    +
    #f4cec3
    +
    +
    +
    Dark:
    +
    #4d2017
    +
    +
    +
    Light:
    +
    rgb(244,206,195)
    +
    +
    +
    Dark:
    +
    rgb(77,32,23)
    @@ -1138,110 +238,20 @@
    H150
    -
    - Light: -
    -
    - #fae9e4 -
    -
    -
    -
    - Dark: -
    -
    - #401c14 -
    -
    -
    -
    - Light: -
    -
    - rgb(250,233,228) -
    -
    -
    -
    - Dark: -
    -
    - rgb(64,28,20) -
    +
    Light:
    +
    #fae9e4
    +
    +
    +
    Dark:
    +
    #401c14
    +
    +
    +
    Light:
    +
    rgb(250,233,228)
    +
    +
    +
    Dark:
    +
    rgb(64,28,20)
    @@ -1251,110 +261,20 @@
    H50
    -
    - Light: -
    -
    - #fdf7f5 -
    -
    -
    -
    - Dark: -
    -
    - #271613 -
    -
    -
    -
    - Light: -
    -
    - rgb(253,247,245) -
    -
    -
    -
    - Dark: -
    -
    - rgb(39,22,19) -
    +
    Light:
    +
    #fdf7f5
    +
    +
    +
    Dark:
    +
    #271613
    +
    +
    +
    Light:
    +
    rgb(253,247,245)
    +
    +
    +
    Dark:
    +
    rgb(39,22,19)
    @@ -1364,110 +284,20 @@
    1050
    -
    - Light: -
    -
    - #371912 -
    -
    -
    -
    - Dark: -
    -
    - #fcf1ee -
    -
    -
    -
    - Light: -
    -
    - rgb(55,25,18) -
    -
    -
    -
    - Dark: -
    -
    - rgb(252,241,238) -
    +
    Light:
    +
    #371912
    +
    +
    +
    Dark:
    +
    #fcf1ee
    +
    +
    +
    Light:
    +
    rgb(55,25,18)
    +
    +
    +
    Dark:
    +
    rgb(252,241,238)
    @@ -1477,110 +307,20 @@
    1000
    -
    - Light: -
    -
    - #461e15 -
    -
    -
    -
    - Dark: -
    -
    - #f7dcd4 -
    -
    -
    -
    - Light: -
    -
    - rgb(70,30,21) -
    -
    -
    -
    - Dark: -
    -
    - rgb(247,220,212) -
    +
    Light:
    +
    #461e15
    +
    +
    +
    Dark:
    +
    #f7dcd4
    +
    +
    +
    Light:
    +
    rgb(70,30,21)
    +
    +
    +
    Dark:
    +
    rgb(247,220,212)
    @@ -1590,110 +330,20 @@
    900
    -
    - Light: -
    -
    - #512218 -
    -
    -
    -
    - Dark: -
    -
    - #f0baa9 -
    -
    -
    -
    - Light: -
    -
    - rgb(81,34,24) -
    -
    -
    -
    - Dark: -
    -
    - rgb(240,186,169) -
    +
    Light:
    +
    #512218
    +
    +
    +
    Dark:
    +
    #f0baa9
    +
    +
    +
    Light:
    +
    rgb(81,34,24)
    +
    +
    +
    Dark:
    +
    rgb(240,186,169)
    @@ -1703,110 +353,20 @@
    800
    -
    - Light: -
    -
    - #7a2d22 -
    -
    -
    -
    - Dark: -
    -
    - #eb9481 -
    -
    -
    -
    - Light: -
    -
    - rgb(122,45,34) -
    -
    -
    -
    - Dark: -
    -
    - rgb(235,148,129) -
    +
    Light:
    +
    #7a2d22
    +
    +
    +
    Dark:
    +
    #eb9481
    +
    +
    +
    Light:
    +
    rgb(122,45,34)
    +
    +
    +
    Dark:
    +
    rgb(235,148,129)
    @@ -1816,110 +376,20 @@
    700
    -
    - Light: -
    -
    - #a5382a -
    -
    -
    -
    - Dark: -
    -
    - #e66a54 -
    -
    -
    -
    - Light: -
    -
    - rgb(165,56,42) -
    -
    -
    -
    - Dark: -
    -
    - rgb(230,106,84) -
    +
    Light:
    +
    #a5382a
    +
    +
    +
    Dark:
    +
    #e66a54
    +
    +
    +
    Light:
    +
    rgb(165,56,42)
    +
    +
    +
    Dark:
    +
    rgb(230,106,84)
    @@ -1929,110 +399,20 @@
    600
    -
    - Light: -
    -
    - #d44332 -
    -
    -
    -
    - Dark: -
    -
    - #d44332 -
    -
    -
    -
    - Light: -
    -
    - rgb(212,67,50) -
    -
    -
    -
    - Dark: -
    -
    - rgb(212,67,50) -
    +
    Light:
    +
    #d44332
    +
    +
    +
    Dark:
    +
    #d44332
    +
    +
    +
    Light:
    +
    rgb(212,67,50)
    +
    +
    +
    Dark:
    +
    rgb(212,67,50)
    @@ -2042,110 +422,20 @@
    500
    -
    - Light: -
    -
    - #e66a54 -
    -
    -
    -
    - Dark: -
    -
    - #a5382a -
    -
    -
    -
    - Light: -
    -
    - rgb(230,106,84) -
    -
    -
    -
    - Dark: -
    -
    - rgb(165,56,42) -
    +
    Light:
    +
    #e66a54
    +
    +
    +
    Dark:
    +
    #a5382a
    +
    +
    +
    Light:
    +
    rgb(230,106,84)
    +
    +
    +
    Dark:
    +
    rgb(165,56,42)
    @@ -2155,110 +445,20 @@
    400
    -
    - Light: -
    -
    - #eb9481 -
    -
    -
    -
    - Dark: -
    -
    - #7a2d22 -
    -
    -
    -
    - Light: -
    -
    - rgb(235,148,129) -
    -
    -
    -
    - Dark: -
    -
    - rgb(122,45,34) -
    +
    Light:
    +
    #eb9481
    +
    +
    +
    Dark:
    +
    #7a2d22
    +
    +
    +
    Light:
    +
    rgb(235,148,129)
    +
    +
    +
    Dark:
    +
    rgb(122,45,34)
    @@ -2268,110 +468,20 @@
    300
    -
    - Light: -
    -
    - #f0baa9 -
    -
    -
    -
    - Dark: -
    -
    - #512218 -
    -
    -
    -
    - Light: -
    -
    - rgb(240,186,169) -
    -
    -
    -
    - Dark: -
    -
    - rgb(81,34,24) -
    +
    Light:
    +
    #f0baa9
    +
    +
    +
    Dark:
    +
    #512218
    +
    +
    +
    Light:
    +
    rgb(240,186,169)
    +
    +
    +
    Dark:
    +
    rgb(81,34,24)
    @@ -2381,110 +491,20 @@
    200
    -
    - Light: -
    -
    - #f7dcd4 -
    -
    -
    -
    - Dark: -
    -
    - #461e15 -
    -
    -
    -
    - Light: -
    -
    - rgb(247,220,212) -
    -
    -
    -
    - Dark: -
    -
    - rgb(70,30,21) -
    +
    Light:
    +
    #f7dcd4
    +
    +
    +
    Dark:
    +
    #461e15
    +
    +
    +
    Light:
    +
    rgb(247,220,212)
    +
    +
    +
    Dark:
    +
    rgb(70,30,21)
    @@ -2494,127 +514,26 @@
    100
    -
    - Light: -
    -
    - #fcf1ee -
    -
    -
    -
    - Dark: -
    -
    - #371912 -
    -
    -
    -
    - Light: -
    -
    - rgb(252,241,238) -
    -
    -
    -
    - Dark: -
    -
    - rgb(55,25,18) -
    +
    Light:
    +
    #fcf1ee
    +
    +
    +
    Dark:
    +
    #371912
    +
    +
    +
    Light:
    +
    rgb(252,241,238)
    +
    +
    +
    Dark:
    +
    rgb(55,25,18)
    -
    - Orange -
    +
    Orange
    @@ -2623,110 +542,20 @@
    H1150
    -
    - Light: -
    -
    - #221913 -
    -
    -
    -
    - Dark: -
    -
    - #fef7ee -
    -
    -
    -
    - Light: -
    -
    - rgb(34,25,19) -
    -
    -
    -
    - Dark: -
    -
    - rgb(254,247,238) -
    +
    Light:
    +
    #221913
    +
    +
    +
    Dark:
    +
    #fef7ee
    +
    +
    +
    Light:
    +
    rgb(34,25,19)
    +
    +
    +
    Dark:
    +
    rgb(254,247,238)
    @@ -2736,110 +565,20 @@
    H1050
    -
    - Light: -
    -
    - #352312 -
    -
    -
    -
    - Dark: -
    -
    - #fbe9d1 -
    -
    -
    -
    - Light: -
    -
    - rgb(53,35,18) -
    -
    -
    -
    - Dark: -
    -
    - rgb(251,233,209) -
    +
    Light:
    +
    #352312
    +
    +
    +
    Dark:
    +
    #fbe9d1
    +
    +
    +
    Light:
    +
    rgb(53,35,18)
    +
    +
    +
    Dark:
    +
    rgb(251,233,209)
    @@ -2849,110 +588,20 @@
    H950
    -
    - Light: -
    -
    - #3e2915 -
    -
    -
    -
    - Dark: -
    -
    - #f6d09a -
    -
    -
    -
    - Light: -
    -
    - rgb(62,41,21) -
    -
    -
    -
    - Dark: -
    -
    - rgb(246,208,154) -
    +
    Light:
    +
    #3e2915
    +
    +
    +
    Dark:
    +
    #f6d09a
    +
    +
    +
    Light:
    +
    rgb(62,41,21)
    +
    +
    +
    Dark:
    +
    rgb(246,208,154)
    @@ -2962,110 +611,20 @@
    H850
    -
    - Light: -
    -
    - #553619 -
    -
    -
    -
    - Dark: -
    -
    - #f0ae51 -
    -
    -
    -
    - Light: -
    -
    - rgb(85,54,25) -
    -
    -
    -
    - Dark: -
    -
    - rgb(240,174,81) -
    +
    Light:
    +
    #553619
    +
    +
    +
    Dark:
    +
    #f0ae51
    +
    +
    +
    Light:
    +
    rgb(85,54,25)
    +
    +
    +
    Dark:
    +
    rgb(240,174,81)
    @@ -3075,110 +634,20 @@
    H750
    -
    - Light: -
    -
    - #764b1e -
    -
    -
    -
    - Dark: -
    -
    - #de8e27 -
    -
    -
    -
    - Light: -
    -
    - rgb(118,75,30) -
    -
    -
    -
    - Dark: -
    -
    - rgb(222,142,39) -
    +
    Light:
    +
    #764b1e
    +
    +
    +
    Dark:
    +
    #de8e27
    +
    +
    +
    Light:
    +
    rgb(118,75,30)
    +
    +
    +
    Dark:
    +
    rgb(222,142,39)
    @@ -3188,110 +657,20 @@
    H650
    -
    - Light: -
    -
    - #986122 -
    -
    -
    -
    - Dark: -
    -
    - #bb7725 -
    -
    -
    -
    - Light: -
    -
    - rgb(152,97,34) -
    -
    -
    -
    - Dark: -
    -
    - rgb(187,119,37) -
    +
    Light:
    +
    #986122
    +
    +
    +
    Dark:
    +
    #bb7725
    +
    +
    +
    Light:
    +
    rgb(152,97,34)
    +
    +
    +
    Dark:
    +
    rgb(187,119,37)
    @@ -3301,110 +680,20 @@
    H550
    -
    - Light: -
    -
    - #bb7725 -
    -
    -
    -
    - Dark: -
    -
    - #986122 -
    -
    -
    -
    - Light: -
    -
    - rgb(187,119,37) -
    -
    -
    -
    - Dark: -
    -
    - rgb(152,97,34) -
    +
    Light:
    +
    #bb7725
    +
    +
    +
    Dark:
    +
    #986122
    +
    +
    +
    Light:
    +
    rgb(187,119,37)
    +
    +
    +
    Dark:
    +
    rgb(152,97,34)
    @@ -3414,110 +703,20 @@
    H450
    -
    - Light: -
    -
    - #de8e27 -
    -
    -
    -
    - Dark: -
    -
    - #764b1e -
    -
    -
    -
    - Light: -
    -
    - rgb(222,142,39) -
    -
    -
    -
    - Dark: -
    -
    - rgb(118,75,30) -
    +
    Light:
    +
    #de8e27
    +
    +
    +
    Dark:
    +
    #764b1e
    +
    +
    +
    Light:
    +
    rgb(222,142,39)
    +
    +
    +
    Dark:
    +
    rgb(118,75,30)
    @@ -3527,110 +726,20 @@
    H350
    -
    - Light: -
    -
    - #f0ae51 -
    -
    -
    -
    - Dark: -
    -
    - #553619 -
    -
    -
    -
    - Light: -
    -
    - rgb(240,174,81) -
    -
    -
    -
    - Dark: -
    -
    - rgb(85,54,25) -
    +
    Light:
    +
    #f0ae51
    +
    +
    +
    Dark:
    +
    #553619
    +
    +
    +
    Light:
    +
    rgb(240,174,81)
    +
    +
    +
    Dark:
    +
    rgb(85,54,25)
    @@ -3640,110 +749,20 @@
    H250
    -
    - Light: -
    -
    - #f6d09a -
    -
    -
    -
    - Dark: -
    -
    - #3e2915 -
    -
    -
    -
    - Light: -
    -
    - rgb(246,208,154) -
    -
    -
    -
    - Dark: -
    -
    - rgb(62,41,21) -
    +
    Light:
    +
    #f6d09a
    +
    +
    +
    Dark:
    +
    #3e2915
    +
    +
    +
    Light:
    +
    rgb(246,208,154)
    +
    +
    +
    Dark:
    +
    rgb(62,41,21)
    @@ -3753,110 +772,20 @@
    H150
    -
    - Light: -
    -
    - #fbe9d1 -
    -
    -
    -
    - Dark: -
    -
    - #352312 -
    -
    -
    -
    - Light: -
    -
    - rgb(251,233,209) -
    -
    -
    -
    - Dark: -
    -
    - rgb(53,35,18) -
    +
    Light:
    +
    #fbe9d1
    +
    +
    +
    Dark:
    +
    #352312
    +
    +
    +
    Light:
    +
    rgb(251,233,209)
    +
    +
    +
    Dark:
    +
    rgb(53,35,18)
    @@ -3866,110 +795,20 @@
    H50
    -
    - Light: -
    -
    - #fef7ee -
    -
    -
    -
    - Dark: -
    -
    - #221913 -
    -
    -
    -
    - Light: -
    -
    - rgb(254,247,238) -
    -
    -
    -
    - Dark: -
    -
    - rgb(34,25,19) -
    +
    Light:
    +
    #fef7ee
    +
    +
    +
    Dark:
    +
    #221913
    +
    +
    +
    Light:
    +
    rgb(254,247,238)
    +
    +
    +
    Dark:
    +
    rgb(34,25,19)
    @@ -3979,110 +818,20 @@
    1100
    -
    - Light: -
    -
    - #2e1f11 -
    -
    -
    -
    - Dark: -
    -
    - #fdf1e2 -
    -
    -
    -
    - Light: -
    -
    - rgb(46,31,17) -
    -
    -
    -
    - Dark: -
    -
    - rgb(253,241,226) -
    +
    Light:
    +
    #2e1f11
    +
    +
    +
    Dark:
    +
    #fdf1e2
    +
    +
    +
    Light:
    +
    rgb(46,31,17)
    +
    +
    +
    Dark:
    +
    rgb(253,241,226)
    @@ -4092,110 +841,20 @@
    1000
    -
    - Light: -
    -
    - #392513 -
    -
    -
    -
    - Dark: -
    -
    - #f8deb8 -
    -
    -
    -
    - Light: -
    -
    - rgb(57,37,19) -
    -
    -
    -
    - Dark: -
    -
    - rgb(248,222,184) -
    +
    Light:
    +
    #392513
    +
    +
    +
    Dark:
    +
    #f8deb8
    +
    +
    +
    Light:
    +
    rgb(57,37,19)
    +
    +
    +
    Dark:
    +
    rgb(248,222,184)
    @@ -4205,110 +864,20 @@
    900
    -
    - Light: -
    -
    - #422b16 -
    -
    -
    -
    - Dark: -
    -
    - #f2bc6d -
    -
    -
    -
    - Light: -
    -
    - rgb(66,43,22) -
    -
    -
    -
    - Dark: -
    -
    - rgb(242,188,109) -
    +
    Light:
    +
    #422b16
    +
    +
    +
    Dark:
    +
    #f2bc6d
    +
    +
    +
    Light:
    +
    rgb(66,43,22)
    +
    +
    +
    Dark:
    +
    rgb(242,188,109)
    @@ -4318,110 +887,20 @@
    800
    -
    - Light: -
    -
    - #623e1b -
    -
    -
    -
    - Dark: -
    -
    - #ec9827 -
    -
    -
    -
    - Light: -
    -
    - rgb(98,62,27) -
    -
    -
    -
    - Dark: -
    -
    - rgb(236,152,39) -
    +
    Light:
    +
    #623e1b
    +
    +
    +
    Dark:
    +
    #ec9827
    +
    +
    +
    Light:
    +
    rgb(98,62,27)
    +
    +
    +
    Dark:
    +
    rgb(236,152,39)
    @@ -4431,110 +910,20 @@
    700
    -
    - Light: -
    -
    - #835420 -
    -
    -
    -
    - Dark: -
    -
    - #c98027 -
    -
    -
    -
    - Light: -
    -
    - rgb(131,84,32) -
    -
    -
    -
    - Dark: -
    -
    - rgb(201,128,39) -
    +
    Light:
    +
    #835420
    +
    +
    +
    Dark:
    +
    #c98027
    +
    +
    +
    Light:
    +
    rgb(131,84,32)
    +
    +
    +
    Dark:
    +
    rgb(201,128,39)
    @@ -4544,110 +933,20 @@
    600
    -
    - Light: -
    -
    - #a66923 -
    -
    -
    -
    - Dark: -
    -
    - #a66923 -
    -
    -
    -
    - Light: -
    -
    - rgb(166,105,35) -
    -
    -
    -
    - Dark: -
    -
    - rgb(166,105,35) -
    +
    Light:
    +
    #a66923
    +
    +
    +
    Dark:
    +
    #a66923
    +
    +
    +
    Light:
    +
    rgb(166,105,35)
    +
    +
    +
    Dark:
    +
    rgb(166,105,35)
    @@ -4657,110 +956,20 @@
    500
    -
    - Light: -
    -
    - #c98027 -
    -
    -
    -
    - Dark: -
    -
    - #835420 -
    -
    -
    -
    - Light: -
    -
    - rgb(201,128,39) -
    -
    -
    -
    - Dark: -
    -
    - rgb(131,84,32) -
    +
    Light:
    +
    #c98027
    +
    +
    +
    Dark:
    +
    #835420
    +
    +
    +
    Light:
    +
    rgb(201,128,39)
    +
    +
    +
    Dark:
    +
    rgb(131,84,32)
    @@ -4770,110 +979,20 @@
    400
    -
    - Light: -
    -
    - #ec9827 -
    -
    -
    -
    - Dark: -
    -
    - #623e1b -
    -
    -
    -
    - Light: -
    -
    - rgb(236,152,39) -
    -
    -
    -
    - Dark: -
    -
    - rgb(98,62,27) -
    +
    Light:
    +
    #ec9827
    +
    +
    +
    Dark:
    +
    #623e1b
    +
    +
    +
    Light:
    +
    rgb(236,152,39)
    +
    +
    +
    Dark:
    +
    rgb(98,62,27)
    @@ -4883,110 +1002,20 @@
    300
    -
    - Light: -
    -
    - #f2bc6d -
    -
    -
    -
    - Dark: -
    -
    - #422b16 -
    -
    -
    -
    - Light: -
    -
    - rgb(242,188,109) -
    -
    -
    -
    - Dark: -
    -
    - rgb(66,43,22) -
    +
    Light:
    +
    #f2bc6d
    +
    +
    +
    Dark:
    +
    #422b16
    +
    +
    +
    Light:
    +
    rgb(242,188,109)
    +
    +
    +
    Dark:
    +
    rgb(66,43,22)
    @@ -4996,110 +1025,20 @@
    200
    -
    - Light: -
    -
    - #f8deb8 -
    -
    -
    -
    - Dark: -
    -
    - #392513 -
    -
    -
    -
    - Light: -
    -
    - rgb(248,222,184) -
    -
    -
    -
    - Dark: -
    -
    - rgb(57,37,19) -
    +
    Light:
    +
    #f8deb8
    +
    +
    +
    Dark:
    +
    #392513
    +
    +
    +
    Light:
    +
    rgb(248,222,184)
    +
    +
    +
    Dark:
    +
    rgb(57,37,19)
    @@ -5109,127 +1048,26 @@
    100
    -
    - Light: -
    -
    - #fdf1e2 -
    -
    -
    -
    - Dark: -
    -
    - #2e1f11 -
    -
    -
    -
    - Light: -
    -
    - rgb(253,241,226) -
    -
    -
    -
    - Dark: -
    -
    - rgb(46,31,17) -
    +
    Light:
    +
    #fdf1e2
    +
    +
    +
    Dark:
    +
    #2e1f11
    +
    +
    +
    Light:
    +
    rgb(253,241,226)
    +
    +
    +
    Dark:
    +
    rgb(46,31,17)
    -
    - Yellow -
    +
    Yellow
    @@ -5238,110 +1076,20 @@
    H1150
    -
    - Light: -
    -
    - #1f1a11 -
    -
    -
    -
    - Dark: -
    -
    - #fef8e3 -
    -
    -
    -
    - Light: -
    -
    - rgb(31,26,17) -
    -
    -
    -
    - Dark: -
    -
    - rgb(254,248,227) -
    +
    Light:
    +
    #1f1a11
    +
    +
    +
    Dark:
    +
    #fef8e3
    +
    +
    +
    Light:
    +
    rgb(31,26,17)
    +
    +
    +
    Dark:
    +
    rgb(254,248,227)
    @@ -5351,110 +1099,20 @@
    H1050
    -
    - Light: -
    -
    - #302511 -
    -
    -
    -
    - Dark: -
    -
    - #fbecb3 -
    -
    -
    -
    - Light: -
    -
    - rgb(48,37,17) -
    -
    -
    -
    - Dark: -
    -
    - rgb(251,236,179) -
    +
    Light:
    +
    #302511
    +
    +
    +
    Dark:
    +
    #fbecb3
    +
    +
    +
    Light:
    +
    rgb(48,37,17)
    +
    +
    +
    Dark:
    +
    rgb(251,236,179)
    @@ -5464,110 +1122,20 @@
    H950
    -
    - Light: -
    -
    - #382d14 -
    -
    -
    -
    - Dark: -
    -
    - #f4d560 -
    -
    -
    -
    - Light: -
    -
    - rgb(56,45,20) -
    -
    -
    -
    - Dark: -
    -
    - rgb(244,213,96) -
    +
    Light:
    +
    #382d14
    +
    +
    +
    Dark:
    +
    #f4d560
    +
    +
    +
    Light:
    +
    rgb(56,45,20)
    +
    +
    +
    Dark:
    +
    rgb(244,213,96)
    @@ -5577,110 +1145,20 @@
    H850
    -
    - Light: -
    -
    - #4b3d17 -
    -
    -
    -
    - Dark: -
    -
    - #e1b725 -
    -
    -
    -
    - Light: -
    -
    - rgb(75,61,23) -
    -
    -
    -
    - Dark: -
    -
    - rgb(225,183,37) -
    +
    Light:
    +
    #4b3d17
    +
    +
    +
    Dark:
    +
    #e1b725
    +
    +
    +
    Light:
    +
    rgb(75,61,23)
    +
    +
    +
    Dark:
    +
    rgb(225,183,37)
    @@ -5690,110 +1168,20 @@
    H750
    -
    - Light: -
    -
    - #67521a -
    -
    -
    -
    - Dark: -
    -
    - #c29d24 -
    -
    -
    -
    - Light: -
    -
    - rgb(103,82,26) -
    -
    -
    -
    - Dark: -
    -
    - rgb(194,157,36) -
    +
    Light:
    +
    #67521a
    +
    +
    +
    Dark:
    +
    #c29d24
    +
    +
    +
    Light:
    +
    rgb(103,82,26)
    +
    +
    +
    Dark:
    +
    rgb(194,157,36)
    @@ -5803,110 +1191,20 @@
    H650
    -
    - Light: -
    -
    - #836a1e -
    -
    -
    -
    - Dark: -
    -
    - #a28322 -
    -
    -
    -
    - Light: -
    -
    - rgb(131,106,30) -
    -
    -
    -
    - Dark: -
    -
    - rgb(162,131,34) -
    +
    Light:
    +
    #836a1e
    +
    +
    +
    Dark:
    +
    #a28322
    +
    +
    +
    Light:
    +
    rgb(131,106,30)
    +
    +
    +
    Dark:
    +
    rgb(162,131,34)
    @@ -5916,110 +1214,20 @@
    H550
    -
    - Light: -
    -
    - #a28322 -
    -
    -
    -
    - Dark: -
    -
    - #836a1e -
    -
    -
    -
    - Light: -
    -
    - rgb(162,131,34) -
    -
    -
    -
    - Dark: -
    -
    - rgb(131,106,30) -
    +
    Light:
    +
    #a28322
    +
    +
    +
    Dark:
    +
    #836a1e
    +
    +
    +
    Light:
    +
    rgb(162,131,34)
    +
    +
    +
    Dark:
    +
    rgb(131,106,30)
    @@ -6029,110 +1237,20 @@
    H450
    -
    - Light: -
    -
    - #c29d24 -
    -
    -
    -
    - Dark: -
    -
    - #67521a -
    -
    -
    -
    - Light: -
    -
    - rgb(194,157,36) -
    -
    -
    -
    - Dark: -
    -
    - rgb(103,82,26) -
    +
    Light:
    +
    #c29d24
    +
    +
    +
    Dark:
    +
    #67521a
    +
    +
    +
    Light:
    +
    rgb(194,157,36)
    +
    +
    +
    Dark:
    +
    rgb(103,82,26)
    @@ -6142,110 +1260,20 @@
    H350
    -
    - Light: -
    -
    - #e1b725 -
    -
    -
    -
    - Dark: -
    -
    - #4b3d17 -
    -
    -
    -
    - Light: -
    -
    - rgb(225,183,37) -
    -
    -
    -
    - Dark: -
    -
    - rgb(75,61,23) -
    +
    Light:
    +
    #e1b725
    +
    +
    +
    Dark:
    +
    #4b3d17
    +
    +
    +
    Light:
    +
    rgb(225,183,37)
    +
    +
    +
    Dark:
    +
    rgb(75,61,23)
    @@ -6255,110 +1283,20 @@
    H250
    -
    - Light: -
    -
    - #f4d560 -
    -
    -
    -
    - Dark: -
    -
    - #382d14 -
    -
    -
    -
    - Light: -
    -
    - rgb(244,213,96) -
    -
    -
    -
    - Dark: -
    -
    - rgb(56,45,20) -
    +
    Light:
    +
    #f4d560
    +
    +
    +
    Dark:
    +
    #382d14
    +
    +
    +
    Light:
    +
    rgb(244,213,96)
    +
    +
    +
    Dark:
    +
    rgb(56,45,20)
    @@ -6368,110 +1306,20 @@
    H150
    -
    - Light: -
    -
    - #fbecb3 -
    -
    -
    -
    - Dark: -
    -
    - #302511 -
    -
    -
    -
    - Light: -
    -
    - rgb(251,236,179) -
    -
    -
    -
    - Dark: -
    -
    - rgb(48,37,17) -
    +
    Light:
    +
    #fbecb3
    +
    +
    +
    Dark:
    +
    #302511
    +
    +
    +
    Light:
    +
    rgb(251,236,179)
    +
    +
    +
    Dark:
    +
    rgb(48,37,17)
    @@ -6481,110 +1329,20 @@
    H50
    -
    - Light: -
    -
    - #fef8e3 -
    -
    -
    -
    - Dark: -
    -
    - #1f1a11 -
    -
    -
    -
    - Light: -
    -
    - rgb(254,248,227) -
    -
    -
    -
    - Dark: -
    -
    - rgb(31,26,17) -
    +
    Light:
    +
    #fef8e3
    +
    +
    +
    Dark:
    +
    #1f1a11
    +
    +
    +
    Light:
    +
    rgb(254,248,227)
    +
    +
    +
    Dark:
    +
    rgb(31,26,17)
    @@ -6594,110 +1352,20 @@
    1100
    -
    - Light: -
    -
    - #29200f -
    -
    -
    -
    - Dark: -
    -
    - #fdf3d1 -
    -
    -
    -
    - Light: -
    -
    - rgb(41,32,15) -
    -
    -
    -
    - Dark: -
    -
    - rgb(253,243,209) -
    +
    Light:
    +
    #29200f
    +
    +
    +
    Dark:
    +
    #fdf3d1
    +
    +
    +
    Light:
    +
    rgb(41,32,15)
    +
    +
    +
    Dark:
    +
    rgb(253,243,209)
    @@ -6707,110 +1375,20 @@
    1000
    -
    - Light: -
    -
    - #342912 -
    -
    -
    -
    - Dark: -
    -
    - #f9e187 -
    -
    -
    -
    - Light: -
    -
    - rgb(52,41,18) -
    -
    -
    -
    - Dark: -
    -
    - rgb(249,225,135) -
    +
    Light:
    +
    #342912
    +
    +
    +
    Dark:
    +
    #f9e187
    +
    +
    +
    Light:
    +
    rgb(52,41,18)
    +
    +
    +
    Dark:
    +
    rgb(249,225,135)
    @@ -6820,110 +1398,20 @@
    900
    -
    - Light: -
    -
    - #3b3015 -
    -
    -
    -
    - Dark: -
    -
    - #edc225 -
    -
    -
    -
    - Light: -
    -
    - rgb(59,48,21) -
    -
    -
    -
    - Dark: -
    -
    - rgb(237,194,37) -
    +
    Light:
    +
    #3b3015
    +
    +
    +
    Dark:
    +
    #edc225
    +
    +
    +
    Light:
    +
    rgb(59,48,21)
    +
    +
    +
    Dark:
    +
    rgb(237,194,37)
    @@ -6933,110 +1421,20 @@
    800
    -
    - Light: -
    -
    - #564518 -
    -
    -
    -
    - Dark: -
    -
    - #cea724 -
    -
    -
    -
    - Light: -
    -
    - rgb(86,69,24) -
    -
    -
    -
    - Dark: -
    -
    - rgb(206,167,36) -
    +
    Light:
    +
    #564518
    +
    +
    +
    Dark:
    +
    #cea724
    +
    +
    +
    Light:
    +
    rgb(86,69,24)
    +
    +
    +
    Dark:
    +
    rgb(206,167,36)
    @@ -7046,110 +1444,20 @@
    700
    -
    - Light: -
    -
    - #725b1c -
    -
    -
    -
    - Dark: -
    -
    - #af8d23 -
    -
    -
    -
    - Light: -
    -
    - rgb(114,91,28) -
    -
    -
    -
    - Dark: -
    -
    - rgb(175,141,35) -
    +
    Light:
    +
    #725b1c
    +
    +
    +
    Dark:
    +
    #af8d23
    +
    +
    +
    Light:
    +
    rgb(114,91,28)
    +
    +
    +
    Dark:
    +
    rgb(175,141,35)
    @@ -7159,110 +1467,20 @@
    600
    -
    - Light: -
    -
    - #8f7420 -
    -
    -
    -
    - Dark: -
    -
    - #8f7420 -
    -
    -
    -
    - Light: -
    -
    - rgb(143,116,32) -
    -
    -
    -
    - Dark: -
    -
    - rgb(143,116,32) -
    +
    Light:
    +
    #8f7420
    +
    +
    +
    Dark:
    +
    #8f7420
    +
    +
    +
    Light:
    +
    rgb(143,116,32)
    +
    +
    +
    Dark:
    +
    rgb(143,116,32)
    @@ -7272,110 +1490,20 @@
    500
    -
    - Light: -
    -
    - #af8d23 -
    -
    -
    -
    - Dark: -
    -
    - #725b1c -
    -
    -
    -
    - Light: -
    -
    - rgb(175,141,35) -
    -
    -
    -
    - Dark: -
    -
    - rgb(114,91,28) -
    +
    Light:
    +
    #af8d23
    +
    +
    +
    Dark:
    +
    #725b1c
    +
    +
    +
    Light:
    +
    rgb(175,141,35)
    +
    +
    +
    Dark:
    +
    rgb(114,91,28)
    @@ -7385,110 +1513,20 @@
    400
    -
    - Light: -
    -
    - #cea724 -
    -
    -
    -
    - Dark: -
    -
    - #564518 -
    -
    -
    -
    - Light: -
    -
    - rgb(206,167,36) -
    -
    -
    -
    - Dark: -
    -
    - rgb(86,69,24) -
    +
    Light:
    +
    #cea724
    +
    +
    +
    Dark:
    +
    #564518
    +
    +
    +
    Light:
    +
    rgb(206,167,36)
    +
    +
    +
    Dark:
    +
    rgb(86,69,24)
    @@ -7498,110 +1536,20 @@
    300
    -
    - Light: -
    -
    - #edc225 -
    -
    -
    -
    - Dark: -
    -
    - #3b3015 -
    -
    -
    -
    - Light: -
    -
    - rgb(237,194,37) -
    -
    -
    -
    - Dark: -
    -
    - rgb(59,48,21) -
    +
    Light:
    +
    #edc225
    +
    +
    +
    Dark:
    +
    #3b3015
    +
    +
    +
    Light:
    +
    rgb(237,194,37)
    +
    +
    +
    Dark:
    +
    rgb(59,48,21)
    @@ -7611,110 +1559,20 @@
    200
    -
    - Light: -
    -
    - #f9e187 -
    -
    -
    -
    - Dark: -
    -
    - #342912 -
    -
    -
    -
    - Light: -
    -
    - rgb(249,225,135) -
    -
    -
    -
    - Dark: -
    -
    - rgb(52,41,18) -
    +
    Light:
    +
    #f9e187
    +
    +
    +
    Dark:
    +
    #342912
    +
    +
    +
    Light:
    +
    rgb(249,225,135)
    +
    +
    +
    Dark:
    +
    rgb(52,41,18)
    @@ -7724,127 +1582,26 @@
    100
    -
    - Light: -
    -
    - #fdf3d1 -
    -
    -
    -
    - Dark: -
    -
    - #29200f -
    -
    -
    -
    - Light: -
    -
    - rgb(253,243,209) -
    -
    -
    -
    - Dark: -
    -
    - rgb(41,32,15) -
    +
    Light:
    +
    #fdf3d1
    +
    +
    +
    Dark:
    +
    #29200f
    +
    +
    +
    Light:
    +
    rgb(253,243,209)
    +
    +
    +
    Dark:
    +
    rgb(41,32,15)
    -
    - Green -
    +
    Green
    @@ -7853,110 +1610,20 @@
    H1150
    -
    - Light: -
    -
    - #161e10 -
    -
    -
    -
    - Dark: -
    -
    - #f5faf2 -
    -
    -
    -
    - Light: -
    -
    - rgb(22,30,16) -
    -
    -
    -
    - Dark: -
    -
    - rgb(245,250,242) -
    +
    Light:
    +
    #161e10
    +
    +
    +
    Dark:
    +
    #f5faf2
    +
    +
    +
    Light:
    +
    rgb(22,30,16)
    +
    +
    +
    Dark:
    +
    rgb(245,250,242)
    @@ -7966,110 +1633,20 @@
    H1050
    -
    - Light: -
    -
    - #1c2b0f -
    -
    -
    -
    - Dark: -
    -
    - #e6f0dd -
    -
    -
    -
    - Light: -
    -
    - rgb(28,43,15) -
    -
    -
    -
    - Dark: -
    -
    - rgb(230,240,221) -
    +
    Light:
    +
    #1c2b0f
    +
    +
    +
    Dark:
    +
    #e6f0dd
    +
    +
    +
    Light:
    +
    rgb(28,43,15)
    +
    +
    +
    Dark:
    +
    rgb(230,240,221)
    @@ -8079,110 +1656,20 @@
    H950
    -
    - Light: -
    -
    - #203212 -
    -
    -
    -
    - Dark: -
    -
    - #c9deb6 -
    -
    -
    -
    - Light: -
    -
    - rgb(32,50,18) -
    -
    -
    -
    - Dark: -
    -
    - rgb(201,222,182) -
    +
    Light:
    +
    #203212
    +
    +
    +
    Dark:
    +
    #c9deb6
    +
    +
    +
    Light:
    +
    rgb(32,50,18)
    +
    +
    +
    Dark:
    +
    rgb(201,222,182)
    @@ -8192,110 +1679,20 @@
    H850
    -
    - Light: -
    -
    - #2a4513 -
    -
    -
    -
    - Dark: -
    -
    - #a3c784 -
    -
    -
    -
    - Light: -
    -
    - rgb(42,69,19) -
    -
    -
    -
    - Dark: -
    -
    - rgb(163,199,132) -
    +
    Light:
    +
    #2a4513
    +
    +
    +
    Dark:
    +
    #a3c784
    +
    +
    +
    Light:
    +
    rgb(42,69,19)
    +
    +
    +
    Dark:
    +
    rgb(163,199,132)
    @@ -8305,110 +1702,20 @@
    H750
    -
    - Light: -
    -
    - #366015 -
    -
    -
    -
    - Dark: -
    -
    - #7caf52 -
    -
    -
    -
    - Light: -
    -
    - rgb(54,96,21) -
    -
    -
    -
    - Dark: -
    -
    - rgb(124,175,82) -
    +
    Light:
    +
    #366015
    +
    +
    +
    Dark:
    +
    #7caf52
    +
    +
    +
    Light:
    +
    rgb(54,96,21)
    +
    +
    +
    Dark:
    +
    rgb(124,175,82)
    @@ -8418,110 +1725,20 @@
    H650
    -
    - Light: -
    -
    - #3e7c13 -
    -
    -
    -
    - Dark: -
    -
    - #5a9727 -
    -
    -
    -
    - Light: -
    -
    - rgb(62,124,19) -
    -
    -
    -
    - Dark: -
    -
    - rgb(90,151,39) -
    +
    Light:
    +
    #3e7c13
    +
    +
    +
    Dark:
    +
    #5a9727
    +
    +
    +
    Light:
    +
    rgb(62,124,19)
    +
    +
    +
    Dark:
    +
    rgb(90,151,39)
    @@ -8531,110 +1748,20 @@
    H550
    -
    - Light: -
    -
    - #5a9727 -
    -
    -
    -
    - Dark: -
    -
    - #3e7c13 -
    -
    -
    -
    - Light: -
    -
    - rgb(90,151,39) -
    -
    -
    -
    - Dark: -
    -
    - rgb(62,124,19) -
    +
    Light:
    +
    #5a9727
    +
    +
    +
    Dark:
    +
    #3e7c13
    +
    +
    +
    Light:
    +
    rgb(90,151,39)
    +
    +
    +
    Dark:
    +
    rgb(62,124,19)
    @@ -8644,110 +1771,20 @@
    H450
    -
    - Light: -
    -
    - #7caf52 -
    -
    -
    -
    - Dark: -
    -
    - #366015 -
    -
    -
    -
    - Light: -
    -
    - rgb(124,175,82) -
    -
    -
    -
    - Dark: -
    -
    - rgb(54,96,21) -
    +
    Light:
    +
    #7caf52
    +
    +
    +
    Dark:
    +
    #366015
    +
    +
    +
    Light:
    +
    rgb(124,175,82)
    +
    +
    +
    Dark:
    +
    rgb(54,96,21)
    @@ -8757,110 +1794,20 @@
    H350
    -
    - Light: -
    -
    - #a3c784 -
    -
    -
    -
    - Dark: -
    -
    - #2a4513 -
    -
    -
    -
    - Light: -
    -
    - rgb(163,199,132) -
    -
    -
    -
    - Dark: -
    -
    - rgb(42,69,19) -
    +
    Light:
    +
    #a3c784
    +
    +
    +
    Dark:
    +
    #2a4513
    +
    +
    +
    Light:
    +
    rgb(163,199,132)
    +
    +
    +
    Dark:
    +
    rgb(42,69,19)
    @@ -8870,110 +1817,20 @@
    H250
    -
    - Light: -
    -
    - #c9deb6 -
    -
    -
    -
    - Dark: -
    -
    - #203212 -
    -
    -
    -
    - Light: -
    -
    - rgb(201,222,182) -
    -
    -
    -
    - Dark: -
    -
    - rgb(32,50,18) -
    +
    Light:
    +
    #c9deb6
    +
    +
    +
    Dark:
    +
    #203212
    +
    +
    +
    Light:
    +
    rgb(201,222,182)
    +
    +
    +
    Dark:
    +
    rgb(32,50,18)
    @@ -8983,110 +1840,20 @@
    H150
    -
    - Light: -
    -
    - #e6f0dd -
    -
    -
    -
    - Dark: -
    -
    - #1c2b0f -
    -
    -
    -
    - Light: -
    -
    - rgb(230,240,221) -
    -
    -
    -
    - Dark: -
    -
    - rgb(28,43,15) -
    +
    Light:
    +
    #e6f0dd
    +
    +
    +
    Dark:
    +
    #1c2b0f
    +
    +
    +
    Light:
    +
    rgb(230,240,221)
    +
    +
    +
    Dark:
    +
    rgb(28,43,15)
    @@ -9096,110 +1863,20 @@
    H50
    -
    - Light: -
    -
    - #f5faf2 -
    -
    -
    -
    - Dark: -
    -
    - #161e10 -
    -
    -
    -
    - Light: -
    -
    - rgb(245,250,242) -
    -
    -
    -
    - Dark: -
    -
    - rgb(22,30,16) -
    +
    Light:
    +
    #f5faf2
    +
    +
    +
    Dark:
    +
    #161e10
    +
    +
    +
    Light:
    +
    rgb(245,250,242)
    +
    +
    +
    Dark:
    +
    rgb(22,30,16)
    @@ -9209,110 +1886,20 @@
    1100
    -
    - Light: -
    -
    - #1a260d -
    -
    -
    -
    - Dark: -
    -
    - #eff6ea -
    -
    -
    -
    - Light: -
    -
    - rgb(26,38,13) -
    -
    -
    -
    - Dark: -
    -
    - rgb(239,246,234) -
    +
    Light:
    +
    #1a260d
    +
    +
    +
    Dark:
    +
    #eff6ea
    +
    +
    +
    Light:
    +
    rgb(26,38,13)
    +
    +
    +
    Dark:
    +
    rgb(239,246,234)
    @@ -9322,110 +1909,20 @@
    1000
    -
    - Light: -
    -
    - #1e2e11 -
    -
    -
    -
    - Dark: -
    -
    - #d8e7ca -
    -
    -
    -
    - Light: -
    -
    - rgb(30,46,17) -
    -
    -
    -
    - Dark: -
    -
    - rgb(216,231,202) -
    +
    Light:
    +
    #1e2e11
    +
    +
    +
    Dark:
    +
    #d8e7ca
    +
    +
    +
    Light:
    +
    rgb(30,46,17)
    +
    +
    +
    Dark:
    +
    rgb(216,231,202)
    @@ -9435,110 +1932,20 @@
    900
    -
    - Light: -
    -
    - #223512 -
    -
    -
    -
    - Dark: -
    -
    - #b2d198 -
    -
    -
    -
    - Light: -
    -
    - rgb(34,53,18) -
    -
    -
    -
    - Dark: -
    -
    - rgb(178,209,152) -
    +
    Light:
    +
    #223512
    +
    +
    +
    Dark:
    +
    #b2d198
    +
    +
    +
    Light:
    +
    rgb(34,53,18)
    +
    +
    +
    Dark:
    +
    rgb(178,209,152)
    @@ -9548,110 +1955,20 @@
    800
    -
    - Light: -
    -
    - #2f5014 -
    -
    -
    -
    - Dark: -
    -
    - #8cb966 -
    -
    -
    -
    - Light: -
    -
    - rgb(47,80,20) -
    -
    -
    -
    - Dark: -
    -
    - rgb(140,185,102) -
    +
    Light:
    +
    #2f5014
    +
    +
    +
    Dark:
    +
    #8cb966
    +
    +
    +
    Light:
    +
    rgb(47,80,20)
    +
    +
    +
    Dark:
    +
    rgb(140,185,102)
    @@ -9661,110 +1978,20 @@
    700
    -
    - Light: -
    -
    - #3b6a15 -
    -
    -
    -
    - Dark: -
    -
    - #65a134 -
    -
    -
    -
    - Light: -
    -
    - rgb(59,106,21) -
    -
    -
    -
    - Dark: -
    -
    - rgb(101,161,52) -
    +
    Light:
    +
    #3b6a15
    +
    +
    +
    Dark:
    +
    #65a134
    +
    +
    +
    Light:
    +
    rgb(59,106,21)
    +
    +
    +
    Dark:
    +
    rgb(101,161,52)
    @@ -9774,110 +2001,20 @@
    600
    -
    - Light: -
    -
    - #498714 -
    -
    -
    -
    - Dark: -
    -
    - #498714 -
    -
    -
    -
    - Light: -
    -
    - rgb(73,135,20) -
    -
    -
    -
    - Dark: -
    -
    - rgb(73,135,20) -
    +
    Light:
    +
    #498714
    +
    +
    +
    Dark:
    +
    #498714
    +
    +
    +
    Light:
    +
    rgb(73,135,20)
    +
    +
    +
    Dark:
    +
    rgb(73,135,20)
    @@ -9887,110 +2024,20 @@
    500
    -
    - Light: -
    -
    - #65a134 -
    -
    -
    -
    - Dark: -
    -
    - #3b6a15 -
    -
    -
    -
    - Light: -
    -
    - rgb(101,161,52) -
    -
    -
    -
    - Dark: -
    -
    - rgb(59,106,21) -
    +
    Light:
    +
    #65a134
    +
    +
    +
    Dark:
    +
    #3b6a15
    +
    +
    +
    Light:
    +
    rgb(101,161,52)
    +
    +
    +
    Dark:
    +
    rgb(59,106,21)
    @@ -10000,110 +2047,20 @@
    400
    -
    - Light: -
    -
    - #8cb966 -
    -
    -
    -
    - Dark: -
    -
    - #2f5014 -
    -
    -
    -
    - Light: -
    -
    - rgb(140,185,102) -
    -
    -
    -
    - Dark: -
    -
    - rgb(47,80,20) -
    +
    Light:
    +
    #8cb966
    +
    +
    +
    Dark:
    +
    #2f5014
    +
    +
    +
    Light:
    +
    rgb(140,185,102)
    +
    +
    +
    Dark:
    +
    rgb(47,80,20)
    @@ -10113,110 +2070,20 @@
    300
    -
    - Light: -
    -
    - #b2d198 -
    -
    -
    -
    - Dark: -
    -
    - #223512 -
    -
    -
    -
    - Light: -
    -
    - rgb(178,209,152) -
    -
    -
    -
    - Dark: -
    -
    - rgb(34,53,18) -
    +
    Light:
    +
    #b2d198
    +
    +
    +
    Dark:
    +
    #223512
    +
    +
    +
    Light:
    +
    rgb(178,209,152)
    +
    +
    +
    Dark:
    +
    rgb(34,53,18)
    @@ -10226,110 +2093,20 @@
    200
    -
    - Light: -
    -
    - #d8e7ca -
    -
    -
    -
    - Dark: -
    -
    - #1e2e11 -
    -
    -
    -
    - Light: -
    -
    - rgb(216,231,202) -
    -
    -
    -
    - Dark: -
    -
    - rgb(30,46,17) -
    +
    Light:
    +
    #d8e7ca
    +
    +
    +
    Dark:
    +
    #1e2e11
    +
    +
    +
    Light:
    +
    rgb(216,231,202)
    +
    +
    +
    Dark:
    +
    rgb(30,46,17)
    @@ -10339,127 +2116,26 @@
    100
    -
    - Light: -
    -
    - #eff6ea -
    -
    -
    -
    - Dark: -
    -
    - #1a260d -
    -
    -
    -
    - Light: -
    -
    - rgb(239,246,234) -
    -
    -
    -
    - Dark: -
    -
    - rgb(26,38,13) -
    +
    Light:
    +
    #eff6ea
    +
    +
    +
    Dark:
    +
    #1a260d
    +
    +
    +
    Light:
    +
    rgb(239,246,234)
    +
    +
    +
    Dark:
    +
    rgb(26,38,13)
    -
    - Blue -
    +
    Blue
    @@ -10468,110 +2144,20 @@
    H1150
    -
    - Light: -
    -
    - #111a32 -
    -
    -
    -
    - Dark: -
    -
    - #f4f7fe -
    -
    -
    -
    - Light: -
    -
    - rgb(17,26,50) -
    -
    -
    -
    - Dark: -
    -
    - rgb(244,247,254) -
    +
    Light:
    +
    #111a32
    +
    +
    +
    Dark:
    +
    #f4f7fe
    +
    +
    +
    Light:
    +
    rgb(17,26,50)
    +
    +
    +
    Dark:
    +
    rgb(244,247,254)
    @@ -10581,110 +2167,20 @@
    H1050
    -
    - Light: -
    -
    - #16234f -
    -
    -
    -
    - Dark: -
    -
    - #e7edff -
    -
    -
    -
    - Light: -
    -
    - rgb(22,35,79) -
    -
    -
    -
    - Dark: -
    -
    - rgb(231,237,255) -
    +
    Light:
    +
    #16234f
    +
    +
    +
    Dark:
    +
    #e7edff
    +
    +
    +
    Light:
    +
    rgb(22,35,79)
    +
    +
    +
    Dark:
    +
    rgb(231,237,255)
    @@ -10694,110 +2190,20 @@
    H950
    -
    - Light: -
    -
    - #1a295d -
    -
    -
    -
    - Dark: -
    -
    - #cad6fe -
    -
    -
    -
    - Light: -
    -
    - rgb(26,41,93) -
    -
    -
    -
    - Dark: -
    -
    - rgb(202,214,254) -
    +
    Light:
    +
    #1a295d
    +
    +
    +
    Dark:
    +
    #cad6fe
    +
    +
    +
    Light:
    +
    rgb(26,41,93)
    +
    +
    +
    Dark:
    +
    rgb(202,214,254)
    @@ -10807,110 +2213,20 @@
    H850
    -
    - Light: -
    -
    - #23387c -
    -
    -
    -
    - Dark: -
    -
    - #a4b8fd -
    -
    -
    -
    - Light: -
    -
    - rgb(35,56,124) -
    -
    -
    -
    - Dark: -
    -
    - rgb(164,184,253) -
    +
    Light:
    +
    #23387c
    +
    +
    +
    Dark:
    +
    #a4b8fd
    +
    +
    +
    Light:
    +
    rgb(35,56,124)
    +
    +
    +
    Dark:
    +
    rgb(164,184,253)
    @@ -10920,110 +2236,20 @@
    H750
    -
    - Light: -
    -
    - #304daa -
    -
    -
    -
    - Dark: -
    -
    - #7d9bfd -
    -
    -
    -
    - Light: -
    -
    - rgb(48,77,170) -
    -
    -
    -
    - Dark: -
    -
    - rgb(125,155,253) -
    +
    Light:
    +
    #304daa
    +
    +
    +
    Dark:
    +
    #7d9bfd
    +
    +
    +
    Light:
    +
    rgb(48,77,170)
    +
    +
    +
    Dark:
    +
    rgb(125,155,253)
    @@ -11031,112 +2257,22 @@
    -
    H650
    -
    -
    - Light: -
    -
    - #3d63da -
    -
    -
    -
    - Dark: -
    -
    - #587df7 -
    -
    -
    -
    - Light: -
    -
    - rgb(61,99,218) -
    -
    -
    -
    - Dark: -
    -
    - rgb(88,125,247) -
    +
    H650
    +
    +
    Light:
    +
    #3d63da
    +
    +
    +
    Dark:
    +
    #587df7
    +
    +
    +
    Light:
    +
    rgb(61,99,218)
    +
    +
    +
    Dark:
    +
    rgb(88,125,247)
    @@ -11146,110 +2282,20 @@
    H550
    -
    - Light: -
    -
    - #587df7 -
    -
    -
    -
    - Dark: -
    -
    - #3d63da -
    -
    -
    -
    - Light: -
    -
    - rgb(88,125,247) -
    -
    -
    -
    - Dark: -
    -
    - rgb(61,99,218) -
    +
    Light:
    +
    #587df7
    +
    +
    +
    Dark:
    +
    #3d63da
    +
    +
    +
    Light:
    +
    rgb(88,125,247)
    +
    +
    +
    Dark:
    +
    rgb(61,99,218)
    @@ -11259,110 +2305,20 @@
    H450
    -
    - Light: -
    -
    - #7d9bfd -
    -
    -
    -
    - Dark: -
    -
    - #304daa -
    -
    -
    -
    - Light: -
    -
    - rgb(125,155,253) -
    -
    -
    -
    - Dark: -
    -
    - rgb(48,77,170) -
    +
    Light:
    +
    #7d9bfd
    +
    +
    +
    Dark:
    +
    #304daa
    +
    +
    +
    Light:
    +
    rgb(125,155,253)
    +
    +
    +
    Dark:
    +
    rgb(48,77,170)
    @@ -11372,110 +2328,20 @@
    H350
    -
    - Light: -
    -
    - #a4b8fd -
    -
    -
    -
    - Dark: -
    -
    - #23387c -
    -
    -
    -
    - Light: -
    -
    - rgb(164,184,253) -
    -
    -
    -
    - Dark: -
    -
    - rgb(35,56,124) -
    +
    Light:
    +
    #a4b8fd
    +
    +
    +
    Dark:
    +
    #23387c
    +
    +
    +
    Light:
    +
    rgb(164,184,253)
    +
    +
    +
    Dark:
    +
    rgb(35,56,124)
    @@ -11485,110 +2351,20 @@
    H250
    -
    - Light: -
    -
    - #cad6fe -
    -
    -
    -
    - Dark: -
    -
    - #1a295d -
    -
    -
    -
    - Light: -
    -
    - rgb(202,214,254) -
    -
    -
    -
    - Dark: -
    -
    - rgb(26,41,93) -
    +
    Light:
    +
    #cad6fe
    +
    +
    +
    Dark:
    +
    #1a295d
    +
    +
    +
    Light:
    +
    rgb(202,214,254)
    +
    +
    +
    Dark:
    +
    rgb(26,41,93)
    @@ -11598,110 +2374,20 @@
    H150
    -
    - Light: -
    -
    - #e7edff -
    -
    -
    -
    - Dark: -
    -
    - #16234f -
    -
    -
    -
    - Light: -
    -
    - rgb(231,237,255) -
    -
    -
    -
    - Dark: -
    -
    - rgb(22,35,79) -
    +
    Light:
    +
    #e7edff
    +
    +
    +
    Dark:
    +
    #16234f
    +
    +
    +
    Light:
    +
    rgb(231,237,255)
    +
    +
    +
    Dark:
    +
    rgb(22,35,79)
    @@ -11711,110 +2397,20 @@
    H50
    -
    - Light: -
    -
    - #f6f8ff -
    -
    -
    -
    - Dark: -
    -
    - #111a32 -
    -
    -
    -
    - Light: -
    -
    - rgb(246,248,255) -
    -
    -
    -
    - Dark: -
    -
    - rgb(17,26,50) -
    +
    Light:
    +
    #f6f8ff
    +
    +
    +
    Dark:
    +
    #111a32
    +
    +
    +
    Light:
    +
    rgb(246,248,255)
    +
    +
    +
    Dark:
    +
    rgb(17,26,50)
    @@ -11824,110 +2420,20 @@
    1100
    -
    - Light: -
    -
    - #132045 -
    -
    -
    -
    - Dark: -
    -
    - #f0f4ff -
    -
    -
    -
    - Light: -
    -
    - rgb(19,32,69) -
    -
    -
    -
    - Dark: -
    -
    - rgb(240,244,255) -
    +
    Light:
    +
    #132045
    +
    +
    +
    Dark:
    +
    #f0f4ff
    +
    +
    +
    Light:
    +
    rgb(19,32,69)
    +
    +
    +
    Dark:
    +
    rgb(240,244,255)
    @@ -11937,110 +2443,20 @@
    1000
    -
    - Light: -
    -
    - #182556 -
    -
    -
    -
    - Dark: -
    -
    - #d9e2ff -
    -
    -
    -
    - Light: -
    -
    - rgb(24,37,86) -
    -
    -
    -
    - Dark: -
    -
    - rgb(217,226,255) -
    +
    Light:
    +
    #182556
    +
    +
    +
    Dark:
    +
    #d9e2ff
    +
    +
    +
    Light:
    +
    rgb(24,37,86)
    +
    +
    +
    Dark:
    +
    rgb(217,226,255)
    @@ -12050,110 +2466,20 @@
    900
    -
    - Light: -
    -
    - #1b2b62 -
    -
    -
    -
    - Dark: -
    -
    - #b4c4fd -
    -
    -
    -
    - Light: -
    -
    - rgb(27,43,98) -
    -
    -
    -
    - Dark: -
    -
    - rgb(180,196,253) -
    +
    Light:
    +
    #1b2b62
    +
    +
    +
    Dark:
    +
    #b4c4fd
    +
    +
    +
    Light:
    +
    rgb(27,43,98)
    +
    +
    +
    Dark:
    +
    rgb(180,196,253)
    @@ -12163,110 +2489,20 @@
    800
    -
    - Light: -
    -
    - #28408d -
    -
    -
    -
    - Dark: -
    -
    - #8da7fd -
    -
    -
    -
    - Light: -
    -
    - rgb(40,64,141) -
    -
    -
    -
    - Dark: -
    -
    - rgb(141,167,253) -
    +
    Light:
    +
    #28408d
    +
    +
    +
    Dark:
    +
    #8da7fd
    +
    +
    +
    Light:
    +
    rgb(40,64,141)
    +
    +
    +
    Dark:
    +
    rgb(141,167,253)
    @@ -12276,110 +2512,20 @@
    700
    -
    - Light: -
    -
    - #3555bd -
    -
    -
    -
    - Dark: -
    -
    - #6689fd -
    -
    -
    -
    - Light: -
    -
    - rgb(53,85,189) -
    -
    -
    -
    - Dark: -
    -
    - rgb(102,137,253) -
    +
    Light:
    +
    #3555bd
    +
    +
    +
    Dark:
    +
    #6689fd
    +
    +
    +
    Light:
    +
    rgb(53,85,189)
    +
    +
    +
    Dark:
    +
    rgb(102,137,253)
    @@ -12389,110 +2535,20 @@
    600
    -
    - Light: -
    -
    - #436cee -
    -
    -
    -
    - Dark: -
    -
    - #436cee -
    -
    -
    -
    - Light: -
    -
    - rgb(67,108,238) -
    -
    -
    -
    - Dark: -
    -
    - rgb(67,108,238) -
    +
    Light:
    +
    #436cee
    +
    +
    +
    Dark:
    +
    #436cee
    +
    +
    +
    Light:
    +
    rgb(67,108,238)
    +
    +
    +
    Dark:
    +
    rgb(67,108,238)
    @@ -12502,110 +2558,20 @@
    500
    -
    - Light: -
    -
    - #6689fd -
    -
    -
    -
    - Dark: -
    -
    - #3555bd -
    -
    -
    -
    - Light: -
    -
    - rgb(102,137,253) -
    -
    -
    -
    - Dark: -
    -
    - rgb(53,85,189) -
    +
    Light:
    +
    #6689fd
    +
    +
    +
    Dark:
    +
    #3555bd
    +
    +
    +
    Light:
    +
    rgb(102,137,253)
    +
    +
    +
    Dark:
    +
    rgb(53,85,189)
    @@ -12615,110 +2581,20 @@
    400
    -
    - Light: -
    -
    - #8da7fd -
    -
    -
    -
    - Dark: -
    -
    - #28408d -
    -
    -
    -
    - Light: -
    -
    - rgb(141,167,253) -
    -
    -
    -
    - Dark: -
    -
    - rgb(40,64,141) -
    +
    Light:
    +
    #8da7fd
    +
    +
    +
    Dark:
    +
    #28408d
    +
    +
    +
    Light:
    +
    rgb(141,167,253)
    +
    +
    +
    Dark:
    +
    rgb(40,64,141)
    @@ -12728,110 +2604,20 @@
    300
    -
    - Light: -
    -
    - #b4c4fd -
    -
    -
    -
    - Dark: -
    -
    - #1b2b62 -
    -
    -
    -
    - Light: -
    -
    - rgb(180,196,253) -
    -
    -
    -
    - Dark: -
    -
    - rgb(27,43,98) -
    +
    Light:
    +
    #b4c4fd
    +
    +
    +
    Dark:
    +
    #1b2b62
    +
    +
    +
    Light:
    +
    rgb(180,196,253)
    +
    +
    +
    Dark:
    +
    rgb(27,43,98)
    @@ -12841,110 +2627,20 @@
    200
    -
    - Light: -
    -
    - #d9e2ff -
    -
    -
    -
    - Dark: -
    -
    - #182556 -
    -
    -
    -
    - Light: -
    -
    - rgb(217,226,255) -
    -
    -
    -
    - Dark: -
    -
    - rgb(24,37,86) -
    +
    Light:
    +
    #d9e2ff
    +
    +
    +
    Dark:
    +
    #182556
    +
    +
    +
    Light:
    +
    rgb(217,226,255)
    +
    +
    +
    Dark:
    +
    rgb(24,37,86)
    @@ -12954,127 +2650,26 @@
    100
    -
    - Light: -
    -
    - #f0f4ff -
    -
    -
    -
    - Dark: -
    -
    - #132045 -
    -
    -
    -
    - Light: -
    -
    - rgb(240,244,255) -
    -
    -
    -
    - Dark: -
    -
    - rgb(19,32,69) -
    +
    Light:
    +
    #f0f4ff
    +
    +
    +
    Dark:
    +
    #132045
    +
    +
    +
    Light:
    +
    rgb(240,244,255)
    +
    +
    +
    Dark:
    +
    rgb(19,32,69)
    -
    - Gray -
    +
    Gray
    @@ -13083,110 +2678,20 @@
    H1150
    -
    - Light: -
    -
    - #181b22 -
    -
    -
    -
    - Dark: -
    -
    - #f8f8f9 -
    -
    -
    -
    - Light: -
    -
    - rgb(24,27,34) -
    -
    -
    -
    - Dark: -
    -
    - rgb(248,248,249) -
    +
    Light:
    +
    #181b22
    +
    +
    +
    Dark:
    +
    #f8f8f9
    +
    +
    +
    Light:
    +
    rgb(24,27,34)
    +
    +
    +
    Dark:
    +
    rgb(248,248,249)
    @@ -13196,110 +2701,20 @@
    H1050
    -
    - Light: -
    -
    - #222731 -
    -
    -
    -
    - Dark: -
    -
    - #ebedef -
    -
    -
    -
    - Light: -
    -
    - rgb(34,39,49) -
    -
    -
    -
    - Dark: -
    -
    - rgb(235,237,239) -
    +
    Light:
    +
    #222731
    +
    +
    +
    Dark:
    +
    #ebedef
    +
    +
    +
    Light:
    +
    rgb(34,39,49)
    +
    +
    +
    Dark:
    +
    rgb(235,237,239)
    @@ -13309,110 +2724,20 @@
    H950
    -
    - Light: -
    -
    - #292e3a -
    -
    -
    -
    - Dark: -
    -
    - #d4d8dd -
    -
    -
    -
    - Light: -
    -
    - rgb(41,46,58) -
    -
    -
    -
    - Dark: -
    -
    - rgb(212,216,221) -
    +
    Light:
    +
    #292e3a
    +
    +
    +
    Dark:
    +
    #d4d8dd
    +
    +
    +
    Light:
    +
    rgb(41,46,58)
    +
    +
    +
    Dark:
    +
    rgb(212,216,221)
    @@ -13422,110 +2747,20 @@
    H850
    -
    - Light: -
    -
    - #373e4e -
    -
    -
    -
    - Dark: -
    -
    - #b7bcc6 -
    -
    -
    -
    - Light: -
    -
    - rgb(55,62,78) -
    -
    -
    -
    - Dark: -
    -
    - rgb(183,188,198) -
    +
    Light:
    +
    #373e4e
    +
    +
    +
    Dark:
    +
    #b7bcc6
    +
    +
    +
    Light:
    +
    rgb(55,62,78)
    +
    +
    +
    Dark:
    +
    rgb(183,188,198)
    @@ -13535,110 +2770,20 @@
    H750
    -
    - Light: -
    -
    - #4c556b -
    -
    -
    -
    - Dark: -
    -
    - #9ba1af -
    -
    -
    -
    - Light: -
    -
    - rgb(76,85,107) -
    -
    -
    -
    - Dark: -
    -
    - rgb(155,161,175) -
    +
    Light:
    +
    #4c556b
    +
    +
    +
    Dark:
    +
    #9ba1af
    +
    +
    +
    Light:
    +
    rgb(76,85,107)
    +
    +
    +
    Dark:
    +
    rgb(155,161,175)
    @@ -13648,110 +2793,20 @@
    H650
    -
    - Light: -
    -
    - #646d84 -
    -
    -
    -
    - Dark: -
    -
    - #7e8799 -
    -
    -
    -
    - Light: -
    -
    - rgb(100,109,132) -
    -
    -
    -
    - Dark: -
    -
    - rgb(126,135,153) -
    +
    Light:
    +
    #646d84
    +
    +
    +
    Dark:
    +
    #7e8799
    +
    +
    +
    Light:
    +
    rgb(100,109,132)
    +
    +
    +
    Dark:
    +
    rgb(126,135,153)
    @@ -13761,110 +2816,20 @@
    H550
    -
    - Light: -
    -
    - #7e8799 -
    -
    -
    -
    - Dark: -
    -
    - #646d84 -
    -
    -
    -
    - Light: -
    -
    - rgb(126,135,153) -
    -
    -
    -
    - Dark: -
    -
    - rgb(100,109,132) -
    +
    Light:
    +
    #7e8799
    +
    +
    +
    Dark:
    +
    #646d84
    +
    +
    +
    Light:
    +
    rgb(126,135,153)
    +
    +
    +
    Dark:
    +
    rgb(100,109,132)
    @@ -13874,110 +2839,20 @@
    H450
    -
    - Light: -
    -
    - #9ba1af -
    -
    -
    -
    - Dark: -
    -
    - #4c556b -
    -
    -
    -
    - Light: -
    -
    - rgb(155,161,175) -
    -
    -
    -
    - Dark: -
    -
    - rgb(76,85,107) -
    +
    Light:
    +
    #9ba1af
    +
    +
    +
    Dark:
    +
    #4c556b
    +
    +
    +
    Light:
    +
    rgb(155,161,175)
    +
    +
    +
    Dark:
    +
    rgb(76,85,107)
    @@ -13987,110 +2862,20 @@
    H350
    -
    - Light: -
    -
    - #b7bcc6 -
    -
    -
    -
    - Dark: -
    -
    - #373e4e -
    -
    -
    -
    - Light: -
    -
    - rgb(183,188,198) -
    -
    -
    -
    - Dark: -
    -
    - rgb(55,62,78) -
    +
    Light:
    +
    #b7bcc6
    +
    +
    +
    Dark:
    +
    #373e4e
    +
    +
    +
    Light:
    +
    rgb(183,188,198)
    +
    +
    +
    Dark:
    +
    rgb(55,62,78)
    @@ -14100,110 +2885,20 @@
    H250
    -
    - Light: -
    -
    - #d4d8dd -
    -
    -
    -
    - Dark: -
    -
    - #292e3a -
    -
    -
    -
    - Light: -
    -
    - rgb(212,216,221) -
    -
    -
    -
    - Dark: -
    -
    - rgb(41,46,58) -
    +
    Light:
    +
    #d4d8dd
    +
    +
    +
    Dark:
    +
    #292e3a
    +
    +
    +
    Light:
    +
    rgb(212,216,221)
    +
    +
    +
    Dark:
    +
    rgb(41,46,58)
    @@ -14213,110 +2908,20 @@
    H150
    -
    - Light: -
    -
    - #ebedef -
    -
    -
    -
    - Dark: -
    -
    - #222731 -
    -
    -
    -
    - Light: -
    -
    - rgb(235,237,239) -
    -
    -
    -
    - Dark: -
    -
    - rgb(34,39,49) -
    +
    Light:
    +
    #ebedef
    +
    +
    +
    Dark:
    +
    #222731
    +
    +
    +
    Light:
    +
    rgb(235,237,239)
    +
    +
    +
    Dark:
    +
    rgb(34,39,49)
    @@ -14326,110 +2931,20 @@
    H50
    -
    - Light: -
    -
    - #f8f8f9 -
    -
    -
    -
    - Dark: -
    -
    - #181b22 -
    -
    -
    -
    - Light: -
    -
    - rgb(248,248,249) -
    -
    -
    -
    - Dark: -
    -
    - rgb(24,27,34) -
    +
    Light:
    +
    #f8f8f9
    +
    +
    +
    Dark:
    +
    #181b22
    +
    +
    +
    Light:
    +
    rgb(248,248,249)
    +
    +
    +
    Dark:
    +
    rgb(24,27,34)
    @@ -14439,110 +2954,20 @@
    1100
    -
    - Light: -
    -
    - #1e222a -
    -
    -
    -
    - Dark: -
    -
    - #f3f4f5 -
    -
    -
    -
    - Light: -
    -
    - rgb(30,34,42) -
    -
    -
    -
    - Dark: -
    -
    - rgb(243,244,245) -
    +
    Light:
    +
    #1e222a
    +
    +
    +
    Dark:
    +
    #f3f4f5
    +
    +
    +
    Light:
    +
    rgb(30,34,42)
    +
    +
    +
    Dark:
    +
    rgb(243,244,245)
    @@ -14552,110 +2977,20 @@
    1000
    -
    - Light: -
    -
    - #252a35 -
    -
    -
    -
    - Dark: -
    -
    - #e0e3e7 -
    -
    -
    -
    - Light: -
    -
    - rgb(37,42,53) -
    -
    -
    -
    - Dark: -
    -
    - rgb(224,227,231) -
    +
    Light:
    +
    #252a35
    +
    +
    +
    Dark:
    +
    #e0e3e7
    +
    +
    +
    Light:
    +
    rgb(37,42,53)
    +
    +
    +
    Dark:
    +
    rgb(224,227,231)
    @@ -14665,110 +3000,20 @@
    900
    -
    - Light: -
    -
    - #2c313d -
    -
    -
    -
    - Dark: -
    -
    - #c3c7cf -
    -
    -
    -
    - Light: -
    -
    - rgb(44,49,61) -
    -
    -
    -
    - Dark: -
    -
    - rgb(195,199,207) -
    +
    Light:
    +
    #2c313d
    +
    +
    +
    Dark:
    +
    #c3c7cf
    +
    +
    +
    Light:
    +
    rgb(44,49,61)
    +
    +
    +
    Dark:
    +
    rgb(195,199,207)
    @@ -14778,110 +3023,20 @@
    800
    -
    - Light: -
    -
    - #3f4759 -
    -
    -
    -
    - Dark: -
    -
    - #a7acb8 -
    -
    -
    -
    - Light: -
    -
    - rgb(63,71,89) -
    -
    -
    -
    - Dark: -
    -
    - rgb(167,172,184) -
    +
    Light:
    +
    #3f4759
    +
    +
    +
    Dark:
    +
    #a7acb8
    +
    +
    +
    Light:
    +
    rgb(63,71,89)
    +
    +
    +
    Dark:
    +
    rgb(167,172,184)
    @@ -14891,110 +3046,20 @@
    700
    -
    - Light: -
    -
    - #545f77 -
    -
    -
    -
    - Dark: -
    -
    - #8a91a2 -
    -
    -
    -
    - Light: -
    -
    - rgb(84,95,119) -
    -
    -
    -
    - Dark: -
    -
    - rgb(138,145,162) -
    +
    Light:
    +
    #545f77
    +
    +
    +
    Dark:
    +
    #8a91a2
    +
    +
    +
    Light:
    +
    rgb(84,95,119)
    +
    +
    +
    Dark:
    +
    rgb(138,145,162)
    @@ -15004,110 +3069,20 @@
    600
    -
    - Light: -
    -
    - #6e778c -
    -
    -
    -
    - Dark: -
    -
    - #6e778c -
    -
    -
    -
    - Light: -
    -
    - rgb(110,119,140) -
    -
    -
    -
    - Dark: -
    -
    - rgb(110,119,140) -
    +
    Light:
    +
    #6e778c
    +
    +
    +
    Dark:
    +
    #6e778c
    +
    +
    +
    Light:
    +
    rgb(110,119,140)
    +
    +
    +
    Dark:
    +
    rgb(110,119,140)
    @@ -15117,110 +3092,20 @@
    500
    -
    - Light: -
    -
    - #8a91a2 -
    -
    -
    -
    - Dark: -
    -
    - #545f77 -
    -
    -
    -
    - Light: -
    -
    - rgb(138,145,162) -
    -
    -
    -
    - Dark: -
    -
    - rgb(84,95,119) -
    +
    Light:
    +
    #8a91a2
    +
    +
    +
    Dark:
    +
    #545f77
    +
    +
    +
    Light:
    +
    rgb(138,145,162)
    +
    +
    +
    Dark:
    +
    rgb(84,95,119)
    @@ -15230,110 +3115,20 @@
    400
    -
    - Light: -
    -
    - #a7acb8 -
    -
    -
    -
    - Dark: -
    -
    - #3f4759 -
    -
    -
    -
    - Light: -
    -
    - rgb(167,172,184) -
    -
    -
    -
    - Dark: -
    -
    - rgb(63,71,89) -
    +
    Light:
    +
    #a7acb8
    +
    +
    +
    Dark:
    +
    #3f4759
    +
    +
    +
    Light:
    +
    rgb(167,172,184)
    +
    +
    +
    Dark:
    +
    rgb(63,71,89)
    @@ -15343,110 +3138,20 @@
    300
    -
    - Light: -
    -
    - #c3c7cf -
    -
    -
    -
    - Dark: -
    -
    - #2c313d -
    -
    -
    -
    - Light: -
    -
    - rgb(195,199,207) -
    -
    -
    -
    - Dark: -
    -
    - rgb(44,49,61) -
    +
    Light:
    +
    #c3c7cf
    +
    +
    +
    Dark:
    +
    #2c313d
    +
    +
    +
    Light:
    +
    rgb(195,199,207)
    +
    +
    +
    Dark:
    +
    rgb(44,49,61)
    @@ -15456,110 +3161,20 @@
    200
    -
    - Light: -
    -
    - #e0e3e7 -
    -
    -
    -
    - Dark: -
    -
    - #252a35 -
    -
    -
    -
    - Light: -
    -
    - rgb(224,227,231) -
    -
    -
    -
    - Dark: -
    -
    - rgb(37,42,53) -
    +
    Light:
    +
    #e0e3e7
    +
    +
    +
    Dark:
    +
    #252a35
    +
    +
    +
    Light:
    +
    rgb(224,227,231)
    +
    +
    +
    Dark:
    +
    rgb(37,42,53)
    @@ -15569,110 +3184,20 @@
    100
    -
    - Light: -
    -
    - #f3f4f5 -
    -
    -
    -
    - Dark: -
    -
    - #1e222a -
    -
    -
    -
    - Light: -
    -
    - rgb(243,244,245) -
    -
    -
    -
    - Dark: -
    -
    - rgb(30,34,42) -
    +
    Light:
    +
    #f3f4f5
    +
    +
    +
    Dark:
    +
    #1e222a
    +
    +
    +
    Light:
    +
    rgb(243,244,245)
    +
    +
    +
    Dark:
    +
    rgb(30,34,42)
    @@ -15686,110 +3211,20 @@
    1200
    -
    - Light: -
    -
    - #0f1115 -
    -
    -
    -
    - Dark: -
    -
    - #ffffff -
    -
    -
    -
    - Light: -
    -
    - rgb(15,17,21) -
    -
    -
    -
    - Dark: -
    -
    - rgb(255,255,255) -
    +
    Light:
    +
    #0f1115
    +
    +
    +
    Dark:
    +
    #ffffff
    +
    +
    +
    Light:
    +
    rgb(15,17,21)
    +
    +
    +
    Dark:
    +
    rgb(255,255,255)
    @@ -15799,110 +3234,20 @@
    0
    -
    - Light: -
    -
    - #ffffff -
    -
    -
    -
    - Dark: -
    -
    - #0f1115 -
    -
    -
    -
    - Light: -
    -
    - rgb(255,255,255) -
    -
    -
    -
    - Dark: -
    -
    - rgb(15,17,21) -
    +
    Light:
    +
    #ffffff
    +
    +
    +
    Dark:
    +
    #0f1115
    +
    +
    +
    Light:
    +
    rgb(255,255,255)
    +
    +
    +
    Dark:
    +
    rgb(15,17,21)
    diff --git a/apps/doc/src/app/guidelines/colors/components/theme-colors/theme-colors.component.css b/apps/doc/src/app/guidelines/colors/components/theme-colors/theme-colors.component.css index cb713ae3b9..7f32a4d586 100644 --- a/apps/doc/src/app/guidelines/colors/components/theme-colors/theme-colors.component.css +++ b/apps/doc/src/app/guidelines/colors/components/theme-colors/theme-colors.component.css @@ -74,3 +74,21 @@ line-height: 20px; word-wrap: break-word; } + +.description-text-header { + color: var(--prizm-v3-text-icon-primary); + font-size: 16px; + font-family: Inter; + font-weight: 400; + line-height: 20px; + word-wrap: break-word; +} + +.description-text { + flex: 1 1 0; + color: var(--prizm-v3-text-icon-secondary); + font-size: 16px; + font-family: Inter; + font-weight: 500; + line-height: 20px; +} diff --git a/apps/doc/src/app/guidelines/colors/components/theme-colors/theme-colors.component.html b/apps/doc/src/app/guidelines/colors/components/theme-colors/theme-colors.component.html index c252e381ca..9a759073ec 100644 --- a/apps/doc/src/app/guidelines/colors/components/theme-colors/theme-colors.component.html +++ b/apps/doc/src/app/guidelines/colors/components/theme-colors/theme-colors.component.html @@ -9,14 +9,14 @@
    Disable
    Light:
    -
    alias: Gray/100
    +
    alias: Gray/100
    Dark:
    -
    alias: Gray/300
    +
    alias: Gray/300
    -
    Token: --prizm-v3-button-disable
    +
    Token: --prizm-v3-button-disable
    @@ -27,14 +27,14 @@
    Ghost-Hover
    Light:
    -
    alias: Gray/H150
    +
    alias: Gray/H150
    Dark:
    350
    -
    Token: --prizm-v3-button-ghost-hover
    +
    Token: --prizm-v3-button-ghost-hover
    @@ -45,14 +45,14 @@
    Alarm-Ghost-Active
    Light:
    -
    alias: Red/200
    +
    alias: Red/200
    Dark:
    -
    alias: Red/400
    +
    alias: Red/400
    -
    Token: --prizm-v3-button-alarm-ghost-active
    +
    Token: --prizm-v3-button-alarm-ghost-active
    @@ -63,14 +63,14 @@
    Alarm-Solid-Active
    Light:
    -
    alias: Red/700
    +
    alias: Red/700
    Dark:
    -
    alias: Red/700
    +
    alias: Red/700
    -
    Token: -prizm-v3-button-alarm-solid-active
    +
    Token: -prizm-v3-button-alarm-solid-active
    @@ -81,14 +81,14 @@
    Alarm-Solid-Hover
    Light:
    -
    alias: Red/H650
    +
    alias: Red/H650
    Dark:
    -
    alias: Red/H650
    +
    alias: Red/H650
    -
    Token: -prizm-v3-button-alarm-solid-hover
    +
    Token: -prizm-v3-button-alarm-solid-hover
    @@ -99,14 +99,14 @@
    Alarm-Solid-Default
    Light:
    -
    alias: Red/600
    +
    alias: Red/600
    Dark:
    -
    alias: Red/600
    +
    alias: Red/600
    -
    Token: -prizm-v3-button-alarm-solid-default
    +
    Token: -prizm-v3-button-alarm-solid-default
    @@ -117,14 +117,14 @@
    Warning-Ghost-Active
    Light:
    -
    alias: Orange/200
    +
    alias: Orange/200
    Dark:
    -
    alias: Orange/400
    +
    alias: Orange/400
    -
    Token: --prizm-v3-button-warning-ghost-active
    +
    Token: --prizm-v3-button-warning-ghost-active
    @@ -135,14 +135,14 @@
    Warning-Solid-Active
    Light:
    -
    alias: Orange/500
    +
    alias: Orange/500
    Dark:
    -
    alias: Orange/900
    +
    alias: Orange/900
    -
    Token: --prizm-v3-button-warning-solid-active
    +
    Token: --prizm-v3-button-warning-solid-active
    @@ -153,14 +153,14 @@
    Warning-Solid-Hover
    Light:
    -
    alias: Orange/H450
    +
    alias: Orange/H450
    Dark:
    -
    alias: Orange/H850
    +
    alias: Orange/H850
    -
    Token: --prizm-v3-button-warning-solid-hover
    +
    Token: --prizm-v3-button-warning-solid-hover
    @@ -171,14 +171,14 @@
    Warning-Solid-Default
    Light:
    -
    alias: Orange/400
    +
    alias: Orange/400
    Dark:
    -
    alias: Orange/800
    +
    alias: Orange/800
    -
    Token: --prizm-v3-button-warning-solid-default
    +
    Token: --prizm-v3-button-warning-solid-default
    @@ -189,14 +189,14 @@
    Success-Ghost-Active
    Light:
    -
    alias: Green/200
    +
    alias: Green/200
    Dark:
    -
    alias: Green/400
    +
    alias: Green/400
    -
    Token: --prizm-v3-button-success-ghost-active
    +
    Token: --prizm-v3-button-success-ghost-active
    @@ -207,14 +207,14 @@
    Success-Solid-Active
    Light:
    -
    alias: Green/700
    +
    alias: Green/700
    Dark:
    -
    alias: Green/700
    +
    alias: Green/700
    -
    Token: --prizm-v3-button-success-solid-active
    +
    Token: --prizm-v3-button-success-solid-active
    @@ -225,14 +225,14 @@
    Success-Solid-Hover
    Light:
    -
    alias: Green/H650
    +
    alias: Green/H650
    Dark:
    -
    alias: Green/H650
    +
    alias: Green/H650
    -
    Token: --prizm-v3-button-success-solid-hover
    +
    Token: --prizm-v3-button-success-solid-hover
    @@ -243,14 +243,14 @@
    Success-Solid-Default
    Light:
    -
    alias: Green/600
    +
    alias: Green/600
    Dark:
    -
    alias: Green/600
    +
    alias: Green/600
    -
    Token: --prizm-v3-button-success-solid-default
    +
    Token: --prizm-v3-button-success-solid-default
    @@ -261,14 +261,14 @@
    Secondary-Ghost-Active
    Light:
    -
    alias: Gray/200
    +
    alias: Gray/200
    Dark:
    -
    alias: Gray/400
    +
    alias: Gray/400
    -
    Token: --prizm-v3-button-secondary-ghost-active
    +
    Token: --prizm-v3-button-secondary-ghost-active
    @@ -279,14 +279,14 @@
    Secondary-Solid-Active
    Light:
    -
    alias: Gray/700
    +
    alias: Gray/700
    Dark:
    -
    alias: Gray/700
    +
    alias: Gray/700
    -
    Token: --prizm-v3-button-secondary-solid-active
    +
    Token: --prizm-v3-button-secondary-solid-active
    @@ -297,14 +297,14 @@
    Secondary-Solid-Hover
    Light:
    -
    alias: Gray/H650
    +
    alias: Gray/H650
    Dark:
    -
    alias: Gray/H650
    +
    alias: Gray/H650
    -
    Token: --prizm-v3-button-secondary-solid-hover
    +
    Token: --prizm-v3-button-secondary-solid-hover
    @@ -315,14 +315,14 @@
    Secondary-Solid-Default
    Light:
    -
    alias: Gray/600
    +
    alias: Gray/600
    Dark:
    -
    alias: Gray/600
    +
    alias: Gray/600
    -
    Token: --prizm-v3-button-secondary-solid-default
    +
    Token: --prizm-v3-button-secondary-solid-default
    @@ -333,14 +333,14 @@
    Primary-Ghost-Active
    Light:
    -
    alias: Blue/200
    +
    alias: Blue/200
    Dark:
    -
    alias: Blue/400
    +
    alias: Blue/400
    -
    Token: --prizm-v3-button-primary-ghost-active
    +
    Token: --prizm-v3-button-primary-ghost-active
    @@ -351,14 +351,14 @@
    Primary-Solid-Active
    Light:
    -
    alias: Blue/700
    +
    alias: Blue/700
    Dark:
    -
    alias: Blue/700
    +
    alias: Blue/700
    -
    Token: --prizm-v3-button-primary-solid-active
    +
    Token: --prizm-v3-button-primary-solid-active
    @@ -369,14 +369,14 @@
    Primary-Solid-Hover
    Light:
    -
    alias: Blue/H650
    +
    alias: Blue/H650
    Dark:
    -
    alias: Blue/H650
    +
    alias: Blue/H650
    -
    Token: --prizm-v3-button-primary-solid-hover
    +
    Token: --prizm-v3-button-primary-solid-hover
    @@ -387,14 +387,14 @@
    Primary-Solid-Default
    Light:
    -
    alias: Blue/600
    +
    alias: Blue/600
    Dark:
    -
    alias: Blue/600
    +
    alias: Blue/600
    -
    Token: --prizm-v3-button-primary-solid-default
    +
    Token: --prizm-v3-button-primary-solid-default
    @@ -410,14 +410,14 @@
    Active-Disable
    Light:
    -
    alias: Blue/400
    +
    alias: Blue/400
    Dark:
    -
    alias: Blue/400
    +
    alias: Blue/400
    -
    Token: --prizm-v3-form-active-disable
    +
    Token: --prizm-v3-form-active-disable
    @@ -428,14 +428,14 @@
    Active-Hover
    Light:
    -
    alias: Blue/H650
    +
    alias: Blue/H650
    Dark:
    -
    alias: Blue/H650
    +
    alias: Blue/H650
    -
    Token: --prizm-v3-form-active-hover
    +
    Token: --prizm-v3-form-active-hover
    @@ -446,14 +446,14 @@
    Active
    Light:
    -
    alias: Blue/600
    +
    alias: Blue/600
    Dark:
    -
    alias: Blue/600
    +
    alias: Blue/600
    -
    Token: --prizm-v3-form-active
    +
    Token: --prizm-v3-form-active
    @@ -464,14 +464,14 @@
    Stroke-Disable
    Light:
    -
    alias: Gray/100
    +
    alias: Gray/100
    Dark:
    -
    alias: 1200
    +
    alias: 1200
    -
    Token: --prizm-v3-form-stroke-disable
    +
    Token: --prizm-v3-form-stroke-disable
    @@ -482,14 +482,14 @@
    Stroke-Hover
    Light:
    -
    alias: Gray/H450
    +
    alias: Gray/H450
    Dark:
    -
    alias: Gray/H650
    +
    alias: Gray/H650
    -
    Token: --prizm-v3-form-stroke-hover
    +
    Token: --prizm-v3-form-stroke-hover
    @@ -500,14 +500,14 @@
    Stroke-Default
    Light:
    -
    alias: Gray/300
    +
    alias: Gray/300
    Dark:
    -
    alias: Gray/500
    +
    alias: Gray/500
    -
    Token: --prizm-v3-form-stroke-default
    +
    Token: --prizm-v3-form-stroke-default
    @@ -518,14 +518,14 @@
    Fill-Disable
    Light:
    -
    alias: Gray/100
    +
    alias: Gray/100
    Dark:
    -
    alias: 0
    +
    alias: 0
    -
    Token: --prizm-v3-form-fill-disable
    +
    Token: --prizm-v3-form-fill-disable
    @@ -536,14 +536,14 @@
    Fill-Default
    Light:
    -
    alias: Gray/100
    +
    alias: Gray/100
    Dark:
    -
    alias: 0
    +
    alias: 0
    -
    Token: --prizm-v3-form-fill-default
    +
    Token: --prizm-v3-form-fill-default
    @@ -565,84 +565,22 @@
    Fill-Blanket
    Light:
    -
    - #0f111580 -
    +
    #0f111580
    Dark:
    -
    - #0f111580 -
    +
    #0f111580
    -
    Token: --prizm-v3-background-fill-blanket
    +
    Token: --prizm-v3-background-fill-blanket
    -
    +
    Light:
    -
    - rgba(15,17,21,0.5) -
    -
    -
    +
    rgba(15,17,21,0.5)
    +
    +
    Dark:
    -
    - rgba(15,17,21,0.5) -
    +
    rgba(15,17,21,0.5)
    @@ -653,14 +591,14 @@
    Fill-Overlay
    Light:
    -
    alias: 0
    +
    alias: 0
    Dark:
    -
    alias: Gray/200
    +
    alias: Gray/200
    -
    Token: --prizm-v3-background-fill-overlay
    +
    Token: --prizm-v3-background-fill-overlay
    @@ -671,14 +609,14 @@
    Fill-Panel
    Light:
    -
    alias: 0
    +
    alias: 0
    Dark:
    -
    alias: Gray/300
    +
    alias: Gray/300
    -
    Token: --prizm-v3-background-fill-panel
    +
    Token: --prizm-v3-background-fill-panel
    @@ -689,14 +627,14 @@
    Stroke-Focus
    Light:
    -
    alias: Blue/400
    +
    alias: Blue/400
    Dark:
    -
    alias: Blue/800
    +
    alias: Blue/800
    -
    Token: --prizm-v3-background-stroke-focus
    +
    Token: --prizm-v3-background-stroke-focus
    @@ -707,14 +645,14 @@
    Stroke
    Light:
    -
    alias: Gray/200
    +
    alias: Gray/200
    Dark:
    -
    alias: Gray/400
    +
    alias: Gray/400
    -
    Token: --prizm-v3-background-stroke
    +
    Token: --prizm-v3-background-stroke
    @@ -725,14 +663,14 @@
    Fill-Revers
    Light:
    -
    alias: Gray/1100
    +
    alias: Gray/1100
    Dark:
    -
    alias: Gray/100
    +
    alias: Gray/100
    -
    Token: --prizm-v3-background-fill-reverse
    +
    Token: --prizm-v3-background-fill-reverse
    @@ -743,14 +681,14 @@
    Fill-Secondary
    Light:
    -
    alias: Gray/100
    +
    alias: Gray/100
    Dark:
    -
    alias: 1200
    +
    alias: 1200
    -
    Token: --prizm-v3-background-fill-secondary
    +
    Token: --prizm-v3-background-fill-secondary
    @@ -761,14 +699,14 @@
    Fill-Primary
    Light:
    -
    alias: 0
    +
    alias: 0
    Dark:
    -
    alias: Gray/100
    +
    alias: Gray/100
    -
    Token: --prizm-v3-background-fill-primary
    +
    Token: --prizm-v3-background-fill-primary
    @@ -784,14 +722,14 @@
    Link-Visited
    Light:
    -
    alias: Blue/400
    +
    alias: Blue/400
    Dark:
    -
    alias: Blue/500
    +
    alias: Blue/500
    -
    Token: --prizm-v3-text-icon-link-visited
    +
    Token: --prizm-v3-text-icon-link-visited
    @@ -802,14 +740,14 @@
    Link-Hover
    Light:
    -
    alias: Blue/H650
    +
    alias: Blue/H650
    Dark:
    -
    alias: Blue/H750
    +
    alias: Blue/H750
    -
    Token: --prizm-v3-text-icon-link-hover
    +
    Token: --prizm-v3-text-icon-link-hover
    @@ -820,14 +758,14 @@
    Exception
    Light:
    -
    alias: 0
    +
    alias: 0
    Dark:
    -
    alias: 1200
    +
    alias: 1200
    -
    Token: --prizm-v3-text-icon-exception
    +
    Token: --prizm-v3-text-icon-exception
    @@ -838,14 +776,14 @@
    Revers
    Light:
    -
    alias: 0
    +
    alias: 0
    Dark:
    -
    alias: 0
    +
    alias: 0
    -
    Token: --prizm-v3-text-icon-reverse
    +
    Token: --prizm-v3-text-icon-reverse
    @@ -856,14 +794,14 @@
    Link
    Light:
    -
    alias: Blue/600
    +
    alias: Blue/600
    Dark:
    -
    alias: Blue/700
    +
    alias: Blue/700
    -
    Token: --prizm-v3-text-icon-link
    +
    Token: --prizm-v3-text-icon-link
    @@ -874,14 +812,14 @@
    Disable
    Light:
    -
    alias: Gray/400
    +
    alias: Gray/400
    Dark:
    -
    alias: Gray/500
    +
    alias: Gray/500
    -
    Token: --prizm-v3-text-icon-disable
    +
    Token: --prizm-v3-text-icon-disable
    @@ -892,14 +830,14 @@
    Tertiary
    Light:
    -
    alias: Gray/600
    +
    alias: Gray/600
    Dark:
    -
    alias: Gray/600
    +
    alias: Gray/600
    -
    Token: --prizm-v3-text-icon-tertiary
    +
    Token: --prizm-v3-text-icon-tertiary
    @@ -910,14 +848,14 @@
    Secondary
    Light:
    -
    alias: Gray/800
    +
    alias: Gray/800
    Dark:
    -
    alias: Gray/800
    +
    alias: Gray/800
    -
    Token: --prizm-v3-text-icon-secondary
    +
    Token: --prizm-v3-text-icon-secondary
    @@ -928,14 +866,14 @@
    Primary
    Light:
    -
    alias: 1200
    +
    alias: 1200
    Dark:
    -
    alias: 1200
    +
    alias: 1200
    -
    Token: --prizm-v3-text-icon-primary
    +
    Token: --prizm-v3-text-icon-primary
    @@ -951,14 +889,14 @@
    Stroke-Cell-Hover
    Light:
    -
    alias: Gray/H450
    +
    alias: Gray/H450
    Dark:
    -
    alias: Gray/H650
    +
    alias: Gray/H650
    -
    Token: --prizm-v3-table-stroke-cell-hover
    +
    Token: --prizm-v3-table-stroke-cell-hover
    @@ -969,14 +907,14 @@
    Fill-Row-Active
    Light:
    -
    alias: Blue/200
    +
    alias: Blue/200
    Dark:
    -
    alias: Blue/400
    +
    alias: Blue/400
    -
    Token: --prizm-v3-table-fill-row-active
    +
    Token: --prizm-v3-table-fill-row-active
    @@ -987,14 +925,14 @@
    Fill-Row-Hover
    Light:
    -
    alias: Gray/H150
    +
    alias: Gray/H150
    Dark:
    -
    alias: Gray/H250
    +
    alias: Gray/H250
    -
    Token: --prizm-v3-table-fill-row-hover
    +
    Token: --prizm-v3-table-fill-row-hover
    @@ -1005,14 +943,14 @@
    Fill-Header-Hover
    Light:
    -
    alias: Gray/H150
    +
    alias: Gray/H150
    Dark:
    -
    alias: Gray/H250
    +
    alias: Gray/H250
    -
    Token: --prizm-v3-table-fill-header-hover
    +
    Token: --prizm-v3-table-fill-header-hover
    @@ -1023,14 +961,14 @@
    Stroke-Cell-Active
    Light:
    -
    alias: Blue/600
    +
    alias: Blue/600
    Dark:
    -
    alias: Blue/600
    +
    alias: Blue/600
    -
    Token: --prizm-v3-table-stroke-cell-active
    +
    Token: --prizm-v3-table-stroke-cell-active
    @@ -1041,14 +979,14 @@
    Fill-Cell-Disable
    Light:
    -
    alias: Gray/200
    +
    alias: Gray/200
    Dark:
    -
    alias: Gray/300
    +
    alias: Gray/300
    -
    Token: --prizm-v3-table-fill-cell-disable
    +
    Token: --prizm-v3-table-fill-cell-disable
    @@ -1059,14 +997,14 @@
    Stroke-Cell-Default
    Light:
    -
    alias: Gray/200
    +
    alias: Gray/200
    Dark:
    -
    alias: Gray/400
    +
    alias: Gray/400
    -
    Token: --prizm-v3-table-stroke-cell-default
    +
    Token: --prizm-v3-table-stroke-cell-default
    @@ -1077,14 +1015,14 @@
    Fill-Header-Default
    Light:
    -
    alias: Gray/100
    +
    alias: Gray/100
    Dark:
    -
    alias: Gray/200
    +
    alias: Gray/200
    -
    Token: --prizm-v3-table-fill-header-default
    +
    Token: --prizm-v3-table-fill-header-default
    @@ -1095,14 +1033,14 @@
    Fill-Row-Zebra_Default
    Light:
    -
    alias: Gray/100
    +
    alias: Gray/100
    Dark:
    -
    alias: Gray/200
    +
    alias: Gray/200
    -
    Token: --prizm-v3-table-fill-row-zebra_default
    +
    Token: --prizm-v3-table-fill-row-zebra_default
    @@ -1118,14 +1056,14 @@
    Alarm-Secondary-Hover
    Light:
    -
    alias: Red/H250
    +
    alias: Red/H250
    Dark:
    -
    alias: Red/H350
    +
    alias: Red/H350
    -
    Token: --prizm-v3-status-alarm-secondary-hover
    +
    Token: --prizm-v3-status-alarm-secondary-hover
    @@ -1136,14 +1074,14 @@
    Alarm-Primary-Hover
    Light:
    -
    alias: Red/H650
    +
    alias: Red/H650
    Dark:
    -
    alias: Red/H650
    +
    alias: Red/H650
    -
    Token: --prizm-v3-status-alarm-primary-hover
    +
    Token: --prizm-v3-status-alarm-primary-hover
    @@ -1154,14 +1092,14 @@
    Warning-Secondary-Hover
    Light:
    -
    alias: Orange/H150
    +
    alias: Orange/H150
    Dark:
    -
    alias: Orange/H350
    +
    alias: Orange/H350
    -
    Token: --prizm-v3-status-warning-secondary-hover
    +
    Token: --prizm-v3-status-warning-secondary-hover
    @@ -1172,14 +1110,14 @@
    Warning-Primary-Hover
    Light:
    -
    alias: Orange/H450
    +
    alias: Orange/H450
    Dark:
    -
    alias: Orange/H850
    +
    alias: Orange/H850
    -
    Token: --prizm-v3-status-warning-primary-hover
    +
    Token: --prizm-v3-status-warning-primary-hover
    @@ -1190,14 +1128,14 @@
    Attention-Secondary-Hover
    Light:
    -
    alias: Yellow/H150
    +
    alias: Yellow/H150
    Dark:
    -
    alias: Yellow/H350
    +
    alias: Yellow/H350
    -
    Token: --prizm-v3-status-attention-secondary-hover
    +
    Token: --prizm-v3-status-attention-secondary-hover
    @@ -1208,14 +1146,14 @@
    Attention-Primary-Hover
    Light:
    -
    alias: Yellow/H350
    +
    alias: Yellow/H350
    Dark:
    -
    alias: Yellow/H950
    +
    alias: Yellow/H950
    -
    Token: --prizm-v3-status-attention-primary-hover
    +
    Token: --prizm-v3-status-attention-primary-hover
    @@ -1226,14 +1164,14 @@
    Success-Secondary-Hover
    Light:
    -
    alias: Green/H250
    +
    alias: Green/H250
    Dark:
    -
    alias: Green/H350
    +
    alias: Green/H350
    -
    Token: --prizm-v3-status-success-secondary-hover
    +
    Token: --prizm-v3-status-success-secondary-hover
    @@ -1244,14 +1182,14 @@
    Success-Primary-Hover
    Light:
    -
    alias: Green/H650
    +
    alias: Green/H650
    Dark:
    -
    alias: Green/H650
    +
    alias: Green/H650
    -
    Token: --prizm-v3-status-success-primary-hover
    +
    Token: --prizm-v3-status-success-primary-hover
    @@ -1262,14 +1200,14 @@
    None-Secondary-Hover
    Light:
    -
    alias: Gray/H250
    +
    alias: Gray/H250
    Dark:
    -
    alias: Gray/H350
    +
    alias: Gray/H350
    -
    Token: --prizm-v3-status-none-secondary-hover
    +
    Token: --prizm-v3-status-none-secondary-hover
    @@ -1280,14 +1218,14 @@
    None-Primary-Hover
    Light:
    -
    alias: Gray/H650
    +
    alias: Gray/H650
    Dark:
    -
    alias: Gray/H650
    +
    alias: Gray/H650
    -
    Token: --prizm-v3-status-none-primary-hover
    +
    Token: --prizm-v3-status-none-primary-hover
    @@ -1298,14 +1236,14 @@
    Info-Secondary-Hover
    Light:
    -
    alias: Blue/H250
    +
    alias: Blue/H250
    Dark:
    -
    alias: Blue/H350
    +
    alias: Blue/H350
    -
    Token: --prizm-v3-status-info-secondary-hover
    +
    Token: --prizm-v3-status-info-secondary-hover
    @@ -1316,14 +1254,14 @@
    Info-Primary-Hover
    Light:
    -
    alias: Blue/H650
    +
    alias: Blue/H650
    Dark:
    -
    alias: Blue/H650
    +
    alias: Blue/H650
    -
    Token: --prizm-v3-status-info-primary-hover
    +
    Token: --prizm-v3-status-info-primary-hover
    @@ -1334,14 +1272,14 @@
    Alarm-Secondary-Default
    Light:
    -
    alias: Red/200
    +
    alias: Red/200
    Dark:
    -
    alias: Red/300
    +
    alias: Red/300
    -
    Token: --prizm-v3-status-alarm-secondary-default
    +
    Token: --prizm-v3-status-alarm-secondary-default
    @@ -1352,14 +1290,14 @@
    Alarm-Primary-Default
    Light:
    -
    alias: Red/600
    +
    alias: Red/600
    Dark:
    -
    alias: Red/600
    +
    alias: Red/600
    -
    Token: --prizm-v3-status-alarm-primary-default
    +
    Token: --prizm-v3-status-alarm-primary-default
    @@ -1370,14 +1308,14 @@
    Warning-Secondary-Default
    Light:
    -
    alias: Orange/100
    +
    alias: Orange/100
    Dark:
    -
    alias: Orange/300
    +
    alias: Orange/300
    -
    Token: --prizm-v3-status-warning-secondary-default
    +
    Token: --prizm-v3-status-warning-secondary-default
    @@ -1388,14 +1326,14 @@
    Warning-Primary-Default
    Light:
    -
    alias: Orange/400
    +
    alias: Orange/400
    Dark:
    -
    alias: Orange/800
    +
    alias: Orange/800
    -
    Token: --prizm-v3-status-warning-primary-default
    +
    Token: --prizm-v3-status-warning-primary-default
    @@ -1406,14 +1344,14 @@
    Attention-Secondary-Default
    Light:
    -
    alias: Yellow/100
    +
    alias: Yellow/100
    Dark:
    -
    alias: Yellow/300
    +
    alias: Yellow/300
    -
    Token: --prizm-v3-status-attention-secondary-default
    +
    Token: --prizm-v3-status-attention-secondary-default
    @@ -1424,14 +1362,14 @@
    Attention-Primary-Default
    Light:
    -
    alias: Yellow/300
    +
    alias: Yellow/300
    Dark:
    -
    alias: Yellow/900
    +
    alias: Yellow/900
    -
    Token: --prizm-v3-status-attention-primary-default
    +
    Token: --prizm-v3-status-attention-primary-default
    @@ -1442,14 +1380,14 @@
    Success-Secondary-Default
    Light:
    -
    alias: Green/200
    +
    alias: Green/200
    Dark:
    -
    alias: Green/300
    +
    alias: Green/300
    -
    Token: --prizm-v3-status-success-secondary-default
    +
    Token: --prizm-v3-status-success-secondary-default
    @@ -1460,14 +1398,14 @@
    Success-Primary-Default
    Light:
    -
    alias: Green/600
    +
    alias: Green/600
    Dark:
    -
    alias: Green/600
    +
    alias: Green/600
    -
    Token: --prizm-v3-status-success-primary-default
    +
    Token: --prizm-v3-status-success-primary-default
    @@ -1478,14 +1416,14 @@
    None-Secondary-Default
    Light:
    -
    alias: Gray/200
    +
    alias: Gray/200
    Dark:
    -
    alias: Gray/300
    +
    alias: Gray/300
    -
    Token: --prizm-v3-status-none-secondary-default
    +
    Token: --prizm-v3-status-none-secondary-default
    @@ -1496,14 +1434,14 @@
    None-Primary-Default
    Light:
    -
    alias: Gray/600
    +
    alias: Gray/600
    Dark:
    -
    alias: Gray/600
    +
    alias: Gray/600
    -
    Token: --prizm-v3-status-none-primary-default
    +
    Token: --prizm-v3-status-none-primary-default
    @@ -1514,14 +1452,14 @@
    Info-Secondary-Default
    Light:
    -
    alias: Blue/200
    +
    alias: Blue/200
    Dark:
    -
    alias: Blue/300
    +
    alias: Blue/300
    -
    Token: --prizm-v3-status-info-secondary-default
    +
    Token: --prizm-v3-status-info-secondary-default
    @@ -1532,14 +1470,14 @@
    Info-Primary-Default
    Light:
    -
    alias: Blue/600
    +
    alias: Blue/600
    Dark:
    -
    alias: Blue/600
    +
    alias: Blue/600
    -
    Token: --prizm-v3-status-info-primary-default
    +
    Token: --prizm-v3-status-info-primary-default
    @@ -1555,14 +1493,14 @@
    Prognosis
    Light:
    -
    alias: Gray/600
    +
    alias: Gray/600
    Dark:
    -
    alias: Gray/600
    +
    alias: Gray/600
    -
    Token: --prizm-v3-index-prognosis
    +
    Token: --prizm-v3-index-prognosis
    @@ -1573,84 +1511,22 @@
    Fact
    Light:
    -
    - #20222b -
    +
    #20222b
    Dark:
    -
    - #ffffff -
    +
    #ffffff
    -
    Token: --prizm-v3-index-fact
    +
    Token: --prizm-v3-index-fact
    -
    +
    Light:
    -
    - rgb(32,34,43) -
    -
    -
    +
    rgb(32,34,43)
    +
    +
    Dark:
    -
    - rgb(255,255,255) -
    +
    rgb(255,255,255)
    @@ -1661,84 +1537,22 @@
    Plan
    Light:
    -
    - #0033ff -
    +
    #0033ff
    Dark:
    -
    - #4075ff -
    +
    #4075ff
    -
    Token: --prizm-v3-index-plan
    +
    Token: --prizm-v3-index-plan
    -
    +
    Light:
    -
    - rgb(0,51,255) -
    -
    -
    +
    rgb(0,51,255)
    +
    +
    Dark:
    -
    - rgb(64,117,255) -
    +
    rgb(64,117,255)
    @@ -1760,84 +1574,22 @@
    Axis-Area-Active
    Light:
    -
    - #436cee33 -
    +
    #436cee33
    Dark:
    -
    - #436cee33 -
    +
    #436cee33
    -
    Token: --prizm-v3-chart-axis-area-active
    +
    Token: --prizm-v3-chart-axis-area-active
    -
    +
    Light:
    -
    - rgba(67,108,238,0.2) -
    -
    -
    +
    rgba(67,108,238,0.2)
    +
    +
    Dark:
    -
    - rgba(67,108,238,0.2) -
    +
    rgba(67,108,238,0.2)
    @@ -1848,14 +1600,14 @@
    Axis-Line-Active
    Light:
    -
    alias: Blue/600
    +
    alias: Blue/600
    Dark:
    -
    alias: Blue/600
    +
    alias: Blue/600
    -
    Token: --prizm-v3-chart-axis-line-active
    +
    Token: --prizm-v3-chart-axis-line-active
    @@ -1866,14 +1618,14 @@
    Axis-Line-Hover
    Light:
    -
    alias: 1200
    +
    alias: 1200
    Dark:
    -
    alias: 1200
    +
    alias: 1200
    -
    Token: --prizm-v3-chart-axis-line-hover
    +
    Token: --prizm-v3-chart-axis-line-hover
    @@ -1894,84 +1646,22 @@
    Axis-Area-Hover
    Light:
    -
    - #8a91a233 -
    +
    #8a91a233
    Dark:
    -
    - #8a91a233 -
    +
    #8a91a233
    -
    Token: --prizm-v3-chart-axis-area-hover
    +
    Token: --prizm-v3-chart-axis-area-hover
    -
    +
    Light:
    -
    - rgba(138,145,162,0.2) -
    -
    -
    +
    rgba(138,145,162,0.2)
    +
    +
    Dark:
    -
    - rgba(138,145,162,0.2) -
    +
    rgba(138,145,162,0.2)
    @@ -1992,84 +1682,22 @@
    Fill-Blanket
    Light:
    -
    - #8a91a233 -
    +
    #8a91a233
    Dark:
    -
    - #8a91a233 -
    +
    #8a91a233
    -
    Token: --prizm-v3-chart-fill-blanket
    +
    Token: --prizm-v3-chart-fill-blanket
    -
    +
    Light:
    -
    - rgba(138,145,162,0.2) -
    -
    -
    +
    rgba(138,145,162,0.2)
    +
    +
    Dark:
    -
    - rgba(138,145,162,0.2) -
    +
    rgba(138,145,162,0.2)
    @@ -2080,14 +1708,45 @@
    Axis-Default
    Light:
    -
    alias: Gray/300
    +
    alias: Gray/300
    +
    +
    +
    Dark:
    +
    alias: Gray/300
    +
    +
    +
    Token: --prizm-v3-chart-axis-default
    +
    +
    +
    +
    +
    +
    Shadow
    +
    +
    +
    +
    +
    +
    +
    Shadow color
    +
    +
    Light:
    +
    rgba(191, 198, 215, 0.5)
    Dark:
    -
    alias: Gray/300
    +
    rgba(0, 0, 0, 0.5)
    -
    Token: --prizm-v3-chart-axis-default
    +
    Token: --prizm-v3-shadow-color
    diff --git a/apps/doc/src/app/guidelines/theme/components/theme-for-designers/theme-for-designers.component.ts b/apps/doc/src/app/guidelines/theme/components/theme-for-designers/theme-for-designers.component.ts index 04fab242fe..83cb220b8a 100644 --- a/apps/doc/src/app/guidelines/theme/components/theme-for-designers/theme-for-designers.component.ts +++ b/apps/doc/src/app/guidelines/theme/components/theme-for-designers/theme-for-designers.component.ts @@ -459,6 +459,52 @@ export class ThemeForDesignersComponent { description: 'Заблокированная кнопка', variable: '--prizm-v3-button-disable', }, + { + groupName: 'Shadow', + name: 'Shadow', + description: 'Цвет теней', + variable: '--prizm-v3-shadow-color', + }, + { + name: 'Shadow-Big-Top', + description: 'Большая тень сверху', + variable: '--prizm-v3-shadow-big-top', + }, + { + name: 'Shadow-Big-Right', + description: 'Большая тень справа', + variable: '--prizm-v3-shadow-big-right', + }, + { + name: 'Shadow-Big-Left', + description: 'Большая тень слева', + variable: '--prizm-v3-shadow-big-left', + }, + { + name: 'Shadow-Big-Bottom', + description: 'Большая тень снизу', + variable: '--prizm-v3-shadow-big-bottom', + }, + { + name: 'Shadow-Mini-Top', + description: 'Маленькая тень сверху', + variable: '--prizm-v3-shadow-mini-top', + }, + { + name: 'Shadow-Mini-Right', + description: 'Маленькая тень справа', + variable: '--prizm-v3-shadow-mini-righ', + }, + { + name: 'Shadow-Mini-Left', + description: 'Маленькая тень слева', + variable: '--prizm-v3-shadow-mini-left', + }, + { + name: 'Shadow-Mini-Bottom', + description: 'Маленькая тень снизу', + variable: '--prizm-v3-shadow-mini-bottom', + }, ]; constructor( From f81e99c7893683dbfacd337fa5deb1f41df3e852 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Wed, 28 Feb 2024 22:24:20 +0300 Subject: [PATCH 056/291] feat: change focus to focus-visible for radiobtn, checkbox, breadcrumbs #1297 --- .../lib/components/breadcrumbs/breadcrumbs.component.less | 6 +++--- .../src/lib/components/checkbox/checkbox.component.less | 2 +- .../lib/components/radio/prizm-radio-button.component.less | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/components/src/lib/components/breadcrumbs/breadcrumbs.component.less b/libs/components/src/lib/components/breadcrumbs/breadcrumbs.component.less index 6be76d3a89..d3d6429459 100644 --- a/libs/components/src/lib/components/breadcrumbs/breadcrumbs.component.less +++ b/libs/components/src/lib/components/breadcrumbs/breadcrumbs.component.less @@ -53,7 +53,7 @@ span { &__dots button { &:hover, - &:focus { + &:focus-visible { color: var(--prizm-v3-button-primary-solid-hover); } } @@ -105,7 +105,7 @@ span { } } - &:focus:not(.breadcrumb_active) { + &:focus-visible:not(.breadcrumb_active) { border-color: var(--prizm-v3-background-stroke-focus); } } @@ -155,7 +155,7 @@ span { } &:hover, - &:focus { + &:focus-visible { background: var(--prizm-v3-table-fill-row-hover); } } diff --git a/libs/components/src/lib/components/checkbox/checkbox.component.less b/libs/components/src/lib/components/checkbox/checkbox.component.less index 171ad2388f..15cbcbc8d3 100644 --- a/libs/components/src/lib/components/checkbox/checkbox.component.less +++ b/libs/components/src/lib/components/checkbox/checkbox.component.less @@ -118,7 +118,7 @@ } } -:host:focus { +:host:focus-visible { .checkbox { box-shadow: 0 0 0 2px var(--prizm-v3-background-stroke-focus); diff --git a/libs/components/src/lib/components/radio/prizm-radio-button.component.less b/libs/components/src/lib/components/radio/prizm-radio-button.component.less index bad342e1c3..bd44dab2ff 100644 --- a/libs/components/src/lib/components/radio/prizm-radio-button.component.less +++ b/libs/components/src/lib/components/radio/prizm-radio-button.component.less @@ -65,7 +65,7 @@ prizm-radio-button { cursor: pointer; - &:focus + .radio-button { + &:focus-visible + .radio-button { box-shadow: 0 0 0 2px var(--prizm-v3-background-stroke-focus); transition: 0.3s; } @@ -81,7 +81,7 @@ prizm-radio-button { } } - &:not(:checked):focus + .radio-button { + &:not(:checked):focus-visible + .radio-button { border-color: var(--prizm-v3-form-stroke-default); } From a6f1c648202c9696b23fc383d6314bfeaad2b432 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 29 Feb 2024 10:51:36 +0300 Subject: [PATCH 057/291] feat: change focus to focus visible to chips item and input icon btn --- .../lib/components/chips/chips-item/chips-item.component.less | 4 ++-- .../common/input-icon-button/input-icon-button.component.less | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libs/components/src/lib/components/chips/chips-item/chips-item.component.less b/libs/components/src/lib/components/chips/chips-item/chips-item.component.less index 71b8b1bd04..5fcfbc02a1 100644 --- a/libs/components/src/lib/components/chips/chips-item/chips-item.component.less +++ b/libs/components/src/lib/components/chips/chips-item/chips-item.component.less @@ -33,7 +33,7 @@ button { &:not(:disabled) { &:hover, - &:focus { + &:focus-visible { outline: var(--prizm-v3-background-stroke-focus) 1px solid; } } @@ -55,7 +55,7 @@ button { font-size: 16px; color: var(--prizm-v3-status-none-primary-default); - &:focus { + &:focus-visible { color: var(--prizm-v3-background-stroke-focus); } } diff --git a/libs/components/src/lib/components/input/common/input-icon-button/input-icon-button.component.less b/libs/components/src/lib/components/input/common/input-icon-button/input-icon-button.component.less index 1c19bac1af..e9bc5f9eaa 100644 --- a/libs/components/src/lib/components/input/common/input-icon-button/input-icon-button.component.less +++ b/libs/components/src/lib/components/input/common/input-icon-button/input-icon-button.component.less @@ -26,7 +26,7 @@ color: var(--prizm-v3-button-primary-solid-hover); } - &:focus { + &:focus-visible { color: var(--prizm-v3-button-primary-solid-hover); } From 033efc1927da1f395cc5dd4d01ac84612b4a709c Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Thu, 29 Feb 2024 14:26:49 +0300 Subject: [PATCH 058/291] fix(chore): stacblitz for v3 #1209 --- libs/components/src/styles/icons-16/icons-16.less | 4 ++-- libs/components/src/styles/icons/icons.less | 4 ++-- libs/components/src/styles/skeleton/skeleton.less | 2 +- libs/components/src/styles/styles.less | 6 +++--- libs/theme/src/styles/theme/v3/index.less | 10 +++++----- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libs/components/src/styles/icons-16/icons-16.less b/libs/components/src/styles/icons-16/icons-16.less index 8b3ddfcf31..e48a859acd 100644 --- a/libs/components/src/styles/icons-16/icons-16.less +++ b/libs/components/src/styles/icons-16/icons-16.less @@ -1,2 +1,2 @@ -@import './location'; -@import './set'; +@import './location.less'; +@import './set.less'; diff --git a/libs/components/src/styles/icons/icons.less b/libs/components/src/styles/icons/icons.less index 8b3ddfcf31..e48a859acd 100644 --- a/libs/components/src/styles/icons/icons.less +++ b/libs/components/src/styles/icons/icons.less @@ -1,2 +1,2 @@ -@import './location'; -@import './set'; +@import './location.less'; +@import './set.less'; diff --git a/libs/components/src/styles/skeleton/skeleton.less b/libs/components/src/styles/skeleton/skeleton.less index bc33e165b1..ee5c0f7045 100644 --- a/libs/components/src/styles/skeleton/skeleton.less +++ b/libs/components/src/styles/skeleton/skeleton.less @@ -1,4 +1,4 @@ -@import '../mixins/mixins'; +@import '../mixins/mixins.less'; .prizm-skeleton { position: relative; diff --git a/libs/components/src/styles/styles.less b/libs/components/src/styles/styles.less index 538b486ff3..fb220c9798 100644 --- a/libs/components/src/styles/styles.less +++ b/libs/components/src/styles/styles.less @@ -1,6 +1,6 @@ -@import 'dropdown-host'; -@import 'skeleton/skeleton'; -@import 'animations'; +@import 'dropdown-host.less'; +@import 'skeleton/skeleton.less'; +@import 'animations.less'; * { box-sizing: border-box; diff --git a/libs/theme/src/styles/theme/v3/index.less b/libs/theme/src/styles/theme/v3/index.less index 0635907662..b102f396d2 100644 --- a/libs/theme/src/styles/theme/v3/index.less +++ b/libs/theme/src/styles/theme/v3/index.less @@ -1,8 +1,8 @@ -@import './palette'; -@import './default'; -@import './default-palette'; -@import './dark'; -@import './dark-palette'; +@import './palette.less'; +@import './default.less'; +@import './default-palette.less'; +@import './dark.less'; +@import './dark-palette.less'; :root { .prizmV3Palette(); From cfbbcfcc5f35cce51792dcbdafef69aebe35ddd7 Mon Sep 17 00:00:00 2001 From: ickisIckis Date: Thu, 29 Feb 2024 16:17:30 +0300 Subject: [PATCH 059/291] Update apps/doc/src/app/guidelines/theme/components/theme-for-designers/theme-for-designers.component.ts Co-authored-by: alexhawkins94 <122870313+alexhawkins94@users.noreply.github.com> --- .../theme-for-designers/theme-for-designers.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/doc/src/app/guidelines/theme/components/theme-for-designers/theme-for-designers.component.ts b/apps/doc/src/app/guidelines/theme/components/theme-for-designers/theme-for-designers.component.ts index 83cb220b8a..4f5392b133 100644 --- a/apps/doc/src/app/guidelines/theme/components/theme-for-designers/theme-for-designers.component.ts +++ b/apps/doc/src/app/guidelines/theme/components/theme-for-designers/theme-for-designers.component.ts @@ -493,7 +493,7 @@ export class ThemeForDesignersComponent { { name: 'Shadow-Mini-Right', description: 'Маленькая тень справа', - variable: '--prizm-v3-shadow-mini-righ', + variable: '--prizm-v3-shadow-mini-right', }, { name: 'Shadow-Mini-Left', From 43808eb4113d7507cd3a7297c7c552187af8853c Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Wed, 6 Mar 2024 11:33:51 +0300 Subject: [PATCH 060/291] fix(components/input-date-time-range): afte clear time values in calendar got error #1368 --- .../input-layout-date-time-range.component.ts | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libs/components/src/lib/components/input/input-date-time-range/input-layout-date-time-range.component.ts b/libs/components/src/lib/components/input/input-date-time-range/input-layout-date-time-range.component.ts index 46578e9504..761e6d5d25 100644 --- a/libs/components/src/lib/components/input/input-date-time-range/input-layout-date-time-range.component.ts +++ b/libs/components/src/lib/components/input/input-date-time-range/input-layout-date-time-range.component.ts @@ -517,7 +517,7 @@ export class PrizmInputLayoutDateTimeRangeComponent } public updateTimeTo(value: PrizmTime): void { - // TODO: #mz add min max + // TODO: feature > safe add min max limiter if ( value && this.value?.timeRange?.to instanceof PrizmTime && @@ -529,16 +529,14 @@ export class PrizmInputLayoutDateTimeRangeComponent } public updateTimeFrom(value: PrizmTime): void { - // TODO: #mz add min max + // TODO: feature > safe add min max limiter if ( value && this.value?.timeRange?.from instanceof PrizmTime && this.value?.timeRange?.from?.isSameTime(value) ) return; - // const range = PrizmDateTimeRange.safeUpdateTimeFrom(this.value, value); - // this.updateValue(range?.copy()); - this.nativeValueTimeFrom$$.next(value.toString(this.timeMode)); + this.nativeValueTimeFrom$$.next(value?.toString(this.timeMode) ?? ''); } public referFocusToMain(referFocus = true) { From 3d913d5135048319e2aee8938f94c30730a15911 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Wed, 6 Mar 2024 13:01:00 +0300 Subject: [PATCH 061/291] fix: small bugs --- .../input-layout-date-time-range.component.ts | 2 +- .../input-layout-date-time-range.component.ts | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/doc/src/app/components/input/input-layout-date-time-range/input-layout-date-time-range.component.ts b/apps/doc/src/app/components/input/input-layout-date-time-range/input-layout-date-time-range.component.ts index d5a6ac5d7c..1b50c152e6 100644 --- a/apps/doc/src/app/components/input/input-layout-date-time-range/input-layout-date-time-range.component.ts +++ b/apps/doc/src/app/components/input/input-layout-date-time-range/input-layout-date-time-range.component.ts @@ -36,7 +36,7 @@ export class InputLayoutDateTimeRangeComponent { new PrizmDateTimeRange(new PrizmDayRange(new PrizmDay(2018, 2, 10), new PrizmDay(2018, 2, 10))) ); readonly min = new PrizmDateTime(new PrizmDay(2000, 2, 20), new PrizmTime(0, 0)); - readonly max = new PrizmDateTime(new PrizmDay(2040, 2, 20), new PrizmTime(0, 0)); + readonly max = new PrizmDateTime(new PrizmDay(2040, 2, 20), new PrizmTime(23, 59)); public placeholder = 'Выберите период'; public testIdPostfix!: string; public sizeVariants: ReadonlyArray = ['l', 'm', 's']; diff --git a/libs/components/src/lib/components/input/input-date-time-range/input-layout-date-time-range.component.ts b/libs/components/src/lib/components/input/input-date-time-range/input-layout-date-time-range.component.ts index 761e6d5d25..2e4bf239e5 100644 --- a/libs/components/src/lib/components/input/input-date-time-range/input-layout-date-time-range.component.ts +++ b/libs/components/src/lib/components/input/input-date-time-range/input-layout-date-time-range.component.ts @@ -369,10 +369,10 @@ export class PrizmInputLayoutDateTimeRangeComponent if (!toTimeValue || toTimeValue.length !== this.computedTimeMask.length) return; if ( - fromValue === this.value?.dayRange?.from.toString() && - fromTimeValue === this.value?.timeRange?.from.toString(this.timeMode) && - toValue === this.value?.dayRange?.to.toString() && - toTimeValue === this.value?.timeRange?.to.toString(this.timeMode) + fromValue === this.value?.dayRange?.from?.toString() && + fromTimeValue === this.value?.timeRange?.from?.toString(this.timeMode) && + toValue === this.value?.dayRange?.to?.toString() && + toTimeValue === this.value?.timeRange?.to?.toString(this.timeMode) ) { return; } From 48d01c11f8f03094bfd22f619e7b0bd00d2f17c5 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Wed, 6 Mar 2024 16:17:43 +0300 Subject: [PATCH 062/291] fix(components/input-date-time): min/max does not work correctly in InputLayoutDateTime #1421 --- .../src/lib/@core/date-time/index.ts | 1 + .../src/lib/@core/date-time/time-limit.ts | 42 +++++++++++++++++++ .../src/lib/@core/date-time/time.ts | 1 + .../input-layout-date-time.component.ts | 24 ++++++----- 4 files changed, 58 insertions(+), 10 deletions(-) create mode 100644 libs/components/src/lib/@core/date-time/time-limit.ts diff --git a/libs/components/src/lib/@core/date-time/index.ts b/libs/components/src/lib/@core/date-time/index.ts index fdb6531738..85723fa8a0 100644 --- a/libs/components/src/lib/@core/date-time/index.ts +++ b/libs/components/src/lib/@core/date-time/index.ts @@ -14,3 +14,4 @@ export * from './time'; export * from './time-range'; export * from './year'; export * from './day-time-range'; +export * from './time-limit'; diff --git a/libs/components/src/lib/@core/date-time/time-limit.ts b/libs/components/src/lib/@core/date-time/time-limit.ts new file mode 100644 index 0000000000..e67bfbb229 --- /dev/null +++ b/libs/components/src/lib/@core/date-time/time-limit.ts @@ -0,0 +1,42 @@ +import { PrizmDay } from './day'; +import { PrizmTime } from './time'; + +export function prizmTimeLimitWithinRange( + date: PrizmDay, + time: PrizmTime | null, + dateMin: PrizmDay, + dateMax: PrizmDay, + timeMin: PrizmTime | null = null, + timeMax: PrizmTime | null = null +) { + if (!date || !time || (!timeMin && !timeMax)) { + return time; + } + + time = handleTimeLimit(date, time, dateMin, timeMin); + time = handleTimeLimit(date, time, dateMax, timeMax, false); + + return time; +} + +export const handleTimeLimit = ( + date: PrizmDay, + time: PrizmTime, + limitDate: PrizmDay, + limitTime: PrizmTime | null, + isMin: boolean = true +) => { + if (!limitTime || !limitDate || !limitDate.daySame(date)) { + return time; + } + + const shouldSetTime = isMin + ? limitTime.toAbsoluteMilliseconds() > time.toAbsoluteMilliseconds() + : limitTime.toAbsoluteMilliseconds() < time.toAbsoluteMilliseconds(); + + if (shouldSetTime) { + time = time.timeLimit(isMin ? limitTime : null, isMin ? null : limitTime); + } + + return time; +}; diff --git a/libs/components/src/lib/@core/date-time/time.ts b/libs/components/src/lib/@core/date-time/time.ts index 311586d7e3..6d61cc5ad5 100644 --- a/libs/components/src/lib/@core/date-time/time.ts +++ b/libs/components/src/lib/@core/date-time/time.ts @@ -10,6 +10,7 @@ import { PRIZM_SECONDS_IN_MINUTE, } from './date-time'; import { prizmAssert, prizmPadStart } from '@prizm-ui/core'; +import { PrizmDay } from './day'; /** * Immutable time object with hours, minutes, seconds and ms diff --git a/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.ts b/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.ts index dd0296afff..50829aa049 100644 --- a/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.ts +++ b/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.ts @@ -59,6 +59,7 @@ import { PrizmLinkComponent } from '../../link'; import { PrizmValueAccessorModule } from '../../../directives/value-accessor/value-accessor.module'; import { PrizmListingItemComponent } from '../../listing-item'; import { PrizmLanguageInputLayoutDateTime } from '@prizm-ui/i18n'; +import { prizmTimeLimitWithinRange } from '../../../@core/date-time/time-limit'; @Component({ selector: `prizm-input-layout-date-time`, @@ -324,18 +325,14 @@ export class PrizmInputLayoutDateTimeComponent private updateWithCorrectDateAndTime(value: [PrizmDay | null, PrizmTime | null]): void { if (!value) return; let [date, time] = value; + + const dateMin = this.min instanceof PrizmDay ? this.min : this.min && this.min[0]; + const dateMax = this.max instanceof PrizmDay ? this.max : this.max && this.max[0]; + // correct min max time - if (date) - date = date.dayLimit( - this.min instanceof PrizmDay ? this.min : this.min && this.min[0], - this.max instanceof PrizmDay ? this.max : this.max && this.max[0] - ); + if (date) date = date.dayLimit(dateMin, dateMax); - const timeMin = Array.isArray(this.min) && this.min[1] ? this.min[1] : null; - const timeMax = Array.isArray(this.max) && this.max[1] ? this.max[1] : null; - if (time && (timeMin || timeMax)) { - time = time.timeLimit(timeMin, timeMax); - } + if (date) time = this.limitTime(date, time, dateMin, dateMax); this.focusableElement?.updateNativeValues({ idx: 0, @@ -351,6 +348,13 @@ export class PrizmInputLayoutDateTimeComponent this.updateValue([date, time]); } + private limitTime(date: PrizmDay, time: PrizmTime | null, dateMin: PrizmDay, dateMax: PrizmDay) { + const timeMin = Array.isArray(this.min) && this.min[1] ? this.min[1] : null; + const timeMax = Array.isArray(this.max) && this.max[1] ? this.max[1] : null; + + return prizmTimeLimitWithinRange(date, time, dateMin, dateMax, timeMin, timeMax); + } + public onTimeValueChange(value: string): void { if (value === this.computedTimeValue()) return; this.nativeValue$$.next([this.nativeValue$$.value[0], value]); From b37111185c99e802bc26fadeed0ca4b8ca3cfb76 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 11 Mar 2024 17:24:58 +0300 Subject: [PATCH 063/291] feat: change focus to focus visible to slider cnob --- .../src/lib/components/slider/slider-cnob.component.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/components/src/lib/components/slider/slider-cnob.component.less b/libs/components/src/lib/components/slider/slider-cnob.component.less index 0da8be7a9f..4754c07c7f 100644 --- a/libs/components/src/lib/components/slider/slider-cnob.component.less +++ b/libs/components/src/lib/components/slider/slider-cnob.component.less @@ -26,7 +26,7 @@ background-color: var(--prizm-v3-button-primary-solid-hover); } - &:focus { + &:focus-visible { z-index: 1000; &::before { visibility: visible; From 402cc27fd9c135c1d46e456f5aa18cfff98ae28b Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 11 Mar 2024 17:44:00 +0300 Subject: [PATCH 064/291] feat: change focus to focus visible to stepper button --- .../src/lib/components/stepper/stepper-selector.component.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/components/src/lib/components/stepper/stepper-selector.component.less b/libs/components/src/lib/components/stepper/stepper-selector.component.less index b9665d992a..30f9f8985b 100644 --- a/libs/components/src/lib/components/stepper/stepper-selector.component.less +++ b/libs/components/src/lib/components/stepper/stepper-selector.component.less @@ -11,7 +11,7 @@ } .step { - &:focus { + &:focus-visible { .step__index, .step__icon { box-shadow: 0 0 0 2px var(--prizm-v3-background-stroke-focus); From 759b555c82f910d0c698b708127674a38b094a2f Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 11 Mar 2024 17:52:27 +0300 Subject: [PATCH 065/291] feat: change focus to focus visible to toggle --- libs/components/src/lib/components/toggle/toggle.component.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/components/src/lib/components/toggle/toggle.component.less b/libs/components/src/lib/components/toggle/toggle.component.less index b04b347418..e92e09b2b8 100644 --- a/libs/components/src/lib/components/toggle/toggle.component.less +++ b/libs/components/src/lib/components/toggle/toggle.component.less @@ -30,7 +30,7 @@ } } - &:focus-within:not(._disabled) { + &:has(:focus-visible):not(._disabled) { box-shadow: 0 0 0 2px var(--prizm-v3-background-stroke-focus); transition: 0.3s; } From 9690557c6a59c696d8c66ec5b1965f3a1b238ad1 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 11 Mar 2024 18:36:26 +0300 Subject: [PATCH 066/291] feat: change focus to focus visible to buttons --- libs/components/src/lib/components/button/button.component.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/components/src/lib/components/button/button.component.less b/libs/components/src/lib/components/button/button.component.less index 093d071879..1918640f40 100644 --- a/libs/components/src/lib/components/button/button.component.less +++ b/libs/components/src/lib/components/button/button.component.less @@ -13,7 +13,7 @@ // TODO 4.0.0: set default min-width 120px according to prizm button component description min-width: var(--prizm-button-min-width, unset); - &._focused { + &._focus-visible { box-shadow: 0 0 0 2px var(--prizm-v3-background-stroke-focus); transition: 0.3s; } From d9a7d2c89dcfcd68c472e835b8094486b896671a Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 14 Mar 2024 12:57:33 +0300 Subject: [PATCH 067/291] fix: calendar and calendar month markup change #1242 --- .../calendar-month.component.less | 17 +++++++------ .../calendar/calendar.component.less | 24 +++++++------------ .../primitive-calendar.component.less | 8 +++++-- .../primitive-month-picker.component.less | 21 ++++------------ .../primitive-month-picker.module.ts | 7 ------ .../primitive-year-picker.component.less | 19 +++++---------- libs/components/src/styles/mixins/picker.less | 17 ++++++++----- 7 files changed, 44 insertions(+), 69 deletions(-) diff --git a/libs/components/src/lib/components/calendar-month/calendar-month.component.less b/libs/components/src/lib/components/calendar-month/calendar-month.component.less index e2bbacf6dc..df590c4bf5 100644 --- a/libs/components/src/lib/components/calendar-month/calendar-month.component.less +++ b/libs/components/src/lib/components/calendar-month/calendar-month.component.less @@ -1,12 +1,15 @@ @import '../../../styles/ui-local.less'; -.picker(3.6875rem); +@itemWidth: 85px; +@itemHeight: 45px; + +.picker(@itemWidth, @itemHeight); :host { display: block; - height: 13.625rem; - width: 15.75rem; - padding: 1.125rem; + height: 222px; + width: 256px; + padding: 16px; box-sizing: content-box; .year-btn { @@ -16,16 +19,12 @@ .z-row { flex-wrap: wrap; - margin-top: 1.4375rem; + justify-content: center; } .z-cell { box-sizing: content-box; - &:nth-child(n + 5) { - margin-top: 1.75rem; - } - &:not([data-range='start']):not([data-range='single']):not([data-range='end']):hover { background-color: var(--prizm-v3-button-ghost-hover); diff --git a/libs/components/src/lib/components/calendar/calendar.component.less b/libs/components/src/lib/components/calendar/calendar.component.less index 51e1781ef9..941a02a0e2 100644 --- a/libs/components/src/lib/components/calendar/calendar.component.less +++ b/libs/components/src/lib/components/calendar/calendar.component.less @@ -1,23 +1,17 @@ -@verticalSpace: 1rem; -@horizontalSpace: 1.125rem; -@itemSize: 2.25rem; -@paginationSize: 1.5rem; -@calendarSize: @itemSize * 7; -@height: @paginationSize + @verticalSpace + @calendarSize; +@paddings: 16px; +@paginationHeight: 40px; +@calendarWidth: 280px; +@calendarHeight: 312px + @paginationHeight; :host { display: block; - height: calc(@height + var(--prizm-calendar-footer-height, 0)); - width: @calendarSize; - padding: 16px; + height: calc(@calendarHeight + var(--prizm-calendar-footer-height, 0)); + width: @calendarWidth; + padding: @paddings; box-sizing: content-box; } .z-scrollbar { - height: @paginationSize + @verticalSpace + @calendarSize - 2rem; - width: @calendarSize + @horizontalSpace; -} - -.z-pagination { - margin-bottom: @verticalSpace; + height: @calendarHeight - @paginationHeight - (@paddings * 2); + width: @calendarWidth + @paddings; } diff --git a/libs/components/src/lib/components/internal/primitive-calendar/primitive-calendar.component.less b/libs/components/src/lib/components/internal/primitive-calendar/primitive-calendar.component.less index c5dc62e132..2d5658399c 100644 --- a/libs/components/src/lib/components/internal/primitive-calendar/primitive-calendar.component.less +++ b/libs/components/src/lib/components/internal/primitive-calendar/primitive-calendar.component.less @@ -1,11 +1,15 @@ @import '../../../../styles/ui-local.less'; -@itemSize: 2.25rem; +@itemSize: 40px; -.picker(@itemSize); +.picker(@itemSize, @itemSize); :host { width: @itemSize * 7; + + .footer:not(:empty) { + margin-top: 8px; + } } .z-item { diff --git a/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.less b/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.less index a5c4b996b9..db470b58b0 100644 --- a/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.less +++ b/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.less @@ -1,27 +1,14 @@ @import '../../../../styles/ui-local.less'; -@itemSize: 3.9375rem; +@itemWidth: 93px; +@itemHeight: 70px; -.picker(@itemSize); +.picker(@itemWidth, @itemHeight); :host { - width: @itemSize * 4; -} - -.z-row { - margin: 16px 0; - gap: 4px; - - &:first-child { - margin-top: 0; - } - - &:last-child { - margin-bottom: 0; - } + width: 280px; } .z-cell { flex-grow: 1; - width: 100%; } diff --git a/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.module.ts b/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.module.ts index db6d5031f5..6504db43b3 100644 --- a/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.module.ts +++ b/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.module.ts @@ -1,12 +1,5 @@ import { NgModule } from '@angular/core'; import { PrizmPrimitiveMonthPickerComponent } from './primitive-month-picker.component'; -import { PrizmLetModule } from '@prizm-ui/helpers'; -import { PrizmRepeatTimesModule } from '../../../directives/repeat-times/repeat-times.module'; -import { PrizmHoveredModule } from '../../../directives/hovered/hovered.module'; -import { PrizmPressedModule } from '../../../directives/pressed/pressed.module'; -import { PrizmScrollIntoViewModule } from '../../../directives/scroll-into-view/scroll-into-view.module'; -import { PrizmMonthPipeModule } from '../../../pipes/month'; -import { CommonModule } from '@angular/common'; /** * @deprecated diff --git a/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.less b/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.less index 0e840181af..ab9508f175 100644 --- a/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.less +++ b/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.less @@ -1,21 +1,14 @@ @import '../../../../styles/ui-local.less'; -@itemSize: 3.9375rem; +@itemWidth: 93px; +@itemHeight: 56px; -.picker(@itemSize); +.picker(@itemWidth, @itemHeight); :host { - width: @itemSize * 4; + width: 280px; } -.z-row { - margin: 0.875rem 0; - - &:first-child { - margin-top: 0; - } - - &:last-child { - margin-bottom: 0; - } +.z-cell { + flex-grow: 1; } diff --git a/libs/components/src/styles/mixins/picker.less b/libs/components/src/styles/mixins/picker.less index bc4a6e220a..98170baf5d 100644 --- a/libs/components/src/styles/mixins/picker.less +++ b/libs/components/src/styles/mixins/picker.less @@ -1,4 +1,4 @@ -.picker(@itemSize) { +.picker(@itemWidth, @itemHeight) { :host { display: block; font: var(--prizm-font-text-m); @@ -8,13 +8,17 @@ .createStackingContext(); display: flex; justify-content: space-between; - height: 2.25rem; + height: @itemHeight; } .z-item { + display: flex; + align-items: center; + justify-content: center; position: relative; flex: 1; - line-height: 2rem; + // height: 100%; + height: @itemHeight; border-radius: 2px; color: var(--prizm-v3-text-icon-secondary); font-weight: 600; @@ -37,13 +41,12 @@ display: flex; align-items: center; justify-content: center; - width: @itemSize; + width: @itemWidth; text-align: center; outline: none; cursor: pointer; background-clip: content-box; box-sizing: border-box; - border: 2px solid transparent; &_today { border-radius: 2px; @@ -59,6 +62,8 @@ .z-item { border: 1px solid var(--prizm-v3-button-primary-solid-default); color: var(--prizm-v3-button-primary-solid-default); + // height: @itemHeight; + width: @itemWidth; &_unavailable { color: var(--prizm-v3-text-icon-disable); @@ -87,7 +92,7 @@ } &:not(:last-child):before { - right: -@itemSize; + // right: -@itemWidth; } &:last-child:first-child:before { From 356e78b5901f87aa24c31b216a79cf482ffc2273 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 14 Mar 2024 14:20:51 +0300 Subject: [PATCH 068/291] fix: replace title by hint in year spin button #1457 --- .../examples/base/calendar-base-example.component.ts | 2 +- .../components/calendar-month/calendar-month.component.less | 6 ------ .../primitive-calendar/primitive-calendar.component.less | 1 - .../primitive-spin-button/primitive-spin-button.module.ts | 2 ++ .../primitive-spin-button.template.html | 4 ++-- libs/components/src/styles/mixins/picker.less | 4 ---- 6 files changed, 5 insertions(+), 14 deletions(-) diff --git a/apps/doc/src/app/components/calendars/calendar/examples/base/calendar-base-example.component.ts b/apps/doc/src/app/components/calendars/calendar/examples/base/calendar-base-example.component.ts index 990b7bfa75..f70201ac7a 100644 --- a/apps/doc/src/app/components/calendars/calendar/examples/base/calendar-base-example.component.ts +++ b/apps/doc/src/app/components/calendars/calendar/examples/base/calendar-base-example.component.ts @@ -16,7 +16,7 @@ import { PrizmDay, PrizmDayWithStatus } from '@prizm-ui/components'; export class PrizmCalendarBaseExampleComponent { public day = new PrizmDay(2017, 0, 15); public daysWithStatus = [ - new PrizmDayWithStatus(2017, 0, 10, 'index'), + new PrizmDayWithStatus(2017, 0, 1, 'index'), new PrizmDayWithStatus(2017, 0, 11, 'warning'), new PrizmDayWithStatus(2017, 0, 12, 'danger'), new PrizmDayWithStatus(2017, 0, 13, 'success'), diff --git a/libs/components/src/lib/components/calendar-month/calendar-month.component.less b/libs/components/src/lib/components/calendar-month/calendar-month.component.less index df590c4bf5..94b9300969 100644 --- a/libs/components/src/lib/components/calendar-month/calendar-month.component.less +++ b/libs/components/src/lib/components/calendar-month/calendar-month.component.less @@ -34,12 +34,6 @@ } } -.z-cell_interval:nth-child(4n) { - &:before { - right: 0; - } -} - .z-scrollbar { height: inherit; width: inherit; diff --git a/libs/components/src/lib/components/internal/primitive-calendar/primitive-calendar.component.less b/libs/components/src/lib/components/internal/primitive-calendar/primitive-calendar.component.less index 2d5658399c..176998542c 100644 --- a/libs/components/src/lib/components/internal/primitive-calendar/primitive-calendar.component.less +++ b/libs/components/src/lib/components/internal/primitive-calendar/primitive-calendar.component.less @@ -67,7 +67,6 @@ height: 4px; width: 50%; bottom: 4px; - transform: translateX(50%); border-radius: 2px; background-color: var(--prizm-status-day-color); diff --git a/libs/components/src/lib/components/internal/primitive-spin-button/primitive-spin-button.module.ts b/libs/components/src/lib/components/internal/primitive-spin-button/primitive-spin-button.module.ts index 1d00efa667..e2192d31e4 100644 --- a/libs/components/src/lib/components/internal/primitive-spin-button/primitive-spin-button.module.ts +++ b/libs/components/src/lib/components/internal/primitive-spin-button/primitive-spin-button.module.ts @@ -4,6 +4,7 @@ import { PrizmFocusableModule, PrizmFocusedModule, PrizmFocusVisibleModule, + PrizmHintDirective, PrizmPreventDefaultModule, } from '../../../directives'; import { PrizmButtonModule } from '../../button/button.module'; @@ -18,6 +19,7 @@ import { PrizmPrimitiveSpinButtonComponent } from './primitive-spin-button.compo PrizmFocusableModule, PrizmPreventDefaultModule, PrizmButtonModule, + PrizmHintDirective, ], declarations: [PrizmPrimitiveSpinButtonComponent], exports: [PrizmPrimitiveSpinButtonComponent], diff --git a/libs/components/src/lib/components/internal/primitive-spin-button/primitive-spin-button.template.html b/libs/components/src/lib/components/internal/primitive-spin-button/primitive-spin-button.template.html index eb4e7e54e8..744370bfbd 100644 --- a/libs/components/src/lib/components/internal/primitive-spin-button/primitive-spin-button.template.html +++ b/libs/components/src/lib/components/internal/primitive-spin-button/primitive-spin-button.template.html @@ -19,7 +19,7 @@ icon="arrows-chevron-left" appearance="secondary" [class.z-arrow_hidden]="leftComputedDisabled" - [title]="texts[0]" + [prizmHint]="texts[0]" [focusable]="false" (click)="onLeftClick()" > @@ -36,7 +36,7 @@ icon="arrows-chevron-right" [appearanceType]="mode" [class.z-arrow_hidden]="rightComputedDisabled" - [title]="texts[1]" + [prizmHint]="texts[1]" [focusable]="false" (click)="onRightClick()" > diff --git a/libs/components/src/styles/mixins/picker.less b/libs/components/src/styles/mixins/picker.less index 98170baf5d..93535db529 100644 --- a/libs/components/src/styles/mixins/picker.less +++ b/libs/components/src/styles/mixins/picker.less @@ -91,10 +91,6 @@ } } - &:not(:last-child):before { - // right: -@itemWidth; - } - &:last-child:first-child:before { right: 0; } From 649b83fdc1cd81b214cb68be1dfa199c7b1fb0e5 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 14 Mar 2024 15:23:47 +0300 Subject: [PATCH 069/291] fix: styles for interval --- libs/components/src/styles/mixins/picker.less | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/components/src/styles/mixins/picker.less b/libs/components/src/styles/mixins/picker.less index 93535db529..0a1b0c3894 100644 --- a/libs/components/src/styles/mixins/picker.less +++ b/libs/components/src/styles/mixins/picker.less @@ -85,6 +85,7 @@ &_interval { &:before { background: var(--prizm-v3-button-primary-ghost-active); + border-radius: unset; :host._single & { background-color: var(--prizm-v3-button-primary-ghost-active); From d1face17ad035efe0dedf49da80bea609306d51b Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 15 Mar 2024 13:20:00 +0300 Subject: [PATCH 070/291] fix: calendar range should hilight only choosen year and month #1465 --- .../calendar-month.component.html | 4 ++++ .../calendar-month.component.ts | 1 - .../primitive-month-picker.component.ts | 13 +++++++------ .../primitive-year-picker.component.less | 6 +++--- .../primitive-year-picker.component.ts | 19 ++++++++++++------- 5 files changed, 26 insertions(+), 17 deletions(-) diff --git a/libs/components/src/lib/components/calendar-month/calendar-month.component.html b/libs/components/src/lib/components/calendar-month/calendar-month.component.html index d3ca2afc9e..0fc16adc2b 100644 --- a/libs/components/src/lib/components/calendar-month/calendar-month.component.html +++ b/libs/components/src/lib/components/calendar-month/calendar-month.component.html @@ -4,6 +4,10 @@ [max]="max" [initialItem]="year" [value]="value" + [intervalSupport]="true" + [style.--prizm-year-item-widtn]="'84px'" + [style.--prizm-year-item-height]="'44px'" + [style.--prizm-year-picker-widtn]="'256px'" (yearClick)="onPickerYearClick($event)" > diff --git a/libs/components/src/lib/components/calendar-month/calendar-month.component.ts b/libs/components/src/lib/components/calendar-month/calendar-month.component.ts index 7fc5c4af79..8913e7a88b 100644 --- a/libs/components/src/lib/components/calendar-month/calendar-month.component.ts +++ b/libs/components/src/lib/components/calendar-month/calendar-month.component.ts @@ -28,7 +28,6 @@ import { CommonModule } from '@angular/common'; import { PrizmFocusableModule, PrizmHoveredDirective, - PrizmHoveredModule, PrizmPressedModule, PrizmStopPropagationModule, } from '../../directives'; diff --git a/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.ts b/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.ts index 40f9d83158..7e401c0612 100644 --- a/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.ts +++ b/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.ts @@ -133,12 +133,13 @@ export class PrizmPrimitiveMonthPickerComponent extends PrizmAbstractTestId { return value.month === item && value.year === this.currentYear ? PrizmRangeState.Single : null; } - if ( - this.value instanceof PrizmDayRange && - this.value.isMonthInRange(new PrizmMonth(this.currentYear, item)) - ) { - return PrizmRangeState.Single; - } + // TODO finish it after add support intervals or delete + // if ( + // this.value instanceof PrizmDayRange && + // this.value.isMonthInRange(new PrizmMonth(this.currentYear, item)) + // ) { + // return PrizmRangeState.Single; + // } if ( (value.from.month === item && !value.from.monthSame(value.to)) || diff --git a/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.less b/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.less index ab9508f175..b9917ae7d3 100644 --- a/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.less +++ b/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.less @@ -1,12 +1,12 @@ @import '../../../../styles/ui-local.less'; -@itemWidth: 93px; -@itemHeight: 56px; +@itemWidth: var(--prizm-year-item-widtn, 93px); +@itemHeight: var(--prizm-year-item-height, 56px); .picker(@itemWidth, @itemHeight); :host { - width: 280px; + width: var(--prizm-year-picker-widtn, 280px); } .z-cell { diff --git a/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.ts b/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.ts index 4b17f9705c..e398c054ca 100644 --- a/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.ts +++ b/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.ts @@ -59,6 +59,10 @@ export class PrizmPrimitiveYearPickerComponent extends PrizmAbstractTestId { @prizmDefaultProp() disabledItemHandler: PrizmBooleanHandler = PRIZM_ALWAYS_FALSE_HANDLER; + @Input() + @prizmDefaultProp() + intervalSupport = false; + @Output() readonly yearClick = new EventEmitter(); @@ -131,12 +135,13 @@ export class PrizmPrimitiveYearPickerComponent extends PrizmAbstractTestId { return value.year === item ? PrizmRangeState.Single : null; } - if ( - (value instanceof PrizmDayRange || value instanceof PrizmMonthRange) && - value.isYearInRange(new PrizmYear(item)) - ) { - return PrizmRangeState.Single; - } + // TODO add after add support intervals or delete + // if ( + // (value instanceof PrizmDayRange || value instanceof PrizmMonthRange) && + // value.isYearInRange(new PrizmYear(item)) + // ) { + // return PrizmRangeState.Single; + // } if ( (value.from.year === item && !value.from.yearSame(value.to)) || @@ -183,7 +188,7 @@ export class PrizmPrimitiveYearPickerComponent extends PrizmAbstractTestId { * not support interval * */ public itemIsInterval(item: number): boolean { - return false; + return this.intervalSupport ? this.itemIsIntervalNew(item) : false; } /** From 9dc43fc4aebc9cf32dae866214b5469017958178 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 15 Mar 2024 13:46:01 +0300 Subject: [PATCH 071/291] fix: index marker color blends with the background of the selected date #1461 --- .../primitive-calendar.component.less | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/libs/components/src/lib/components/internal/primitive-calendar/primitive-calendar.component.less b/libs/components/src/lib/components/internal/primitive-calendar/primitive-calendar.component.less index 176998542c..05ca2557b1 100644 --- a/libs/components/src/lib/components/internal/primitive-calendar/primitive-calendar.component.less +++ b/libs/components/src/lib/components/internal/primitive-calendar/primitive-calendar.component.less @@ -92,3 +92,14 @@ ); } } + +[data-range='single']:not([data-state='hovered']) { + .z-status { + &[data-prizm-status='index'] { + background-color: var( + --prizm-calendar-day-status-secondary-default, + var(--prizm-v3-status-info-secondary-default) + ); + } + } +} From eebec1fe5ab7228cf518213fcc2117b3463f28ae Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 15 Mar 2024 15:10:51 +0300 Subject: [PATCH 072/291] refactor: some commented code removed --- .../primitive-month-picker.component.ts | 8 -------- .../primitive-year-picker.component.ts | 10 +--------- 2 files changed, 1 insertion(+), 17 deletions(-) diff --git a/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.ts b/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.ts index 7e401c0612..9f13b2e578 100644 --- a/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.ts +++ b/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.ts @@ -133,14 +133,6 @@ export class PrizmPrimitiveMonthPickerComponent extends PrizmAbstractTestId { return value.month === item && value.year === this.currentYear ? PrizmRangeState.Single : null; } - // TODO finish it after add support intervals or delete - // if ( - // this.value instanceof PrizmDayRange && - // this.value.isMonthInRange(new PrizmMonth(this.currentYear, item)) - // ) { - // return PrizmRangeState.Single; - // } - if ( (value.from.month === item && !value.from.monthSame(value.to)) || (hoveredItem !== null && diff --git a/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.ts b/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.ts index e398c054ca..bc1988521d 100644 --- a/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.ts +++ b/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.ts @@ -135,14 +135,6 @@ export class PrizmPrimitiveYearPickerComponent extends PrizmAbstractTestId { return value.year === item ? PrizmRangeState.Single : null; } - // TODO add after add support intervals or delete - // if ( - // (value instanceof PrizmDayRange || value instanceof PrizmMonthRange) && - // value.isYearInRange(new PrizmYear(item)) - // ) { - // return PrizmRangeState.Single; - // } - if ( (value.from.year === item && !value.from.yearSame(value.to)) || (hoveredItem !== null && @@ -192,7 +184,7 @@ export class PrizmPrimitiveYearPickerComponent extends PrizmAbstractTestId { } /** - * TODO with support intervals + * with support intervals * */ public itemIsIntervalNew(item: number): boolean { const { value, hoveredItem } = this; From cbcacc3311f727b9aeecd240f924742f28f92318 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 18 Mar 2024 15:33:20 +0300 Subject: [PATCH 073/291] fix: calendar range year picker and month picker fix --- .../examples/range/range.component.ts | 2 +- .../calendar/calendar.component.html | 9 ++++ .../calendars/calendar/calendar.component.ts | 3 +- .../calendar/calendar.component.html | 2 + .../components/calendar/calendar.component.ts | 6 ++- .../primitive-calendar-range.component.html | 2 + .../primitive-calendar-range.component.ts | 3 ++ .../primitive-month-picker.component.ts | 49 ++++++++++--------- .../primitive-year-picker.component.ts | 22 +++++---- 9 files changed, 63 insertions(+), 35 deletions(-) diff --git a/apps/doc/src/app/components/calendars/calendar-month/examples/range/range.component.ts b/apps/doc/src/app/components/calendars/calendar-month/examples/range/range.component.ts index cd03708509..612748702d 100644 --- a/apps/doc/src/app/components/calendars/calendar-month/examples/range/range.component.ts +++ b/apps/doc/src/app/components/calendars/calendar-month/examples/range/range.component.ts @@ -10,7 +10,7 @@ import { PrizmMonth, PrizmMonthRange } from '@prizm-ui/components'; export class PrizmMonthExample2Component { value: PrizmMonthRange | null = null; - max = new PrizmMonth(2021, 7); + max = new PrizmMonth(2024, 3); min = new PrizmMonth(2019, 7); public onMonthClick(month: PrizmMonth): void { diff --git a/apps/doc/src/app/components/calendars/calendar/calendar.component.html b/apps/doc/src/app/components/calendars/calendar/calendar.component.html index 4cabb88022..a17fce8917 100644 --- a/apps/doc/src/app/components/calendars/calendar/calendar.component.html +++ b/apps/doc/src/app/components/calendars/calendar/calendar.component.html @@ -15,6 +15,7 @@ [prizmDocHostElement]="element" [value]="day" [showAdjacent]="showAdjacent" + [rangeState]="rangeState" (dayClick)="onDayClick($event)" > @@ -99,6 +100,14 @@ Marker Handler + + Range State + + @@ -30,6 +31,7 @@ [initialItem]="$any(clickedMonth)" [value]="value" [currentYear]="month.year" + [rangeState]="rangeState" (monthClick)="onPickerMonthClick($event)" automation-id="prizm-calendar__year" > diff --git a/libs/components/src/lib/components/calendar/calendar.component.ts b/libs/components/src/lib/components/calendar/calendar.component.ts index 5f9a6401fc..e49f07375a 100644 --- a/libs/components/src/lib/components/calendar/calendar.component.ts +++ b/libs/components/src/lib/components/calendar/calendar.component.ts @@ -12,7 +12,7 @@ import { PrizmMapper } from '../../types/mapper'; import { PrizmMarkerHandler } from '../../types/marker-handler'; import { PrizmWithOptionalMinMax } from '../../types/with-optional-min-max'; import { prizmNullableSame } from '../../util/common/nullable-same'; -import { PrizmDayWithStatus } from '../../@core'; +import { PrizmDayWithStatus, PrizmRangeState } from '../../@core'; import { PrizmAbstractTestId } from '../../abstract/interactive'; import { CommonModule } from '@angular/common'; import { PrizmPrimitiveCalendarComponent } from '../internal/primitive-calendar'; @@ -83,6 +83,10 @@ export class PrizmCalendarComponent extends PrizmAbstractTestId implements Prizm @prizmDefaultProp() markerHandler: PrizmMarkerHandler = PRIZM_DEFAULT_MARKER_HANDLER; + @Input() + @prizmDefaultProp() + rangeState: PrizmRangeState = PrizmRangeState.Single; + @Output() readonly dayClick = new EventEmitter(); diff --git a/libs/components/src/lib/components/internal/primitive-calendar-range/primitive-calendar-range.component.html b/libs/components/src/lib/components/internal/primitive-calendar-range/primitive-calendar-range.component.html index d8dac6196b..ac7a53ec52 100644 --- a/libs/components/src/lib/components/internal/primitive-calendar-range/primitive-calendar-range.component.html +++ b/libs/components/src/lib/components/internal/primitive-calendar-range/primitive-calendar-range.component.html @@ -8,6 +8,7 @@ [value]="value" [disabledItemHandler]="disabledItemHandler" [showAdjacent]="false" + [rangeState]="rangeStates[0]" (dayClick)="onDayClick($event)" (monthChange)="onSectionFirstViewedMonth($event)" > @@ -25,6 +26,7 @@ [value]="value" [disabledItemHandler]="disabledItemHandler" [showAdjacent]="false" + [rangeState]="rangeStates[1]" (dayClick)="onDayClick($event)" (monthChange)="onSectionSecondViewedMonth($event)" > diff --git a/libs/components/src/lib/components/internal/primitive-calendar-range/primitive-calendar-range.component.ts b/libs/components/src/lib/components/internal/primitive-calendar-range/primitive-calendar-range.component.ts index c91e21dd95..62556e9fe2 100644 --- a/libs/components/src/lib/components/internal/primitive-calendar-range/primitive-calendar-range.component.ts +++ b/libs/components/src/lib/components/internal/primitive-calendar-range/primitive-calendar-range.component.ts @@ -24,6 +24,7 @@ import { PrizmBooleanHandler } from '../../../types/handler'; import { PrizmMapper } from '../../../types/mapper'; import { PrizmMarkerHandler } from '../../../types/marker-handler'; import { PrizmAbstractTestId } from '../../../abstract/interactive'; +import { PrizmRangeState } from '../../../@core/enums'; /** * @internal @@ -64,6 +65,8 @@ export class PrizmPrimitiveCalendarRangeComponent extends PrizmAbstractTestId im @prizmDefaultProp() value: PrizmDayRange | null = null; + readonly rangeStates = [PrizmRangeState.Start, PrizmRangeState.End]; + @Output() readonly dayClick = new EventEmitter(); diff --git a/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.ts b/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.ts index 9f13b2e578..ea24fc208c 100644 --- a/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.ts +++ b/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.ts @@ -19,6 +19,7 @@ import { PrizmAbstractTestId } from '../../../abstract/interactive'; import { PrizmLetDirective } from '@prizm-ui/helpers'; import { CommonModule } from '@angular/common'; import { PrizmMonthPipeModule } from '../../../pipes'; +import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion'; const ITEMS_IN_ROW = 3; const ROWS = 4; @@ -70,6 +71,17 @@ export class PrizmPrimitiveMonthPickerComponent extends PrizmAbstractTestId { @prizmDefaultProp() disabledItemHandler: PrizmBooleanHandler = PRIZM_ALWAYS_FALSE_HANDLER; + @Input() + @prizmDefaultProp() + rangeState: PrizmRangeState = PrizmRangeState.Single; + + @Input() + @prizmDefaultProp() + set intervalSupport(value: BooleanInput) { + this._intervalSupport = coerceBooleanProperty(value); + } + private _intervalSupport = false; + @Output() readonly monthClick = new EventEmitter(); @@ -144,29 +156,22 @@ export class PrizmPrimitiveMonthPickerComponent extends PrizmAbstractTestId { hoveredItem === value.from.month && value.from.monthSame(value.to)) ) { - return PrizmRangeState.Single; - - // TODO finish it after add support intervals - // return PrizmRangeState.Start; + return this.rangeState === PrizmRangeState.Start || this._intervalSupport ? this.rangeState : null; } - // TODO finish it after add support intervals - // if ( - // (value.to.month === item && !value.from.monthSame(value.to)) || - // (hoveredItem !== null && - // hoveredItem < value.from.month && - // value.from.month === item && - // value.from.monthSame(value.to)) || - // (hoveredItem !== null && - // hoveredItem === item && - // hoveredItem > value.from.month && - // value.from.monthSame(value.to)) - // ) { - // return PrizmRangeState.Single; - // - // - // // return PrizmRangeState.End; - // } + if ( + (value.to.month === item && !value.from.monthSame(value.to)) || + (hoveredItem !== null && + hoveredItem < value.from.month && + value.from.month === item && + value.from.monthSame(value.to)) || + (hoveredItem !== null && + hoveredItem === item && + hoveredItem > value.from.month && + value.from.monthSame(value.to)) + ) { + return this.rangeState === PrizmRangeState.End || this._intervalSupport ? this.rangeState : null; + } return value.from.monthSame(value.to) && value.from.month === item && value.from.year === this.currentYear ? PrizmRangeState.Single @@ -181,7 +186,7 @@ export class PrizmPrimitiveMonthPickerComponent extends PrizmAbstractTestId { * not support interval * */ public itemIsInterval(item: number): boolean { - return false; + return this._intervalSupport ? this.itemIsIntervalNew(item) : false; } /** diff --git a/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.ts b/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.ts index bc1988521d..cbb49bc3f9 100644 --- a/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.ts +++ b/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.ts @@ -16,6 +16,7 @@ import { import { PrizmRangeState } from '../../../@core/enums/range-state'; import { PrizmAbstractTestId } from '../../../abstract/interactive'; import { PrizmLetDirective } from '@prizm-ui/helpers'; +import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion'; const LIMIT = 100; const ITEMS_IN_ROW = 3; @@ -61,7 +62,14 @@ export class PrizmPrimitiveYearPickerComponent extends PrizmAbstractTestId { @Input() @prizmDefaultProp() - intervalSupport = false; + rangeState: PrizmRangeState = PrizmRangeState.Single; + + @Input() + @prizmDefaultProp() + set intervalSupport(value: BooleanInput) { + this._intervalSupport = coerceBooleanProperty(value); + } + private _intervalSupport = false; @Output() readonly yearClick = new EventEmitter(); @@ -146,10 +154,7 @@ export class PrizmPrimitiveYearPickerComponent extends PrizmAbstractTestId { hoveredItem < value.from.year && value.from.yearSame(value.to)) ) { - return PrizmRangeState.Single; - - // TODO add after add support intervals - // return PrizmRangeState.Start; + return this.rangeState === PrizmRangeState.Start || this._intervalSupport ? this.rangeState : null; } if ( @@ -163,10 +168,7 @@ export class PrizmPrimitiveYearPickerComponent extends PrizmAbstractTestId { hoveredItem > value.from.year && value.from.yearSame(value.to)) ) { - return PrizmRangeState.Single; - - // TODO add after add support intervals - // return PrizmRangeState.End; + return this.rangeState === PrizmRangeState.End || this._intervalSupport ? this.rangeState : null; } return value.from.yearSame(value.to) && value.from.year === item ? PrizmRangeState.Single : null; @@ -180,7 +182,7 @@ export class PrizmPrimitiveYearPickerComponent extends PrizmAbstractTestId { * not support interval * */ public itemIsInterval(item: number): boolean { - return this.intervalSupport ? this.itemIsIntervalNew(item) : false; + return this._intervalSupport ? this.itemIsIntervalNew(item) : false; } /** From 54bf81e505d192449660aab9607529eb2d2fe646 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 19 Mar 2024 10:51:19 +0300 Subject: [PATCH 074/291] fix: calendar range corners for interval --- .../calendar-month/calendar-month.component.ts | 2 +- .../primitive-year-picker.component.ts | 8 +++++--- libs/components/src/styles/mixins/picker.less | 12 ++++++++++++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/libs/components/src/lib/components/calendar-month/calendar-month.component.ts b/libs/components/src/lib/components/calendar-month/calendar-month.component.ts index 8913e7a88b..c0a24e4578 100644 --- a/libs/components/src/lib/components/calendar-month/calendar-month.component.ts +++ b/libs/components/src/lib/components/calendar-month/calendar-month.component.ts @@ -180,7 +180,7 @@ export class PrizmCalendarMonthComponent } if (!value.isSingleMonth) { - return value.from.monthSameOrBefore(month) && value.to.monthAfter(month); + return value.from.monthSameOrBefore(month) && value.to.monthSameOrAfter(month); } if (hoveredItem === null) { diff --git a/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.ts b/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.ts index cbb49bc3f9..18016bc751 100644 --- a/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.ts +++ b/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.ts @@ -154,7 +154,9 @@ export class PrizmPrimitiveYearPickerComponent extends PrizmAbstractTestId { hoveredItem < value.from.year && value.from.yearSame(value.to)) ) { - return this.rangeState === PrizmRangeState.Start || this._intervalSupport ? this.rangeState : null; + return this.rangeState === PrizmRangeState.Start || this._intervalSupport + ? PrizmRangeState.Start + : null; } if ( @@ -168,7 +170,7 @@ export class PrizmPrimitiveYearPickerComponent extends PrizmAbstractTestId { hoveredItem > value.from.year && value.from.yearSame(value.to)) ) { - return this.rangeState === PrizmRangeState.End || this._intervalSupport ? this.rangeState : null; + return this.rangeState === PrizmRangeState.End || this._intervalSupport ? PrizmRangeState.End : null; } return value.from.yearSame(value.to) && value.from.year === item ? PrizmRangeState.Single : null; @@ -196,7 +198,7 @@ export class PrizmPrimitiveYearPickerComponent extends PrizmAbstractTestId { } if (!value.from.yearSame(value.to)) { - return value.from.year <= item && value.to.year > item; + return value.from.year <= item && value.to.year >= item; } if (hoveredItem === null || value.from.year === hoveredItem) { diff --git a/libs/components/src/styles/mixins/picker.less b/libs/components/src/styles/mixins/picker.less index 0a1b0c3894..6e2761d6fa 100644 --- a/libs/components/src/styles/mixins/picker.less +++ b/libs/components/src/styles/mixins/picker.less @@ -110,6 +110,18 @@ border-radius: 0; color: var(--prizm-v3-button-primary-solid-default); } + + &[data-range='start'] > .z-item:before, + &[data-range='start'] > .z-item:after { + border-top-right-radius: 0; + border-bottom-right-radius: 0; + } + + &[data-range='end'] > .z-item:before, + &[data-range='end'] > .z-item:after { + border-top-left-radius: 0; + border-bottom-left-radius: 0; + } } &[data-range] { From 3776012e456e287efebd2873392ecade7dc6d617 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 19 Mar 2024 14:29:01 +0300 Subject: [PATCH 075/291] fix: incorrect hover behavior in calnedar --- .../primitive-month-picker.component.ts | 46 ++++++++----------- .../primitive-year-picker.component.ts | 42 +++++++---------- 2 files changed, 34 insertions(+), 54 deletions(-) diff --git a/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.ts b/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.ts index ea24fc208c..f033ed5e43 100644 --- a/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.ts +++ b/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.ts @@ -135,7 +135,7 @@ export class PrizmPrimitiveMonthPickerComponent extends PrizmAbstractTestId { } public getItemRange(item: number): PrizmRangeState | null { - const { value, hoveredItem } = this; + const { value } = this; if (value === null) { return null; @@ -145,37 +145,27 @@ export class PrizmPrimitiveMonthPickerComponent extends PrizmAbstractTestId { return value.month === item && value.year === this.currentYear ? PrizmRangeState.Single : null; } - if ( - (value.from.month === item && !value.from.monthSame(value.to)) || - (hoveredItem !== null && - hoveredItem > value.from.month && - value.from.month === item && - value.from.monthSame(value.to)) || - (hoveredItem !== null && - hoveredItem === item && - hoveredItem === value.from.month && - value.from.monthSame(value.to)) - ) { - return this.rangeState === PrizmRangeState.Start || this._intervalSupport ? this.rangeState : null; + if (this._intervalSupport) { + return value.from.month === item && value.from.year === this.currentYear + ? PrizmRangeState.Start + : value.to.month === item && value.from.year === this.currentYear + ? PrizmRangeState.End + : null; } - if ( - (value.to.month === item && !value.from.monthSame(value.to)) || - (hoveredItem !== null && - hoveredItem < value.from.month && - value.from.month === item && - value.from.monthSame(value.to)) || - (hoveredItem !== null && - hoveredItem === item && - hoveredItem > value.from.month && - value.from.monthSame(value.to)) - ) { - return this.rangeState === PrizmRangeState.End || this._intervalSupport ? this.rangeState : null; + if (this.rangeState === PrizmRangeState.Start && value.from.month === item) { + return PrizmRangeState.Start; } - return value.from.monthSame(value.to) && value.from.month === item && value.from.year === this.currentYear - ? PrizmRangeState.Single - : null; + if (this.rangeState === PrizmRangeState.End && value.to.month === item) { + return PrizmRangeState.End; + } + + if (value.from.monthSame(value.to) && value.from.month === item && value.from.year === this.currentYear) { + return PrizmRangeState.Single; + } + + return null; } public itemIsToday(item: number): boolean { diff --git a/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.ts b/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.ts index 18016bc751..b2c563baaf 100644 --- a/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.ts +++ b/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.ts @@ -133,7 +133,7 @@ export class PrizmPrimitiveYearPickerComponent extends PrizmAbstractTestId { } public getItemRange(item: number): PrizmRangeState | null { - const { value, hoveredItem } = this; + const { value } = this; if (value === null) { return null; @@ -143,37 +143,27 @@ export class PrizmPrimitiveYearPickerComponent extends PrizmAbstractTestId { return value.year === item ? PrizmRangeState.Single : null; } - if ( - (value.from.year === item && !value.from.yearSame(value.to)) || - (hoveredItem !== null && - hoveredItem > value.from.year && - value.from.year === item && - value.from.yearSame(value.to)) || - (hoveredItem !== null && - hoveredItem === item && - hoveredItem < value.from.year && - value.from.yearSame(value.to)) - ) { - return this.rangeState === PrizmRangeState.Start || this._intervalSupport + if (this._intervalSupport) { + return value.from.year === item ? PrizmRangeState.Start + : value.to.year === item + ? PrizmRangeState.End : null; } - if ( - (value.to.year === item && !value.from.yearSame(value.to)) || - (hoveredItem !== null && - hoveredItem < value.from.year && - value.from.year === item && - value.from.yearSame(value.to)) || - (hoveredItem !== null && - hoveredItem === item && - hoveredItem > value.from.year && - value.from.yearSame(value.to)) - ) { - return this.rangeState === PrizmRangeState.End || this._intervalSupport ? PrizmRangeState.End : null; + if (this.rangeState === PrizmRangeState.Start && value.from.year === item) { + return PrizmRangeState.Start; } - return value.from.yearSame(value.to) && value.from.year === item ? PrizmRangeState.Single : null; + if (this.rangeState === PrizmRangeState.End && value.to.year === item) { + return PrizmRangeState.End; + } + + if (value.from.yearSame(value.to) && value.from.year === item) { + return PrizmRangeState.Single; + } + + return null; } public itemIsToday(item: number): boolean { From c57cbb6564b287d1a54d837d581855e7982126df Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 19 Mar 2024 18:24:16 +0300 Subject: [PATCH 076/291] fix: calendar year bouncing on hover --- libs/components/src/styles/mixins/picker.less | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/components/src/styles/mixins/picker.less b/libs/components/src/styles/mixins/picker.less index 6e2761d6fa..ac4324a8b6 100644 --- a/libs/components/src/styles/mixins/picker.less +++ b/libs/components/src/styles/mixins/picker.less @@ -12,12 +12,12 @@ } .z-item { + border: 1px solid transparent; display: flex; align-items: center; justify-content: center; position: relative; flex: 1; - // height: 100%; height: @itemHeight; border-radius: 2px; color: var(--prizm-v3-text-icon-secondary); @@ -62,7 +62,6 @@ .z-item { border: 1px solid var(--prizm-v3-button-primary-solid-default); color: var(--prizm-v3-button-primary-solid-default); - // height: @itemHeight; width: @itemWidth; &_unavailable { From 1e5c4495c97fe6867eaaa71f998cf93659767e4f Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 19 Mar 2024 19:19:21 +0300 Subject: [PATCH 077/291] fix: calendar year bouncing on hover --- .../calendar-month/calendar-month.component.less | 1 + libs/components/src/styles/mixins/picker.less | 8 +++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libs/components/src/lib/components/calendar-month/calendar-month.component.less b/libs/components/src/lib/components/calendar-month/calendar-month.component.less index 94b9300969..83ce61a2a7 100644 --- a/libs/components/src/lib/components/calendar-month/calendar-month.component.less +++ b/libs/components/src/lib/components/calendar-month/calendar-month.component.less @@ -30,6 +30,7 @@ .z-item { color: var(--prizm-v3-button-primary-solid-hover) !important; + border-color: var(--prizm-v3-button-ghost-hover); } } } diff --git a/libs/components/src/styles/mixins/picker.less b/libs/components/src/styles/mixins/picker.less index ac4324a8b6..813fa96dff 100644 --- a/libs/components/src/styles/mixins/picker.less +++ b/libs/components/src/styles/mixins/picker.less @@ -60,7 +60,7 @@ } .z-item { - border: 1px solid var(--prizm-v3-button-primary-solid-default); + border-color: var(--prizm-v3-button-primary-solid-default); color: var(--prizm-v3-button-primary-solid-default); width: @itemWidth; @@ -82,6 +82,9 @@ } &_interval { + & > .z-item { + border-color: var(--prizm-v3-button-primary-ghost-active); + } &:before { background: var(--prizm-v3-button-primary-ghost-active); border-radius: unset; @@ -126,6 +129,7 @@ &[data-range] { &:not([data-state='hovered']) > .z-item { color: var(--prizm-v3-text-icon-exception); + border-color: var(--prizm-v3-button-primary-solid-default); &:before, &:after { @@ -136,6 +140,7 @@ &[data-state='hovered'] > .z-item { background-color: var(--prizm-v3-button-ghost-hover); color: var(--prizm-v3-button-primary-solid-hover); + border-color: var(--prizm-v3-button-ghost-hover); } &[data-state='hovered'] > .z-item:before, @@ -188,6 +193,7 @@ &[data-state='hovered']:not([data-range]):not(.z-cell_today) > .z-item { background-color: var(--prizm-v3-button-ghost-hover); + border-color: var(--prizm-v3-button-ghost-hover); color: var(--prizm-v3-button-primary-solid-hover); } From 2daf11cc03e1e7c0d7eb756fd50c214448338125 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Wed, 20 Mar 2024 11:18:46 +0300 Subject: [PATCH 078/291] fix: spin button hint direction --- .../primitive-spin-button/primitive-spin-button.template.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libs/components/src/lib/components/internal/primitive-spin-button/primitive-spin-button.template.html b/libs/components/src/lib/components/internal/primitive-spin-button/primitive-spin-button.template.html index 744370bfbd..62ef87ed1a 100644 --- a/libs/components/src/lib/components/internal/primitive-spin-button/primitive-spin-button.template.html +++ b/libs/components/src/lib/components/internal/primitive-spin-button/primitive-spin-button.template.html @@ -20,6 +20,7 @@ appearance="secondary" [class.z-arrow_hidden]="leftComputedDisabled" [prizmHint]="texts[0]" + [prizmHintDirection]="'b'" [focusable]="false" (click)="onLeftClick()" > @@ -37,6 +38,7 @@ [appearanceType]="mode" [class.z-arrow_hidden]="rightComputedDisabled" [prizmHint]="texts[1]" + [prizmHintDirection]="'b'" [focusable]="false" (click)="onRightClick()" > From 5f29ae813b8b93c9c9c312c4353da8fc477bc4fa Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Wed, 20 Mar 2024 18:04:08 +0300 Subject: [PATCH 079/291] fix: outline removed for breadcrumb content projection example --- .../breadcrumbs-example-projection.component.less | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/doc/src/app/components/breadcrumbs/examples/breadcrumbs-projection-basic/breadcrumbs-example-projection.component.less b/apps/doc/src/app/components/breadcrumbs/examples/breadcrumbs-projection-basic/breadcrumbs-example-projection.component.less index 9aca9890fb..d668c99b28 100644 --- a/apps/doc/src/app/components/breadcrumbs/examples/breadcrumbs-projection-basic/breadcrumbs-example-projection.component.less +++ b/apps/doc/src/app/components/breadcrumbs/examples/breadcrumbs-projection-basic/breadcrumbs-example-projection.component.less @@ -4,6 +4,7 @@ a { line-height: 16px; color: var(--prizm-v3-text-icon-tertiary); text-decoration: none; + outline: none; &:hover { color: var(--prizm-v3-text-icon-link-hover); From 4c951c905673fb7970723f1c3c07c070682442b8 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 21 Mar 2024 11:15:54 +0300 Subject: [PATCH 080/291] fix: fileupload buttons incorrect gap #1482 --- .../src/lib/components/file-upload/file-upload.component.less | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/components/src/lib/components/file-upload/file-upload.component.less b/libs/components/src/lib/components/file-upload/file-upload.component.less index 579626c919..7d7c1f2cf8 100644 --- a/libs/components/src/lib/components/file-upload/file-upload.component.less +++ b/libs/components/src/lib/components/file-upload/file-upload.component.less @@ -59,7 +59,7 @@ .file { display: grid; - grid-template-columns: 44px 8px fit-content(60%) auto 24px 24px; + grid-template-columns: 44px 8px fit-content(60%) auto 24px 8px 24px; grid-template-rows: 24px 20px; align-items: end; &:not(:last-child) { @@ -126,7 +126,7 @@ } &__delete-btn { - grid-column-start: 6; + grid-column-start: 7; } &__progress { From 300694720e599e7d52e5572c446fc0f5f001ebbc Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Mon, 25 Mar 2024 11:36:38 +0300 Subject: [PATCH 081/291] feat: update tags for npm delpoy ci pipelines for v3 version --- .github/workflows/beta-publish-ng16.yml | 26 +++++++++---------- .github/workflows/main-publish-ng16.yml | 22 ++++++++-------- .../workflows/pre-release-publish-ng16.yml | 26 +++++++++---------- 3 files changed, 37 insertions(+), 37 deletions(-) diff --git a/.github/workflows/beta-publish-ng16.yml b/.github/workflows/beta-publish-ng16.yml index d23c1aa624..4150243376 100644 --- a/.github/workflows/beta-publish-ng16.yml +++ b/.github/workflows/beta-publish-ng16.yml @@ -52,12 +52,12 @@ jobs: - name: 'Increase max memory limit' run: | - export NODE_OPTIONS="--max_old_space_size=4096" + export NODE_OPTIONS="--max_old_space_size=8192" - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag beta --json 2>/dev/null || echo '3.11.1-beta.0') | jq '([.[] | select(startswith("3.11.1-beta"))] | last // "3.11.1-beta.0")' 2>/dev/null || echo '3.11.1-beta.0' + (npm view @prizm-ui/components versions --tag ng16beta --json 2>/dev/null || echo '3.10.0-beta.0') | jq '([.[] | select(startswith("3.10.0-beta"))] | last // "3.10.0-beta.0")' 2>/dev/null || echo '3.10.0-beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV @@ -139,7 +139,7 @@ jobs: node-version: '18.x' registry-url: 'https://registry.npmjs.org' - - run: cd dist/libs/components && npm publish --tag beta --access public --verbose + - run: cd dist/libs/components && npm publish --tag ng16beta --access public --verbose publish-i18n: needs: build @@ -166,7 +166,7 @@ jobs: node-version: '18.x' registry-url: 'https://registry.npmjs.org' - - run: cd dist/libs/i18n && npm publish --tag beta --access public --verbose + - run: cd dist/libs/i18n && npm publish --tag ng16beta --access public --verbose publish-helpers: needs: build @@ -193,7 +193,7 @@ jobs: node-version: '18.x' registry-url: 'https://registry.npmjs.org' - - run: cd dist/libs/helpers && npm publish --tag beta --access public --verbose + - run: cd dist/libs/helpers && npm publish --tag ng16beta --access public --verbose publish-core: needs: build @@ -219,7 +219,7 @@ jobs: node-version: '18.x' registry-url: 'https://registry.npmjs.org' - - run: cd dist/libs/core && npm publish --tag beta --access public --verbose + - run: cd dist/libs/core && npm publish --tag ng16beta --access public --verbose publish-theme: needs: build @@ -246,7 +246,7 @@ jobs: node-version: '18.x' registry-url: 'https://registry.npmjs.org' - - run: cd dist/libs/theme && npm publish --tag beta --access public --verbose + - run: cd dist/libs/theme && npm publish --tag ng16beta --access public --verbose publish-icons: needs: build @@ -273,7 +273,7 @@ jobs: node-version: '18.x' registry-url: 'https://registry.npmjs.org' - - run: cd dist/libs/icons/base && npm publish --tag beta --access public --verbose + - run: cd dist/libs/icons/base && npm publish --tag ng16beta --access public --verbose publish-flags: needs: build @@ -300,7 +300,7 @@ jobs: node-version: '18.x' registry-url: 'https://registry.npmjs.org' - - run: cd dist/libs/icons/flags && npm publish --tag beta --access public --verbose + - run: cd dist/libs/icons/flags && npm publish --tag ng16beta --access public --verbose publish-plugin: needs: build @@ -327,7 +327,7 @@ jobs: node-version: '18.x' registry-url: 'https://registry.npmjs.org' - - run: cd dist/libs/plugin && npm publish --tag beta --access public --verbose + - run: cd dist/libs/plugin && npm publish --tag ng16beta --access public --verbose publish-ast: needs: build @@ -354,7 +354,7 @@ jobs: node-version: '18.x' registry-url: 'https://registry.npmjs.org' - - run: cd dist/libs/ast && npm publish --tag beta --access public --verbose + - run: cd dist/libs/ast && npm publish --tag ng16beta --access public --verbose publish-charts: needs: build @@ -381,7 +381,7 @@ jobs: node-version: '18.x' registry-url: 'https://registry.npmjs.org' - - run: cd dist/libs/charts && npm publish --tag beta --access public --verbose + - run: cd dist/libs/charts && npm publish --tag ng16beta --access public --verbose publish-nxmv: needs: build @@ -408,4 +408,4 @@ jobs: node-version: '18.x' registry-url: 'https://registry.npmjs.org' - - run: cd dist/libs/nxmv && npm publish --tag beta --access public --verbose + - run: cd dist/libs/nxmv && npm publish --tag ng16beta --access public --verbose diff --git a/.github/workflows/main-publish-ng16.yml b/.github/workflows/main-publish-ng16.yml index bb1ba399ff..aadb722fd2 100644 --- a/.github/workflows/main-publish-ng16.yml +++ b/.github/workflows/main-publish-ng16.yml @@ -132,7 +132,7 @@ jobs: name: dist path: ./dist - - run: cd dist/libs/components && npm publish --access public --verbose + - run: cd dist/libs/components && npm publish --tag ng16 --access public --verbose publish-i18n: needs: build @@ -160,7 +160,7 @@ jobs: name: dist path: ./dist - - run: cd dist/libs/i18n && npm publish --access public --verbose + - run: cd dist/libs/i18n && npm publish --tag ng16 --access public --verbose publish-helpers: needs: build @@ -188,7 +188,7 @@ jobs: name: dist path: ./dist - - run: cd dist/libs/helpers && npm publish --access public --verbose + - run: cd dist/libs/helpers && npm publish --tag ng16 --access public --verbose publish-core: needs: build @@ -216,7 +216,7 @@ jobs: name: dist path: ./dist - - run: cd dist/libs/core && npm publish --access public --verbose + - run: cd dist/libs/core && npm publish --tag ng16 --access public --verbose publish-theme: needs: build @@ -244,7 +244,7 @@ jobs: name: dist path: ./dist - - run: cd dist/libs/theme && npm publish --access public --verbose + - run: cd dist/libs/theme && npm publish --tag ng16 --access public --verbose publish-icons: needs: build @@ -272,7 +272,7 @@ jobs: name: dist path: ./dist - - run: cd dist/libs/icons/base && npm publish --access public --verbose + - run: cd dist/libs/icons/base && npm publish --tag ng16 --access public --verbose publish-flags: needs: build @@ -300,7 +300,7 @@ jobs: name: dist path: ./dist - - run: cd dist/libs/icons/flags && npm publish --access public --verbose + - run: cd dist/libs/icons/flags && npm publish --tag ng16 --access public --verbose publish-plugin: needs: build @@ -328,7 +328,7 @@ jobs: name: dist path: ./dist - - run: cd dist/libs/plugin && npm publish --access public --verbose + - run: cd dist/libs/plugin && npm publish --tag ng16 --access public --verbose publish-ast: needs: build @@ -356,7 +356,7 @@ jobs: name: dist path: ./dist - - run: cd dist/libs/ast && npm publish --access public --verbose + - run: cd dist/libs/ast && npm publish --tag ng16 --access public --verbose publish-charts: needs: build @@ -384,7 +384,7 @@ jobs: name: dist path: ./dist - - run: cd dist/libs/charts && npm publish --access public --verbose + - run: cd dist/libs/charts && npm publish --tag ng16 --access public --verbose publish-nxmv: needs: build @@ -412,4 +412,4 @@ jobs: name: dist path: ./dist - - run: cd dist/libs/nxmv && npm publish --access public --verbose + - run: cd dist/libs/nxmv && npm publish --tag ng16 --access public --verbose diff --git a/.github/workflows/pre-release-publish-ng16.yml b/.github/workflows/pre-release-publish-ng16.yml index 0a85deeb91..3b88abcbe3 100644 --- a/.github/workflows/pre-release-publish-ng16.yml +++ b/.github/workflows/pre-release-publish-ng16.yml @@ -52,12 +52,12 @@ jobs: - name: 'Increase max memory limit' run: | - export NODE_OPTIONS="--max_old_space_size=4096" + export NODE_OPTIONS="--max_old_space_size=8192" - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag next --json 2>/dev/null || echo '3.11.1-next.0') | jq '([.[] | select(startswith("3.11.1-next"))] | last // "3.11.1-next.0")' 2>/dev/null || echo '3.11.1-next.0' + (npm view @prizm-ui/components versions --tag ng16next --json 2>/dev/null || echo '3.10.0-next.0') | jq '([.[] | select(startswith("3.10.0-next"))] | last // "3.10.0-next.0")' 2>/dev/null || echo '3.10.0-next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV @@ -139,7 +139,7 @@ jobs: node-version: '18.x' registry-url: 'https://registry.npmjs.org' - - run: cd dist/libs/components && npm publish --tag next --access public --verbose + - run: cd dist/libs/components && npm publish --tag ng16next --access public --verbose publish-i18n: needs: build @@ -166,7 +166,7 @@ jobs: node-version: '18.x' registry-url: 'https://registry.npmjs.org' - - run: cd dist/libs/i18n && npm publish --tag next --access public --verbose + - run: cd dist/libs/i18n && npm publish --tag ng16next --access public --verbose publish-helpers: needs: build @@ -193,7 +193,7 @@ jobs: node-version: '18.x' registry-url: 'https://registry.npmjs.org' - - run: cd dist/libs/helpers && npm publish --tag next --access public --verbose + - run: cd dist/libs/helpers && npm publish --tag ng16next --access public --verbose publish-core: needs: build @@ -219,7 +219,7 @@ jobs: node-version: '18.x' registry-url: 'https://registry.npmjs.org' - - run: cd dist/libs/core && npm publish --tag next --access public --verbose + - run: cd dist/libs/core && npm publish --tag ng16next --access public --verbose publish-theme: needs: build @@ -246,7 +246,7 @@ jobs: node-version: '18.x' registry-url: 'https://registry.npmjs.org' - - run: cd dist/libs/theme && npm publish --tag next --access public --verbose + - run: cd dist/libs/theme && npm publish --tag ng16next --access public --verbose publish-icons: needs: build @@ -273,7 +273,7 @@ jobs: node-version: '18.x' registry-url: 'https://registry.npmjs.org' - - run: cd dist/libs/icons/base && npm publish --tag next --access public --verbose + - run: cd dist/libs/icons/base && npm publish --tag ng16next --access public --verbose publish-flags: needs: build @@ -300,7 +300,7 @@ jobs: node-version: '18.x' registry-url: 'https://registry.npmjs.org' - - run: cd dist/libs/icons/flags && npm publish --tag next --access public --verbose + - run: cd dist/libs/icons/flags && npm publish --tag ng16next --access public --verbose publish-plugin: needs: build @@ -327,7 +327,7 @@ jobs: node-version: '18.x' registry-url: 'https://registry.npmjs.org' - - run: cd dist/libs/plugin && npm publish --tag next --access public --verbose + - run: cd dist/libs/plugin && npm publish --tag ng16next --access public --verbose publish-ast: needs: build @@ -354,7 +354,7 @@ jobs: node-version: '18.x' registry-url: 'https://registry.npmjs.org' - - run: cd dist/libs/ast && npm publish --tag next --access public --verbose + - run: cd dist/libs/ast && npm publish --tag ng16next --access public --verbose publish-charts: needs: build @@ -381,7 +381,7 @@ jobs: node-version: '18.x' registry-url: 'https://registry.npmjs.org' - - run: cd dist/libs/charts && npm publish --tag next --access public --verbose + - run: cd dist/libs/charts && npm publish --tag ng16next --access public --verbose publish-nxmv: needs: build @@ -408,4 +408,4 @@ jobs: node-version: '18.x' registry-url: 'https://registry.npmjs.org' - - run: cd dist/libs/nxmv && npm publish --tag next --access public --verbose + - run: cd dist/libs/nxmv && npm publish --tag ng16next --access public --verbose From 60821f3e144db4c5270e4f9f13c30e094241018c Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Wed, 17 Jan 2024 15:13:13 +0300 Subject: [PATCH 082/291] fix(components/cron): small fixes --- libs/components/src/lib/components/cron/cron.component.html | 2 +- .../src/lib/components/switcher/switcher.component.html | 3 +-- .../src/lib/components/switcher/switcher.component.ts | 4 ++++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/libs/components/src/lib/components/cron/cron.component.html b/libs/components/src/lib/components/cron/cron.component.html index 51ddbd01a0..ca1f5f052f 100644 --- a/libs/components/src/lib/components/cron/cron.component.html +++ b/libs/components/src/lib/components/cron/cron.component.html @@ -49,7 +49,7 @@ > - + !switcher.hide); + } + @Input() @prizmDefaultProp() public set selectedSwitcherIdx(idx: number) { From aa6117bf79a4028d0fc1f9472264b728913c9889 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 25 Mar 2024 14:20:46 +0300 Subject: [PATCH 083/291] fix: version fix for cron switcher #1494 --- libs/components/src/lib/components/cron/cron.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/components/src/lib/components/cron/cron.component.html b/libs/components/src/lib/components/cron/cron.component.html index ca1f5f052f..51ddbd01a0 100644 --- a/libs/components/src/lib/components/cron/cron.component.html +++ b/libs/components/src/lib/components/cron/cron.component.html @@ -49,7 +49,7 @@ > Date: Mon, 25 Mar 2024 15:56:37 +0300 Subject: [PATCH 084/291] chore: version 1.15.1 up tp 1.16.0 --- .github/workflows/beta-publish-ng14.yml | 2 +- .github/workflows/main-publish-ng14.yml | 2 +- .github/workflows/pre-release-publish-ng14.yml | 2 +- apps/doc/src/app/version-manager/current.const.ts | 2 +- .../src/app/version-manager/current.const.ts.ng14 | 2 +- .../src/app/version-manager/versions.constants.ts | 12 ++++++------ libs/ast/package.json.ng14 | 2 +- libs/charts/base/package.json.ng14 | 6 +++--- libs/components/package.json.ng14 | 10 +++++----- libs/core/package.json.ng14 | 2 +- libs/helpers/package.json.ng14 | 2 +- libs/i18n/package.json.ng14 | 2 +- libs/icons/base/package.json.ng14 | 2 +- libs/icons/flags/package.json.ng14 | 4 ++-- libs/nxmv/package.json.ng14 | 2 +- libs/plugin/package.json.ng14 | 4 ++-- libs/schematics/package.json.ng14 | 2 +- libs/theme/package.json.ng14 | 6 +++--- package.json.ng14 | 2 +- 19 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/beta-publish-ng14.yml b/.github/workflows/beta-publish-ng14.yml index d9a665d1fa..8009289bfd 100644 --- a/.github/workflows/beta-publish-ng14.yml +++ b/.github/workflows/beta-publish-ng14.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng14beta --json 2>/dev/null || echo '1.15.1-ng14beta.0') | jq '([.[] | select(startswith("1.15.1-ng14beta"))] | last // "1.15.1-ng14beta.0")' 2>/dev/null || echo '1.15.1-ng14beta.0' + (npm view @prizm-ui/components versions --tag ng14beta --json 2>/dev/null || echo '1.16.0-ng14beta.0') | jq '([.[] | select(startswith("1.16.0-ng14beta"))] | last // "1.16.0-ng14beta.0")' 2>/dev/null || echo '1.16.0-ng14beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng14.yml b/.github/workflows/main-publish-ng14.yml index 0a82cb239d..971c785fd6 100644 --- a/.github/workflows/main-publish-ng14.yml +++ b/.github/workflows/main-publish-ng14.yml @@ -58,7 +58,7 @@ jobs: - name: Set up environment variables run: | last_v1_version=$( - echo '1.15.1' + echo '1.16.0' ) echo "LAST_V1_VERSION=${last_v1_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng14.yml b/.github/workflows/pre-release-publish-ng14.yml index 038354c5e0..7bcc57722b 100644 --- a/.github/workflows/pre-release-publish-ng14.yml +++ b/.github/workflows/pre-release-publish-ng14.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng14next --json 2>/dev/null || echo '1.15.1-ng14next.0') | jq '([.[] | select(startswith("1.15.1-ng14next"))] | last // "1.15.1-ng14next.0")' 2>/dev/null || echo '1.15.1-ng14next.0' + (npm view @prizm-ui/components versions --tag ng14next --json 2>/dev/null || echo '1.16.0-ng14next.0') | jq '([.[] | select(startswith("1.16.0-ng14next"))] | last // "1.16.0-ng14next.0")' 2>/dev/null || echo '1.16.0-ng14next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/apps/doc/src/app/version-manager/current.const.ts b/apps/doc/src/app/version-manager/current.const.ts index 092f3ce545..a7db703f9f 100644 --- a/apps/doc/src/app/version-manager/current.const.ts +++ b/apps/doc/src/app/version-manager/current.const.ts @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '1.15.1'; +export const PRIZM_CURRENT_VERSION = '1.16.0'; diff --git a/apps/doc/src/app/version-manager/current.const.ts.ng14 b/apps/doc/src/app/version-manager/current.const.ts.ng14 index 092f3ce545..a7db703f9f 100644 --- a/apps/doc/src/app/version-manager/current.const.ts.ng14 +++ b/apps/doc/src/app/version-manager/current.const.ts.ng14 @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '1.15.1'; +export const PRIZM_CURRENT_VERSION = '1.16.0'; diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index d1cf29490a..09247cb46a 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -30,8 +30,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ }, }, { - label: '1.15.1 (ng14)', - version: '1.15.1', + label: '1.16.0 (ng14)', + version: '1.16.0', stackblitz: 'https://stackblitz.com/edit/prizm-v1-demo', link: new URL('https://prizm-v1.web.app'), otherLinks: [], @@ -54,8 +54,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '1.15.1-next (ng14)', - version: '1.15.1-next', + label: '1.16.0-next (ng14)', + version: '1.16.0-next', stackblitz: 'https://stackblitz.com/edit/prizm-v1-next-demo', link: new URL('https://prizm-v1-next.web.app'), otherLinks: [], @@ -75,8 +75,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '1.15.1-beta (ng14)', - version: '1.15.1-beta', + label: '1.16.0-beta (ng14)', + version: '1.16.0-beta', stackblitz: 'https://stackblitz.com/edit/prizm-v1-beta-demo', link: new URL('https://prizm-v1-beta.web.app'), otherLinks: [], diff --git a/libs/ast/package.json.ng14 b/libs/ast/package.json.ng14 index a80ff60446..69345c645b 100644 --- a/libs/ast/package.json.ng14 +++ b/libs/ast/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "1.15.1", + "version": "1.16.0", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json.ng14 b/libs/charts/base/package.json.ng14 index df692cde2e..b7eecffc8e 100644 --- a/libs/charts/base/package.json.ng14 +++ b/libs/charts/base/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "1.15.1", + "version": "1.16.0", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/theme": "^1.15.1", - "@prizm-ui/helpers": "^1.15.1", + "@prizm-ui/theme": "^1.16.0", + "@prizm-ui/helpers": "^1.16.0", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/package.json.ng14 b/libs/components/package.json.ng14 index 18e5066df6..62666341a5 100644 --- a/libs/components/package.json.ng14 +++ b/libs/components/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "1.15.1", + "version": "1.16.0", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -17,10 +17,10 @@ "@ng-web-apis/resize-observer": "2.0.0", "@ng-web-apis/intersection-observer": "2.0.0", "@ng-web-apis/mutation-observer": "2.0.0", - "@prizm-ui/helpers": "^1.15.1", - "@prizm-ui/core": "^1.15.1", - "@prizm-ui/i18n": "^1.15.1", - "@prizm-ui/theme": "^1.15.1" + "@prizm-ui/helpers": "^1.16.0", + "@prizm-ui/core": "^1.16.0", + "@prizm-ui/i18n": "^1.16.0", + "@prizm-ui/theme": "^1.16.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json.ng14 b/libs/core/package.json.ng14 index 067afa27b8..ac76f8e97b 100644 --- a/libs/core/package.json.ng14 +++ b/libs/core/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "1.15.1", + "version": "1.16.0", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json.ng14 b/libs/helpers/package.json.ng14 index 96e99cf9d6..137740df92 100644 --- a/libs/helpers/package.json.ng14 +++ b/libs/helpers/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "1.15.1", + "version": "1.16.0", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json.ng14 b/libs/i18n/package.json.ng14 index 234d743949..44aa5878e2 100644 --- a/libs/i18n/package.json.ng14 +++ b/libs/i18n/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "1.15.1", + "version": "1.16.0", "peerDependencies": { "@angular/core": "^14.2.0" }, diff --git a/libs/icons/base/package.json.ng14 b/libs/icons/base/package.json.ng14 index aae5c481f3..2613dbcf8d 100644 --- a/libs/icons/base/package.json.ng14 +++ b/libs/icons/base/package.json.ng14 @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/core": "^1.15.1" + "@prizm-ui/core": "^1.16.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json.ng14 b/libs/icons/flags/package.json.ng14 index 3a48421a8c..3a4bc78ded 100644 --- a/libs/icons/flags/package.json.ng14 +++ b/libs/icons/flags/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "1.15.1", + "version": "1.16.0", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/core": "^1.15.1" + "@prizm-ui/core": "^1.16.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json.ng14 b/libs/nxmv/package.json.ng14 index aeb41bbfc6..f72add0944 100644 --- a/libs/nxmv/package.json.ng14 +++ b/libs/nxmv/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "1.15.1", + "version": "1.16.0", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json.ng14 b/libs/plugin/package.json.ng14 index 827ae0fec9..3e22f7761a 100644 --- a/libs/plugin/package.json.ng14 +++ b/libs/plugin/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "1.15.1", + "version": "1.16.0", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^1.15.1" + "@prizm-ui/ast": "^1.16.0" } } diff --git a/libs/schematics/package.json.ng14 b/libs/schematics/package.json.ng14 index 260abea0ed..ac444b4660 100644 --- a/libs/schematics/package.json.ng14 +++ b/libs/schematics/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "1.15.1", + "version": "1.16.0", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json.ng14 b/libs/theme/package.json.ng14 index 77c5f70a59..5595e9b00e 100644 --- a/libs/theme/package.json.ng14 +++ b/libs/theme/package.json.ng14 @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "1.15.1", + "version": "1.16.0", "peerDependencies": { "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/core": "^1.15.1", - "@prizm-ui/helpers": "^1.15.1" + "@prizm-ui/core": "^1.16.0", + "@prizm-ui/helpers": "^1.16.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json.ng14 b/package.json.ng14 index 38132ab4bc..31c002fd20 100644 --- a/package.json.ng14 +++ b/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "1.15.1", + "version": "1.16.0", "license": "MIT", "husky": { "hooks": { From 1b2c62bb4aea218dd4836e5e4a2dc69419851e4a Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 25 Mar 2024 16:02:40 +0300 Subject: [PATCH 085/291] chore: version 2.12.1 up tp 2.13.0 --- .github/workflows/beta-publish-ng15.yml | 2 +- .github/workflows/main-publish-ng15.yml | 2 +- .github/workflows/pre-release-publish-ng15.yml | 2 +- .../src/app/version-manager/current.const.ts.ng15 | 2 +- .../src/app/version-manager/versions.constants.ts | 12 ++++++------ libs/ast/package.json.ng15 | 2 +- libs/charts/base/package.json.ng15 | 6 +++--- libs/components/package.json.ng15 | 10 +++++----- libs/core/package.json.ng15 | 2 +- libs/helpers/package.json.ng15 | 2 +- libs/i18n/package.json.ng15 | 2 +- libs/icons/base/package.json.ng15 | 4 ++-- libs/icons/flags/package.json.ng15 | 4 ++-- libs/nxmv/package.json.ng15 | 2 +- libs/plugin/package.json.ng15 | 4 ++-- libs/schematics/package.json.ng15 | 2 +- libs/theme/package.json.ng15 | 6 +++--- package.json.ng15 | 2 +- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/beta-publish-ng15.yml b/.github/workflows/beta-publish-ng15.yml index 415e89b276..95a0a3116e 100644 --- a/.github/workflows/beta-publish-ng15.yml +++ b/.github/workflows/beta-publish-ng15.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng15beta --json 2>/dev/null || echo '2.12.1-ng15beta.0') | jq '([.[] | select(startswith("2.12.1-ng15beta"))] | last // "2.12.1-ng15beta.0")' 2>/dev/null || echo '2.12.1-ng15beta.0' + (npm view @prizm-ui/components versions --tag ng15beta --json 2>/dev/null || echo '2.13.0-ng15beta.0') | jq '([.[] | select(startswith("2.13.0-ng15beta"))] | last // "2.13.0-ng15beta.0")' 2>/dev/null || echo '2.13.0-ng15beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng15.yml b/.github/workflows/main-publish-ng15.yml index 76abe9611e..e05c314abc 100644 --- a/.github/workflows/main-publish-ng15.yml +++ b/.github/workflows/main-publish-ng15.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_v2_version=$( - echo '2.12.1' + echo '2.13.0' ) echo "LAST_V2_VERSION=${last_v2_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng15.yml b/.github/workflows/pre-release-publish-ng15.yml index 879e9f1fb6..0aa402fad6 100644 --- a/.github/workflows/pre-release-publish-ng15.yml +++ b/.github/workflows/pre-release-publish-ng15.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng15next --json 2>/dev/null || echo '2.12.1-ng15next.0') | jq '([.[] | select(startswith("2.12.1-ng15next"))] | last // "2.12.1-ng15next.0")' 2>/dev/null || echo '2.12.1-ng15next.0' + (npm view @prizm-ui/components versions --tag ng15next --json 2>/dev/null || echo '2.13.0-ng15next.0') | jq '([.[] | select(startswith("2.13.0-ng15next"))] | last // "2.13.0-ng15next.0")' 2>/dev/null || echo '2.13.0-ng15next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/apps/doc/src/app/version-manager/current.const.ts.ng15 b/apps/doc/src/app/version-manager/current.const.ts.ng15 index 05e8058e38..34b25f91d7 100644 --- a/apps/doc/src/app/version-manager/current.const.ts.ng15 +++ b/apps/doc/src/app/version-manager/current.const.ts.ng15 @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '2.12.1'; +export const PRIZM_CURRENT_VERSION = '2.13.0'; diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index 09247cb46a..570ba8af6b 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -20,8 +20,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ }, }, { - label: '2.12.1 (ng15)', - version: '2.12.1', + label: '2.13.0 (ng15)', + version: '2.13.0', stackblitz: 'https://stackblitz.com/edit/prizm-v2-demo', link: new URL('https://prizm-v2.web.app'), otherLinks: [], @@ -47,9 +47,9 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '2.12.1-next (ng15)', + label: '2.13.0-next (ng15)', stackblitz: 'https://stackblitz.com/edit/prizm-v2-next-demo', - version: '2.12.1-next', + version: '2.13.0-next', link: new URL('https://prizm-v2-next.web.app'), otherLinks: [], }, @@ -68,8 +68,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '2.12.1-beta (ng15)', - version: '2.12.1-beta', + label: '2.13.0-beta (ng15)', + version: '2.13.0-beta', stackblitz: 'https://stackblitz.com/edit/prizm-v2-beta-demo', link: new URL('https://prizm-v2-beta.web.app'), otherLinks: [], diff --git a/libs/ast/package.json.ng15 b/libs/ast/package.json.ng15 index cd6b0c539d..02bf987252 100644 --- a/libs/ast/package.json.ng15 +++ b/libs/ast/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "2.12.1", + "version": "2.13.0", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json.ng15 b/libs/charts/base/package.json.ng15 index a271e91b5d..f8da5e1221 100644 --- a/libs/charts/base/package.json.ng15 +++ b/libs/charts/base/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "2.12.1", + "version": "2.13.0", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/theme": "^2.12.1", - "@prizm-ui/helpers": "^2.12.1", + "@prizm-ui/theme": "^2.13.0", + "@prizm-ui/helpers": "^2.13.0", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/package.json.ng15 b/libs/components/package.json.ng15 index 3fca5a1a73..41e94c6f48 100644 --- a/libs/components/package.json.ng15 +++ b/libs/components/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "2.12.1", + "version": "2.13.0", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -18,10 +18,10 @@ "@ng-web-apis/resize-observer": "2.0.0", "@ng-web-apis/intersection-observer": "2.0.0", "@ng-web-apis/mutation-observer": "2.0.0", - "@prizm-ui/helpers": "^2.12.1", - "@prizm-ui/core": "^2.12.1", - "@prizm-ui/i18n": "^2.12.1", - "@prizm-ui/theme": "^2.12.1" + "@prizm-ui/helpers": "^2.13.0", + "@prizm-ui/core": "^2.13.0", + "@prizm-ui/i18n": "^2.13.0", + "@prizm-ui/theme": "^2.13.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json.ng15 b/libs/core/package.json.ng15 index e245884263..2af0d6152e 100644 --- a/libs/core/package.json.ng15 +++ b/libs/core/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "2.12.1", + "version": "2.13.0", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json.ng15 b/libs/helpers/package.json.ng15 index f64244b971..1854e91959 100644 --- a/libs/helpers/package.json.ng15 +++ b/libs/helpers/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "2.12.1", + "version": "2.13.0", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json.ng15 b/libs/i18n/package.json.ng15 index 4eb5ec9a9f..9c215c6714 100644 --- a/libs/i18n/package.json.ng15 +++ b/libs/i18n/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "2.12.1", + "version": "2.13.0", "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0" diff --git a/libs/icons/base/package.json.ng15 b/libs/icons/base/package.json.ng15 index cb826540bc..515fb82d58 100644 --- a/libs/icons/base/package.json.ng15 +++ b/libs/icons/base/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "2.12.1", + "version": "2.13.0", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/core": "^2.12.1" + "@prizm-ui/core": "^2.13.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json.ng15 b/libs/icons/flags/package.json.ng15 index f349ca5b1b..570a6b0e19 100644 --- a/libs/icons/flags/package.json.ng15 +++ b/libs/icons/flags/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "2.12.1", + "version": "2.13.0", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/core": "^2.12.1" + "@prizm-ui/core": "^2.13.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json.ng15 b/libs/nxmv/package.json.ng15 index 8602f5cbec..1aa3b6d526 100644 --- a/libs/nxmv/package.json.ng15 +++ b/libs/nxmv/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "2.12.1", + "version": "2.13.0", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json.ng15 b/libs/plugin/package.json.ng15 index c1de88ee74..92b7fc1fb1 100644 --- a/libs/plugin/package.json.ng15 +++ b/libs/plugin/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "2.12.1", + "version": "2.13.0", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^2.12.1" + "@prizm-ui/ast": "^2.13.0" } } diff --git a/libs/schematics/package.json.ng15 b/libs/schematics/package.json.ng15 index 4b5cc894b2..3c07d7c071 100644 --- a/libs/schematics/package.json.ng15 +++ b/libs/schematics/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "2.12.1", + "version": "2.13.0", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json.ng15 b/libs/theme/package.json.ng15 index 2c3a8b22f7..ecd67db8f9 100644 --- a/libs/theme/package.json.ng15 +++ b/libs/theme/package.json.ng15 @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "2.12.1", + "version": "2.13.0", "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/core": "^2.12.1", - "@prizm-ui/helpers": "^2.12.1" + "@prizm-ui/core": "^2.13.0", + "@prizm-ui/helpers": "^2.13.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json.ng15 b/package.json.ng15 index 17ed86f0fe..9183940b31 100644 --- a/package.json.ng15 +++ b/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "2.12.1", + "version": "2.13.0", "license": "MIT", "husky": { "hooks": { From f3daed797752016868850ca786234cebf678c141 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 25 Mar 2024 16:13:47 +0300 Subject: [PATCH 086/291] chore: version 3.11.1 up tp 3.12.0 --- .github/workflows/beta-publish-ng16.yml | 2 +- .github/workflows/main-publish-ng16.yml | 2 +- .github/workflows/pre-release-publish-ng16.yml | 2 +- .../src/app/version-manager/current.const.ts.ng16 | 2 +- .../src/app/version-manager/versions.constants.ts | 12 ++++++------ libs/ast/package.json | 2 +- libs/ast/package.json.ng16 | 2 +- libs/charts/base/package.json | 6 +++--- libs/charts/base/package.json.ng16 | 6 +++--- libs/components/package.json | 10 +++++----- libs/components/package.json.ng16 | 10 +++++----- libs/core/package.json | 2 +- libs/core/package.json.ng16 | 2 +- libs/helpers/package.json | 2 +- libs/helpers/package.json.ng16 | 2 +- libs/i18n/package.json | 2 +- libs/i18n/package.json.ng16 | 2 +- libs/icons/base/package.json | 4 ++-- libs/icons/base/package.json.ng16 | 4 ++-- libs/icons/flags/package.json | 4 ++-- libs/icons/flags/package.json.ng16 | 4 ++-- libs/nxmv/package.json | 2 +- libs/nxmv/package.json.ng16 | 2 +- libs/plugin/package.json | 4 ++-- libs/plugin/package.json.ng16 | 4 ++-- libs/schematics/package.json | 2 +- libs/schematics/package.json.ng16 | 2 +- libs/theme/package.json | 6 +++--- libs/theme/package.json.ng16 | 6 +++--- package.json | 2 +- package.json.ng16 | 2 +- 31 files changed, 58 insertions(+), 58 deletions(-) diff --git a/.github/workflows/beta-publish-ng16.yml b/.github/workflows/beta-publish-ng16.yml index 4150243376..d16a163a2c 100644 --- a/.github/workflows/beta-publish-ng16.yml +++ b/.github/workflows/beta-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng16beta --json 2>/dev/null || echo '3.10.0-beta.0') | jq '([.[] | select(startswith("3.10.0-beta"))] | last // "3.10.0-beta.0")' 2>/dev/null || echo '3.10.0-beta.0' + (npm view @prizm-ui/components versions --tag ng16beta --json 2>/dev/null || echo '3.12.0-beta.0') | jq '([.[] | select(startswith("3.12.0-beta"))] | last // "3.12.0-beta.0")' 2>/dev/null || echo '3.12.0-beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng16.yml b/.github/workflows/main-publish-ng16.yml index aadb722fd2..8b50223337 100644 --- a/.github/workflows/main-publish-ng16.yml +++ b/.github/workflows/main-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_v3_version=$( - echo '3.11.1' + echo '3.12.0' ) echo "LAST_V3_VERSION=${last_v3_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng16.yml b/.github/workflows/pre-release-publish-ng16.yml index 3b88abcbe3..5271323a11 100644 --- a/.github/workflows/pre-release-publish-ng16.yml +++ b/.github/workflows/pre-release-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng16next --json 2>/dev/null || echo '3.10.0-next.0') | jq '([.[] | select(startswith("3.10.0-next"))] | last // "3.10.0-next.0")' 2>/dev/null || echo '3.10.0-next.0' + (npm view @prizm-ui/components versions --tag ng16next --json 2>/dev/null || echo '3.12.0-next.0') | jq '([.[] | select(startswith("3.12.0-next"))] | last // "3.12.0-next.0")' 2>/dev/null || echo '3.12.0-next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/apps/doc/src/app/version-manager/current.const.ts.ng16 b/apps/doc/src/app/version-manager/current.const.ts.ng16 index 567a9c0b88..4990b091f3 100644 --- a/apps/doc/src/app/version-manager/current.const.ts.ng16 +++ b/apps/doc/src/app/version-manager/current.const.ts.ng16 @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '3.11.1'; +export const PRIZM_CURRENT_VERSION = '3.12.0'; diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index 570ba8af6b..7c7999c3ce 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -10,8 +10,8 @@ export interface PrizmVersionMeta { export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ { - label: '3.11.1 (ng16)', - version: '3.11.1', + label: '3.12.0 (ng16)', + version: '3.12.0', stackblitz: 'https://stackblitz.com/edit/prizm-v3-demo', link: new URL('http://prizm.site'), otherLinks: [new URL('https://prizm-v3.web.app')], @@ -40,8 +40,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ }, }, { - label: '3.11.1-next (ng16)', - version: '3.11.1-next', + label: '3.12.0-next (ng16)', + version: '3.12.0-next', stackblitz: 'https://stackblitz.com/edit/prizm-v3-next-demo', link: new URL('https://prizm-v3-next.web.app'), otherLinks: [], @@ -61,8 +61,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '3.11.1-beta (ng16)', - version: '3.11.1-beta', + label: '3.12.0-beta (ng16)', + version: '3.12.0-beta', stackblitz: 'https://stackblitz.com/edit/prizm-v3-beta-demo', link: new URL('https://prizm-v3-beta.web.app'), otherLinks: [], diff --git a/libs/ast/package.json b/libs/ast/package.json index 964b76d358..dd52cd82fc 100644 --- a/libs/ast/package.json +++ b/libs/ast/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "3.11.1", + "version": "3.12.0", "private": false, "publishConfig": { "access": "public", diff --git a/libs/ast/package.json.ng16 b/libs/ast/package.json.ng16 index 964b76d358..dd52cd82fc 100644 --- a/libs/ast/package.json.ng16 +++ b/libs/ast/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "3.11.1", + "version": "3.12.0", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json b/libs/charts/base/package.json index 9ae760771e..ba60feb422 100644 --- a/libs/charts/base/package.json +++ b/libs/charts/base/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "3.11.1", + "version": "3.12.0", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/theme": "^3.11.1", - "@prizm-ui/helpers": "^3.11.1", + "@prizm-ui/theme": "^3.12.0", + "@prizm-ui/helpers": "^3.12.0", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/charts/base/package.json.ng16 b/libs/charts/base/package.json.ng16 index 9ae760771e..ba60feb422 100644 --- a/libs/charts/base/package.json.ng16 +++ b/libs/charts/base/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "3.11.1", + "version": "3.12.0", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/theme": "^3.11.1", - "@prizm-ui/helpers": "^3.11.1", + "@prizm-ui/theme": "^3.12.0", + "@prizm-ui/helpers": "^3.12.0", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/package.json b/libs/components/package.json index b9e14116ac..789902f526 100644 --- a/libs/components/package.json +++ b/libs/components/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "3.11.1", + "version": "3.12.0", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -18,10 +18,10 @@ "@ng-web-apis/resize-observer": "^3.0.0", "@ng-web-apis/intersection-observer": "^3.0.0", "@ng-web-apis/mutation-observer": "^3.0.0", - "@prizm-ui/helpers": "^3.11.1", - "@prizm-ui/core": "^3.11.1", - "@prizm-ui/i18n": "^3.11.1", - "@prizm-ui/theme": "^3.11.1" + "@prizm-ui/helpers": "^3.12.0", + "@prizm-ui/core": "^3.12.0", + "@prizm-ui/i18n": "^3.12.0", + "@prizm-ui/theme": "^3.12.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/components/package.json.ng16 b/libs/components/package.json.ng16 index b9e14116ac..789902f526 100644 --- a/libs/components/package.json.ng16 +++ b/libs/components/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "3.11.1", + "version": "3.12.0", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -18,10 +18,10 @@ "@ng-web-apis/resize-observer": "^3.0.0", "@ng-web-apis/intersection-observer": "^3.0.0", "@ng-web-apis/mutation-observer": "^3.0.0", - "@prizm-ui/helpers": "^3.11.1", - "@prizm-ui/core": "^3.11.1", - "@prizm-ui/i18n": "^3.11.1", - "@prizm-ui/theme": "^3.11.1" + "@prizm-ui/helpers": "^3.12.0", + "@prizm-ui/core": "^3.12.0", + "@prizm-ui/i18n": "^3.12.0", + "@prizm-ui/theme": "^3.12.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json b/libs/core/package.json index 5b0894b880..71d52a3e3a 100644 --- a/libs/core/package.json +++ b/libs/core/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "3.11.1", + "version": "3.12.0", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/core/package.json.ng16 b/libs/core/package.json.ng16 index 5b0894b880..71d52a3e3a 100644 --- a/libs/core/package.json.ng16 +++ b/libs/core/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "3.11.1", + "version": "3.12.0", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json b/libs/helpers/package.json index 9b4be6b274..c153667946 100644 --- a/libs/helpers/package.json +++ b/libs/helpers/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "3.11.1", + "version": "3.12.0", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/helpers/package.json.ng16 b/libs/helpers/package.json.ng16 index 9b4be6b274..c153667946 100644 --- a/libs/helpers/package.json.ng16 +++ b/libs/helpers/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "3.11.1", + "version": "3.12.0", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json b/libs/i18n/package.json index 8961bea8df..d02a6fcb99 100644 --- a/libs/i18n/package.json +++ b/libs/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "3.11.1", + "version": "3.12.0", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0" diff --git a/libs/i18n/package.json.ng16 b/libs/i18n/package.json.ng16 index 8961bea8df..d02a6fcb99 100644 --- a/libs/i18n/package.json.ng16 +++ b/libs/i18n/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "3.11.1", + "version": "3.12.0", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0" diff --git a/libs/icons/base/package.json b/libs/icons/base/package.json index 44d49146a8..296d48fa38 100644 --- a/libs/icons/base/package.json +++ b/libs/icons/base/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "3.11.1", + "version": "3.12.0", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.11.1" + "@prizm-ui/core": "^3.12.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/base/package.json.ng16 b/libs/icons/base/package.json.ng16 index 44d49146a8..296d48fa38 100644 --- a/libs/icons/base/package.json.ng16 +++ b/libs/icons/base/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "3.11.1", + "version": "3.12.0", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.11.1" + "@prizm-ui/core": "^3.12.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json b/libs/icons/flags/package.json index 51ffced2da..cafc0a3f46 100644 --- a/libs/icons/flags/package.json +++ b/libs/icons/flags/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "3.11.1", + "version": "3.12.0", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.11.1" + "@prizm-ui/core": "^3.12.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json.ng16 b/libs/icons/flags/package.json.ng16 index 51ffced2da..cafc0a3f46 100644 --- a/libs/icons/flags/package.json.ng16 +++ b/libs/icons/flags/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "3.11.1", + "version": "3.12.0", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.11.1" + "@prizm-ui/core": "^3.12.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json b/libs/nxmv/package.json index d3f6cd4ca1..63fb06bf99 100644 --- a/libs/nxmv/package.json +++ b/libs/nxmv/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "3.11.1", + "version": "3.12.0", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/nxmv/package.json.ng16 b/libs/nxmv/package.json.ng16 index d3f6cd4ca1..63fb06bf99 100644 --- a/libs/nxmv/package.json.ng16 +++ b/libs/nxmv/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "3.11.1", + "version": "3.12.0", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json b/libs/plugin/package.json index 1e2c1257f0..b1e47c0f42 100644 --- a/libs/plugin/package.json +++ b/libs/plugin/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "3.11.1", + "version": "3.12.0", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^3.11.1" + "@prizm-ui/ast": "^3.12.0" } } diff --git a/libs/plugin/package.json.ng16 b/libs/plugin/package.json.ng16 index 1e2c1257f0..b1e47c0f42 100644 --- a/libs/plugin/package.json.ng16 +++ b/libs/plugin/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "3.11.1", + "version": "3.12.0", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^3.11.1" + "@prizm-ui/ast": "^3.12.0" } } diff --git a/libs/schematics/package.json b/libs/schematics/package.json index cf61d009fc..f1afd5c53b 100644 --- a/libs/schematics/package.json +++ b/libs/schematics/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "3.11.1", + "version": "3.12.0", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/schematics/package.json.ng16 b/libs/schematics/package.json.ng16 index cf61d009fc..f1afd5c53b 100644 --- a/libs/schematics/package.json.ng16 +++ b/libs/schematics/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "3.11.1", + "version": "3.12.0", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json b/libs/theme/package.json index e9d8c29ca1..12092d5c9b 100644 --- a/libs/theme/package.json +++ b/libs/theme/package.json @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "3.11.1", + "version": "3.12.0", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.11.1", - "@prizm-ui/helpers": "^3.11.1" + "@prizm-ui/core": "^3.12.0", + "@prizm-ui/helpers": "^3.12.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/theme/package.json.ng16 b/libs/theme/package.json.ng16 index e9d8c29ca1..12092d5c9b 100644 --- a/libs/theme/package.json.ng16 +++ b/libs/theme/package.json.ng16 @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "3.11.1", + "version": "3.12.0", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.11.1", - "@prizm-ui/helpers": "^3.11.1" + "@prizm-ui/core": "^3.12.0", + "@prizm-ui/helpers": "^3.12.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json b/package.json index bb999e475b..aa6d18161d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "3.11.1", + "version": "3.12.0", "license": "MIT", "husky": { "hooks": { diff --git a/package.json.ng16 b/package.json.ng16 index bb999e475b..aa6d18161d 100644 --- a/package.json.ng16 +++ b/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "3.11.1", + "version": "3.12.0", "license": "MIT", "husky": { "hooks": { From ed58664acb3978cca20f834a7b816116cf1fac11 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 25 Mar 2024 16:25:13 +0300 Subject: [PATCH 087/291] feat: changelog update --- .../app/about-prizm/changelog/CHANGELOG.md | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index b0fecaefc5..c9e8b5277d 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -2,6 +2,38 @@ All notable changes to this project will be documented in this file. +## [1.16.0, 2.13.0, 3.12.0](https://github.com/zyfra/Prizm) (23-03-2023) + +## Features + +- feat(components/breadcrumbs): change the focus to focus-visible for breadcrumbs #1297 +- feat(components/checkbox): change the focus to focus-visible for checkbox #1297 +- feat(components/radio-button): change the focus to focus-visible for radio-button #1297 +- feat(components/chips): change the focus to focus-visible for chips #1297 +- feat(components/input-icon-button): change the focus to focus-visible for input-icon-button #1297 +- feat(components/slider): change the focus to focus-visible for slider cnob #1297 +- feat(components/stepper): change the focus to focus-visible for stepper button #1297 +- feat(components/input-icon-button): change the focus to focus-visible for toggle #1297 +- feat(components/input-icon-button): change the focus to focus-visible for button #1297 +- feat(docs/theme): add shadow color to docs #900 + +### Bug fixes + +- fix(components/calendar): replace default 'title' attribute by prizm hint in calendar year pagination buttons #1457 +- fix(components/calendar-range): incorrect markup for year and month screens fix #1445 +- fix(components/input-layout-date-time): incorrect control markup fix #1242 +- fix(components/input-layout-date-time-range): incorrect control markup fix #1242 +- fix(components/calendar-month): incorrect control markup fix #1242 +- fix(components/calendar-range): single year should be highlighted in calendar range #1465 +- fix(components/calendar-range): single month should be highlighted in calendar range #1464 +- fix(components/calendar): index marker color blends with the background of the selected date #1461 +- fix(components/input-date-time-range): afte clear time values in calendar got error #1368 +- fix(components/input-date-time): min/max does not work correctly in InputLayoutDateTime #1421 +- fix(chore): stackblitz for v3 #1209 +- fix(docs/colors): fix documentation styles for dark theme +- fix(components/file-upload) fileupload buttons incorrect gap #1482 +- fix(components/navigation-menu): hint icon margins added for navigation menu #1329 + ## [1.15.1, 2.12.1, 3.11.1](https://github.com/zyfra/Prizm) (19-02-2023) ### Bug fixes From 27fb731ff30e315c540798dea2c68fc35dcd8a5a Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 26 Mar 2024 09:00:42 +0300 Subject: [PATCH 088/291] feat: changelog update --- apps/doc/src/app/about-prizm/changelog/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index c9e8b5277d..054085233c 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -33,6 +33,7 @@ All notable changes to this project will be documented in this file. - fix(docs/colors): fix documentation styles for dark theme - fix(components/file-upload) fileupload buttons incorrect gap #1482 - fix(components/navigation-menu): hint icon margins added for navigation menu #1329 +- fix (components/cron): switcher used in Cron incorrectly displays selected tab #1494 ## [1.15.1, 2.12.1, 3.11.1](https://github.com/zyfra/Prizm) (19-02-2023) From a53b7b867f488f3fe5e7aaa761efcb567e753d0c Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 26 Mar 2024 10:31:54 +0300 Subject: [PATCH 089/291] fix: recall switcher changes --- apps/doc/src/app/about-prizm/changelog/CHANGELOG.md | 1 - .../src/lib/components/switcher/switcher.component.html | 3 ++- .../src/lib/components/switcher/switcher.component.ts | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index 054085233c..c9e8b5277d 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -33,7 +33,6 @@ All notable changes to this project will be documented in this file. - fix(docs/colors): fix documentation styles for dark theme - fix(components/file-upload) fileupload buttons incorrect gap #1482 - fix(components/navigation-menu): hint icon margins added for navigation menu #1329 -- fix (components/cron): switcher used in Cron incorrectly displays selected tab #1494 ## [1.15.1, 2.12.1, 3.11.1](https://github.com/zyfra/Prizm) (19-02-2023) diff --git a/libs/components/src/lib/components/switcher/switcher.component.html b/libs/components/src/lib/components/switcher/switcher.component.html index 81144f26bb..5d61a59abc 100644 --- a/libs/components/src/lib/components/switcher/switcher.component.html +++ b/libs/components/src/lib/components/switcher/switcher.component.html @@ -1,7 +1,8 @@
    - + !switcher.hide); - } - @Input() @prizmDefaultProp() public set selectedSwitcherIdx(idx: number) { From 5c564b0e0a9fc78a23079904deae450c090daf55 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 26 Mar 2024 14:32:20 +0300 Subject: [PATCH 090/291] fix: changelog 3.12.0 fix texts --- apps/doc/src/app/about-prizm/changelog/CHANGELOG.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index c9e8b5277d..5fc4f01982 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -13,8 +13,8 @@ All notable changes to this project will be documented in this file. - feat(components/input-icon-button): change the focus to focus-visible for input-icon-button #1297 - feat(components/slider): change the focus to focus-visible for slider cnob #1297 - feat(components/stepper): change the focus to focus-visible for stepper button #1297 -- feat(components/input-icon-button): change the focus to focus-visible for toggle #1297 -- feat(components/input-icon-button): change the focus to focus-visible for button #1297 +- feat(components/toggle): change the focus to focus-visible for toggle #1297 +- feat(components/button): change the focus to focus-visible for button #1297 - feat(docs/theme): add shadow color to docs #900 ### Bug fixes From c1153e28106caba179295c3151a68e23837c7e15 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 26 Mar 2024 17:29:52 +0300 Subject: [PATCH 091/291] fix: 3.12.0 changelog update --- apps/doc/src/app/about-prizm/changelog/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index 5fc4f01982..e01e493fc0 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -33,6 +33,7 @@ All notable changes to this project will be documented in this file. - fix(docs/colors): fix documentation styles for dark theme - fix(components/file-upload) fileupload buttons incorrect gap #1482 - fix(components/navigation-menu): hint icon margins added for navigation menu #1329 +- fix(components/file-upload) fileupload buttons incorrect gap #1482 ## [1.15.1, 2.12.1, 3.11.1](https://github.com/zyfra/Prizm) (19-02-2023) From 00298bf0df56babdf19adfee77fc0ef32a328ae7 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Wed, 27 Mar 2024 10:47:20 +0300 Subject: [PATCH 092/291] fix(ci): sync pipelines with main --- .github/workflows/beta-publish-ng14.yml | 4 +- .github/workflows/beta-publish-ng15.yml | 4 +- .github/workflows/beta-publish-ng16.yml | 2 +- .github/workflows/beta-publish-ng17.yml | 411 ++++++++++++++++ .github/workflows/beta-released.yml | 30 +- .../check-build-in-real-project-ng14.yml | 2 +- .../check-build-in-real-project-ng15.yml | 2 +- .github/workflows/deploy-main-doc-ng14.yml | 117 +++++ .github/workflows/deploy-main-doc-ng15.yml | 112 +++++ .github/workflows/deploy-main-doc-ng16.yml | 107 +++++ .github/workflows/deploy-main-doc-ng17.yml | 107 +++++ .github/workflows/deploy-main-doc.yml | 27 ++ .github/workflows/main-publish-ng14.yml | 4 +- .github/workflows/main-publish-ng15.yml | 4 +- .github/workflows/main-publish-ng16.yml | 8 +- .github/workflows/main-publish-ng17.yml | 443 ++++++++++++++++++ .github/workflows/pr-ng14.yml | 12 +- .github/workflows/pr-ng15.yml | 12 +- .github/workflows/pr-ng16.yml | 16 +- .github/workflows/pr-ng17.yml | 140 ++++++ .../workflows/pre-release-publish-ng14.yml | 4 +- .../workflows/pre-release-publish-ng15.yml | 4 +- .../workflows/pre-release-publish-ng16.yml | 2 +- .../workflows/pre-release-publish-ng17.yml | 411 ++++++++++++++++ .github/workflows/pre-released.yml | 43 +- .github/workflows/released.yml | 44 +- 26 files changed, 1971 insertions(+), 101 deletions(-) create mode 100644 .github/workflows/beta-publish-ng17.yml create mode 100644 .github/workflows/deploy-main-doc-ng14.yml create mode 100644 .github/workflows/deploy-main-doc-ng15.yml create mode 100644 .github/workflows/deploy-main-doc-ng16.yml create mode 100644 .github/workflows/deploy-main-doc-ng17.yml create mode 100644 .github/workflows/deploy-main-doc.yml create mode 100644 .github/workflows/main-publish-ng17.yml create mode 100644 .github/workflows/pr-ng17.yml create mode 100644 .github/workflows/pre-release-publish-ng17.yml diff --git a/.github/workflows/beta-publish-ng14.yml b/.github/workflows/beta-publish-ng14.yml index 8009289bfd..dab5343eab 100644 --- a/.github/workflows/beta-publish-ng14.yml +++ b/.github/workflows/beta-publish-ng14.yml @@ -52,12 +52,12 @@ jobs: - name: 'Increase max memory limit' run: | - export NODE_OPTIONS="--max_old_space_size=4096" + export NODE_OPTIONS="--max_old_space_size=8192" - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng14beta --json 2>/dev/null || echo '1.16.0-ng14beta.0') | jq '([.[] | select(startswith("1.16.0-ng14beta"))] | last // "1.16.0-ng14beta.0")' 2>/dev/null || echo '1.16.0-ng14beta.0' + (npm view @prizm-ui/components versions --tag ng14beta --json 2>/dev/null || echo '1.14.0-ng14beta.0') | jq '([.[] | select(startswith("1.14.0-ng14beta"))] | last // "1.14.0-ng14beta.0")' 2>/dev/null || echo '1.14.0-ng14beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/beta-publish-ng15.yml b/.github/workflows/beta-publish-ng15.yml index 95a0a3116e..d87c2ac663 100644 --- a/.github/workflows/beta-publish-ng15.yml +++ b/.github/workflows/beta-publish-ng15.yml @@ -52,12 +52,12 @@ jobs: - name: 'Increase max memory limit' run: | - export NODE_OPTIONS="--max_old_space_size=4096" + export NODE_OPTIONS="--max_old_space_size=8192" - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng15beta --json 2>/dev/null || echo '2.13.0-ng15beta.0') | jq '([.[] | select(startswith("2.13.0-ng15beta"))] | last // "2.13.0-ng15beta.0")' 2>/dev/null || echo '2.13.0-ng15beta.0' + (npm view @prizm-ui/components versions --tag ng15beta --json 2>/dev/null || echo '2.11.0-ng15beta.0') | jq '([.[] | select(startswith("2.11.0-ng15beta"))] | last // "2.11.0-ng15beta.0")' 2>/dev/null || echo '2.11.0-ng15beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/beta-publish-ng16.yml b/.github/workflows/beta-publish-ng16.yml index d16a163a2c..4150243376 100644 --- a/.github/workflows/beta-publish-ng16.yml +++ b/.github/workflows/beta-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng16beta --json 2>/dev/null || echo '3.12.0-beta.0') | jq '([.[] | select(startswith("3.12.0-beta"))] | last // "3.12.0-beta.0")' 2>/dev/null || echo '3.12.0-beta.0' + (npm view @prizm-ui/components versions --tag ng16beta --json 2>/dev/null || echo '3.10.0-beta.0') | jq '([.[] | select(startswith("3.10.0-beta"))] | last // "3.10.0-beta.0")' 2>/dev/null || echo '3.10.0-beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/beta-publish-ng17.yml b/.github/workflows/beta-publish-ng17.yml new file mode 100644 index 0000000000..620b30243b --- /dev/null +++ b/.github/workflows/beta-publish-ng17.yml @@ -0,0 +1,411 @@ +# TODO: later change tag by input variable ${{ inputs.tag }} +name: Publish beta packages 17 +on: + workflow_dispatch: + workflow_call: +env: + npmrc_config_push: ${{ secrets.NPMRC_CONFIG_PUSH }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_PUBLISH_TOKEN }} +permissions: + contents: read + packages: write +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Derive appropriate SHAs for base and head for `nx affected` commands + uses: nrwl/nx-set-shas@v3 + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: Restore cache + id: cache-restore + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: 'Initial changes 17' + run: | + cp -f package.json.ng17 package.json + cp -f package-lock.json.ng17 package-lock.json + + - name: Install dependencies + if: steps.cache-restore.outputs.cache-hit != 'true' + run: npm ci --ignore-scripts + + - name: Save cache... + id: cache-save + uses: actions/cache/save@v3 + if: ${{ steps.cache-restore.outputs.cache-hit != 'true' && always() }} + with: + path: ./node_modules + key: ${{ steps.cache-restore.outputs.cache-primary-key }} + + - name: 'Increase max memory limit' + run: | + export NODE_OPTIONS="--max_old_space_size=8192" + + - name: Set up environment variables + run: | + last_draft_version=$( + (npm view @prizm-ui/components versions --tag beta --json 2>/dev/null || echo '4.1.1-beta.0') | jq '([.[] | select(startswith("4.1.1-beta"))] | last // "4.1.1-beta.0")' 2>/dev/null || echo '4.1.1-beta.0' + ) + echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV + + - name: 'Set version 17' + run: npx nx generate @prizm-ui/nx-mv:apply -n v17 + + - name: 'Update beta versions' + run: npx nx generate @prizm-ui/nx-plugin:update-version --updateInDependencies true --newVersion="4.*.*-beta.up" --all --currentVersion="${{ env.LAST_DRAFT_VERSION }}" + + - name: 'Build beta versions.' + run: npx nx run-many --target=build --all --parallel --max-parallel=3 + + - name: Upload dist as artifacts... + id: dist-cache-save + uses: actions/upload-artifact@v3 + with: + name: dist + path: ./dist + + deploy_to_doc: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: 'Build doc app for firebase hosting' + run: npm run build:doc + + - name: Deploy doc to firebase + uses: FirebaseExtended/action-hosting-deploy@v0 + with: + repoToken: '${{ secrets.GITHUB_TOKEN }}' + firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_PRIZMUI }}' + projectId: prizmui + channelId: live + target: v4-beta + + publish-components: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - run: cd dist/libs/components && npm publish --tag beta --access public --verbose + + publish-i18n: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - run: cd dist/libs/i18n && npm publish --tag beta --access public --verbose + + publish-helpers: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - run: cd dist/libs/helpers && npm publish --tag beta --access public --verbose + + publish-core: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - run: cd dist/libs/core && npm publish --tag beta --access public --verbose + + publish-theme: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - run: cd dist/libs/theme && npm publish --tag beta --access public --verbose + + publish-icons: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - run: cd dist/libs/icons/base && npm publish --tag beta --access public --verbose + + publish-flags: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - run: cd dist/libs/icons/flags && npm publish --tag beta --access public --verbose + + publish-plugin: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - run: cd dist/libs/plugin && npm publish --tag beta --access public --verbose + + publish-ast: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - run: cd dist/libs/ast && npm publish --tag beta --access public --verbose + + publish-charts: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - run: cd dist/libs/charts && npm publish --tag beta --access public --verbose + + publish-nxmv: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - run: cd dist/libs/nxmv && npm publish --tag beta --access public --verbose diff --git a/.github/workflows/beta-released.yml b/.github/workflows/beta-released.yml index fa0e4091a9..a1d39560fd 100644 --- a/.github/workflows/beta-released.yml +++ b/.github/workflows/beta-released.yml @@ -6,18 +6,22 @@ env: npmrc_config_push: ${{ secrets.NPMRC_CONFIG_PUSH }} NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_PUBLISH_TOKEN }} jobs: - pre_beta_release_v3: + pre_beta_release_v4: if: ${{ always() }} - uses: zyfra/Prizm/.github/workflows/beta-publish-ng16.yml@main - secrets: inherit - - pre_beta_release_v2: - needs: pre_beta_release_v3 - if: ${{ always() }} - uses: zyfra/Prizm/.github/workflows/beta-publish-ng15.yml@main - secrets: inherit - - pre_beta_release_v1: - needs: pre_beta_release_v2 - uses: zyfra/Prizm/.github/workflows/beta-publish-ng14.yml@main + uses: zyfra/Prizm/.github/workflows/beta-publish-ng17.yml@main secrets: inherit +# pre_beta_release_v3: +# if: ${{ always() }} +# uses: zyfra/Prizm/.github/workflows/beta-publish-ng16.yml@main +# secrets: inherit +# +# pre_beta_release_v2: +# needs: pre_beta_release_v3 +# if: ${{ always() }} +# uses: zyfra/Prizm/.github/workflows/beta-publish-ng15.yml@main +# secrets: inherit +# +# pre_beta_release_v1: +# needs: pre_beta_release_v2 +# uses: zyfra/Prizm/.github/workflows/beta-publish-ng14.yml@main +# secrets: inherit diff --git a/.github/workflows/check-build-in-real-project-ng14.yml b/.github/workflows/check-build-in-real-project-ng14.yml index 1e69206927..63fcd4bb2c 100644 --- a/.github/workflows/check-build-in-real-project-ng14.yml +++ b/.github/workflows/check-build-in-real-project-ng14.yml @@ -53,7 +53,7 @@ jobs: - name: 'Increase max memory limit' run: | - export NODE_OPTIONS="--max_old_space_size=4096" + export NODE_OPTIONS="--max_old_space_size=8192" - name: 'Build doc app for firebase hosting' run: npx ng build diff --git a/.github/workflows/check-build-in-real-project-ng15.yml b/.github/workflows/check-build-in-real-project-ng15.yml index dcbfa6bf0e..23dd0fb202 100644 --- a/.github/workflows/check-build-in-real-project-ng15.yml +++ b/.github/workflows/check-build-in-real-project-ng15.yml @@ -53,7 +53,7 @@ jobs: - name: 'Increase max memory limit' run: | - export NODE_OPTIONS="--max_old_space_size=4096" + export NODE_OPTIONS="--max_old_space_size=8192" - name: 'Build doc app for firebase hosting' run: npx ng build diff --git a/.github/workflows/deploy-main-doc-ng14.yml b/.github/workflows/deploy-main-doc-ng14.yml new file mode 100644 index 0000000000..04cc352f4c --- /dev/null +++ b/.github/workflows/deploy-main-doc-ng14.yml @@ -0,0 +1,117 @@ +name: Deploy doc main 14 +on: + workflow_dispatch: + workflow_call: +env: + npmrc_config_push: ${{ secrets.NPMRC_CONFIG_PUSH }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_PUBLISH_TOKEN }} +permissions: + contents: read + packages: write +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Derive appropriate SHAs for base and head for `nx affected` commands + uses: nrwl/nx-set-shas@v3 + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: Restore cache + id: cache-restore + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_14-${{ hashFiles('package-lock.json.ng14') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_14- + + - name: 'Initial changes 14' + run: | + cp -f package.json.ng14 package.json + cp -f package-lock.json.ng14 package-lock.json + + - name: Install dependencies + if: steps.cache-restore.outputs.cache-hit != 'true' + run: npm ci --ignore-scripts + + - name: Save cache... + id: cache-save + uses: actions/cache/save@v3 + if: ${{ steps.cache-restore.outputs.cache-hit != 'true' && always() }} + with: + path: ./node_modules + key: ${{ steps.cache-restore.outputs.cache-primary-key }} + + - name: 'Increase max memory limit' + run: | + export NODE_OPTIONS="--max_old_space_size=8192" + + - name: Set up environment variables + run: | + last_v1_version=$( + echo '1.14.0' + ) + echo "LAST_V1_VERSION=${last_v1_version}" >> $GITHUB_ENV + + - name: 'Set version 14' + run: npx nx generate @prizm-ui/nx-mv:apply -n v14 + + # - name: 'Update main versions' + # run: npx nx generate @prizm-ui/nx-plugin:update-version --updateInDependencies true --newVersion="1.*.*.up" --all --currentVersion="${{ env.LAST_V1_VERSION }}" + + - name: 'Build main versions' + run: npx nx run-many --target=build --all --parallel --max-parallel=3 + + - name: Upload dist as artifacts... + id: dist-cache-save + uses: actions/upload-artifact@v3 + with: + name: dist + path: ./dist + + deploy_to_doc: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_14-${{ hashFiles('package-lock.json.ng14') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_14- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: 'Build doc app for firebase hosting' + run: npm run build:doc + + - name: Deploy doc to firebase + uses: FirebaseExtended/action-hosting-deploy@v0 + with: + repoToken: '${{ secrets.GITHUB_TOKEN }}' + firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_PRIZMUI }}' + projectId: prizmui + channelId: live + target: v1 diff --git a/.github/workflows/deploy-main-doc-ng15.yml b/.github/workflows/deploy-main-doc-ng15.yml new file mode 100644 index 0000000000..7610985427 --- /dev/null +++ b/.github/workflows/deploy-main-doc-ng15.yml @@ -0,0 +1,112 @@ +name: Deploy doc main 15 +on: + workflow_dispatch: + workflow_call: +env: + npmrc_config_push: ${{ secrets.NPMRC_CONFIG_PUSH }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_PUBLISH_TOKEN }} +permissions: + contents: read + packages: write +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Derive appropriate SHAs for base and head for `nx affected` commands + uses: nrwl/nx-set-shas@v3 + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: Restore cache + id: cache-restore + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_15-${{ hashFiles('package-lock.json.ng15') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_15- + + - name: 'Initial changes 15' + run: | + cp -f package.json.ng15 package.json + cp -f package-lock.json.ng15 package-lock.json + + - name: Install dependencies + if: steps.cache-restore.outputs.cache-hit != 'true' + run: npm ci --ignore-scripts + + - name: Save cache... + id: cache-save + uses: actions/cache/save@v3 + if: ${{ steps.cache-restore.outputs.cache-hit != 'true' && always() }} + with: + path: ./node_modules + key: ${{ steps.cache-restore.outputs.cache-primary-key }} + + - name: 'Increase max memory limit' + run: | + export NODE_OPTIONS="--max_old_space_size=8192" + + - name: Set up environment variables + run: | + last_v2_version=$( + echo '2.11.0' + ) + echo "LAST_V2_VERSION=${last_v2_version}" >> $GITHUB_ENV + + - name: 'Set version 15' + run: npx nx generate @prizm-ui/nx-mv:apply -n v15 + + - name: 'Build main versions' + run: npx nx run-many --target=build --all --parallel --max-parallel=3 + + - name: Upload dist as artifacts... + id: dist-cache-save + uses: actions/upload-artifact@v3 + with: + name: dist + path: ./dist + + deploy_to_doc: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_15-${{ hashFiles('package-lock.json.ng15') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_15- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: 'Build doc app for firebase hosting' + run: npm run build:doc + + - name: Deploy doc to firebase + uses: FirebaseExtended/action-hosting-deploy@v0 + with: + repoToken: '${{ secrets.GITHUB_TOKEN }}' + firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_PRIZMUI }}' + projectId: prizmui + channelId: live + target: v2 diff --git a/.github/workflows/deploy-main-doc-ng16.yml b/.github/workflows/deploy-main-doc-ng16.yml new file mode 100644 index 0000000000..0f8898369b --- /dev/null +++ b/.github/workflows/deploy-main-doc-ng16.yml @@ -0,0 +1,107 @@ +# TODO: later change tag by input variable ${{ inputs.tag }} +name: Deploy doc main 16 +on: + workflow_dispatch: + workflow_call: +env: + npmrc_config_push: ${{ secrets.NPMRC_CONFIG_PUSH }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_PUBLISH_TOKEN }} +permissions: + contents: read + packages: write +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Derive appropriate SHAs for base and head for `nx affected` commands + uses: nrwl/nx-set-shas@v3 + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: Restore cache + id: cache-restore + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_16-${{ hashFiles('package-lock.json.ng16') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_16- + + - name: 'Initial changes 16' + run: | + cp -f package.json.ng16 package.json + cp -f package-lock.json.ng16 package-lock.json + + - name: Install dependencies + if: steps.cache-restore.outputs.cache-hit != 'true' + run: npm ci --ignore-scripts + + - name: Save cache... + id: cache-save + uses: actions/cache/save@v3 + if: ${{ steps.cache-restore.outputs.cache-hit != 'true' && always() }} + with: + path: ./node_modules + key: ${{ steps.cache-restore.outputs.cache-primary-key }} + + - name: 'Increase max memory limit' + run: | + export NODE_OPTIONS="--max_old_space_size=8192" + + - name: Set up environment variables + run: | + last_v3_version=$( + echo '3.10.0' + ) + echo "LAST_V3_VERSION=${last_v3_version}" >> $GITHUB_ENV + + - name: 'Set version 16' + run: npx nx generate @prizm-ui/nx-mv:apply -n v16 + + - name: 'Build main versions' + run: npx nx run-many --target=build --all --parallel --max-parallel=3 + + - name: Upload dist as artifacts... + id: dist-cache-save + uses: actions/upload-artifact@v3 + with: + name: dist + path: ./dist + + deploy_to_doc: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_16-${{ hashFiles('package-lock.json.ng16') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_16- + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: 'Build doc app for firebase hosting' + run: npm run build:doc + + - name: Deploy doc to firebase + uses: FirebaseExtended/action-hosting-deploy@v0 + with: + repoToken: '${{ secrets.GITHUB_TOKEN }}' + firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_PRIZMUI }}' + projectId: prizmui + channelId: live + target: v3 diff --git a/.github/workflows/deploy-main-doc-ng17.yml b/.github/workflows/deploy-main-doc-ng17.yml new file mode 100644 index 0000000000..a4711579e1 --- /dev/null +++ b/.github/workflows/deploy-main-doc-ng17.yml @@ -0,0 +1,107 @@ +# TODO: later change tag by input variable ${{ inputs.tag }} +name: Deploy doc main 17 +on: + workflow_dispatch: + workflow_call: +env: + npmrc_config_push: ${{ secrets.NPMRC_CONFIG_PUSH }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_PUBLISH_TOKEN }} +permissions: + contents: read + packages: write +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Derive appropriate SHAs for base and head for `nx affected` commands + uses: nrwl/nx-set-shas@v3 + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: Restore cache + id: cache-restore + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: 'Initial changes 17' + run: | + cp -f package.json.ng17 package.json + cp -f package-lock.json.ng17 package-lock.json + + - name: Install dependencies + if: steps.cache-restore.outputs.cache-hit != 'true' + run: npm ci --ignore-scripts + + - name: Save cache... + id: cache-save + uses: actions/cache/save@v3 + if: ${{ steps.cache-restore.outputs.cache-hit != 'true' && always() }} + with: + path: ./node_modules + key: ${{ steps.cache-restore.outputs.cache-primary-key }} + + - name: 'Increase max memory limit' + run: | + export NODE_OPTIONS="--max_old_space_size=8192" + + - name: Set up environment variables + run: | + last_v3_version=$( + echo '3.10.0' + ) + echo "LAST_V3_VERSION=${last_v3_version}" >> $GITHUB_ENV + + - name: 'Set version 17' + run: npx nx generate @prizm-ui/nx-mv:apply -n v17 + + - name: 'Build main versions' + run: npx nx run-many --target=build --all --parallel --max-parallel=3 + + - name: Upload dist as artifacts... + id: dist-cache-save + uses: actions/upload-artifact@v3 + with: + name: dist + path: ./dist + + deploy_to_doc: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: 'Build doc app for firebase hosting' + run: npm run build:doc + + - name: Deploy doc to firebase + uses: FirebaseExtended/action-hosting-deploy@v0 + with: + repoToken: '${{ secrets.GITHUB_TOKEN }}' + firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_PRIZMUI }}' + projectId: prizmui + channelId: live + target: v4 diff --git a/.github/workflows/deploy-main-doc.yml b/.github/workflows/deploy-main-doc.yml new file mode 100644 index 0000000000..874d0c6b57 --- /dev/null +++ b/.github/workflows/deploy-main-doc.yml @@ -0,0 +1,27 @@ +name: Deploy main doc +on: + workflow_dispatch: +env: + npmrc_config_push: ${{ secrets.NPMRC_CONFIG_PUSH }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_PUBLISH_TOKEN }} +jobs: + # release_v4: + # if: ${{ always() }} + # uses: zyfra/Prizm/.github/workflows/main-publish-ng17.yml@main + # secrets: inherit + release_v3: + needs: release_v4 + if: ${{ always() }} + uses: zyfra/Prizm/.github/workflows/deploy-main-doc-ng16.yml@main + secrets: inherit + + release_v2: + needs: release_v3 + if: ${{ always() }} + uses: zyfra/Prizm/.github/workflows/deploy-main-doc-ng15.yml@main + secrets: inherit + + release_v1: + needs: release_v2 + uses: zyfra/Prizm/.github/workflows/deploy-main-doc-ng13.yml@main + secrets: inherit diff --git a/.github/workflows/main-publish-ng14.yml b/.github/workflows/main-publish-ng14.yml index 971c785fd6..4ee02f7635 100644 --- a/.github/workflows/main-publish-ng14.yml +++ b/.github/workflows/main-publish-ng14.yml @@ -53,12 +53,12 @@ jobs: - name: 'Increase max memory limit' run: | - export NODE_OPTIONS="--max_old_space_size=4096" + export NODE_OPTIONS="--max_old_space_size=8192" - name: Set up environment variables run: | last_v1_version=$( - echo '1.16.0' + echo '1.14.0' ) echo "LAST_V1_VERSION=${last_v1_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng15.yml b/.github/workflows/main-publish-ng15.yml index e05c314abc..64fc92ff59 100644 --- a/.github/workflows/main-publish-ng15.yml +++ b/.github/workflows/main-publish-ng15.yml @@ -52,12 +52,12 @@ jobs: - name: 'Increase max memory limit' run: | - export NODE_OPTIONS="--max_old_space_size=4096" + export NODE_OPTIONS="--max_old_space_size=8192" - name: Set up environment variables run: | last_v2_version=$( - echo '2.13.0' + echo '2.11.0' ) echo "LAST_V2_VERSION=${last_v2_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng16.yml b/.github/workflows/main-publish-ng16.yml index 8b50223337..105f5b81e3 100644 --- a/.github/workflows/main-publish-ng16.yml +++ b/.github/workflows/main-publish-ng16.yml @@ -29,7 +29,7 @@ jobs: uses: actions/cache/restore@v3 with: path: ./node_modules - key: ${{ runner.os }}-node_modules_ng_16-${{ hashFiles('package-lock.json.ng15') }} + key: ${{ runner.os }}-node_modules_ng_16-${{ hashFiles('package-lock.json.ng16') }} restore-keys: | ${{ runner.os }}-node_modules_ng_16- @@ -52,12 +52,12 @@ jobs: - name: 'Increase max memory limit' run: | - export NODE_OPTIONS="--max_old_space_size=4096" + export NODE_OPTIONS="--max_old_space_size=8192" - name: Set up environment variables run: | last_v3_version=$( - echo '3.12.0' + echo '3.10.0' ) echo "LAST_V3_VERSION=${last_v3_version}" >> $GITHUB_ENV @@ -104,7 +104,7 @@ jobs: firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_PRIZMUI }}' projectId: prizmui channelId: live - target: main + target: v3 publish-components: needs: build diff --git a/.github/workflows/main-publish-ng17.yml b/.github/workflows/main-publish-ng17.yml new file mode 100644 index 0000000000..a29f430108 --- /dev/null +++ b/.github/workflows/main-publish-ng17.yml @@ -0,0 +1,443 @@ +# TODO: later change tag by input variable ${{ inputs.tag }} +name: Publish main packages 17 +on: + workflow_dispatch: + workflow_call: +env: + npmrc_config_push: ${{ secrets.NPMRC_CONFIG_PUSH }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_PUBLISH_TOKEN }} +permissions: + contents: read + packages: write +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Derive appropriate SHAs for base and head for `nx affected` commands + uses: nrwl/nx-set-shas@v3 + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: Restore cache + id: cache-restore + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: 'Initial changes 17' + run: | + cp -f package.json.ng17 package.json + cp -f package-lock.json.ng17 package-lock.json + + - name: Install dependencies + if: steps.cache-restore.outputs.cache-hit != 'true' + run: npm ci --ignore-scripts + + - name: Save cache... + id: cache-save + uses: actions/cache/save@v3 + if: ${{ steps.cache-restore.outputs.cache-hit != 'true' && always() }} + with: + path: ./node_modules + key: ${{ steps.cache-restore.outputs.cache-primary-key }} + + - name: 'Increase max memory limit' + run: | + export NODE_OPTIONS="--max_old_space_size=8192" + + - name: Set up environment variables + run: | + last_v3_version=$( + echo '4.1.0' + ) + echo "LAST_V3_VERSION=${last_v3_version}" >> $GITHUB_ENV + + - name: 'Set version 17' + run: npx nx generate @prizm-ui/nx-mv:apply -n v17 + + - name: 'Build main versions' + run: npx nx run-many --target=build --all --parallel --max-parallel=3 + + - name: Upload dist as artifacts... + id: dist-cache-save + uses: actions/upload-artifact@v3 + with: + name: dist + path: ./dist + + deploy_to_doc: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: 'Build doc app for firebase hosting' + run: npm run build:doc + + - name: Deploy doc to firebase + uses: FirebaseExtended/action-hosting-deploy@v0 + with: + repoToken: '${{ secrets.GITHUB_TOKEN }}' + firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_PRIZMUI }}' + projectId: prizmui + channelId: live + target: main + + publish-components: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - run: cd dist/libs/components && npm publish --access public --verbose + + publish-i18n: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - run: cd dist/libs/i18n && npm publish --access public --verbose + + publish-helpers: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - run: cd dist/libs/helpers && npm publish --access public --verbose + + publish-core: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - run: cd dist/libs/core && npm publish --access public --verbose + + publish-theme: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - run: cd dist/libs/theme && npm publish --access public --verbose + + publish-icons: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - run: cd dist/libs/icons/base && npm publish --access public --verbose + + publish-icons-loader: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - run: cd dist/libs/icons/loader && npm publish --access public --verbose + + publish-flags: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - run: cd dist/libs/icons/flags && npm publish --access public --verbose + + publish-plugin: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - run: cd dist/libs/plugin && npm publish --access public --verbose + + publish-ast: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - run: cd dist/libs/ast && npm publish --access public --verbose + + publish-charts: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - run: cd dist/libs/charts && npm publish --access public --verbose + + publish-nxmv: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - run: cd dist/libs/nxmv && npm publish --access public --verbose diff --git a/.github/workflows/pr-ng14.yml b/.github/workflows/pr-ng14.yml index 1b66b2b9f5..ca6916dcb8 100644 --- a/.github/workflows/pr-ng14.yml +++ b/.github/workflows/pr-ng14.yml @@ -1,8 +1,10 @@ name: PR NG 14 on: - pull_request_target: - branches: - - main + workflow_dispatch: + workflow_call: +# pull_request_target: +# branches: +# - main jobs: doc_deploy: runs-on: ubuntu-latest @@ -52,7 +54,7 @@ jobs: - name: 'Increase max memory limit' run: | - export NODE_OPTIONS="--max_old_space_size=4096" + export NODE_OPTIONS="--max_old_space_size=8192" - name: 'Clears all the cached Nx artifacts and metadata ' run: npx nx reset @@ -115,7 +117,7 @@ jobs: - name: 'Increase max memory limit' run: | - export NODE_OPTIONS="--max_old_space_size=4096" + export NODE_OPTIONS="--max_old_space_size=8192" # - run: npx nx workspace-lint # - run: npx nx clear-cache diff --git a/.github/workflows/pr-ng15.yml b/.github/workflows/pr-ng15.yml index 4e94bd4360..9458fc96c5 100644 --- a/.github/workflows/pr-ng15.yml +++ b/.github/workflows/pr-ng15.yml @@ -1,8 +1,10 @@ name: PR NG 15 on: - pull_request_target: - branches: - - main + workflow_dispatch: + workflow_call: +# pull_request_target: +# branches: +# - main jobs: doc_deploy: runs-on: ubuntu-latest @@ -49,7 +51,7 @@ jobs: - name: 'Increase max memory limit' run: | - export NODE_OPTIONS="--max_old_space_size=4096" + export NODE_OPTIONS="--max_old_space_size=8192" - name: 'Set version 15' run: npx nx generate @prizm-ui/nx-mv:apply -n v15 @@ -115,7 +117,7 @@ jobs: - name: 'Increase max memory limit' run: | - export NODE_OPTIONS="--max_old_space_size=4096" + export NODE_OPTIONS="--max_old_space_size=8192" # - run: npx nx workspace-lint # - run: npx nx clear-cache diff --git a/.github/workflows/pr-ng16.yml b/.github/workflows/pr-ng16.yml index d801b00dd1..6ccf70ee78 100644 --- a/.github/workflows/pr-ng16.yml +++ b/.github/workflows/pr-ng16.yml @@ -1,8 +1,10 @@ name: PR NG 16 on: - pull_request_target: - branches: - - main + workflow_dispatch: + workflow_call: +# pull_request_target: +# branches: +# - main jobs: doc_deploy: runs-on: ubuntu-latest @@ -26,7 +28,7 @@ jobs: uses: actions/cache/restore@v3 with: path: ./node_modules - key: ${{ runner.os }}-node_modules_ng_16-${{ hashFiles('package-lock.json.ng15') }} + key: ${{ runner.os }}-node_modules_ng_16-${{ hashFiles('package-lock.json.ng16') }} restore-keys: | ${{ runner.os }}-node_modules_ng_16- @@ -49,7 +51,7 @@ jobs: - name: 'Increase max memory limit' run: | - export NODE_OPTIONS="--max_old_space_size=4096" + export NODE_OPTIONS="--max_old_space_size=8192" - name: 'Set version 16' run: npx nx generate @prizm-ui/nx-mv:apply -n v16 @@ -92,7 +94,7 @@ jobs: uses: actions/cache/restore@v3 with: path: ./node_modules - key: ${{ runner.os }}-node_modules_ng_16-${{ hashFiles('package-lock.json.ng15') }} + key: ${{ runner.os }}-node_modules_ng_16-${{ hashFiles('package-lock.json.ng16') }} restore-keys: | ${{ runner.os }}-node_modules_ng_16- @@ -115,7 +117,7 @@ jobs: - name: 'Increase max memory limit' run: | - export NODE_OPTIONS="--max_old_space_size=4096" + export NODE_OPTIONS="--max_old_space_size=8192" # - run: npx nx workspace-lint # - run: npx nx clear-cache diff --git a/.github/workflows/pr-ng17.yml b/.github/workflows/pr-ng17.yml new file mode 100644 index 0000000000..9eeb2168bc --- /dev/null +++ b/.github/workflows/pr-ng17.yml @@ -0,0 +1,140 @@ +name: PR NG 17 +on: + pull_request_target: + branches: + - main +jobs: + doc_deploy: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + ref: ${{ github.event.pull_request.head.ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} + fetch-depth: 0 + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: Derive appropriate SHAs for base and head for `nx affected` commands + uses: nrwl/nx-set-shas@v2 + + - name: Restore cache + id: cache-restore + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: 'Initial changes 17' + run: | + cp -f package.json.ng17 package.json + cp -f package-lock.json.ng17 package-lock.json + + - name: Install dependencies + if: steps.cache-restore.outputs.cache-hit != 'true' + run: npm ci --ignore-scripts + + - name: Save cache... + id: cache-save + uses: actions/cache/save@v3 + if: ${{ steps.cache-restore.outputs.cache-hit != 'true' && always() }} + with: + path: ./node_modules + key: ${{ steps.cache-restore.outputs.cache-primary-key }} + + - name: 'Increase max memory limit' + run: | + export NODE_OPTIONS="--max_old_space_size=8192" + + - name: 'Set version 17' + run: npx nx generate @prizm-ui/nx-mv:apply -n v17 + + - name: 'Clears all the cached Nx artifacts and metadata ' + run: npx nx reset + + - name: 'Build doc app for firebase hosting' + run: npm run build:doc + + - name: 'Upload to Firebase HOSTING (ng17)' + uses: FirebaseExtended/action-hosting-deploy@v0 + with: + repoToken: '${{ secrets.GITHUB_TOKEN }}' + firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_PRIZMUI }}' + expires: 5d + target: v4 + projectId: prizmui + + lint_build_test: + needs: doc_deploy + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + ref: ${{ github.event.pull_request.head.ref }} + repository: ${{ github.event.pull_request.head.repo.full_name }} + fetch-depth: 0 + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: Derive appropriate SHAs for base and head for `nx affected` commands + uses: nrwl/nx-set-shas@v2 + + - name: Restore cache + id: cache-restore + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: 'Initial changes 17' + run: | + cp -f package.json.ng17 package.json + cp -f package-lock.json.ng17 package-lock.json + + - name: Install dependencies + if: steps.cache-restore.outputs.cache-hit != 'true' + run: npm ci --ignore-scripts + + - name: Save cache... + id: cache-save + uses: actions/cache/save@v3 + if: ${{ steps.cache-restore.outputs.cache-hit != 'true' && always() }} + with: + path: ./node_modules + key: ${{ steps.cache-restore.outputs.cache-primary-key }} + + - name: 'Increase max memory limit' + run: | + export NODE_OPTIONS="--max_old_space_size=8192" + + # - run: npx nx workspace-lint + # - run: npx nx clear-cache + + - name: 'Set version 17' + run: npx nx generate @prizm-ui/nx-mv:apply -n v17 + + - name: 'Clears all the cached Nx artifacts and metadata ' + run: npx nx reset + + - run: npx nx affected --target=test --base=origin/main --parallel --max-parallel=3 + - run: npx nx affected --target=lint --base=origin/main + # - run: npx nx affected --target=lint --base=origin/main --parallel --max-parallel=3 + # TODO remove schematics excluding after fix + - run: npx nx affected --target=build --base=origin/main --prod + - run: npx nx format:check --base=origin/main +# TODO LATER fix playwright test +# - name: Install Cypress +# run: npx cypress install + +# - name: Run e2e cypress test +# run: npx nx affected --target=e2e --base=main --prod --parallel --max-parallel=3 diff --git a/.github/workflows/pre-release-publish-ng14.yml b/.github/workflows/pre-release-publish-ng14.yml index 7bcc57722b..83f57b1665 100644 --- a/.github/workflows/pre-release-publish-ng14.yml +++ b/.github/workflows/pre-release-publish-ng14.yml @@ -52,12 +52,12 @@ jobs: - name: 'Increase max memory limit' run: | - export NODE_OPTIONS="--max_old_space_size=4096" + export NODE_OPTIONS="--max_old_space_size=8192" - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng14next --json 2>/dev/null || echo '1.16.0-ng14next.0') | jq '([.[] | select(startswith("1.16.0-ng14next"))] | last // "1.16.0-ng14next.0")' 2>/dev/null || echo '1.16.0-ng14next.0' + (npm view @prizm-ui/components versions --tag ng14next --json 2>/dev/null || echo '1.14.0-ng14next.0') | jq '([.[] | select(startswith("1.14.0-ng14next"))] | last // "1.14.0-ng14next.0")' 2>/dev/null || echo '1.14.0-ng14next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng15.yml b/.github/workflows/pre-release-publish-ng15.yml index 0aa402fad6..add3fa67db 100644 --- a/.github/workflows/pre-release-publish-ng15.yml +++ b/.github/workflows/pre-release-publish-ng15.yml @@ -52,12 +52,12 @@ jobs: - name: 'Increase max memory limit' run: | - export NODE_OPTIONS="--max_old_space_size=4096" + export NODE_OPTIONS="--max_old_space_size=8192" - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng15next --json 2>/dev/null || echo '2.13.0-ng15next.0') | jq '([.[] | select(startswith("2.13.0-ng15next"))] | last // "2.13.0-ng15next.0")' 2>/dev/null || echo '2.13.0-ng15next.0' + (npm view @prizm-ui/components versions --tag ng15next --json 2>/dev/null || echo '2.11.0-ng15next.0') | jq '([.[] | select(startswith("2.11.0-ng15next"))] | last // "2.11.0-ng15next.0")' 2>/dev/null || echo '2.11.0-ng15next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng16.yml b/.github/workflows/pre-release-publish-ng16.yml index 5271323a11..3b88abcbe3 100644 --- a/.github/workflows/pre-release-publish-ng16.yml +++ b/.github/workflows/pre-release-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng16next --json 2>/dev/null || echo '3.12.0-next.0') | jq '([.[] | select(startswith("3.12.0-next"))] | last // "3.12.0-next.0")' 2>/dev/null || echo '3.12.0-next.0' + (npm view @prizm-ui/components versions --tag ng16next --json 2>/dev/null || echo '3.10.0-next.0') | jq '([.[] | select(startswith("3.10.0-next"))] | last // "3.10.0-next.0")' 2>/dev/null || echo '3.10.0-next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng17.yml b/.github/workflows/pre-release-publish-ng17.yml new file mode 100644 index 0000000000..f01d2c1d36 --- /dev/null +++ b/.github/workflows/pre-release-publish-ng17.yml @@ -0,0 +1,411 @@ +# TODO: later change tag by input variable ${{ inputs.tag }} +name: Publish next packages 17 +on: + workflow_dispatch: + workflow_call: +env: + npmrc_config_push: ${{ secrets.NPMRC_CONFIG_PUSH }} + NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_PUBLISH_TOKEN }} +permissions: + contents: read + packages: write +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: 0 + - name: Derive appropriate SHAs for base and head for `nx affected` commands + uses: nrwl/nx-set-shas@v3 + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: Restore cache + id: cache-restore + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: 'Initial changes 17' + run: | + cp -f package.json.ng17 package.json + cp -f package-lock.json.ng17 package-lock.json + + - name: Install dependencies + if: steps.cache-restore.outputs.cache-hit != 'true' + run: npm ci --ignore-scripts + + - name: Save cache... + id: cache-save + uses: actions/cache/save@v3 + if: ${{ steps.cache-restore.outputs.cache-hit != 'true' && always() }} + with: + path: ./node_modules + key: ${{ steps.cache-restore.outputs.cache-primary-key }} + + - name: 'Increase max memory limit' + run: | + export NODE_OPTIONS="--max_old_space_size=8192" + + - name: Set up environment variables + run: | + last_next_version=$( + (npm view @prizm-ui/components versions --tag next --json 2>/dev/null || echo '4.1.1-next.0') | jq '([.[] | select(startswith("4.1.1-next"))] | last // "4.1.1-next.0")' 2>/dev/null || echo '4.1.1-next.0' + ) + echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV + + - name: 'Set version 17' + run: npx nx generate @prizm-ui/nx-mv:apply -n v17 + + - name: 'Update next versions' + run: npx nx generate @prizm-ui/nx-plugin:update-version --updateInDependencies true --newVersion="4.*.*-next.up" --all --currentVersion="${{ env.LAST_NEXT_VERSION }}" + + - name: 'Build next versions' + run: npx nx run-many --target=build --all --parallel --max-parallel=3 + + - name: Upload dist as artifacts... + id: dist-cache-save + uses: actions/upload-artifact@v3 + with: + name: dist + path: ./dist + + deploy_to_doc: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - name: 'Build doc app for firebase hosting' + run: npm run build:doc + + - name: Deploy doc to firebase + uses: FirebaseExtended/action-hosting-deploy@v0 + with: + repoToken: '${{ secrets.GITHUB_TOKEN }}' + firebaseServiceAccount: '${{ secrets.FIREBASE_SERVICE_ACCOUNT_PRIZMUI }}' + projectId: prizmui + channelId: live + target: v4-next + + publish-components: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - run: cd dist/libs/components && npm publish --tag next --access public --verbose + + publish-i18n: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - run: cd dist/libs/i18n && npm publish --tag next --access public --verbose + + publish-helpers: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - run: cd dist/libs/helpers && npm publish --tag next --access public --verbose + + publish-core: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - run: cd dist/libs/core && npm publish --tag next --access public --verbose + + publish-theme: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - run: cd dist/libs/theme && npm publish --tag next --access public --verbose + + publish-icons: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - run: cd dist/libs/icons/base && npm publish --tag next --access public --verbose + + publish-flags: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - run: cd dist/libs/icons/flags && npm publish --tag next --access public --verbose + + publish-plugin: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - run: cd dist/libs/plugin && npm publish --tag next --access public --verbose + + publish-ast: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - run: cd dist/libs/ast && npm publish --tag next --access public --verbose + + publish-charts: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - run: cd dist/libs/charts && npm publish --tag next --access public --verbose + + publish-nxmv: + needs: build + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Restore node_modules in cache + uses: actions/cache/restore@v3 + with: + path: ./node_modules + key: ${{ runner.os }}-node_modules_ng_17-${{ hashFiles('package-lock.json.ng17') }} + restore-keys: | + ${{ runner.os }}-node_modules_ng_17- + + - name: Download dist from artifact + uses: actions/download-artifact@v3 + with: + name: dist + path: ./dist + + - uses: actions/setup-node@v3 + with: + node-version: '18.x' + registry-url: 'https://registry.npmjs.org' + + - run: cd dist/libs/nxmv && npm publish --tag next --access public --verbose diff --git a/.github/workflows/pre-released.yml b/.github/workflows/pre-released.yml index 1feed2ed38..3932eab2a5 100644 --- a/.github/workflows/pre-released.yml +++ b/.github/workflows/pre-released.yml @@ -8,30 +8,23 @@ env: npmrc_config_push: ${{ secrets.NPMRC_CONFIG_PUSH }} NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_PUBLISH_TOKEN }} jobs: - # pre_beta_release_v1: - # uses: zyfra/Prizm/.github/workflows/beta-publish-ng14.yml@main - # secrets: inherit - # - # pre_beta_release_v2: - # uses: zyfra/Prizm/.github/workflows/beta-publish-ng15.yml@main - # secrets: inherit - # - # pre_beta_release_v3: - # uses: zyfra/Prizm/.github/workflows/beta-publish-ng16.yml@main - # secrets: inherit - pre_release_v3: + pre_release_v4: if: ${{ always() }} - uses: zyfra/Prizm/.github/workflows/pre-release-publish-ng16.yml@main - secrets: inherit - - pre_release_v2: - needs: pre_release_v3 - if: ${{ always() }} - uses: zyfra/Prizm/.github/workflows/pre-release-publish-ng15.yml@main - secrets: inherit - - pre_release_v1: - needs: pre_release_v1 - if: ${{ always() }} - uses: zyfra/Prizm/.github/workflows/pre-release-publish-ng14.yml@main + uses: zyfra/Prizm/.github/workflows/pre-release-publish-ng17.yml@main secrets: inherit +# pre_release_v3: +# if: ${{ always() }} +# uses: zyfra/Prizm/.github/workflows/pre-release-publish-ng16.yml@main +# secrets: inherit +# +# pre_release_v2: +# needs: pre_release_v3 +# if: ${{ always() }} +# uses: zyfra/Prizm/.github/workflows/pre-release-publish-ng15.yml@main +# secrets: inherit +# +# pre_release_v1: +# needs: pre_release_v1 +# if: ${{ always() }} +# uses: zyfra/Prizm/.github/workflows/pre-release-publish-ng14.yml@main +# secrets: inherit diff --git a/.github/workflows/released.yml b/.github/workflows/released.yml index a3400f82c0..2251bb98b6 100644 --- a/.github/workflows/released.yml +++ b/.github/workflows/released.yml @@ -8,31 +8,23 @@ env: npmrc_config_push: ${{ secrets.NPMRC_CONFIG_PUSH }} NODE_AUTH_TOKEN: ${{ secrets.NPM_AUTH_PUBLISH_TOKEN }} jobs: - # pre_beta_release_v1: - # uses: zyfra/Prizm/.github/workflows/beta-publish-ng14.yml@main - # secrets: inherit - # - # pre_beta_release_v2: - # uses: zyfra/Prizm/.github/workflows/beta-publish-ng15.yml@main - # secrets: inherit - - # check_package_install: - # uses: zyfra/Prizm/.github/workflows/check-build-in-real-project-ng-15.yml@main - # secrets: inherit - # needs: pre_beta_release - - release_v3: + release_v4: if: ${{ always() }} - uses: zyfra/Prizm/.github/workflows/main-publish-ng16.yml@main - secrets: inherit - - release_v2: - needs: release_v3 - if: ${{ always() }} - uses: zyfra/Prizm/.github/workflows/main-publish-ng15.yml@main - secrets: inherit - - release_v1: - needs: release_v2 - uses: zyfra/Prizm/.github/workflows/main-publish-ng14.yml@main + uses: zyfra/Prizm/.github/workflows/main-publish-ng17.yml@main secrets: inherit +# release_v3: +# needs: release_v4 +# if: ${{ always() }} +# uses: zyfra/Prizm/.github/workflows/main-publish-ng16.yml@main +# secrets: inherit +# +# release_v2: +# needs: release_v3 +# if: ${{ always() }} +# uses: zyfra/Prizm/.github/workflows/main-publish-ng15.yml@main +# secrets: inherit +# +# release_v1: +# needs: release_v2 +# uses: zyfra/Prizm/.github/workflows/main-publish-ng14.yml@main +# secrets: inherit From f18fe86832a012d28ab28fdf6dee30e3fb594798 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Wed, 27 Mar 2024 11:37:12 +0300 Subject: [PATCH 093/291] fix(icons): version for v1 --- angular.json | 23 +++++++++++++++++++++++ libs/icons/base/package.json.ng14 | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 angular.json diff --git a/angular.json b/angular.json new file mode 100644 index 0000000000..5802ed1e67 --- /dev/null +++ b/angular.json @@ -0,0 +1,23 @@ +{ + "version": 2, + "projects": { + "ast": "libs/ast", + "charts-base": "libs/charts/base", + "components": "libs/components", + "core": "libs/core", + "doc": "apps/doc", + "doc-base": "libs/doc/base", + "doc-e2e": "apps/doc-e2e", + "doc-pw-e2e": "apps/doc-pw-e2e", + "flag-icons": "libs/icons/flags", + "helpers": "libs/helpers", + "i18n": "libs/i18n", + "icons": "libs/icons/base", + "nxmv": "libs/nxmv", + "plugin": "libs/plugin", + "plugin-e2e": "apps/plugin-e2e", + "schematics": "libs/schematics", + "test": "libs/test", + "theme": "libs/theme" + } +} diff --git a/libs/icons/base/package.json.ng14 b/libs/icons/base/package.json.ng14 index 2613dbcf8d..a2296feecc 100644 --- a/libs/icons/base/package.json.ng14 +++ b/libs/icons/base/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "1", + "version": "1.16.0", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { From 74ada749834af8527264b7dff649ad8ad026631b Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Wed, 27 Mar 2024 11:38:20 +0300 Subject: [PATCH 094/291] fix(icons): version for v1 --- angular.json | 23 ----------------------- 1 file changed, 23 deletions(-) delete mode 100644 angular.json diff --git a/angular.json b/angular.json deleted file mode 100644 index 5802ed1e67..0000000000 --- a/angular.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": 2, - "projects": { - "ast": "libs/ast", - "charts-base": "libs/charts/base", - "components": "libs/components", - "core": "libs/core", - "doc": "apps/doc", - "doc-base": "libs/doc/base", - "doc-e2e": "apps/doc-e2e", - "doc-pw-e2e": "apps/doc-pw-e2e", - "flag-icons": "libs/icons/flags", - "helpers": "libs/helpers", - "i18n": "libs/i18n", - "icons": "libs/icons/base", - "nxmv": "libs/nxmv", - "plugin": "libs/plugin", - "plugin-e2e": "apps/plugin-e2e", - "schematics": "libs/schematics", - "test": "libs/test", - "theme": "libs/theme" - } -} From 51fa6d59ea183fe5c0ac02e07e060d304950cd9f Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Mon, 1 Apr 2024 12:38:01 +0400 Subject: [PATCH 095/291] fix: fixed description of checkbox module import #1527 --- apps/doc/src/app/components/checkbox/examples/setup-module.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/doc/src/app/components/checkbox/examples/setup-module.md b/apps/doc/src/app/components/checkbox/examples/setup-module.md index 25032a1c34..b28727b2ac 100644 --- a/apps/doc/src/app/components/checkbox/examples/setup-module.md +++ b/apps/doc/src/app/components/checkbox/examples/setup-module.md @@ -7,7 +7,7 @@ import { PrizmCheckboxModule } from '@prizm-ui/components'; @NgModule({ imports: [ // ... - PrizmCheckboxModuleModule, + PrizmCheckboxModule, ], }) export class MyModule {} From a3273d8cc47390d0ba9028ff976ff857a4ce52bb Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Mon, 1 Apr 2024 15:00:39 +0400 Subject: [PATCH 096/291] fix: removed first empty string in code examples --- .../app/tools/ast/examples/accordion/accordion.component.ts | 3 +-- .../tools/ast/examples/breadcrumb/breadcrumb.component.ts | 3 +-- .../src/app/tools/ast/examples/button/button.component.ts | 5 ++--- .../app/tools/ast/examples/checkbox/checkbox.component.ts | 4 +--- apps/doc/src/app/tools/ast/examples/chips/chips.component.ts | 4 +--- .../app/tools/ast/examples/dropdown/dropdown.component.ts | 3 +-- .../ast/examples/input-number/input-number.component.ts | 3 +-- .../ast/examples/input-switch/input-switch.component.ts | 3 +-- apps/doc/src/app/tools/ast/examples/input/input.component.ts | 3 +-- .../ast/examples/multi-select/multi-select.component.ts | 3 +-- apps/doc/src/app/tools/ast/examples/radio/radio.component.ts | 3 +-- .../src/app/tools/ast/examples/spinner/spinner.component.ts | 3 +-- .../ast/examples/split-button/split-button.component.ts | 3 +-- apps/doc/src/app/tools/ast/examples/tabs/tabs.component.ts | 3 +-- .../app/tools/ast/examples/textarea/textarea.component.ts | 4 +--- .../ast/examples/toggle-button/toggle-button.component.ts | 3 +-- .../src/app/tools/ast/examples/tooltip/tooltip.component.ts | 3 +-- 17 files changed, 18 insertions(+), 38 deletions(-) diff --git a/apps/doc/src/app/tools/ast/examples/accordion/accordion.component.ts b/apps/doc/src/app/tools/ast/examples/accordion/accordion.component.ts index 950e5e1388..2fd57ede14 100644 --- a/apps/doc/src/app/tools/ast/examples/accordion/accordion.component.ts +++ b/apps/doc/src/app/tools/ast/examples/accordion/accordion.component.ts @@ -91,8 +91,7 @@ export class PrizmAstAccordionExampleComponent implements OnInit { // } // } // ]; - readonly zyfraAccordionHtml = ` - diff --git a/apps/doc/src/app/tools/ast/examples/breadcrumb/breadcrumb.component.ts b/apps/doc/src/app/tools/ast/examples/breadcrumb/breadcrumb.component.ts index 3089eaf22a..1ffaa9ea02 100644 --- a/apps/doc/src/app/tools/ast/examples/breadcrumb/breadcrumb.component.ts +++ b/apps/doc/src/app/tools/ast/examples/breadcrumb/breadcrumb.component.ts @@ -52,8 +52,7 @@ export class PrizmAstBreadcrumbExampleComponent implements OnInit { // }, // // ]; - readonly html = ` - - Test + readonly zyfraButtonHtml = ` +Test `; resultZyfraButtonHtml!: string; diff --git a/apps/doc/src/app/tools/ast/examples/checkbox/checkbox.component.ts b/apps/doc/src/app/tools/ast/examples/checkbox/checkbox.component.ts index 4e6ea47663..14dea25ce4 100644 --- a/apps/doc/src/app/tools/ast/examples/checkbox/checkbox.component.ts +++ b/apps/doc/src/app/tools/ast/examples/checkbox/checkbox.component.ts @@ -62,9 +62,7 @@ export class PrizmAstCheckboxExampleComponent implements OnInit { // }, // // ]; - readonly html = ` - > -`; + readonly html = ``; result!: string; public ngOnInit(): void { diff --git a/apps/doc/src/app/tools/ast/examples/chips/chips.component.ts b/apps/doc/src/app/tools/ast/examples/chips/chips.component.ts index c35247502f..0cb06ff15a 100644 --- a/apps/doc/src/app/tools/ast/examples/chips/chips.component.ts +++ b/apps/doc/src/app/tools/ast/examples/chips/chips.component.ts @@ -57,9 +57,7 @@ export class PrizmAstChipsExampleComponent implements OnInit { // }, // // ]; - readonly html = ` - -`; + readonly html = ``; result!: string; public ngOnInit(): void { diff --git a/apps/doc/src/app/tools/ast/examples/dropdown/dropdown.component.ts b/apps/doc/src/app/tools/ast/examples/dropdown/dropdown.component.ts index 85da7996fb..4ba7e53619 100644 --- a/apps/doc/src/app/tools/ast/examples/dropdown/dropdown.component.ts +++ b/apps/doc/src/app/tools/ast/examples/dropdown/dropdown.component.ts @@ -103,8 +103,7 @@ export class PrizmAstDropdownExampleComponent implements OnInit { // }, // // ]; - readonly html = ` -Show me
     + readonly html = `Show me
    - {{ item.key }} + {{ item.key | prizmFileName }} + {{ item.key | prizmFileExtension }} {{ item.value.file.size | prizmFileSize }}
    diff --git a/libs/components/src/lib/components/file-upload/file-upload.component.less b/libs/components/src/lib/components/file-upload/file-upload.component.less index 7d7c1f2cf8..35e4964f76 100644 --- a/libs/components/src/lib/components/file-upload/file-upload.component.less +++ b/libs/components/src/lib/components/file-upload/file-upload.component.less @@ -96,17 +96,23 @@ overflow: hidden; text-overflow: ellipsis; display: flex; - gap: 8px; align-items: baseline; } - &__name { + &__name, + &__extension { font-weight: 600; font-size: 14px; line-height: 20px; color: var(--prizm-v3-text-icon-primary); } + &__name { + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; + } &__size { + margin-left: 8px; font-size: 10px; line-height: 12px; color: var(--prizm-v3-text-icon-tertiary); diff --git a/libs/components/src/lib/components/file-upload/file-upload.component.ts b/libs/components/src/lib/components/file-upload/file-upload.component.ts index 17801b6eb9..8ad47f3294 100644 --- a/libs/components/src/lib/components/file-upload/file-upload.component.ts +++ b/libs/components/src/lib/components/file-upload/file-upload.component.ts @@ -37,6 +37,8 @@ import { PrizmButtonComponent } from '../button'; import { PrizmProgressBarComponent } from '../progress'; import { PrizmIconComponent } from '../icon'; import { PrizmUploadStatusPipe } from './pipes/upload-status.pipe'; +import { PrizmFileNamePipe } from './pipes/file-name.pipe'; +import { PrizmFileExtensionPipe } from './pipes/file-extension.pipe'; import { PrizmFileSizePipe } from './pipes/file-size.pipe'; @Component({ @@ -47,6 +49,8 @@ import { PrizmFileSizePipe } from './pipes/file-size.pipe'; imports: [ CommonModule, PrizmUploadStatusPipe, + PrizmFileNamePipe, + PrizmFileExtensionPipe, PrizmFileSizePipe, PrizmSanitizerPipe, PrizmPluckPipe, diff --git a/libs/components/src/lib/components/file-upload/pipes/file-extension.pipe.ts b/libs/components/src/lib/components/file-upload/pipes/file-extension.pipe.ts new file mode 100644 index 0000000000..af2025b067 --- /dev/null +++ b/libs/components/src/lib/components/file-upload/pipes/file-extension.pipe.ts @@ -0,0 +1,8 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({ name: 'prizmFileExtension', standalone: true }) +export class PrizmFileExtensionPipe implements PipeTransform { + public transform(fileFullName: string): string { + return `.${fileFullName.split('.').pop()}` || ''; + } +} diff --git a/libs/components/src/lib/components/file-upload/pipes/file-name.pipe.ts b/libs/components/src/lib/components/file-upload/pipes/file-name.pipe.ts new file mode 100644 index 0000000000..68ba244b57 --- /dev/null +++ b/libs/components/src/lib/components/file-upload/pipes/file-name.pipe.ts @@ -0,0 +1,8 @@ +import { Pipe, PipeTransform } from '@angular/core'; + +@Pipe({ name: 'prizmFileName', standalone: true }) +export class PrizmFileNamePipe implements PipeTransform { + public transform(fileFullName: string): string { + return fileFullName.split('.').slice(0, -1).join('.'); + } +} From 9415f589f49dbb15359a2d38a702770b73d74433 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Wed, 3 Apr 2024 12:03:04 +0400 Subject: [PATCH 103/291] fix: name hint #1541 --- .../src/lib/components/file-upload/file-upload.component.html | 4 ++-- .../src/lib/components/file-upload/file-upload.component.ts | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/libs/components/src/lib/components/file-upload/file-upload.component.html b/libs/components/src/lib/components/file-upload/file-upload.component.html index e2ffc80713..d0ae19904c 100644 --- a/libs/components/src/lib/components/file-upload/file-upload.component.html +++ b/libs/components/src/lib/components/file-upload/file-upload.component.html @@ -47,8 +47,8 @@ -
    - {{ item.key | prizmFileName }} +
    + {{ item.key | prizmFileName }} {{ item.key | prizmFileExtension }} {{ item.value.file.size | prizmFileSize }}
    diff --git a/libs/components/src/lib/components/file-upload/file-upload.component.ts b/libs/components/src/lib/components/file-upload/file-upload.component.ts index 8ad47f3294..b44b5fcdcb 100644 --- a/libs/components/src/lib/components/file-upload/file-upload.component.ts +++ b/libs/components/src/lib/components/file-upload/file-upload.component.ts @@ -40,6 +40,8 @@ import { PrizmUploadStatusPipe } from './pipes/upload-status.pipe'; import { PrizmFileNamePipe } from './pipes/file-name.pipe'; import { PrizmFileExtensionPipe } from './pipes/file-extension.pipe'; import { PrizmFileSizePipe } from './pipes/file-size.pipe'; +import { PrizmHintDirective } from '../../directives'; +import { prizmIsTextOverflow } from '../../util'; @Component({ selector: 'prizm-file-upload', @@ -58,6 +60,7 @@ import { PrizmFileSizePipe } from './pipes/file-size.pipe'; PrizmProgressBarComponent, PrizmButtonComponent, PrizmIconComponent, + PrizmHintDirective, ], standalone: true, providers: [PrizmDestroyService, ...prizmI18nInitWithKey(PRIZM_FILE_UPLOAD, 'fileUpload')], @@ -66,6 +69,7 @@ export class PrizmFileUploadComponent extends PrizmAbstractTestId implements Aft @ViewChild('dropzone') dropzoneElementRef!: ElementRef; override readonly testId_ = 'ui_file_upload'; + readonly prizmIsTextOverflow = prizmIsTextOverflow; options: PrizmFileUploadOptions = { ...prizmFileUploadDefaultOptions }; constructor( From 931ccac7463e6d9b4dcda001e620d565199d165c Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Wed, 3 Apr 2024 14:20:40 +0400 Subject: [PATCH 104/291] fix: hidden overflow for navigation titles #1510 --- .../navigation/navigation-example.const.ts | 25 +++++++++++++++++++ .../prizm-header-dropdown.component.html | 19 ++++++++++++-- .../prizm-header-dropdown.component.less | 2 ++ .../prizm-header-dropdown.component.ts | 3 +++ ...-navigation-item-expandable.component.html | 10 +++++++- ...zm-navigation-item-expandable.component.ts | 3 +++ ...rizm-navigation-item-simple.component.html | 10 +++++++- .../prizm-navigation-item-simple.component.ts | 2 ++ 8 files changed, 70 insertions(+), 4 deletions(-) diff --git a/apps/doc/src/app/components/navigation/navigation-example.const.ts b/apps/doc/src/app/components/navigation/navigation-example.const.ts index 81392e7cf6..063e74dac2 100644 --- a/apps/doc/src/app/components/navigation/navigation-example.const.ts +++ b/apps/doc/src/app/components/navigation/navigation-example.const.ts @@ -85,4 +85,29 @@ export const NAVIGATION_EXAMPLE: INavigationTree[] = [ }, ], }, + { + title: 'Очень очень длинный раздел 4', + icon: 'clapperboard-open', + isExpanded: true, + children: [ + { + title: 'Очень очень длинный подраздел 4.1', + }, + { + title: 'Очень очень длинный подраздел 4.2', + isExpanded: true, + children: [ + { + title: 'Очень очень длинный подраздел 4.2.1', + }, + { + title: 'Подраздел 4.2.2', + }, + ], + }, + { + title: 'Подраздел 4.3', + }, + ], + }, ]; diff --git a/libs/components/src/lib/components/header/components/prizm-header-dropdown/prizm-header-dropdown.component.html b/libs/components/src/lib/components/header/components/prizm-header-dropdown/prizm-header-dropdown.component.html index 5047b1bf5d..d8bfa30994 100644 --- a/libs/components/src/lib/components/header/components/prizm-header-dropdown/prizm-header-dropdown.component.html +++ b/libs/components/src/lib/components/header/components/prizm-header-dropdown/prizm-header-dropdown.component.html @@ -16,7 +16,15 @@ class="screen__icon" [iconClass]="data[currentScreenIdx]?.icon || 'files-folder'" > - {{ data[currentScreenIdx]?.title }} + + {{ data[currentScreenIdx]?.title }} +
    @@ -32,7 +40,14 @@ >
    - {{ item?.title }} + + {{ item?.title }} +
    diff --git a/libs/components/src/lib/components/header/components/prizm-header-dropdown/prizm-header-dropdown.component.less b/libs/components/src/lib/components/header/components/prizm-header-dropdown/prizm-header-dropdown.component.less index eec178040c..de4b7a2562 100644 --- a/libs/components/src/lib/components/header/components/prizm-header-dropdown/prizm-header-dropdown.component.less +++ b/libs/components/src/lib/components/header/components/prizm-header-dropdown/prizm-header-dropdown.component.less @@ -53,6 +53,8 @@ display: flex; gap: 8px; + overflow: hidden; + &__icon { color: var(--prizm-v3-status-info-primary-default); } diff --git a/libs/components/src/lib/components/header/components/prizm-header-dropdown/prizm-header-dropdown.component.ts b/libs/components/src/lib/components/header/components/prizm-header-dropdown/prizm-header-dropdown.component.ts index 6c473a096a..1127ed15ea 100644 --- a/libs/components/src/lib/components/header/components/prizm-header-dropdown/prizm-header-dropdown.component.ts +++ b/libs/components/src/lib/components/header/components/prizm-header-dropdown/prizm-header-dropdown.component.ts @@ -7,6 +7,7 @@ import { PrizmDropdownHostModule } from '../../../dropdowns/dropdown-host'; import { PrizmDataListModule } from '../../../data-list'; import { PrizmButtonModule } from '../../../button'; import { PrizmHintModule } from '../../../../directives'; +import { prizmIsTextOverflow } from '../../../../util'; @Component({ selector: 'prizm-header-dropdown', @@ -29,6 +30,8 @@ export class PrizmHeaderDropdownComponent { @Input() public currentScreenIdx = 0; @Output() screenIdxChange: EventEmitter = new EventEmitter(); + readonly prizmIsTextOverflow = prizmIsTextOverflow; + public openDropdown = false; public changeScreen(idx: number): void { diff --git a/libs/components/src/lib/components/navigation/components/prizm-navigation-item-expandable/prizm-navigation-item-expandable.component.html b/libs/components/src/lib/components/navigation/components/prizm-navigation-item-expandable/prizm-navigation-item-expandable.component.html index d633ca5013..b84790bfeb 100644 --- a/libs/components/src/lib/components/navigation/components/prizm-navigation-item-expandable/prizm-navigation-item-expandable.component.html +++ b/libs/components/src/lib/components/navigation/components/prizm-navigation-item-expandable/prizm-navigation-item-expandable.component.html @@ -3,7 +3,15 @@
    - {{ menuItem?.title }} + + {{ menuItem?.title }} +
    (null); public isActive$: Observable = combineLatest([ this.activeItemService.activeItem$, diff --git a/libs/components/src/lib/components/navigation/components/prizm-navigation-item-simple/prizm-navigation-item-simple.component.html b/libs/components/src/lib/components/navigation/components/prizm-navigation-item-simple/prizm-navigation-item-simple.component.html index 27885b8f2f..71d6ab2c98 100644 --- a/libs/components/src/lib/components/navigation/components/prizm-navigation-item-simple/prizm-navigation-item-simple.component.html +++ b/libs/components/src/lib/components/navigation/components/prizm-navigation-item-simple/prizm-navigation-item-simple.component.html @@ -1,5 +1,13 @@
    - {{ menuItem?.title }} + + {{ menuItem?.title }} +
    = new BehaviorSubject(null); public isActive$: Observable = combineLatest([ From da67c09e773491ee881a276d416be7cd7bda7e68 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Thu, 4 Apr 2024 10:45:44 +0400 Subject: [PATCH 105/291] fix: hidden overflow for navigation titles #1510 --- .../prizm-header-dropdown.component.html | 20 +++++++------------ ...-navigation-item-expandable.component.html | 17 ++++++++-------- ...rizm-navigation-item-simple.component.html | 16 +++++++-------- 3 files changed, 24 insertions(+), 29 deletions(-) diff --git a/libs/components/src/lib/components/header/components/prizm-header-dropdown/prizm-header-dropdown.component.html b/libs/components/src/lib/components/header/components/prizm-header-dropdown/prizm-header-dropdown.component.html index d8bfa30994..36ae45cf39 100644 --- a/libs/components/src/lib/components/header/components/prizm-header-dropdown/prizm-header-dropdown.component.html +++ b/libs/components/src/lib/components/header/components/prizm-header-dropdown/prizm-header-dropdown.component.html @@ -9,20 +9,17 @@ class="dropdown" *ngIf="data.length > 0" [class.dropdown_active]="openDropdown" + [prizmHint]="data[currentScreenIdx]?.title" + [prizmHintCanShow]="prizmIsTextOverflow(title)" (click)="openDropdown = !openDropdown" + prizmHintDirection="b" >
    - + {{ data[currentScreenIdx]?.title }}
    @@ -36,16 +33,13 @@ class="screen-list__item" *ngFor="let item of data; let i = index" [class.selected]="i === currentScreenIdx" + [prizmHint]="item?.title" + [prizmHintCanShow]="prizmIsTextOverflow(title)" (click)="changeScreen(i)" >
    - + {{ item?.title }}
    diff --git a/libs/components/src/lib/components/navigation/components/prizm-navigation-item-expandable/prizm-navigation-item-expandable.component.html b/libs/components/src/lib/components/navigation/components/prizm-navigation-item-expandable/prizm-navigation-item-expandable.component.html index b84790bfeb..3f67a1103f 100644 --- a/libs/components/src/lib/components/navigation/components/prizm-navigation-item-expandable/prizm-navigation-item-expandable.component.html +++ b/libs/components/src/lib/components/navigation/components/prizm-navigation-item-expandable/prizm-navigation-item-expandable.component.html @@ -1,15 +1,16 @@
    -
    +
    - + {{ menuItem?.title }} diff --git a/libs/components/src/lib/components/navigation/components/prizm-navigation-item-simple/prizm-navigation-item-simple.component.html b/libs/components/src/lib/components/navigation/components/prizm-navigation-item-simple/prizm-navigation-item-simple.component.html index 71d6ab2c98..f4cc06c95f 100644 --- a/libs/components/src/lib/components/navigation/components/prizm-navigation-item-simple/prizm-navigation-item-simple.component.html +++ b/libs/components/src/lib/components/navigation/components/prizm-navigation-item-simple/prizm-navigation-item-simple.component.html @@ -1,11 +1,11 @@ -
    - +
    + {{ menuItem?.title }}
    From a4f202b28b26734611b38133dd13acd954081729 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Thu, 4 Apr 2024 15:12:59 +0400 Subject: [PATCH 106/291] fix: typography page changed #1497 #1498 --- .../components/frame4/frame4.component.css | 3622 +-------------- .../components/frame4/frame4.component.html | 714 +-- .../components/frame9/frame9.component.css | 4071 +---------------- .../components/frame9/frame9.component.html | 852 +--- .../typography/typography.component.html | 14 +- .../typography/typography.module.ts | 3 +- 6 files changed, 463 insertions(+), 8813 deletions(-) diff --git a/apps/doc/src/app/guidelines/typography/components/frame4/frame4.component.css b/apps/doc/src/app/guidelines/typography/components/frame4/frame4.component.css index 356c7bf5d7..ea84fd1db3 100644 --- a/apps/doc/src/app/guidelines/typography/components/frame4/frame4.component.css +++ b/apps/doc/src/app/guidelines/typography/components/frame4/frame4.component.css @@ -1,34 +1,15 @@ :host { display: contents; } -.frame4-frame4 { - min-width: 1150px; +.frame-paragraph { height: auto; display: flex; - padding: 56px; position: relative; align-self: stretch; - box-shadow: 0px 8px 32px 0px rgba(191, 198, 215, 0.5); align-items: flex-start; - border-color: rgba(191, 198, 215, 1); - border-style: solid; - border-width: 1px; - border-radius: 2px; flex-direction: column; - background-color: var(--dl-color-bg-body); } -.frame4-text { - font-size: 26px; - font-weight: 800; - color: rgba(51, 125, 254, 1); - height: auto; - align-self: auto; - text-align: left; - line-height: 32px; - margin-right: 0; - margin-bottom: 40px; -} -.frame4-frame5 { +.frame4-content { display: flex; position: relative; align-self: stretch; @@ -37,19 +18,22 @@ margin-bottom: 40px; flex-direction: column; } -.frame4-text002 { - font-size: 20px; - font-weight: 600; - color: rgba(51, 125, 254, 1); - height: auto; - align-self: auto; - text-align: center; - line-height: 24px; - margin-right: 0; - margin-bottom: 8px; -} -.frame4-text004 { - color: var(--dl-color-text-main); +.frame4-info-table { + width: 100%; + .frame4-column-group { + th:nth-child(1), + th:nth-child(2) { + width: 12%; + } + + th:nth-child(3), + th:nth-child(4), + th:nth-child(5) { + width: 13%; + } + } +} +.frame4-description { height: auto; font-size: 18px; align-self: stretch; @@ -63,3585 +47,107 @@ margin-bottom: 8px; text-decoration: none; } -.frame4-frame25885 { - width: 1056px; +.frame4-frame25899 { display: flex; position: relative; - align-self: stretch; align-items: flex-start; border-color: transparent; + margin-bottom: 40px; flex-direction: column; } -.frame4-frame25887 { +.frame4-frame25900 { display: flex; position: relative; - align-self: stretch; align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; - background-color: #f4f6fb; -} -.frame4-table-header { - width: 120px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame4-text-container { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame4-text006 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-table-header01 { - width: 120px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame4-text-container01 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame4-text008 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-table-header02 { - width: 140px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame4-text-container02 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; border-color: transparent; + margin-bottom: 24px; + flex-direction: column; } -.frame4-text010 { +.frame4-text066 { font-size: 12px; - font-weight: 500; - color: #20222b; + font-weight: 700; height: auto; - flex-grow: 1; align-self: auto; - text-align: center; + text-align: left; line-height: 16px; margin-right: 0; - margin-bottom: 0; -} -.frame4-table-header03 { - width: 140px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame4-text-container03 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; + margin-bottom: 4px; } -.frame4-text012 { - font-size: 12px; +.frame4-text068 { + font-size: 10px; font-weight: 500; - color: #20222b; height: auto; - flex-grow: 1; align-self: auto; - text-align: center; - line-height: 16px; + text-align: left; + line-height: 12px; margin-right: 0; margin-bottom: 0; } -.frame4-table-header04 { - width: 140px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - justify-content: center; - background-color: var(--dl-color-grey-g12g2); -} -.frame4-text-container04 { - width: 232px; - display: flex; - padding: 0 4px; - position: relative; - align-items: center; - flex-shrink: 0; - border-color: transparent; -} -.frame4-text014 { - font-size: 12px; - font-weight: 500; - color: #20222b; +.frame4-text070 { + font-size: 14px; + font-weight: 400; height: auto; - flex-grow: 1; align-self: auto; - text-align: center; - line-height: 16px; + text-align: left; + line-height: 20px; margin-right: 0; - margin-bottom: 0; -} -.frame4-table-header05 { - width: 396px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: center; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - justify-content: center; - background-color: var(--dl-color-grey-g12g2); -} -.frame4-text-container05 { - width: 232px; - display: flex; - padding: 0 4px; - position: relative; - align-items: center; - flex-shrink: 0; - border-color: transparent; + margin-bottom: 24px; } -.frame4-text016 { +.frame4-text072 { font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-frame25888 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; -} -.frame4-table-cell { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container06 { - width: var(--dl-size-size-large); - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text018 { - color: var(--dl-color-text-contrast); + font-weight: 400; height: auto; - flex-grow: 1; - font-size: 14px; align-self: auto; - font-style: Medium; text-align: left; - font-family: Inter; - font-weight: 500; line-height: 16px; - font-stretch: normal; margin-right: 0; margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell01 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; } -.frame4-text-container07 { +.frame4-frame25898 { display: flex; - padding: 4px; position: relative; - flex-grow: 1; align-items: flex-start; border-color: transparent; + margin-bottom: 40px; + flex-direction: column; } -.frame4-text020 { - color: var(--dl-color-text-contrast); +.frame4-text143 { + font-size: 26px; + font-weight: 800; height: auto; - font-size: 14px; align-self: auto; - font-style: Regular; text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; + line-height: 32px; margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell02 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container08 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; + margin-bottom: 24px; } -.frame4-text022 { - color: var(--dl-color-text-contrast); +.frame4-text145 { + font-size: 20px; + font-weight: 800; height: auto; - font-size: 14px; align-self: auto; - font-style: Regular; text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; + line-height: 24px; margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell03 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container09 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; + margin-bottom: 24px; } -.frame4-text024 { - color: var(--dl-color-text-contrast); +.frame4-text147 { + font-size: 16px; + font-weight: 800; height: auto; - font-size: 14px; align-self: auto; - font-style: Regular; text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; + line-height: 20px; margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell04 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container10 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; + margin-bottom: 24px; } -.frame4-text026 { - color: var(--dl-color-text-contrast); - height: auto; +.frame4-text149 { font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell05 { - width: 396px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: flex-start; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame4-text-container11 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text028 { - color: var(--dl-color-text-contrast); + font-weight: 800; height: auto; align-self: auto; text-align: left; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-frame25881 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; -} -.frame4-table-cell06 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container12 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text030 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - font-size: 14px; - align-self: auto; - font-style: Medium; - text-align: left; - font-family: Inter; - font-weight: 500; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell07 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container13 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text032 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell08 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container14 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text034 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell09 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container15 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text036 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell10 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container16 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text038 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell11 { - width: 396px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: flex-start; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame4-text-container17 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text040 { - color: var(--dl-color-text-contrast); - height: auto; - align-self: auto; - text-align: left; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-frame25889 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; -} -.frame4-table-cell12 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container18 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text042 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - font-size: 14px; - align-self: auto; - font-style: Medium; - text-align: left; - font-family: Inter; - font-weight: 500; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell13 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container19 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text044 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell14 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container20 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text046 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell15 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container21 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text048 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell16 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container22 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text050 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell17 { - width: 396px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: flex-start; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame4-text-container23 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text052 { - color: var(--dl-color-text-contrast); - height: auto; - align-self: auto; - text-align: left; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-frame25890 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; -} -.frame4-table-cell18 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container24 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text054 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - font-size: 14px; - align-self: auto; - font-style: Medium; - text-align: left; - font-family: Inter; - font-weight: 500; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell19 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container25 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text056 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell20 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container26 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text058 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell21 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container27 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text060 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell22 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container28 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text062 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell23 { - width: 396px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: flex-start; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame4-text-container29 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text064 { - color: var(--dl-color-text-contrast); - height: auto; - align-self: auto; - text-align: left; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-frame25899 { - display: flex; - position: relative; - align-items: flex-start; - border-color: transparent; - margin-bottom: 40px; - flex-direction: column; -} -.frame4-frame25900 { - display: flex; - position: relative; - align-items: flex-start; - border-color: transparent; - margin-bottom: 24px; - flex-direction: column; -} -.frame4-text066 { - font-size: 12px; - font-weight: 700; - color: var(--dl-color-text-main); - width: 1056px; - height: auto; - align-self: auto; - text-align: left; - line-height: 16px; - margin-right: 0; - margin-bottom: 4px; -} -.frame4-text068 { - font-size: 10px; - font-weight: 500; - color: var(--dl-color-text-main); - width: 1056px; - height: auto; - align-self: auto; - text-align: left; - line-height: 12px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-text070 { - font-size: 14px; - font-weight: 400; - color: var(--dl-color-text-main); - width: 1056px; - height: auto; - align-self: auto; - text-align: left; - line-height: 20px; - margin-right: 0; - margin-bottom: 24px; -} -.frame4-text072 { - font-size: 12px; - font-weight: 400; - color: var(--dl-color-text-main); - width: 1056px; - height: auto; - align-self: auto; - text-align: left; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-frame25886 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - border-color: transparent; - margin-bottom: 40px; - flex-direction: column; -} -.frame4-text074 { - font-size: 20px; - font-weight: 600; - color: rgba(51, 125, 254, 1); - height: auto; - align-self: auto; - text-align: center; - line-height: 24px; - margin-right: 0; - margin-bottom: 8px; -} -.frame4-text076 { - color: var(--dl-color-text-main); - height: auto; - font-size: 18px; - align-self: stretch; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 30px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-frame258871 { - width: 1056px; - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - border-color: transparent; - margin-bottom: 40px; - flex-direction: column; -} -.frame4-frame258872 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; - background-color: #f4f6fb; -} -.frame4-table-header06 { - width: 120px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame4-text-container30 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame4-text083 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-table-header07 { - width: 120px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame4-text-container31 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame4-text085 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-table-header08 { - width: 140px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame4-text-container32 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame4-text087 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-table-header09 { - width: 140px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - padding-right: 4px; - background-color: var(--dl-color-grey-g12g2); -} -.frame4-text-container33 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame4-text089 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-table-header10 { - width: 140px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - justify-content: center; - background-color: var(--dl-color-grey-g12g2); -} -.frame4-text-container34 { - width: 232px; - display: flex; - padding: 0 4px; - position: relative; - align-items: center; - flex-shrink: 0; - border-color: transparent; -} -.frame4-text091 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-table-header11 { - width: 396px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: center; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - justify-content: center; - background-color: var(--dl-color-grey-g12g2); -} -.frame4-text-container35 { - width: 232px; - display: flex; - padding: 0 4px; - position: relative; - align-items: center; - flex-shrink: 0; - border-color: transparent; -} -.frame4-text093 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-frame258811 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; -} -.frame4-table-cell24 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container36 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text095 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - font-size: 14px; - align-self: auto; - font-style: Medium; - text-align: left; - font-family: Inter; - font-weight: 500; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell25 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container37 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text097 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell26 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container38 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text099 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell27 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container39 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text101 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell28 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container40 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text103 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell29 { - width: 396px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: flex-start; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame4-text-container41 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text105 { - color: var(--dl-color-text-contrast); - height: auto; - align-self: auto; - text-align: left; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-frame258881 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; -} -.frame4-table-cell30 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container42 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text107 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - font-size: 14px; - align-self: auto; - font-style: Medium; - text-align: left; - font-family: Inter; - font-weight: 500; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell31 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container43 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text109 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell32 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container44 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text111 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell33 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container45 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text113 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell34 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container46 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text115 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell35 { - width: 396px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: flex-start; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame4-text-container47 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text117 { - color: var(--dl-color-text-contrast); - height: auto; - align-self: auto; - text-align: left; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-frame258891 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; -} -.frame4-table-cell36 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container48 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text119 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - font-size: 14px; - align-self: auto; - font-style: Medium; - text-align: left; - font-family: Inter; - font-weight: 500; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell37 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container49 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text121 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell38 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container50 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text123 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell39 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container51 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text125 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell40 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container52 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text127 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell41 { - width: 396px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: flex-start; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame4-text-container53 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text129 { - color: var(--dl-color-text-contrast); - height: auto; - align-self: auto; - text-align: left; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-frame258901 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; -} -.frame4-table-cell42 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container54 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text131 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - font-size: 14px; - align-self: auto; - font-style: Medium; - text-align: left; - font-family: Inter; - font-weight: 500; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell43 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container55 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text133 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell44 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container56 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text135 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell45 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container57 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text137 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell46 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container58 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text139 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell47 { - width: 396px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: flex-start; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame4-text-container59 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text141 { - color: var(--dl-color-text-contrast); - height: auto; - align-self: auto; - text-align: left; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-frame25898 { - display: flex; - position: relative; - align-items: flex-start; - border-color: transparent; - margin-bottom: 40px; - flex-direction: column; -} -.frame4-text143 { - font-size: 26px; - font-weight: 800; - color: #50546b; - width: 1056px; - height: auto; - align-self: auto; - text-align: left; - line-height: 32px; - margin-right: 0; - margin-bottom: 24px; -} -.frame4-text145 { - font-size: 20px; - font-weight: 800; - color: #50546b; - width: 1056px; - height: auto; - align-self: auto; - text-align: left; - line-height: 24px; - margin-right: 0; - margin-bottom: 24px; -} -.frame4-text147 { - font-size: 16px; - font-weight: 800; - color: #50546b; - width: 1056px; - height: auto; - align-self: auto; - text-align: left; - line-height: 20px; - margin-right: 0; - margin-bottom: 24px; -} -.frame4-text149 { - font-size: 14px; - font-weight: 800; - color: #50546b; - width: 1056px; - height: auto; - align-self: auto; - text-align: left; - line-height: 20px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-frame259001 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - border-color: transparent; - margin-bottom: 40px; - flex-direction: column; -} -.frame4-text151 { - font-size: 20px; - font-weight: 600; - color: rgba(51, 125, 254, 1); - height: auto; - align-self: auto; - text-align: center; - line-height: 24px; - margin-right: 0; - margin-bottom: 8px; -} -.frame4-text153 { - color: var(--dl-color-text-main); - height: auto; - font-size: 18px; - align-self: stretch; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 30px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-frame25901 { - width: 1056px; - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - border-color: transparent; - margin-bottom: 40px; - flex-direction: column; -} -.frame4-frame258873 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; - background-color: #f4f6fb; -} -.frame4-table-header12 { - width: 120px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame4-text-container60 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame4-text160 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-table-header13 { - width: 120px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame4-text-container61 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame4-text162 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-table-header14 { - width: 140px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame4-text-container62 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame4-text164 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-table-header15 { - width: 140px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame4-text-container63 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame4-text166 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-table-header16 { - width: 140px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - justify-content: center; - background-color: var(--dl-color-grey-g12g2); -} -.frame4-text-container64 { - width: 232px; - display: flex; - padding: 0 4px; - position: relative; - align-items: center; - flex-shrink: 0; - border-color: transparent; -} -.frame4-text168 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-table-header17 { - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: center; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - justify-content: center; - background-color: var(--dl-color-grey-g12g2); -} -.frame4-text-container65 { - width: 232px; - display: flex; - padding: 0 4px; - position: relative; - align-items: center; - flex-shrink: 0; - border-color: transparent; -} -.frame4-text170 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-frame258812 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; -} -.frame4-table-cell48 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container66 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text172 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - font-size: 14px; - align-self: auto; - font-style: Medium; - text-align: left; - font-family: Inter; - font-weight: 500; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell49 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container67 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text174 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell50 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container68 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text176 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell51 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container69 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text178 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell52 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container70 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text180 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell53 { - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: flex-start; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame4-text-container71 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text182 { - color: var(--dl-color-text-contrast); - height: auto; - align-self: auto; - text-align: left; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-frame258882 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; -} -.frame4-table-cell54 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container72 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text184 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - font-size: 14px; - align-self: auto; - font-style: Medium; - text-align: left; - font-family: Inter; - font-weight: 500; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell55 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container73 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text186 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell56 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container74 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text188 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell57 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container75 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text190 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell58 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container76 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text192 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell59 { - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: flex-start; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame4-text-container77 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text194 { - color: var(--dl-color-text-contrast); - height: auto; - align-self: auto; - text-align: left; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-frame258892 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; -} -.frame4-table-cell60 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container78 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text196 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - font-size: 14px; - align-self: auto; - font-style: Medium; - text-align: left; - font-family: Inter; - font-weight: 500; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell61 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container79 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text198 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell62 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container80 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text200 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell63 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container81 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text202 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell64 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container82 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text204 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell65 { - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: flex-start; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame4-text-container83 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text206 { - color: var(--dl-color-text-contrast); - height: auto; - align-self: auto; - text-align: left; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame4-frame258902 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; -} -.frame4-table-cell66 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container84 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text208 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - font-size: 14px; - align-self: auto; - font-style: Medium; - text-align: left; - font-family: Inter; - font-weight: 500; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell67 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container85 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text210 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell68 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container86 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text212 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell69 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container87 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text214 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell70 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame4-text-container88 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text216 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame4-table-cell71 { - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: flex-start; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame4-text-container89 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame4-text218 { - color: var(--dl-color-text-contrast); - height: auto; - align-self: auto; - text-align: left; - line-height: 16px; + line-height: 20px; margin-right: 0; margin-bottom: 0; } @@ -3655,8 +161,6 @@ .frame4-text220 { font-size: 26px; font-weight: 600; - color: #50546b; - width: 1056px; height: auto; align-self: auto; text-align: left; @@ -3667,8 +171,6 @@ .frame4-text222 { font-size: 20px; font-weight: 600; - color: #50546b; - width: 1056px; height: auto; align-self: auto; text-align: left; @@ -3679,8 +181,6 @@ .frame4-text224 { font-size: 16px; font-weight: 600; - color: #50546b; - width: 1056px; height: auto; align-self: auto; text-align: left; @@ -3691,8 +191,6 @@ .frame4-text226 { font-size: 14px; font-weight: 600; - color: #50546b; - width: 1056px; height: auto; align-self: auto; text-align: left; diff --git a/apps/doc/src/app/guidelines/typography/components/frame4/frame4.component.html b/apps/doc/src/app/guidelines/typography/components/frame4/frame4.component.html index 3b13253691..a7dcc78ecb 100644 --- a/apps/doc/src/app/guidelines/typography/components/frame4/frame4.component.html +++ b/apps/doc/src/app/guidelines/typography/components/frame4/frame4.component.html @@ -1,195 +1,57 @@
    -
    - - Шрифты для дизайнеров - -
    - Main - +

    Шрифты для дизайнеров

    +

    Main

    +
    +
    + Типографика для основного текста -
    -
    -
    -
    - - Название - -
    -
    -
    -
    - - Шрифт - -
    -
    -
    -
    - - Начертание - -
    -
    -
    -
    - - Размер - -
    -
    -
    -
    - - Высота - -
    -
    -
    -
    - - Описание - -
    -
    -
    -
    -
    -
    - Body-text 14 -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Regular -
    -
    -
    -
    - 12 -
    -
    -
    -
    - 20 -
    -
    -
    -
    - - Основной текст - -
    -
    -
    -
    -
    -
    - Body-text 12 -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Regular -
    -
    -
    -
    - 12 -
    -
    -
    -
    - 16 -
    -
    -
    -
    - - Основной текст - -
    -
    -
    -
    -
    -
    - Subtitle -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Bold -
    -
    -
    -
    - 12 -
    -
    -
    -
    - 16 -
    -
    -
    -
    - - Акцентные подзаголовки - -
    -
    -
    -
    -
    -
    - Subscription -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Medium -
    -
    -
    -
    - 10 -
    -
    -
    -
    - 12 -
    -
    -
    -
    - - Подписи - -
    -
    -
    -
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    НазваниеШрифтНачертаниеРазмерВысотаОписание
    Body-text 14InterRegular1220Основной текст
    Body-text 12InterRegular1216Основной текст
    SubtitleInterBold1216Акцентные подзаголовки
    SubscriptionInterMedium1012Подписи
    @@ -219,11 +81,12 @@
    -
    - - Dynamic title - - +
    + +

    Dynamic title

    +
    +
    + Динамические заголовки используются для сущностей, у которых заголовок меняется в зависимости от @@ -240,186 +103,52 @@ -
    -
    -
    -
    -
    - - Название - -
    -
    -
    -
    - Шрифт -
    -
    -
    -
    - - Начертание - -
    -
    -
    -
    - - Размер - -
    -
    -
    -
    - - Высота - -
    -
    -
    -
    - - Описание - -
    -
    -
    -
    -
    -
    - H1 -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Extra Bold -
    -
    -
    -
    - 26 -
    -
    -
    -
    - 32 -
    -
    -
    -
    - - Заголовок 1 уровня - -
    -
    -
    -
    -
    -
    - H2 -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Extra Bold -
    -
    -
    -
    - 20 -
    -
    -
    -
    - 24 -
    -
    -
    -
    - - Заголовок 2 уровня - -
    -
    -
    -
    -
    -
    - H3 -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Extra Bold -
    -
    -
    -
    - 16 -
    -
    -
    -
    - 20 -
    -
    -
    -
    - - Заголовок 3 уровня - -
    -
    -
    -
    -
    -
    - H4 -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Extra Bold -
    -
    -
    -
    - 14 -
    -
    -
    -
    - 20 -
    -
    -
    -
    - - Заголовок 4 уровня - -
    -
    -
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    НазваниеШрифтНачертаниеРазмерВысотаОписание
    H1InterExtra Bold2632Заголовок 1 уровня
    H2InterExtra Bold2024Заголовок 2 уровня
    H3InterExtra Bold1620Заголовок 3 уровня
    H4InterExtra Bold1420Заголовок 4 уровня
    @@ -435,11 +164,12 @@ H4: Динамический заголовок 4 уровня
    -
    - - Static title - - +
    + +

    Static title

    +
    +
    + Статичный стиль применяется для статичных заголовоков.
    @@ -452,186 +182,52 @@     -
    -
    -
    -
    -
    - - Название - -
    -
    -
    -
    - Шрифт -
    -
    -
    -
    - - Начертание - -
    -
    -
    -
    - - Размер - -
    -
    -
    -
    - - Высота - -
    -
    -
    -
    - - Описание - -
    -
    -
    -
    -
    -
    - H1 -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Semi Bold -
    -
    -
    -
    - 26 -
    -
    -
    -
    - 32 -
    -
    -
    -
    - - Заголовок 1 уровня - -
    -
    -
    -
    -
    -
    - H2 -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Semi Bold -
    -
    -
    -
    - 20 -
    -
    -
    -
    - 24 -
    -
    -
    -
    - - Заголовок 2 уровня - -
    -
    -
    -
    -
    -
    - H3 -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Semi Bold -
    -
    -
    -
    - 16 -
    -
    -
    -
    - 20 -
    -
    -
    -
    - - Заголовок 3 уровня - -
    -
    -
    -
    -
    -
    - H4 -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Semi Bold -
    -
    -
    -
    - 14 -
    -
    -
    -
    - 20 -
    -
    -
    -
    - - Заголовок 4 уровня - -
    -
    -
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    НазваниеШрифтНачертаниеРазмерВысотаОписание
    H1InterSemi Bold2632Заголовок 1 уровня
    H2InterSemi Bold2024Заголовок 2 уровня
    H3InterSemi Bold1620Заголовок 3 уровня
    H4InterSemi Bold1420Заголовок 4 уровня
    diff --git a/apps/doc/src/app/guidelines/typography/components/frame9/frame9.component.css b/apps/doc/src/app/guidelines/typography/components/frame9/frame9.component.css index d26ed7e3a8..bf88138f81 100644 --- a/apps/doc/src/app/guidelines/typography/components/frame9/frame9.component.css +++ b/apps/doc/src/app/guidelines/typography/components/frame9/frame9.component.css @@ -1,540 +1,129 @@ :host { display: contents; } -.frame9-frame9 { - min-width: 1150px; - height: auto; - display: flex; - padding: 56px; - position: relative; - align-self: stretch; - box-shadow: 0px 8px 32px 0px rgba(191, 198, 215, 0.5); - align-items: flex-start; - border-color: rgba(191, 198, 215, 1); - border-style: solid; - border-width: 1px; - border-radius: 2px; - flex-direction: column; - background-color: var(--dl-color-bg-body); -} -.frame9-text { - font-size: 26px; - font-weight: 800; - color: rgba(51, 125, 254, 1); +.frame9-text026 { + font-size: 14px; + font-weight: 600; height: auto; align-self: auto; text-align: left; - line-height: 32px; - margin-right: 0; - margin-bottom: 40px; -} -.frame9-frame5 { - width: 1056px; - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - border-color: transparent; - margin-bottom: 40px; - flex-direction: column; -} -.frame9-frame25885 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - border-color: transparent; - flex-direction: column; -} -.frame9-frame25887 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; - background-color: #f4f6fb; -} -.frame9-table-header { - width: 1056px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: center; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - justify-content: center; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container { - width: 232px; - display: flex; - padding: 0 4px; - position: relative; - align-items: center; - flex-shrink: 0; - border-color: transparent; -} -.frame9-text002 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; line-height: 16px; margin-right: 0; margin-bottom: 0; } -.frame9-frame25891 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; - background-color: #f4f6fb; -} -.frame9-table-header01 { - width: 120px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container001 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame9-text004 { +.frame9-text038 { font-size: 12px; - font-weight: 500; - color: #20222b; + font-weight: 600; height: auto; - flex-grow: 1; align-self: auto; - text-align: center; + text-align: left; line-height: 16px; margin-right: 0; margin-bottom: 0; } -.frame9-table-header02 { - width: 120px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container002 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame9-text006 { - font-size: 12px; +.frame9-text050 { + font-size: 14px; font-weight: 500; - color: #20222b; + text-decoration: underline; height: auto; - flex-grow: 1; align-self: auto; - text-align: center; - line-height: 16px; + text-align: left; + line-height: 24px; margin-right: 0; margin-bottom: 0; } -.frame9-table-header03 { - width: 140px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container003 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame9-text008 { +.frame9-text062 { font-size: 12px; font-weight: 500; - color: #20222b; + text-decoration: underline; height: auto; - flex-grow: 1; align-self: auto; - text-align: center; + text-align: left; line-height: 16px; margin-right: 0; margin-bottom: 0; } -.frame9-table-header04 { - width: 140px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container004 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame9-text010 { - font-size: 12px; - font-weight: 500; - color: #20222b; +.frame9-text088 { + font-size: 14px; + font-weight: 400; height: auto; - flex-grow: 1; align-self: auto; - text-align: center; + text-align: left; line-height: 16px; margin-right: 0; margin-bottom: 0; } -.frame9-table-header05 { - width: 140px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - justify-content: center; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container005 { - width: 232px; - display: flex; - padding: 0 4px; - position: relative; - align-items: center; - flex-shrink: 0; - border-color: transparent; -} -.frame9-text012 { +.frame9-text100 { font-size: 12px; - font-weight: 500; - color: #20222b; + font-weight: 400; height: auto; - flex-grow: 1; align-self: auto; - text-align: center; + text-align: left; line-height: 16px; margin-right: 0; margin-bottom: 0; } -.frame9-table-header06 { - width: 396px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: center; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - justify-content: center; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container006 { - width: 232px; - display: flex; - padding: 0 4px; - position: relative; - align-items: center; - flex-shrink: 0; - border-color: transparent; -} -.frame9-text014 { - font-size: 12px; - font-weight: 500; - color: #20222b; +.frame9-text112 { + font-size: 14px; + font-weight: 400; height: auto; - flex-grow: 1; align-self: auto; - text-align: center; - line-height: 16px; + text-align: left; + line-height: 20px; margin-right: 0; margin-bottom: 0; } -.frame9-frame25888 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; -} -.frame9-table-cell { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container007 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text016 { - color: var(--dl-color-text-contrast); +.frame9-text124 { + font-size: 12px; + font-weight: 600; height: auto; - flex-grow: 1; - font-size: 14px; align-self: auto; - font-style: Medium; text-align: left; - font-family: Inter; - font-weight: 500; line-height: 16px; - font-stretch: normal; margin-right: 0; margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell01 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container008 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; } -.frame9-text018 { - color: var(--dl-color-text-contrast); +.frame9-text136 { + font-size: 10px; + font-weight: 500; height: auto; - font-size: 14px; align-self: auto; - font-style: Regular; text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; + line-height: 12px; margin-right: 0; margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell02 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; } -.frame9-text-container009 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text020 { - color: var(--dl-color-text-contrast); +.frame9-text162 { + font-size: 12px; + font-weight: 500; height: auto; - font-size: 14px; align-self: auto; - font-style: Regular; text-align: left; - font-family: Inter; - font-weight: 400; line-height: 16px; - font-stretch: normal; margin-right: 0; margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell03 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container010 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; } -.frame9-text022 { - color: var(--dl-color-text-contrast); - height: auto; +.frame9-text174 { font-size: 14px; + font-weight: 400; + height: auto; align-self: auto; - font-style: Regular; text-align: left; - font-family: Inter; - font-weight: 400; line-height: 16px; - font-stretch: normal; margin-right: 0; margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell04 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container011 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; } -.frame9-text024 { - color: var(--dl-color-text-contrast); +.frame9-text186 { + font-size: 12px; + font-weight: 400; height: auto; - font-size: 14px; align-self: auto; - font-style: Regular; text-align: left; - font-family: Inter; - font-weight: 400; line-height: 16px; - font-stretch: normal; margin-right: 0; margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell05 { - width: 396px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: flex-start; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame9-text-container012 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; } -.frame9-text026 { - font-size: 14px; - font-weight: 600; - color: #20222b; +.frame9-text212 { height: auto; align-self: auto; text-align: left; @@ -542,3569 +131,35 @@ margin-right: 0; margin-bottom: 0; } -.frame9-frame25881 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; -} -.frame9-table-cell06 { - width: 120px; +.frame9-frame9 { + height: auto; display: flex; - padding: 8px 10px; - overflow: hidden; position: relative; align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container013 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; + flex-direction: column; } -.frame9-text028 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - font-size: 14px; - align-self: auto; - font-style: Medium; - text-align: left; - font-family: Inter; - font-weight: 500; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; +.frame9-info-table { + width: 100%; + + .frame9-column-group { + th:nth-child(1), + th:nth-child(2) { + width: 12%; + } + + th:nth-child(3), + th:nth-child(4), + th:nth-child(5) { + width: 13%; + } + } } -.frame9-table-cell07 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container014 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text030 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell08 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container015 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text032 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell09 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container016 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text034 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell10 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container017 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text036 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell11 { - width: 396px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: flex-start; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame9-text-container018 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text038 { - font-size: 12px; - font-weight: 600; - color: #20222b; - height: auto; - align-self: auto; - text-align: left; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-frame25889 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; -} -.frame9-table-cell12 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container019 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text040 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - font-size: 14px; - align-self: auto; - font-style: Medium; - text-align: left; - font-family: Inter; - font-weight: 500; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell13 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container020 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text042 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell14 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container021 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text044 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell15 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container022 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text046 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell16 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container023 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text048 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell17 { - width: 396px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: center; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame9-text-container024 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text050 { - font-size: 14px; - font-weight: 500; - color: #20222b; - text-decoration: underline; - height: auto; - align-self: auto; - text-align: left; - line-height: 24px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-frame25890 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; -} -.frame9-table-cell18 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container025 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text052 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - font-size: 14px; - align-self: auto; - font-style: Medium; - text-align: left; - font-family: Inter; - font-weight: 500; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell19 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container026 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text054 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell20 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container027 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text056 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell21 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container028 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text058 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell22 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container029 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text060 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell23 { - width: 396px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: flex-start; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame9-text-container030 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text062 { - font-size: 12px; - font-weight: 500; - color: #20222b; - text-decoration: underline; - height: auto; - align-self: auto; - text-align: left; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-frame6 { - width: 1056px; - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - border-color: transparent; - margin-bottom: 40px; - flex-direction: column; -} -.frame9-frame258851 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - border-color: transparent; - flex-direction: column; -} -.frame9-frame258871 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; - background-color: #f4f6fb; -} -.frame9-table-header07 { - width: 1056px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: center; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - justify-content: center; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container031 { - width: 232px; - display: flex; - padding: 0 4px; - position: relative; - align-items: center; - flex-shrink: 0; - border-color: transparent; -} -.frame9-text064 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-frame258911 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; - background-color: #f4f6fb; -} -.frame9-table-header08 { - width: 120px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container032 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame9-text066 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-table-header09 { - width: 120px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container033 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame9-text068 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-table-header10 { - width: 140px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container034 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame9-text070 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-table-header11 { - width: 140px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container035 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame9-text072 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-table-header12 { - width: 140px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - justify-content: center; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container036 { - width: 232px; - display: flex; - padding: 0 4px; - position: relative; - align-items: center; - flex-shrink: 0; - border-color: transparent; -} -.frame9-text074 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-table-header13 { - width: 396px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: center; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - justify-content: center; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container037 { - width: 232px; - display: flex; - padding: 0 4px; - position: relative; - align-items: center; - flex-shrink: 0; - border-color: transparent; -} -.frame9-text076 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-frame258881 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; -} -.frame9-table-cell24 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container038 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text078 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - font-size: 14px; - align-self: auto; - font-style: Medium; - text-align: left; - font-family: Inter; - font-weight: 500; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell25 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container039 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text080 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell26 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container040 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text082 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell27 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container041 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text084 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell28 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container042 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text086 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell29 { - width: 396px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: flex-start; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame9-text-container043 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text088 { - font-size: 14px; - font-weight: 400; - color: #20222b; - height: auto; - align-self: auto; - text-align: left; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-frame258811 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; -} -.frame9-table-cell30 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container044 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text090 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - font-size: 14px; - align-self: auto; - font-style: Medium; - text-align: left; - font-family: Inter; - font-weight: 500; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell31 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container045 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text092 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell32 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container046 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text094 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell33 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container047 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text096 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell34 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container048 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text098 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell35 { - width: 396px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: flex-start; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame9-text-container049 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text100 { - font-size: 12px; - font-weight: 400; - color: #20222b; - height: auto; - align-self: auto; - text-align: left; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-frame258891 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; -} -.frame9-table-cell36 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container050 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text102 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - font-size: 14px; - align-self: auto; - font-style: Medium; - text-align: left; - font-family: Inter; - font-weight: 500; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell37 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container051 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text104 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell38 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container052 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text106 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell39 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container053 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text108 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell40 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container054 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text110 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell41 { - width: 396px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: flex-start; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame9-text-container055 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text112 { - font-size: 14px; - font-weight: 400; - color: #20222b; - height: auto; - align-self: auto; - text-align: left; - line-height: 20px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-frame25892 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; -} -.frame9-table-cell42 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container056 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text114 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - font-size: 14px; - align-self: auto; - font-style: Medium; - text-align: left; - font-family: Inter; - font-weight: 500; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell43 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container057 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text116 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell44 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container058 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text118 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell45 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container059 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text120 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell46 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container060 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text122 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell47 { - width: 396px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: center; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame9-text-container061 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text124 { - font-size: 12px; - font-weight: 600; - color: #20222b; - height: auto; - align-self: auto; - text-align: left; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-frame258901 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; -} -.frame9-table-cell48 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container062 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text126 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - font-size: 14px; - align-self: auto; - font-style: Medium; - text-align: left; - font-family: Inter; - font-weight: 500; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell49 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container063 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text128 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell50 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container064 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text130 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell51 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container065 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text132 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell52 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container066 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text134 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell53 { - width: 396px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: center; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame9-text-container067 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text136 { - font-size: 10px; - font-weight: 500; - color: #20222b; - height: auto; - align-self: auto; - text-align: left; - line-height: 12px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-frame7 { - width: 1056px; - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - border-color: transparent; - margin-bottom: 40px; - flex-direction: column; -} -.frame9-frame258852 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - border-color: transparent; - flex-direction: column; -} -.frame9-frame258872 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; - background-color: #f4f6fb; -} -.frame9-table-header14 { - width: 1056px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: center; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - justify-content: center; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container068 { - width: 232px; - display: flex; - padding: 0 4px; - position: relative; - align-items: center; - flex-shrink: 0; - border-color: transparent; -} -.frame9-text138 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-frame258912 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; - background-color: #f4f6fb; -} -.frame9-table-header15 { - width: 128px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container069 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame9-text140 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-table-header16 { - width: 120px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container070 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame9-text142 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-table-header17 { - width: 140px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container071 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame9-text144 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-table-header18 { - width: 140px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container072 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame9-text146 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-table-header19 { - width: 140px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - justify-content: center; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container073 { - width: 232px; - display: flex; - padding: 0 4px; - position: relative; - align-items: center; - flex-shrink: 0; - border-color: transparent; -} -.frame9-text148 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-table-header20 { - width: 388px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: center; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - justify-content: center; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container074 { - width: 232px; - display: flex; - padding: 0 4px; - position: relative; - align-items: center; - flex-shrink: 0; - border-color: transparent; -} -.frame9-text150 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-frame258882 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; -} -.frame9-table-cell54 { - width: 128px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container075 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text152 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - font-size: 14px; - align-self: auto; - font-style: Medium; - text-align: left; - font-family: Inter; - font-weight: 500; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell55 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container076 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text154 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell56 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container077 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text156 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell57 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container078 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text158 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell58 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container079 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text160 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell59 { - width: 388px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: flex-start; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame9-text-container080 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text162 { - font-size: 12px; - font-weight: 500; - color: #20222b; - height: auto; - align-self: auto; - text-align: left; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-frame258812 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; -} -.frame9-table-cell60 { - width: 128px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container081 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text164 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - font-size: 14px; - align-self: auto; - font-style: Medium; - text-align: left; - font-family: Inter; - font-weight: 500; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell61 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container082 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text166 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell62 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container083 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text168 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell63 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container084 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text170 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell64 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container085 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text172 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell65 { - width: 388px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: flex-start; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame9-text-container086 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text174 { - font-size: 14px; - font-weight: 400; - color: #20222b; - height: auto; - align-self: auto; - text-align: left; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-frame258892 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; -} -.frame9-table-cell66 { - width: 128px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container087 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text176 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - font-size: 14px; - align-self: auto; - font-style: Medium; - text-align: left; - font-family: Inter; - font-weight: 500; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell67 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container088 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text178 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell68 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container089 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text180 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell69 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container090 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text182 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell70 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container091 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text184 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell71 { - width: 388px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: flex-start; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame9-text-container092 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text186 { - font-size: 12px; - font-weight: 400; - color: #20222b; - height: auto; - align-self: auto; - text-align: left; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-frame8 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - border-color: transparent; - flex-direction: column; - width: 1056px; -} -.frame9-frame258853 { +.frame9-table-container { display: flex; position: relative; align-self: stretch; align-items: flex-start; border-color: transparent; + margin-bottom: 40px; flex-direction: column; } -.frame9-frame258873 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; - background-color: #f4f6fb; -} -.frame9-table-header21 { - width: 1056px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: center; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - justify-content: center; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container093 { - width: 232px; - display: flex; - padding: 0 4px; - position: relative; - align-items: center; - flex-shrink: 0; - border-color: transparent; -} -.frame9-text188 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-frame258913 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; - margin-bottom: 0px; - background-color: #f4f6fb; -} -.frame9-table-header22 { - width: 120px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container094 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame9-text190 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-table-header23 { - width: 120px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container095 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame9-text192 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-table-header24 { - width: 140px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container096 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame9-text194 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-table-header25 { - width: 140px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container097 { - display: flex; - padding: 0 4px; - position: relative; - flex-grow: 1; - align-items: center; - border-color: transparent; -} -.frame9-text196 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-table-header26 { - width: 140px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: center; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; - justify-content: center; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container098 { - width: 232px; - display: flex; - padding: 0 4px; - position: relative; - align-items: center; - flex-shrink: 0; - border-color: transparent; -} -.frame9-text198 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-table-header27 { - width: 396px; - display: flex; - padding: 4px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: center; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - justify-content: center; - background-color: var(--dl-color-grey-g12g2); -} -.frame9-text-container099 { - width: 232px; - display: flex; - padding: 0 4px; - position: relative; - align-items: center; - flex-shrink: 0; - border-color: transparent; -} -.frame9-text200 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - align-self: auto; - text-align: center; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} -.frame9-frame258883 { - display: flex; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: transparent; -} -.frame9-table-cell72 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container100 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text202 { - color: var(--dl-color-text-contrast); - height: auto; - flex-grow: 1; - font-size: 14px; - align-self: auto; - font-style: Medium; - text-align: left; - font-family: Inter; - font-weight: 500; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell73 { - width: 120px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container101 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text204 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell74 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container102 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text206 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell75 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container103 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text208 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell76 { - width: 140px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - align-self: stretch; - align-items: flex-start; - flex-shrink: 0; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; - margin-right: 0px; -} -.frame9-text-container104 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text210 { - color: var(--dl-color-text-contrast); - height: auto; - font-size: 14px; - align-self: auto; - font-style: Regular; - text-align: left; - font-family: Inter; - font-weight: 400; - line-height: 16px; - font-stretch: normal; - margin-right: 0; - margin-bottom: 0; - text-decoration: none; -} -.frame9-table-cell77 { - width: 396px; - display: flex; - padding: 8px 10px; - overflow: hidden; - position: relative; - flex-grow: 1; - align-self: stretch; - align-items: flex-start; - border-color: rgba(214, 219, 231, 1); - border-style: solid; - border-width: 0.5px; -} -.frame9-text-container105 { - display: flex; - padding: 4px; - position: relative; - flex-grow: 1; - align-items: flex-start; - border-color: transparent; -} -.frame9-text212 { - color: var(--dl-color-text-contrast); - height: auto; - align-self: auto; - text-align: left; - line-height: 16px; - margin-right: 0; - margin-bottom: 0; -} diff --git a/apps/doc/src/app/guidelines/typography/components/frame9/frame9.component.html b/apps/doc/src/app/guidelines/typography/components/frame9/frame9.component.html index b478c5c000..ef9e5f4281 100644 --- a/apps/doc/src/app/guidelines/typography/components/frame9/frame9.component.html +++ b/apps/doc/src/app/guidelines/typography/components/frame9/frame9.component.html @@ -1,683 +1,185 @@
    +

    Шрифты для компонентов

    - - Шрифты для компонентов - -
    -
    -
    -
    -
    - - Buttons & Links - -
    -
    -
    -
    -
    -
    - - Название - -
    -
    -
    -
    - - Шрифт - -
    -
    -
    -
    - - Начертание - -
    -
    -
    -
    - - Размер - -
    -
    -
    -
    - - Высота - -
    -
    -
    -
    - - Описание - -
    -
    -
    -
    -
    -
    - btn-14 -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Semibold -
    -
    -
    -
    - 14 -
    -
    -
    -
    - 16 -
    -
    -
    -
    - - Для всех кнопок кроме 24рх - -
    -
    -
    -
    -
    -
    - btn-12 -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Semibold -
    -
    -
    -
    - 16 -
    -
    -
    -
    - 16 -
    -
    -
    -
    - - Для кнопок высотой 24рх - -
    -
    -
    -
    -
    -
    - link-14 -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Medium -
    -
    -
    -
    - 14 -
    -
    -
    -
    - 16 -
    -
    -
    -
    - - Cсылка, подчеркнутая - -
    -
    -
    -
    -
    -
    - link-12 -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Medium -
    -
    -
    -
    - 12 -
    -
    -
    -
    - 16 -
    -
    -
    -
    - - Cсылка, подчеркнутая - -
    -
    -
    -
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Buttons & Links
    НазваниеШрифтНачертаниеРазмерВысотаОписание
    btn-14InterSemibold1416Для всех кнопок кроме 24рх
    btn-12InterSemibold1616Для кнопок высотой 24рх
    link-14InterMedium1416Cсылка, подчеркнутая
    link-12InterMedium1216Cсылка, подчеркнутая
    -
    -
    -
    -
    -
    - - Input - -
    -
    -
    -
    -
    -
    - - Название - -
    -
    -
    -
    - - Шрифт - -
    -
    -
    -
    - - Начертание - -
    -
    -
    -
    - - Размер - -
    -
    -
    -
    - - Высота - -
    -
    -
    -
    - - Описание - -
    -
    -
    -
    -
    -
    - text-14 -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Regular -
    -
    -
    -
    - 14 -
    -
    -
    -
    - 16 -
    -
    -
    -
    - - - Введенные / выбранные данные - - - -
    -
    -
    -
    -
    -
    - text-12 -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Regular -
    -
    -
    -
    - 12 -
    -
    -
    -
    - 16 -
    -
    -
    -
    - - - Введенные / выбранные данные - - - -
    -
    -
    -
    -
    -
    - area -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Regular -
    -
    -
    -
    - 14 -
    -
    -
    -
    - 20 -
    -
    -
    -
    - - Введенные данные в Text-area - -
    -
    -
    -
    -
    -
    - label -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Semibold -
    -
    -
    -
    - 12 -
    -
    -
    -
    - 16 -
    -
    -
    -
    - - Заголовок формы ввода - -
    -
    -
    -
    -
    -
    - helper -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Medium -
    -
    -
    -
    - 10 -
    -
    -
    -
    - 12 -
    -
    -
    -
    - - Текст пояснения / подсказки - -
    -
    -
    -
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Input
    НазваниеШрифтНачертаниеРазмерВысотаОписание
    text-14InterRegular1416Введенные / выбранные данные
    text-12InterRegular1216Введенные / выбранные данные
    areaInterRegular1420Введенные данные в Text-area
    labelInterSemibold1216Заголовок формы ввода
    helperInterMedium1012Текст пояснения / подсказки
    -
    -
    -
    -
    -
    - - Table - -
    -
    -
    -
    -
    -
    - - Название - -
    -
    -
    -
    - - Шрифт - -
    -
    -
    -
    - - Начертание - -
    -
    -
    -
    - - Размер - -
    -
    -
    -
    - - Высота - -
    -
    -
    -
    - - Описание - -
    -
    -
    -
    -
    -
    - table-heading -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Medium -
    -
    -
    -
    - 12 -
    -
    -
    -
    - 16 -
    -
    -
    -
    - - Основной текст - -
    -
    -
    -
    -
    -
    - table-text-14 -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Regular -
    -
    -
    -
    - 14 -
    -
    -
    -
    - 16 -
    -
    -
    -
    - - Основной текст - -
    -
    -
    -
    -
    -
    - table-text-12 -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Regular -
    -
    -
    -
    - 12 -
    -
    -
    -
    - 16 -
    -
    -
    -
    - - Акцентные подзаголовки - -
    -
    -
    -
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Table
    НазваниеШрифтНачертаниеРазмерВысотаОписание
    table-headingInterMedium1216Основной текст
    table-text-14InterRegular1416Основной текст
    table-text-12InterRegular1216Акцентные подзаголовки
    -
    -
    -
    -
    -
    - - Общие - -
    -
    -
    -
    -
    -
    - - Название - -
    -
    -
    -
    - - Шрифт - -
    -
    -
    -
    - - Начертание - -
    -
    -
    -
    - - Размер - -
    -
    -
    -
    - - Высота - -
    -
    -
    -
    - - Описание - -
    -
    -
    -
    -
    -
    - Chips-text -
    -
    -
    -
    - Inter -
    -
    -
    -
    - Regular -
    -
    -
    -
    - 14 -
    -
    -
    -
    - 16 -
    -
    -
    -
    - - Основной текст - -
    -
    -
    -
    +
    + + + + + + + + + + + + + + + + + + + + + + + + +
    Общие
    НазваниеШрифтНачертаниеРазмерВысотаОписание
    Chips-textInterRegular1416Основной текст
    diff --git a/apps/doc/src/app/guidelines/typography/typography.component.html b/apps/doc/src/app/guidelines/typography/typography.component.html index 9c8a08c782..0b9399a5ca 100644 --- a/apps/doc/src/app/guidelines/typography/typography.component.html +++ b/apps/doc/src/app/guidelines/typography/typography.component.html @@ -1,8 +1,6 @@ - -
    - - -
    - + +
    + + +
    +     diff --git a/apps/doc/src/app/guidelines/typography/typography.module.ts b/apps/doc/src/app/guidelines/typography/typography.module.ts index f004841796..a3782981b9 100644 --- a/apps/doc/src/app/guidelines/typography/typography.module.ts +++ b/apps/doc/src/app/guidelines/typography/typography.module.ts @@ -5,6 +5,7 @@ import { Frame4Component } from './components/frame4/frame4.component'; import { Frame9Component } from './components/frame9/frame9.component'; import { TypographyComponent } from './typography.component'; import { PrizmAddonDocModule } from '@prizm-ui/doc'; +import { PrizmTableModule } from '@prizm-ui/components'; const routes: Routes = [ { @@ -15,7 +16,7 @@ const routes: Routes = [ @NgModule({ bootstrap: [], - imports: [CommonModule, PrizmAddonDocModule, RouterModule.forChild(routes)], + imports: [CommonModule, PrizmAddonDocModule, RouterModule.forChild(routes), PrizmTableModule], declarations: [TypographyComponent, Frame4Component, Frame9Component], exports: [RouterModule], }) From ac2d029f4e0300626b3453e1322bf548f550e264 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Thu, 4 Apr 2024 16:06:03 +0400 Subject: [PATCH 107/291] fix: navigation titles position #1510 --- .../prizm-header-dropdown/prizm-header-dropdown.component.html | 1 - .../prizm-navigation-item-expandable.component.html | 1 - 2 files changed, 2 deletions(-) diff --git a/libs/components/src/lib/components/header/components/prizm-header-dropdown/prizm-header-dropdown.component.html b/libs/components/src/lib/components/header/components/prizm-header-dropdown/prizm-header-dropdown.component.html index 36ae45cf39..990e7ffb05 100644 --- a/libs/components/src/lib/components/header/components/prizm-header-dropdown/prizm-header-dropdown.component.html +++ b/libs/components/src/lib/components/header/components/prizm-header-dropdown/prizm-header-dropdown.component.html @@ -12,7 +12,6 @@ [prizmHint]="data[currentScreenIdx]?.title" [prizmHintCanShow]="prizmIsTextOverflow(title)" (click)="openDropdown = !openDropdown" - prizmHintDirection="b" >
    From 99691a4d1fba4115f7102517b7316de6bb2fe201 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Thu, 4 Apr 2024 16:28:43 +0400 Subject: [PATCH 108/291] fix: name hint #1541 --- .../file-upload/file-upload.component.html | 12 +++++++++--- .../file-upload/file-upload.component.less | 5 ++++- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/libs/components/src/lib/components/file-upload/file-upload.component.html b/libs/components/src/lib/components/file-upload/file-upload.component.html index d0ae19904c..581b312909 100644 --- a/libs/components/src/lib/components/file-upload/file-upload.component.html +++ b/libs/components/src/lib/components/file-upload/file-upload.component.html @@ -47,9 +47,15 @@
    -
    - {{ item.key | prizmFileName }} - {{ item.key | prizmFileExtension }} +
    +
    + {{ item.key | prizmFileName }} + {{ item.key | prizmFileExtension }} +
    {{ item.value.file.size | prizmFileSize }}
    diff --git a/libs/components/src/lib/components/file-upload/file-upload.component.less b/libs/components/src/lib/components/file-upload/file-upload.component.less index 35e4964f76..9fdd2b040a 100644 --- a/libs/components/src/lib/components/file-upload/file-upload.component.less +++ b/libs/components/src/lib/components/file-upload/file-upload.component.less @@ -94,11 +94,14 @@ grid-column-end: 4; padding-right: 8px; overflow: hidden; - text-overflow: ellipsis; display: flex; align-items: baseline; } + &__full-name { + display: flex; + overflow: hidden; + } &__name, &__extension { font-weight: 600; From 84447bdfbd436f9d36d5498de3e9d9e8d8bb3727 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Mon, 8 Apr 2024 15:58:34 +0400 Subject: [PATCH 109/291] feat: cron custom title #1431 --- apps/doc/src/app/components/cron/cron.component.html | 10 ++++++++++ apps/doc/src/app/components/cron/cron.component.ts | 1 + .../src/lib/components/cron/cron.component.html | 2 +- .../src/lib/components/cron/cron.component.ts | 1 + 4 files changed, 13 insertions(+), 1 deletion(-) diff --git a/apps/doc/src/app/components/cron/cron.component.html b/apps/doc/src/app/components/cron/cron.component.html index cf5205a060..87fdf50771 100644 --- a/apps/doc/src/app/components/cron/cron.component.html +++ b/apps/doc/src/app/components/cron/cron.component.html @@ -46,6 +46,7 @@ [hidePeriod]="hidePeriod" [hideResult]="hideResult" [autoSubmit]="autoSubmit" + [title]="title" > @@ -69,6 +70,15 @@ Max width + + Title + +
    - {{ cronI18n$ | async | prizmPluck : ['title'] }} + {{ title ?? (cronI18n$ | async | prizmPluck : ['title']) }}
    diff --git a/libs/components/src/lib/components/cron/cron.component.ts b/libs/components/src/lib/components/cron/cron.component.ts index 73cd7d8c98..d718927ddb 100644 --- a/libs/components/src/lib/components/cron/cron.component.ts +++ b/libs/components/src/lib/components/cron/cron.component.ts @@ -54,6 +54,7 @@ import { PrizmCronHumanReadablePipe } from '../cron-human-readable'; imports: [PrizmCronHumanReadablePipe, PrizmCronInnerModule, PrizmCronMonthPipe, PrizmCronWeekPipe], }) export class PrizmCronComponent extends PrizmAbstractTestId implements OnInit { + @Input() public title: string | null = null; @Input() public set value(value: string) { if (!value) return; this.cron.updateWith(value); From 3ef8e558036d70ba9e79ca53c2830c85c0dcd87a Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Tue, 9 Apr 2024 11:29:10 +0400 Subject: [PATCH 110/291] feat: cron custom title #1431 --- apps/doc/src/app/components/cron/cron.component.html | 8 ++++---- apps/doc/src/app/components/cron/cron.component.ts | 2 +- .../src/lib/components/cron/cron.component.html | 2 +- libs/components/src/lib/components/cron/cron.component.ts | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/doc/src/app/components/cron/cron.component.html b/apps/doc/src/app/components/cron/cron.component.html index 87fdf50771..ed96ecb183 100644 --- a/apps/doc/src/app/components/cron/cron.component.html +++ b/apps/doc/src/app/components/cron/cron.component.html @@ -46,7 +46,7 @@ [hidePeriod]="hidePeriod" [hideResult]="hideResult" [autoSubmit]="autoSubmit" - [title]="title" + [cronTitle]="cronTitle" > @@ -71,12 +71,12 @@ - Title + Cron title
    - {{ title ?? (cronI18n$ | async | prizmPluck : ['title']) }} + {{ cronTitle ?? (cronI18n$ | async | prizmPluck : ['title']) }}
    diff --git a/libs/components/src/lib/components/cron/cron.component.ts b/libs/components/src/lib/components/cron/cron.component.ts index d718927ddb..2e0df746cf 100644 --- a/libs/components/src/lib/components/cron/cron.component.ts +++ b/libs/components/src/lib/components/cron/cron.component.ts @@ -54,7 +54,7 @@ import { PrizmCronHumanReadablePipe } from '../cron-human-readable'; imports: [PrizmCronHumanReadablePipe, PrizmCronInnerModule, PrizmCronMonthPipe, PrizmCronWeekPipe], }) export class PrizmCronComponent extends PrizmAbstractTestId implements OnInit { - @Input() public title: string | null = null; + @Input() public cronTitle: string | null = null; @Input() public set value(value: string) { if (!value) return; this.cron.updateWith(value); From 4cea51b01c61c571ea41551f6cc7ae0057b2928b Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Wed, 10 Apr 2024 11:49:56 +0400 Subject: [PATCH 111/291] feat: cron custom title hint #1431 --- .../src/lib/components/cron/cron.component.html | 13 ++++++++++--- .../src/lib/components/cron/cron.component.less | 7 +++++++ 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/libs/components/src/lib/components/cron/cron.component.html b/libs/components/src/lib/components/cron/cron.component.html index ebfb2483bf..9bd66ab213 100644 --- a/libs/components/src/lib/components/cron/cron.component.html +++ b/libs/components/src/lib/components/cron/cron.component.html @@ -1,8 +1,15 @@
    - - {{ cronTitle ?? (cronI18n$ | async | prizmPluck : ['title']) }} - + + + {{ title }} + +
    Date: Thu, 4 Apr 2024 10:09:40 +0300 Subject: [PATCH 112/291] fix: fix scroll in sticky example #670 --- .../sticky/examples/base/sticky-base-example.component.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/doc/src/app/components/sticky/examples/base/sticky-base-example.component.less b/apps/doc/src/app/components/sticky/examples/base/sticky-base-example.component.less index ce51cc6856..12717a28a6 100644 --- a/apps/doc/src/app/components/sticky/examples/base/sticky-base-example.component.less +++ b/apps/doc/src/app/components/sticky/examples/base/sticky-base-example.component.less @@ -1,6 +1,5 @@ .table { display: block; - width: 1000px; .row { display: grid; @@ -10,6 +9,7 @@ .col { height: 30px; border: 1px solid rgba(128, 128, 128, 0.25); + min-width: 65px; } &.header { From 0c9b3af4cfb60b0d9c491f35348a66f01fd9d31d Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 5 Apr 2024 10:33:28 +0300 Subject: [PATCH 113/291] fix: fix sticky styles --- .../examples/base/sticky-base-example.component.less | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/doc/src/app/components/sticky/examples/base/sticky-base-example.component.less b/apps/doc/src/app/components/sticky/examples/base/sticky-base-example.component.less index 12717a28a6..6610271259 100644 --- a/apps/doc/src/app/components/sticky/examples/base/sticky-base-example.component.less +++ b/apps/doc/src/app/components/sticky/examples/base/sticky-base-example.component.less @@ -1,5 +1,6 @@ .table { display: block; + min-width: 585px; .row { display: grid; @@ -14,14 +15,14 @@ &.header { font-weight: 600; - color: black; + color: var(--prizm-text-icon-primary); } &.footer, &.header, .sticky { - background-color: #d0cece; - color: white; + background-color: var(--prizm-table-fill-row-zebra_default); + color: var(--prizm-text-icon-secondary); } } } From 80bbd919116188ce8844cc3eff85fa462e9fae47 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 4 Apr 2024 10:09:40 +0300 Subject: [PATCH 114/291] fix: fix scroll in sticky example #670 --- .../sticky/examples/base/sticky-base-example.component.less | 1 - 1 file changed, 1 deletion(-) diff --git a/apps/doc/src/app/components/sticky/examples/base/sticky-base-example.component.less b/apps/doc/src/app/components/sticky/examples/base/sticky-base-example.component.less index 6610271259..6e373d0fb4 100644 --- a/apps/doc/src/app/components/sticky/examples/base/sticky-base-example.component.less +++ b/apps/doc/src/app/components/sticky/examples/base/sticky-base-example.component.less @@ -1,6 +1,5 @@ .table { display: block; - min-width: 585px; .row { display: grid; From 733659efb33f4db9e8c9951ace53ae82d142ff57 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 5 Apr 2024 10:33:28 +0300 Subject: [PATCH 115/291] fix: fix sticky styles --- .../sticky/examples/base/sticky-base-example.component.less | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/doc/src/app/components/sticky/examples/base/sticky-base-example.component.less b/apps/doc/src/app/components/sticky/examples/base/sticky-base-example.component.less index 6e373d0fb4..6610271259 100644 --- a/apps/doc/src/app/components/sticky/examples/base/sticky-base-example.component.less +++ b/apps/doc/src/app/components/sticky/examples/base/sticky-base-example.component.less @@ -1,5 +1,6 @@ .table { display: block; + min-width: 585px; .row { display: grid; From ee89ac8b162424728cc07542d42572a4299a133a Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Wed, 10 Apr 2024 11:36:22 +0300 Subject: [PATCH 116/291] fix: add color prefix --- .../sticky/examples/base/sticky-base-example.component.less | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/doc/src/app/components/sticky/examples/base/sticky-base-example.component.less b/apps/doc/src/app/components/sticky/examples/base/sticky-base-example.component.less index 6610271259..cd4df19fe0 100644 --- a/apps/doc/src/app/components/sticky/examples/base/sticky-base-example.component.less +++ b/apps/doc/src/app/components/sticky/examples/base/sticky-base-example.component.less @@ -15,14 +15,14 @@ &.header { font-weight: 600; - color: var(--prizm-text-icon-primary); + color: var(--prizm-v3-text-icon-primary); } &.footer, &.header, .sticky { - background-color: var(--prizm-table-fill-row-zebra_default); - color: var(--prizm-text-icon-secondary); + background-color: var(--prizm-v3-table-fill-row-zebra_default); + color: var(--prizm-v3-text-icon-secondary); } } } From 2335970180792c50684c1290c3b1615e6ba2768c Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 29 Mar 2024 09:38:32 +0300 Subject: [PATCH 117/291] fix: incorrect display of one unhidden column in column settings #1036 --- .../column-settings/column-settings.component.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/components/src/lib/components/column-settings/column-settings.component.ts b/libs/components/src/lib/components/column-settings/column-settings.component.ts index 3836a7db54..597e5efcdc 100644 --- a/libs/components/src/lib/components/column-settings/column-settings.component.ts +++ b/libs/components/src/lib/components/column-settings/column-settings.component.ts @@ -5,6 +5,7 @@ import { EventEmitter, Inject, Input, + OnChanges, Output, ViewChild, } from '@angular/core'; @@ -59,7 +60,7 @@ import { PrizmColumnDropListComponent } from './components/column-drop-list/colu ], providers: [...prizmI18nInitWithKey(PRIZM_COLUMN_SETTINGS, 'columnSettings')], }) -export class PrizmColumnSettingsComponent extends PrizmAbstractTestId implements AfterViewInit { +export class PrizmColumnSettingsComponent extends PrizmAbstractTestId implements AfterViewInit, OnChanges { @ViewChild('stickyLeftList', { read: CdkDropList }) stickyLeftList: CdkDropList | undefined; @ViewChild('columnList', { read: CdkDropList }) columnList: CdkDropList | undefined; @ViewChild('stickyRightList', { read: CdkDropList }) stickyRightList: CdkDropList | undefined; @@ -87,6 +88,10 @@ export class PrizmColumnSettingsComponent extends PrizmAbstractTestId implements super(); } + ngOnChanges(): void { + this.checkIsLastShown(); + } + ngAfterViewInit(): void { if (this.stickySettings) { this.connectedColumns = [this.stickyLeftList as CdkDropList, this.stickyRightList as CdkDropList]; From 31fc0b38c9dc27a1704bdf99047f1afc4cdd22e4 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Wed, 10 Apr 2024 13:23:28 +0400 Subject: [PATCH 118/291] feat: cron custom title max width #1431 --- libs/components/src/lib/components/cron/cron.component.less | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/components/src/lib/components/cron/cron.component.less b/libs/components/src/lib/components/cron/cron.component.less index d2522a35bd..9c1432206e 100644 --- a/libs/components/src/lib/components/cron/cron.component.less +++ b/libs/components/src/lib/components/cron/cron.component.less @@ -14,6 +14,7 @@ } .cron-title { + max-width: 280px; margin-right: 1rem; overflow: hidden; text-overflow: ellipsis; From e7fac94bdc2ef68528b9c61d6466b73e18643f8a Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 29 Mar 2024 09:16:26 +0300 Subject: [PATCH 119/291] fix: search for server sort example #1107 --- .../table-server-sort-example.component.ts | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/apps/doc/src/app/components/table/examples/table-server-sort-example/table-server-sort-example.component.ts b/apps/doc/src/app/components/table/examples/table-server-sort-example/table-server-sort-example.component.ts index 67eda04c22..73f9b11fc5 100644 --- a/apps/doc/src/app/components/table/examples/table-server-sort-example/table-server-sort-example.component.ts +++ b/apps/doc/src/app/components/table/examples/table-server-sort-example/table-server-sort-example.component.ts @@ -6,7 +6,7 @@ import { prizmTableDefaultColumnSort, PrizmTableSorterService, } from '@prizm-ui/components'; -import { BehaviorSubject, of } from 'rxjs'; +import { BehaviorSubject } from 'rxjs'; import { delay, map, switchMap, tap } from 'rxjs/operators'; export interface ITableProduct { @@ -98,12 +98,13 @@ export class TableServerSortExampleComponent { public products: ITableProduct[] = TABLE_EXAMPLE_SORT; public searchString: string | null = null; - public searchAllowedProducts: ITableProduct[] = this.products; + public searchAllowedProducts$$ = new BehaviorSubject(this.products); + public sorter$$ = new BehaviorSubject[]>([]); public readonly data$ = this.sorter$$.pipe( tap(() => this.showLoader$.next(true)), switchMap((sort: PrizmTableCellSorter[]) => { - return of(this.products).pipe( + return this.searchAllowedProducts$$.pipe( delay(3000), map(data => { return this.tableSorterService.sort( @@ -118,14 +119,18 @@ export class TableServerSortExampleComponent { }), tap(() => this.showLoader$.next(false)) ); - constructor(private readonly tableSorterService: PrizmTableSorterService) {} + public showLoader$ = new BehaviorSubject(false); + + constructor(private readonly tableSorterService: PrizmTableSorterService) {} + public search(value: string, key: T): void { this.searchString = value.toLowerCase(); - this.searchAllowedProducts = this.products.filter(product => + const searchAllowedProducts = this.products.filter(product => (product[key] as string).toLowerCase().includes(this.searchString as string) ); + this.searchAllowedProducts$$.next(searchAllowedProducts); } public updateSort(sort: PrizmTableCellSorter[]): void { From df51a9ab4e945315c6bb96b69f341eb058e476ff Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Wed, 10 Apr 2024 14:32:40 +0300 Subject: [PATCH 120/291] fix: input number manual input works incorrect if min set #1580 --- .../input/input-number/input-number.component.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/libs/components/src/lib/components/input/input-number/input-number.component.ts b/libs/components/src/lib/components/input/input-number/input-number.component.ts index b8539f0f7d..eb7378d991 100644 --- a/libs/components/src/lib/components/input/input-number/input-number.component.ts +++ b/libs/components/src/lib/components/input/input-number/input-number.component.ts @@ -111,10 +111,15 @@ export class PrizmInputNumberComponent extends PrizmInputControl impleme @HostListener('input', ['$event.data']) @HostListener('paste', ['$event.clipboardData.getData("Text")']) public onInput(data: string) { - this.validateMinMax(); + this.validateMax(); this.input$$.next(data); } + @HostListener('blur') + public onBlur() { + this.validateMin(); + } + constructor( @Self() public readonly ngControl: NgControl, @Host() private readonly el: ElementRef @@ -128,15 +133,15 @@ export class PrizmInputNumberComponent extends PrizmInputControl impleme this.stateChanges.next(); } - private validateMinMax() { + private validateMax() { if (this.max !== null && this.max < this.value) { this.el.nativeElement.value = this.max.toString(); this.stateChanges.next(); - return; } + } + private validateMin() { if (this.min !== null && this.min > this.value) { - this.el.nativeElement.value = this.min.toString(); this.stateChanges.next(); return; } From b690180eb39ea113c49a10b49ec9a69e7040bfb9 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 22 Mar 2024 13:26:20 +0300 Subject: [PATCH 121/291] feat: charts colors update #1196 --- ...rizm-charts-waterfall-example.component.ts | 2 +- .../charts/waterfall/waterfall.component.ts | 2 +- libs/charts/base/src/lib/theme/dark.const.ts | 158 +++++++++------- libs/charts/base/src/lib/theme/light.const.ts | 175 +++++++++++------- 4 files changed, 196 insertions(+), 141 deletions(-) diff --git a/apps/doc/src/app/charts/waterfall/examples/base/prizm-charts-waterfall-example.component.ts b/apps/doc/src/app/charts/waterfall/examples/base/prizm-charts-waterfall-example.component.ts index 78133a8b23..76a083aaed 100644 --- a/apps/doc/src/app/charts/waterfall/examples/base/prizm-charts-waterfall-example.component.ts +++ b/apps/doc/src/app/charts/waterfall/examples/base/prizm-charts-waterfall-example.component.ts @@ -38,7 +38,7 @@ export class PrizmChartsWaterfallExampleComponent { }, }, label: { - style: { fontSize: 10, fill: 'rgba(0,0,0,0.65)' }, + style: { fontSize: 10 }, layout: [{ type: 'interval-adjust-position' }], }, total: { diff --git a/apps/doc/src/app/charts/waterfall/waterfall.component.ts b/apps/doc/src/app/charts/waterfall/waterfall.component.ts index 401b7ee955..fa215b6e38 100644 --- a/apps/doc/src/app/charts/waterfall/waterfall.component.ts +++ b/apps/doc/src/app/charts/waterfall/waterfall.component.ts @@ -33,7 +33,7 @@ export class WaterfallComponent { }, }, label: { - style: { fontSize: 10, fill: 'rgba(0,0,0,0.65)' }, + style: { fontSize: 10 }, layout: [{ type: 'interval-adjust-position' }], }, total: { diff --git a/libs/charts/base/src/lib/theme/dark.const.ts b/libs/charts/base/src/lib/theme/dark.const.ts index f535b7518b..474a1d8fcd 100644 --- a/libs/charts/base/src/lib/theme/dark.const.ts +++ b/libs/charts/base/src/lib/theme/dark.const.ts @@ -1,40 +1,62 @@ import { PrizmChartThemeObject } from './types'; +export const PRIZM_CHART_DARK_THEME_DATA_COLORS = [ + '#339999', + '#9966FF', + '#33CCFF', + '#8D91A4', + '#CC9933', + '#FF99CC', + '#99CC99', + '#CC66FF', + '#9999FF', + '#CC9999', + '#669900', +]; + +export const PRIZM_DARK_THEME_AXIS_COLOR = '#2c313d'; + +export const PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY = '#a7acb8'; + +export const PRIZM_DARK_THEME_TEXT_COLOR_DISABLE = '#545f77'; + +export const PRIZM_DARK_THEME_BACKGROUND_COLOR_PRIMARY = '#1e222a'; + export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { prizm: { components: { bar: { - color: ['#AD52BC', '#00BCD4', '#337EFF'], + color: PRIZM_CHART_DARK_THEME_DATA_COLORS, xAxis: { minTickInterval: 10, grid: { line: { style: { - stroke: '#50546B', + stroke: PRIZM_DARK_THEME_AXIS_COLOR, }, }, }, line: { style: { - stroke: '#50546b', + stroke: PRIZM_DARK_THEME_AXIS_COLOR, }, }, range: [0, 1], }, }, - scatter: { + area: { xAxis: { minTickInterval: 10, grid: { line: { style: { - stroke: '#50546B', + stroke: PRIZM_DARK_THEME_AXIS_COLOR, }, }, }, line: { style: { - stroke: '#50546b', + stroke: PRIZM_DARK_THEME_AXIS_COLOR, }, }, range: [0, 1], @@ -44,31 +66,31 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { grid: { line: { style: { - stroke: '#50546B', + stroke: PRIZM_DARK_THEME_AXIS_COLOR, }, }, }, line: { style: { - stroke: '#50546b', + stroke: PRIZM_DARK_THEME_AXIS_COLOR, }, }, range: [0, 1], }, }, - area: { + scatter: { xAxis: { minTickInterval: 10, grid: { line: { style: { - stroke: '#50546B', + stroke: PRIZM_DARK_THEME_AXIS_COLOR, }, }, }, line: { style: { - stroke: '#50546b', + stroke: PRIZM_DARK_THEME_AXIS_COLOR, }, }, range: [0, 1], @@ -78,13 +100,13 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { grid: { line: { style: { - stroke: '#50546B', + stroke: PRIZM_DARK_THEME_AXIS_COLOR, }, }, }, line: { style: { - stroke: '#50546b', + stroke: PRIZM_DARK_THEME_AXIS_COLOR, }, }, range: [0, 1], @@ -92,10 +114,11 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { }, }, }, - background: 'rgba(32, 34, 43, 1)', + background: PRIZM_DARK_THEME_BACKGROUND_COLOR_PRIMARY, + // TODO: reseacrh why this subColor here #dr subColor: 'rgba(48, 51, 64, 1)', - semanticRed: 'rgba(241, 65, 65, 1)', - semanticGreen: 'rgba(73, 171, 77, 1)', + semanticRed: '#FF0033', + semanticGreen: '#009900', padding: 'auto', fontFamily: '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', @@ -104,6 +127,7 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { minColumnWidth: null, roseWidthRatio: 0.9999999, multiplePieWidthRatio: 0.7692307692307692, + // TODO: reseacrh why this colors here #dr sequenceColors: [ '#B8E1FF', '#9AC5FF', @@ -150,7 +174,7 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { position: 'center', spacing: 12, style: { - fill: '#595959', + fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, fontSize: 12, lineHeight: 12, textBaseline: 'middle', @@ -169,7 +193,7 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { }, offset: 8, style: { - fill: 'rgba(161, 165, 183, 1)', + fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, fontSize: 12, lineHeight: 12, fontFamily: @@ -179,14 +203,14 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { line: { style: { lineWidth: 1, - stroke: 'rgba(80, 84, 107, 1)', + stroke: PRIZM_DARK_THEME_AXIS_COLOR, }, }, grid: { line: { type: 'line', style: { - stroke: '#50546B', + stroke: PRIZM_DARK_THEME_AXIS_COLOR, lineWidth: 1, lineDash: null, }, @@ -194,14 +218,7 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { alignTick: true, animate: true, }, - tickLine: { - style: { - lineWidth: 1, - stroke: 'rgba(80, 84, 107, 1)', - }, - alignTick: true, - length: 4, - }, + tickLine: null, subTickLine: null, animate: true, }, @@ -253,7 +270,7 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { line: { type: 'line', style: { - stroke: 'rgba(161, 165, 183, 1)', + stroke: PRIZM_DARK_THEME_AXIS_COLOR, lineWidth: 1, lineDash: null, }, @@ -268,7 +285,7 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { }, tickLine: { style: { - stroke: 'rgba(161, 165, 183, 1)', + stroke: PRIZM_DARK_THEME_AXIS_COLOR, }, }, }, @@ -276,14 +293,14 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { title: { style: { fontSize: 0, - fill: 'rgba(161, 165, 183, 1)', + fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, }, }, grid: { line: { type: 'circle', style: { - stroke: 'rgba(161, 165, 183, 1)', + stroke: PRIZM_DARK_THEME_AXIS_COLOR, lineWidth: 1, lineDash: null, }, @@ -293,7 +310,7 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { }, label: { style: { - fill: 'rgba(161, 165, 183, 1)', + fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, }, }, }, @@ -306,13 +323,13 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { spacing: 4, style: { r: 4, - fill: '#5B8FF9', + fill: '#4075FF', }, }, itemName: { spacing: 5, style: { - fill: 'rgba(244, 246, 251, 1)', + fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, fontFamily: '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', fontSize: 12, @@ -330,16 +347,16 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { }, unchecked: { nameStyle: { - fill: '#D8D8D8', + fill: PRIZM_DARK_THEME_TEXT_COLOR_DISABLE, }, markerStyle: { - fill: '#D8D8D8', - stroke: '#D8D8D8', + fill: PRIZM_DARK_THEME_TEXT_COLOR_DISABLE, + stroke: PRIZM_DARK_THEME_TEXT_COLOR_DISABLE, }, }, inactive: { nameStyle: { - fill: '#D8D8D8', + fill: PRIZM_DARK_THEME_TEXT_COLOR_DISABLE, }, markerStyle: { opacity: 0.2, @@ -351,15 +368,15 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { marker: { style: { size: 12, - inactiveFill: 'rgba(119, 123, 146, 0.3)', + inactiveFill: '#2c313d', inactiveOpacity: 12, - fill: 'rgba(119, 123, 146, 1)', + fill: '#6e778c', opacity: 1, }, }, text: { style: { - fill: 'rgba(191, 198, 215, 1)', + fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, fontSize: 12, }, }, @@ -396,7 +413,7 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { size: 12, defaultLength: 100, style: { - fill: 'rgba(191, 198, 215, 1)', + fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, stroke: null, lineWidth: 0, }, @@ -406,7 +423,7 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { spacing: 12, formatter: null, style: { - fill: 'rgba(191, 198, 215, 1)', + fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, fontSize: 12, lineHeight: 16, textBaseline: 'middle', @@ -417,8 +434,8 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { handler: { size: 10, style: { - fill: 'rgba(191, 198, 215, 1)', - stroke: 'rgba(191, 198, 215, 1)', + fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, + stroke: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, }, }, slidable: true, @@ -435,7 +452,7 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { position: 'auto', marker: { symbol: 'circle', - stroke: 'rgba(244, 246, 251, 1)', + stroke: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, shadowBlur: 10, shadowOffsetX: 0, shadowOffsetY: 0, @@ -454,7 +471,7 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { textBackground: { padding: 2, style: { - fill: 'rgba(0, 0, 0, 0.25)', + fill: 'red', lineWidth: 0, stroke: null, }, @@ -468,12 +485,12 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { zIndex: 8, transition: 'left 0.4s cubic-bezier(0.23, 1, 0.32, 1) 0s, top 0.4s cubic-bezier(0.23, 1, 0.32, 1) 0s', - backgroundColor: 'var(--prizm-grey-g3-g11)', + backgroundColor: 'var(--prizm-background-fill-overlay)', + color: 'var(--prizm-text-icon-primary)', fontFamily: 'Inter', overflow: 'hidden', - color: 'var(--prizm-grey-g12-g2)', opacity: 0.95, - boxShadow: '0px -2px 4px var(--prizm-shadow)', + boxShadow: 'var(--prizm-shadow-big-bottom)', borderRadius: '2px', fontSize: 14, lineHeight: '12px', @@ -495,6 +512,7 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { marginTop: '12px', marginLeft: 0, marginRight: 0, + color: 'var(--prizm-text-icon-secondary)', }, 'g2-tooltip-marker': { width: '8px', @@ -513,14 +531,14 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { annotation: { arc: { style: { - stroke: '#D9D9D9', + stroke: PRIZM_DARK_THEME_AXIS_COLOR, lineWidth: 1, }, animate: true, }, line: { style: { - stroke: '#BFBFBF', + stroke: PRIZM_DARK_THEME_AXIS_COLOR, lineDash: null, lineWidth: 1, }, @@ -528,7 +546,7 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { position: 'start', autoRotate: true, style: { - fill: '#595959', + fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, stroke: null, lineWidth: 0, fontSize: 12, @@ -542,7 +560,7 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { }, text: { style: { - fill: '#595959', + fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, stroke: null, lineWidth: 0, fontSize: 12, @@ -572,13 +590,13 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { point: { style: { r: 3, - stroke: '#5B8FF9', + stroke: '#4075FF', lineWidth: 2, }, }, line: { style: { - stroke: '#BFBFBF', + stroke: PRIZM_DARK_THEME_AXIS_COLOR, lineWidth: 1, }, length: 16, @@ -586,7 +604,7 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { text: { style: { textAlign: 'start', - fill: '#595959', + fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, stroke: null, lineWidth: 0, fontSize: 12, @@ -607,7 +625,7 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { text: { textAlign: 'center', textBaseline: 'bottom', - fill: '#595959', + fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, stroke: null, lineWidth: 0, fontSize: 12, @@ -622,25 +640,25 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { common: { padding: [8, 8, 8, 8], backgroundStyle: { - fill: 'rgba(19, 21, 28, 1)', + fill: PRIZM_DARK_THEME_BACKGROUND_COLOR_PRIMARY, opacity: 0.5, }, foregroundStyle: { - fill: 'rgba(19, 21, 28, 1)', + fill: PRIZM_DARK_THEME_BACKGROUND_COLOR_PRIMARY, opacity: 0.25, }, handlerStyle: { width: 8, height: 24, - fill: 'rgba(19, 21, 28, 1)', + fill: PRIZM_DARK_THEME_BACKGROUND_COLOR_PRIMARY, opacity: 1, - stroke: 'rgba(80, 84, 107, 1)', + stroke: '#6e778c', lineWidth: 1, radius: 2, highLightFill: '#FFF', }, textStyle: { - fill: 'rgba(119, 123, 146, 1)', + fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, opacity: 1, fontSize: 12, lineHeight: 12, @@ -656,13 +674,13 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { }, default: { style: { - trackColor: 'rgba(19, 21, 28, 1)', - thumbColor: 'rgba(80, 84, 107, 1)', + trackColor: PRIZM_DARK_THEME_BACKGROUND_COLOR_PRIMARY, + thumbColor: '#545f77', }, }, hover: { style: { - thumbColor: 'rgba(119, 123, 146, 1)', + thumbColor: '#7e8799', }, }, }, @@ -670,11 +688,11 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { labels: { offset: 12, style: { - fill: 'rgba(244, 246, 251, 1)', + fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, fontSize: 12, fontFamily: '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', - stroke: 'rgba(19, 21, 28, 1)', + stroke: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, lineWidth: 0, }, fillColorDark: '#2c3542', @@ -694,7 +712,7 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { }, overflowLabels: { style: { - fill: '#595959', + fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, fontSize: 12, fontFamily: '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', diff --git a/libs/charts/base/src/lib/theme/light.const.ts b/libs/charts/base/src/lib/theme/light.const.ts index 9aebac318d..3857cb5c40 100644 --- a/libs/charts/base/src/lib/theme/light.const.ts +++ b/libs/charts/base/src/lib/theme/light.const.ts @@ -1,18 +1,47 @@ import { PrizmChartThemeObject } from './types'; +export const PRIZM_CHART_LIGHT_THEME_DATA_COLORS = [ + '#336666', + '#9933FF', + '#3366CC', + '#606580', + '#996600', + '#CC3366', + '#003300', + '#990099', + '#6633FF', + '#663333', + '#666600', +]; + +export const PRIZM_LIGHT_THEME_AXIS_COLOR = '#c3c7cf'; + +export const PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY = '#3f4759'; + +export const PRIZM_LIGHT_THEME_TEXT_COLOR_DISABLE = '#a7acb8'; + +export const PRIZM_LIGHT_THEME_BACKGROUND_COLOR_PRIMARY = '#ffffff'; + export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { prizm: { components: { bar: { - color: ['#AD52BC', '#00BCD4', '#337EFF'], + color: PRIZM_CHART_LIGHT_THEME_DATA_COLORS, xAxis: { + minTickInterval: 10, grid: { line: { style: { - stroke: '#A1A5B7', + stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, }, }, }, + line: { + style: { + stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, + }, + }, + range: [0, 1], }, }, area: { @@ -21,13 +50,13 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { grid: { line: { style: { - stroke: '#A1A5B7', + stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, }, }, }, line: { style: { - stroke: '#A1A5B7', + stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, }, }, range: [0, 1], @@ -37,13 +66,13 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { grid: { line: { style: { - stroke: '#A1A5B7', + stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, }, }, }, line: { style: { - stroke: '#A1A5B7', + stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, }, }, range: [0, 1], @@ -55,13 +84,13 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { grid: { line: { style: { - stroke: '#A1A5B7', + stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, }, }, }, line: { style: { - stroke: '#A1A5B7', + stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, }, }, range: [0, 1], @@ -71,13 +100,13 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { grid: { line: { style: { - stroke: '#A1A5B7', + stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, }, }, }, line: { style: { - stroke: '#A1A5B7', + stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, }, }, range: [0, 1], @@ -85,10 +114,11 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { }, }, }, - background: '#ffffff', + background: PRIZM_LIGHT_THEME_BACKGROUND_COLOR_PRIMARY, + // TODO: reseacrh why this subColor here #dr subColor: 'rgba(214, 219, 231, 1)', - semanticRed: 'rgba(241, 65, 65, 1)', - semanticGreen: 'rgba(73, 171, 77, 1)', + semanticRed: '#CC0000', + semanticGreen: '#006600', padding: 'auto', fontFamily: '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', @@ -97,6 +127,7 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { minColumnWidth: null, roseWidthRatio: 0.9999999, multiplePieWidthRatio: 0.7692307692307692, + // TODO: reseacrh why this colors here #dr sequenceColors: [ '#B8E1FF', '#9AC5FF', @@ -143,7 +174,7 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { position: 'center', spacing: 12, style: { - fill: '#595959', + fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, fontSize: 12, lineHeight: 12, textBaseline: 'middle', @@ -162,7 +193,7 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { }, offset: 8, style: { - fill: 'rgba(80, 84, 107, 1)', + fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, fontSize: 12, lineHeight: 12, fontFamily: @@ -172,14 +203,14 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { line: { style: { lineWidth: 1, - stroke: 'rgba(191, 198, 215, 1)', + stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, }, }, grid: { line: { type: 'line', style: { - stroke: '#A1A5B7', + stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, lineWidth: 1, lineDash: null, }, @@ -187,21 +218,18 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { alignTick: true, animate: true, }, - tickLine: { - style: { - lineWidth: 1, - stroke: 'rgba(191, 198, 215, 1)', - }, - alignTick: true, - length: 4, - }, + tickLine: null, subTickLine: null, animate: true, }, top: { position: 'top', grid: null, - title: null, + title: { + style: { + fontSize: 12, + }, + }, verticalLimitLength: 0.5, }, bottom: { @@ -216,14 +244,22 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { }, left: { position: 'left', - title: null, + title: { + style: { + fontSize: 12, + }, + }, line: null, tickLine: null, verticalLimitLength: 0.3333333333333333, }, right: { position: 'right', - title: null, + title: { + style: { + fontSize: 12, + }, + }, line: null, tickLine: null, verticalLimitLength: 0.3333333333333333, @@ -234,7 +270,7 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { line: { type: 'line', style: { - stroke: 'rgba(80, 84, 107, 1)', + stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, lineWidth: 1, lineDash: null, }, @@ -249,7 +285,7 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { }, tickLine: { style: { - stroke: 'rgba(80, 84, 107, 1)', + stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, }, }, }, @@ -257,14 +293,14 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { title: { style: { fontSize: 0, - fill: 'rgba(80, 84, 107, 1)', + fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, }, }, grid: { line: { type: 'circle', style: { - stroke: 'rgba(80, 84, 107, 1)', + stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, lineWidth: 1, lineDash: null, }, @@ -274,7 +310,7 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { }, label: { style: { - fill: 'rgba(80, 84, 107, 1)', + fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, }, }, }, @@ -287,13 +323,13 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { spacing: 4, style: { r: 4, - fill: '#5B8FF9', + fill: '#4075FF', }, }, itemName: { spacing: 5, style: { - fill: 'rgba(32, 34, 43, 1)', + fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, fontFamily: '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', fontSize: 12, @@ -311,16 +347,16 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { }, unchecked: { nameStyle: { - fill: '#D8D8D8', + fill: PRIZM_LIGHT_THEME_TEXT_COLOR_DISABLE, }, markerStyle: { - fill: '#D8D8D8', - stroke: '#D8D8D8', + fill: PRIZM_LIGHT_THEME_TEXT_COLOR_DISABLE, + stroke: PRIZM_LIGHT_THEME_TEXT_COLOR_DISABLE, }, }, inactive: { nameStyle: { - fill: '#D8D8D8', + fill: PRIZM_LIGHT_THEME_TEXT_COLOR_DISABLE, }, markerStyle: { opacity: 0.2, @@ -332,15 +368,15 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { marker: { style: { size: 12, - inactiveFill: 'rgba(119, 123, 146, 0.3)', + inactiveFill: '#f3f4f5', inactiveOpacity: 12, - fill: 'rgba(119, 123, 146, 1)', + fill: '#6e778c', opacity: 1, }, }, text: { style: { - fill: 'rgba(80, 84, 107, 1)', + fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, fontSize: 12, }, }, @@ -377,7 +413,7 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { size: 12, defaultLength: 100, style: { - fill: 'rgba(80, 84, 107, 1)', + fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, stroke: null, lineWidth: 0, }, @@ -387,7 +423,7 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { spacing: 12, formatter: null, style: { - fill: 'rgba(80, 84, 107, 1)', + fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, fontSize: 12, lineHeight: 16, textBaseline: 'middle', @@ -398,8 +434,8 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { handler: { size: 8, style: { - fill: 'rgba(80, 84, 107, 1)', - stroke: 'rgba(80, 84, 107, 1)', + fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, + stroke: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, }, }, slidable: true, @@ -416,7 +452,7 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { position: 'auto', marker: { symbol: 'circle', - stroke: 'rgba(19, 21, 28, 1)', + stroke: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, shadowBlur: 10, shadowOffsetX: 0, shadowOffsetY: 0, @@ -447,11 +483,11 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { position: 'absolute', visibility: 'hidden', zIndex: 8, - boxShadow: '0px -2px 4px var(--prizm-shadow)', + boxShadow: 'var(--prizm-shadow-big-bottom)', transition: 'left 0.4s cubic-bezier(0.23, 1, 0.32, 1) 0s, top 0.4s cubic-bezier(0.23, 1, 0.32, 1) 0s', - backgroundColor: 'var(--prizm-grey-g3-g11)', - color: 'var(--prizm-grey-g12-g2)', + backgroundColor: 'var(--prizm-background-fill-overlay)', + color: 'var(--prizm-text-icon-primary)', overflow: 'hidden', fontFamily: 'Inter', opacity: 0.95, @@ -476,6 +512,7 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { marginTop: '12px', marginLeft: 0, marginRight: 0, + color: 'var(--prizm-text-icon-secondary)', }, 'g2-tooltip-marker': { width: '8px', @@ -494,14 +531,14 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { annotation: { arc: { style: { - stroke: '#D9D9D9', + stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, lineWidth: 1, }, animate: true, }, line: { style: { - stroke: '#BFBFBF', + stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, lineDash: null, lineWidth: 1, }, @@ -509,7 +546,7 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { position: 'start', autoRotate: true, style: { - fill: '#595959', + fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, stroke: null, lineWidth: 0, fontSize: 12, @@ -523,7 +560,7 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { }, text: { style: { - fill: '#595959', + fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, stroke: null, lineWidth: 0, fontSize: 12, @@ -553,13 +590,13 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { point: { style: { r: 3, - stroke: '#5B8FF9', + stroke: '#4075FF', lineWidth: 2, }, }, line: { style: { - stroke: '#BFBFBF', + stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, lineWidth: 1, }, length: 16, @@ -567,7 +604,7 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { text: { style: { textAlign: 'start', - fill: '#595959', + fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, stroke: null, lineWidth: 0, fontSize: 12, @@ -588,7 +625,7 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { text: { textAlign: 'center', textBaseline: 'bottom', - fill: '#595959', + fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, stroke: null, lineWidth: 0, fontSize: 12, @@ -603,25 +640,25 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { common: { padding: [8, 8, 8, 8], backgroundStyle: { - fill: 'rgba(244, 246, 251, 1)', + fill: PRIZM_LIGHT_THEME_BACKGROUND_COLOR_PRIMARY, opacity: 0.5, }, foregroundStyle: { - fill: 'rgba(244, 246, 251, 1)', + fill: PRIZM_LIGHT_THEME_BACKGROUND_COLOR_PRIMARY, opacity: 0.25, }, handlerStyle: { width: 8, height: 24, - fill: 'rgba(244, 246, 251, 1)', + fill: PRIZM_LIGHT_THEME_BACKGROUND_COLOR_PRIMARY, opacity: 1, - stroke: 'rgba(191, 198, 215, 1)', + stroke: '#6e778c', lineWidth: 1, radius: 2, highLightFill: '#FFF', }, textStyle: { - fill: 'rgba(119, 123, 146, 1)', + fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, opacity: 1, fontSize: 12, lineHeight: 12, @@ -637,13 +674,13 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { }, default: { style: { - trackColor: 'rgba(244, 246, 251, 1)', - thumbColor: 'rgba(191, 198, 215, 1)', + trackColor: PRIZM_LIGHT_THEME_BACKGROUND_COLOR_PRIMARY, + thumbColor: '#c3c7cf', }, }, hover: { style: { - thumbColor: 'rgba(119, 123, 146, 1)', + thumbColor: '#9ba1af', }, }, }, @@ -651,11 +688,11 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { labels: { offset: 12, style: { - fill: 'rgba(19, 21, 28, 1)', + fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, fontSize: 12, fontFamily: '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', - stroke: 'rgba(244, 246, 251, 1)', + stroke: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, lineWidth: null, }, fillColorDark: '#2c3542', @@ -675,7 +712,7 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { }, overflowLabels: { style: { - fill: '#595959', + fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, fontSize: 12, fontFamily: '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', From 3f5d064fa9b6b5a9ecdf3ff1f2628b2bc8000348 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 11 Apr 2024 10:53:07 +0300 Subject: [PATCH 122/291] fix: remove redundant token from default v3 theme --- libs/theme/src/styles/theme/v3/default.less | 1 - package-lock.json | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libs/theme/src/styles/theme/v3/default.less b/libs/theme/src/styles/theme/v3/default.less index 081fd29c30..44f562415f 100644 --- a/libs/theme/src/styles/theme/v3/default.less +++ b/libs/theme/src/styles/theme/v3/default.less @@ -97,7 +97,6 @@ Link - https://www.figma.com/file/lR03OmslN1ngsyglw65gKK/%F0%9F%8E%A8-Light-them --prizm-v3-chart-axis-line-active: var(--prizm-v3-palette-blue-600); --prizm-v3-chart-axis-area-hover: #8a91a233; --prizm-v3-chart-axis-area-active: #436cee33; - --prizm-v3-token: #ffffff; --prizm-v3-chart-fill-blanket: #8a91a233; --prizm-v3-shadow-color: var(--prizm-v3-palette-shadow-light); --prizm-v3-shadow-big-top: 0px -8px 32px 0px var(--prizm-v3-shadow-color); diff --git a/package-lock.json b/package-lock.json index 6adf779331..ec9c149569 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@prizm-ui/sdk", - "version": "3.5.1", + "version": "3.12.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@prizm-ui/sdk", - "version": "3.5.1", + "version": "3.12.0", "license": "MIT", "dependencies": { "@angular-extensions/svg-icons-builder": "^3.0.0", From 7e33fc14eafb4a5183cd7ba974fd93766199295b Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 22 Mar 2024 17:13:19 +0300 Subject: [PATCH 123/291] fix: theming not applyes to charts #1489 --- libs/charts/base/src/lib/theme/dark.const.ts | 50 ++++--------------- libs/charts/base/src/lib/theme/light.const.ts | 43 ++-------------- 2 files changed, 14 insertions(+), 79 deletions(-) diff --git a/libs/charts/base/src/lib/theme/dark.const.ts b/libs/charts/base/src/lib/theme/dark.const.ts index 474a1d8fcd..0019ae116a 100644 --- a/libs/charts/base/src/lib/theme/dark.const.ts +++ b/libs/charts/base/src/lib/theme/dark.const.ts @@ -26,7 +26,6 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { prizm: { components: { bar: { - color: PRIZM_CHART_DARK_THEME_DATA_COLORS, xAxis: { minTickInterval: 10, grid: { @@ -45,6 +44,7 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { }, }, area: { + color: PRIZM_CHART_DARK_THEME_DATA_COLORS, xAxis: { minTickInterval: 10, grid: { @@ -471,7 +471,7 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { textBackground: { padding: 2, style: { - fill: 'red', + fill: 'rgba(0, 0, 0, 0.25)', lineWidth: 0, stroke: null, }, @@ -695,7 +695,7 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { stroke: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, lineWidth: 0, }, - fillColorDark: '#2c3542', + fillColorDark: '#ffffff', fillColorLight: '#ffffff', autoRotate: true, }, @@ -705,18 +705,18 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { fontSize: 12, fontFamily: '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', - stroke: null, + stroke: '#FFFFFF', lineWidth: 0, }, autoRotate: true, }, overflowLabels: { style: { - fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, + fill: '#FFFFFF', fontSize: 12, fontFamily: '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', - stroke: '#FFFFFF', + stroke: null, lineWidth: 1, }, }, @@ -734,40 +734,8 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { 'circle-axis-subTick-line': false, 'radius-axis-subTick-line': false, styleSheet: { - brandColor: 'rgba(51, 126, 255, 1)', - paletteQualitative10: [ - 'rgba(51, 126, 255, 1)', - 'rgba(241, 65, 65, 1)', - 'rgba(73, 171, 77, 1)', - 'rgba(255, 124, 10, 1)', - 'rgba(192, 90, 255, 1)', - 'rgba(162, 226, 255, 1)', - 'rgba(130, 253, 231, 1)', - 'rgba(255, 208, 41, 1)', - 'rgba(161, 165, 183, 1)', - 'rgba(255, 140, 188, 1)', - ], - paletteQualitative20: [ - '#5B8FF9', - '#CDDDFD', - '#5AD8A6', - '#CDF3E4', - '#5D7092', - '#CED4DE', - '#F6BD16', - '#FCEBB9', - '#6F5EF9', - '#D3CEFD', - '#6DC8EC', - '#D3EEF9', - '#945FB9', - '#DECFEA', - '#FF9845', - '#FFE0C7', - '#1E9493', - '#BBDEDE', - '#FF99C3', - '#FFE0ED', - ], + brandColor: PRIZM_CHART_DARK_THEME_DATA_COLORS[0], + paletteQualitative10: PRIZM_CHART_DARK_THEME_DATA_COLORS, + paletteQualitative20: PRIZM_CHART_DARK_THEME_DATA_COLORS, }, }; diff --git a/libs/charts/base/src/lib/theme/light.const.ts b/libs/charts/base/src/lib/theme/light.const.ts index 3857cb5c40..d6a88b0653 100644 --- a/libs/charts/base/src/lib/theme/light.const.ts +++ b/libs/charts/base/src/lib/theme/light.const.ts @@ -26,7 +26,6 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { prizm: { components: { bar: { - color: PRIZM_CHART_LIGHT_THEME_DATA_COLORS, xAxis: { minTickInterval: 10, grid: { @@ -712,11 +711,11 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { }, overflowLabels: { style: { - fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, + fill: '#FFFFFF', fontSize: 12, fontFamily: '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', - stroke: '#FFFFFF', + stroke: null, lineWidth: 1, }, }, @@ -734,40 +733,8 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { 'circle-axis-subTick-line': false, 'radius-axis-subTick-line': false, styleSheet: { - brandColor: 'rgba(51, 126, 255, 1)', - paletteQualitative10: [ - 'rgba(51, 126, 255, 1)', - 'rgba(241, 65, 65, 1)', - 'rgba(73, 171, 77, 1)', - 'rgba(255, 124, 10, 1)', - 'rgba(192, 90, 255, 1)', - 'rgba(162, 226, 255, 1)', - 'rgba(130, 253, 231, 1)', - 'rgba(255, 208, 41, 1)', - 'rgba(161, 165, 183, 1)', - 'rgba(255, 140, 188, 1)', - ], - paletteQualitative20: [ - '#5B8FF9', - '#CDDDFD', - '#5AD8A6', - '#CDF3E4', - '#5D7092', - '#CED4DE', - '#F6BD16', - '#FCEBB9', - '#6F5EF9', - '#D3CEFD', - '#6DC8EC', - '#D3EEF9', - '#945FB9', - '#DECFEA', - '#FF9845', - '#FFE0C7', - '#1E9493', - '#BBDEDE', - '#FF99C3', - '#FFE0ED', - ], + brandColor: PRIZM_CHART_LIGHT_THEME_DATA_COLORS[0], + paletteQualitative10: PRIZM_CHART_LIGHT_THEME_DATA_COLORS, + paletteQualitative20: PRIZM_CHART_LIGHT_THEME_DATA_COLORS, }, }; From 721276ff6e419e7162ebadebe714a40b1cfc1ca2 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 2 Apr 2024 13:26:22 +0300 Subject: [PATCH 124/291] fix: wronk stroke color on hover in waterfall, pie and radial bar #1508 --- libs/charts/base/src/lib/theme/dark.const.ts | 38 +++++++++++++++++++ libs/charts/base/src/lib/theme/light.const.ts | 38 +++++++++++++++++++ 2 files changed, 76 insertions(+) diff --git a/libs/charts/base/src/lib/theme/dark.const.ts b/libs/charts/base/src/lib/theme/dark.const.ts index 0019ae116a..447c984884 100644 --- a/libs/charts/base/src/lib/theme/dark.const.ts +++ b/libs/charts/base/src/lib/theme/dark.const.ts @@ -22,6 +22,8 @@ export const PRIZM_DARK_THEME_TEXT_COLOR_DISABLE = '#545f77'; export const PRIZM_DARK_THEME_BACKGROUND_COLOR_PRIMARY = '#1e222a'; +export const PRIZM_DARK_THEME_STROKE_HOVER_COLOR = '#ffffff'; + export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { prizm: { components: { @@ -112,6 +114,42 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { range: [0, 1], }, }, + waterfall: { + interactions: [{ type: 'element-active' }], + state: { + active: { + animate: { duration: 100, easing: 'easeLinear' }, + style: { + lineWidth: 1, + stroke: PRIZM_DARK_THEME_STROKE_HOVER_COLOR, + }, + }, + }, + }, + pie: { + interactions: [{ type: 'element-active' }], + state: { + active: { + animate: { duration: 100, easing: 'easeLinear' }, + style: { + lineWidth: 1, + stroke: PRIZM_DARK_THEME_STROKE_HOVER_COLOR, + }, + }, + }, + }, + 'radial-bar': { + interactions: [{ type: 'element-active' }], + state: { + active: { + animate: { duration: 100, easing: 'easeLinear' }, + style: { + lineWidth: 1, + stroke: PRIZM_DARK_THEME_STROKE_HOVER_COLOR, + }, + }, + }, + }, }, }, background: PRIZM_DARK_THEME_BACKGROUND_COLOR_PRIMARY, diff --git a/libs/charts/base/src/lib/theme/light.const.ts b/libs/charts/base/src/lib/theme/light.const.ts index d6a88b0653..481c6b7dff 100644 --- a/libs/charts/base/src/lib/theme/light.const.ts +++ b/libs/charts/base/src/lib/theme/light.const.ts @@ -22,6 +22,8 @@ export const PRIZM_LIGHT_THEME_TEXT_COLOR_DISABLE = '#a7acb8'; export const PRIZM_LIGHT_THEME_BACKGROUND_COLOR_PRIMARY = '#ffffff'; +export const PRIZM_LIGHT_THEME_STROKE_HOVER_COLOR = '#20222b'; + export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { prizm: { components: { @@ -111,6 +113,42 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { range: [0, 1], }, }, + waterfall: { + interactions: [{ type: 'element-active' }], + state: { + active: { + animate: { duration: 100, easing: 'easeLinear' }, + style: { + lineWidth: 1, + stroke: PRIZM_LIGHT_THEME_STROKE_HOVER_COLOR, + }, + }, + }, + }, + pie: { + interactions: [{ type: 'element-active' }], + state: { + active: { + animate: { duration: 100, easing: 'easeLinear' }, + style: { + lineWidth: 1, + stroke: PRIZM_LIGHT_THEME_STROKE_HOVER_COLOR, + }, + }, + }, + }, + 'radial-bar': { + interactions: [{ type: 'element-active' }], + state: { + active: { + animate: { duration: 100, easing: 'easeLinear' }, + style: { + lineWidth: 1, + stroke: PRIZM_LIGHT_THEME_STROKE_HOVER_COLOR, + }, + }, + }, + }, }, }, background: PRIZM_LIGHT_THEME_BACKGROUND_COLOR_PRIMARY, From 413146a96702d56e9a234b0c8572e8915b5239e1 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 2 Apr 2024 14:42:13 +0300 Subject: [PATCH 125/291] fix: points on the scatter are not completely hidden #1493 --- .../examples/base/prizm-charts-scatter-example.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/doc/src/app/charts/scatter/examples/base/prizm-charts-scatter-example.component.ts b/apps/doc/src/app/charts/scatter/examples/base/prizm-charts-scatter-example.component.ts index 3c904b5c77..353a4a83b3 100644 --- a/apps/doc/src/app/charts/scatter/examples/base/prizm-charts-scatter-example.component.ts +++ b/apps/doc/src/app/charts/scatter/examples/base/prizm-charts-scatter-example.component.ts @@ -216,7 +216,7 @@ export class PrizmChartsScatterExampleComponent { Team: 'Viktoria Plzen', 'xG conceded': 0.33, 'Shot conceded': 7, - Result: 3, + Result: '3', }, { 'H/A': 'H', From 2695406f36a62692599ccee6c6f1c2e8be55fe57 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 2 Apr 2024 16:03:48 +0300 Subject: [PATCH 126/291] fix: pie line style update for dark theme --- libs/charts/base/src/lib/theme/dark.const.ts | 4 ++++ libs/charts/base/src/lib/theme/light.const.ts | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/libs/charts/base/src/lib/theme/dark.const.ts b/libs/charts/base/src/lib/theme/dark.const.ts index 447c984884..4a895546d7 100644 --- a/libs/charts/base/src/lib/theme/dark.const.ts +++ b/libs/charts/base/src/lib/theme/dark.const.ts @@ -137,6 +137,10 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { }, }, }, + pieStyle: { + lineWidth: 1, + stroke: PRIZM_DARK_THEME_BACKGROUND_COLOR_PRIMARY, + }, }, 'radial-bar': { interactions: [{ type: 'element-active' }], diff --git a/libs/charts/base/src/lib/theme/light.const.ts b/libs/charts/base/src/lib/theme/light.const.ts index 481c6b7dff..de15f4e3f4 100644 --- a/libs/charts/base/src/lib/theme/light.const.ts +++ b/libs/charts/base/src/lib/theme/light.const.ts @@ -136,6 +136,10 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { }, }, }, + pieStyle: { + lineWidth: 1, + stroke: PRIZM_LIGHT_THEME_BACKGROUND_COLOR_PRIMARY, + }, }, 'radial-bar': { interactions: [{ type: 'element-active' }], From 3cb9b5e26f738310b34c064480034f70695d4f0c Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 2 Apr 2024 17:41:26 +0300 Subject: [PATCH 127/291] fix: incorrect examples for bar stacked and bar groupd charts #1507 --- .../prizm-charts-group-bar-example.component.html | 2 +- .../group/prizm-charts-group-bar-example.component.ts | 2 ++ .../prizm-charts-stacked-bar-example.component.html | 1 + .../prizm-charts-stacked-bar-example.component.ts | 10 ++++++++++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/apps/doc/src/app/charts/bar/examples/group/prizm-charts-group-bar-example.component.html b/apps/doc/src/app/charts/bar/examples/group/prizm-charts-group-bar-example.component.html index 6fad0ca618..2f3d88133f 100644 --- a/apps/doc/src/app/charts/bar/examples/group/prizm-charts-group-bar-example.component.html +++ b/apps/doc/src/app/charts/bar/examples/group/prizm-charts-group-bar-example.component.html @@ -1,6 +1,6 @@ Date: Tue, 2 Apr 2024 17:48:24 +0300 Subject: [PATCH 128/291] fix: add labels for bar group example --- .../examples/group/prizm-charts-group-bar-example.component.html | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/doc/src/app/charts/bar/examples/group/prizm-charts-group-bar-example.component.html b/apps/doc/src/app/charts/bar/examples/group/prizm-charts-group-bar-example.component.html index 2f3d88133f..235695ad97 100644 --- a/apps/doc/src/app/charts/bar/examples/group/prizm-charts-group-bar-example.component.html +++ b/apps/doc/src/app/charts/bar/examples/group/prizm-charts-group-bar-example.component.html @@ -1,5 +1,6 @@ Date: Wed, 3 Apr 2024 15:08:38 +0300 Subject: [PATCH 129/291] refactor: replace chart base options from theming --- .../base/src/lib/theme/base-options.const.ts | 577 ++++++++++++++++++ libs/charts/base/src/lib/theme/dark.const.ts | 391 +----------- libs/charts/base/src/lib/theme/light.const.ts | 390 +----------- libs/charts/base/src/lib/theme/types.ts | 2 + 4 files changed, 597 insertions(+), 763 deletions(-) create mode 100644 libs/charts/base/src/lib/theme/base-options.const.ts diff --git a/libs/charts/base/src/lib/theme/base-options.const.ts b/libs/charts/base/src/lib/theme/base-options.const.ts new file mode 100644 index 0000000000..23e9fb446b --- /dev/null +++ b/libs/charts/base/src/lib/theme/base-options.const.ts @@ -0,0 +1,577 @@ +import { PrizmChartBaseOptions } from './types'; + +export const PRIZM_DEFAULT_AXIS_OPTIONS = { + minTickInterval: 10, + range: [0, 1], +}; + +export const PRIZM_CHART_BASE_OPTIONS: PrizmChartBaseOptions = { + prizm: { + components: { + bar: { + xAxis: PRIZM_DEFAULT_AXIS_OPTIONS, + }, + area: { + xAxis: PRIZM_DEFAULT_AXIS_OPTIONS, + yAxis: PRIZM_DEFAULT_AXIS_OPTIONS, + }, + scatter: { + xAxis: PRIZM_DEFAULT_AXIS_OPTIONS, + yAxis: PRIZM_DEFAULT_AXIS_OPTIONS, + }, + waterfall: { + interactions: [{ type: 'element-active' }], + state: { + active: { + animate: { duration: 100, easing: 'easeLinear' }, + }, + }, + }, + pie: { + interactions: [{ type: 'element-active' }], + state: { + active: { + animate: { duration: 100, easing: 'easeLinear' }, + }, + }, + pieStyle: { + lineWidth: 1, + }, + }, + 'radial-bar': { + interactions: [{ type: 'element-active' }], + state: { + active: { + animate: { duration: 100, easing: 'easeLinear' }, + }, + }, + }, + }, + }, + padding: 'auto', + fontFamily: + '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', + columnWidthRatio: 0.5, + maxColumnWidth: null, + minColumnWidth: null, + roseWidthRatio: 0.9999999, + multiplePieWidthRatio: 0.7692307692307692, + shapes: { + point: [ + 'hollow-circle', + 'hollow-square', + 'hollow-bowtie', + 'hollow-diamond', + 'hollow-hexagon', + 'hollow-triangle', + 'hollow-triangle-down', + 'circle', + 'square', + 'bowtie', + 'diamond', + 'hexagon', + 'triangle', + 'triangle-down', + 'cross', + 'tick', + 'plus', + 'hyphen', + 'line', + ], + line: ['line', 'dash', 'dot', 'smooth'], + area: ['area', 'smooth', 'line', 'smooth-line'], + interval: ['rect', 'hollow-rect', 'line', 'tick'], + }, + sizes: [1, 10], + components: { + axis: { + common: { + title: { + autoRotate: true, + position: 'center', + spacing: 12, + style: { + fontSize: 12, + lineHeight: 12, + textBaseline: 'middle', + fontFamily: + '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', + }, + }, + label: { + autoRotate: false, + autoEllipsis: false, + autoHide: { + type: 'equidistance', + cfg: { + minGap: 6, + }, + }, + offset: 8, + style: { + fontSize: 12, + lineHeight: 12, + fontFamily: + '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', + }, + }, + line: { + style: { + lineWidth: 1, + }, + }, + grid: { + line: { + type: 'line', + style: { + lineWidth: 1, + lineDash: null, + }, + }, + alignTick: true, + animate: true, + }, + tickLine: null, + subTickLine: null, + animate: true, + }, + top: { + position: 'top', + grid: null, + title: { + style: { + fontSize: 12, + }, + }, + verticalLimitLength: 0.5, + }, + bottom: { + position: 'bottom', + grid: null, + title: { + style: { + fontSize: 12, + }, + }, + verticalLimitLength: 0.5, + }, + left: { + position: 'left', + title: { + style: { + fontSize: 12, + }, + }, + line: null, + tickLine: null, + verticalLimitLength: 0.3333333333333333, + }, + right: { + position: 'right', + title: { + style: { + fontSize: 12, + }, + }, + line: null, + tickLine: null, + verticalLimitLength: 0.3333333333333333, + }, + circle: { + title: null, + grid: { + line: { + type: 'line', + style: { + lineWidth: 1, + lineDash: null, + }, + }, + alignTick: true, + animate: true, + }, + line: { + style: { + lineWidth: 0, + }, + }, + }, + radius: { + title: { + style: { + fontSize: 0, + }, + }, + grid: { + line: { + type: 'circle', + style: { + lineWidth: 1, + lineDash: null, + }, + }, + alignTick: true, + animate: true, + }, + }, + }, + legend: { + common: { + title: null, + marker: { + symbol: 'circle', + spacing: 4, + style: { + r: 4, + }, + }, + itemName: { + spacing: 5, + style: { + fontFamily: + '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', + fontSize: 12, + lineHeight: 12, + fontWeight: 'normal', + textAlign: 'start', + textBaseline: 'middle', + }, + }, + itemStates: { + active: { + nameStyle: { + opacity: 0.8, + }, + }, + inactive: { + markerStyle: { + opacity: 0.2, + }, + }, + }, + flipPage: true, + pageNavigator: { + marker: { + style: { + size: 12, + inactiveOpacity: 12, + opacity: 1, + }, + }, + text: { + style: { + fontSize: 12, + }, + }, + }, + animate: false, + maxItemWidth: 200, + itemSpacing: 16, + itemMarginBottom: 12, + padding: [8, 8, 8, 8], + legendItemMarginBottom: 16, + }, + right: { + layout: 'vertical', + padding: [0, 8, 0, 8], + }, + left: { + layout: 'vertical', + padding: [0, 8, 0, 8], + }, + top: { + layout: 'horizontal', + padding: [8, 0, 8, 0], + }, + bottom: { + layout: 'horizontal', + padding: [8, 0, 8, 0], + }, + continuous: { + title: null, + background: null, + track: {}, + rail: { + type: 'color', + size: 12, + defaultLength: 100, + style: { + stroke: null, + lineWidth: 0, + }, + }, + label: { + align: 'rail', + spacing: 12, + formatter: null, + style: { + fontSize: 12, + lineHeight: 16, + textBaseline: 'middle', + fontFamily: + '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', + }, + }, + handler: { + size: 10, + }, + slidable: true, + padding: [8, 8, 8, 8], + }, + }, + tooltip: { + showContent: true, + follow: true, + showCrosshairs: false, + showMarkers: true, + shared: false, + enterable: false, + position: 'auto', + marker: { + symbol: 'circle', + shadowBlur: 10, + shadowOffsetX: 0, + shadowOffsetY: 0, + lineWidth: 1, + r: 4, + }, + crosshairs: { + line: { + style: { + lineWidth: 1, + }, + }, + text: null, + textBackground: { + padding: 2, + style: { + lineWidth: 0, + stroke: null, + }, + }, + follow: false, + }, + domStyles: { + 'g2-tooltip': { + position: 'absolute', + visibility: 'hidden', + zIndex: 8, + transition: + 'left 0.4s cubic-bezier(0.23, 1, 0.32, 1) 0s, top 0.4s cubic-bezier(0.23, 1, 0.32, 1) 0s', + backgroundColor: 'var(--prizm-background-fill-overlay)', + color: 'var(--prizm-text-icon-primary)', + fontFamily: 'Inter', + overflow: 'hidden', + opacity: 0.95, + boxShadow: 'var(--prizm-shadow-big-bottom)', + borderRadius: '2px', + fontSize: 14, + lineHeight: '12px', + padding: '0 12px 0 12px', + }, + 'g2-tooltip-title': { + marginBottom: '12px', + marginTop: '12px', + }, + 'g2-tooltip-list': { + margin: 0, + listStyleType: 'none', + padding: 0, + }, + 'g2-tooltip-list-item': { + listStyleType: 'none', + padding: 0, + marginBottom: '12px', + marginTop: '12px', + marginLeft: 0, + marginRight: 0, + color: 'var(--prizm-text-icon-secondary)', + }, + 'g2-tooltip-marker': { + width: '8px', + height: '8px', + borderRadius: '50%', + display: 'inline-block', + marginRight: '8px', + }, + 'g2-tooltip-value': { + display: 'inline-block', + float: 'right', + marginLeft: '30px', + }, + }, + }, + annotation: { + arc: { + style: { + lineWidth: 1, + }, + animate: true, + }, + line: { + style: { + lineDash: null, + lineWidth: 1, + }, + text: { + position: 'start', + autoRotate: true, + style: { + stroke: null, + lineWidth: 0, + fontSize: 12, + textAlign: 'start', + fontFamily: + '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', + textBaseline: 'bottom', + }, + }, + animate: true, + }, + text: { + style: { + stroke: null, + lineWidth: 0, + fontSize: 12, + textBaseline: 'middle', + textAlign: 'start', + fontFamily: + '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', + }, + animate: true, + }, + region: { + top: false, + style: { + lineWidth: 0, + stroke: null, + fillOpacity: 0.06, + }, + animate: true, + }, + image: { + top: false, + animate: true, + }, + dataMarker: { + top: true, + point: { + style: { + r: 3, + lineWidth: 2, + }, + }, + line: { + style: { + lineWidth: 1, + }, + length: 16, + }, + text: { + style: { + textAlign: 'start', + stroke: null, + lineWidth: 0, + fontSize: 12, + fontFamily: + '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', + }, + }, + direction: 'upward', + autoAdjust: true, + animate: true, + }, + dataRegion: { + style: { + region: { + fillOpacity: 0.06, + }, + text: { + textAlign: 'center', + textBaseline: 'bottom', + stroke: null, + lineWidth: 0, + fontSize: 12, + fontFamily: + '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', + }, + }, + animate: true, + }, + }, + slider: { + common: { + padding: [8, 8, 8, 8], + backgroundStyle: { + opacity: 0.5, + }, + foregroundStyle: { + opacity: 0.25, + }, + handlerStyle: { + width: 8, + height: 24, + opacity: 1, + stroke: '#6e778c', + lineWidth: 1, + radius: 2, + highLightFill: '#FFF', + }, + textStyle: { + opacity: 1, + fontSize: 12, + lineHeight: 12, + fontWeight: 'normal', + stroke: null, + lineWidth: 0, + }, + }, + }, + scrollbar: { + common: { + padding: [8, 8, 8, 8], + }, + }, + }, + labels: { + offset: 12, + style: { + fontSize: 12, + fontFamily: + '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', + lineWidth: 0, + }, + autoRotate: true, + }, + innerLabels: { + style: { + fontSize: 12, + fontFamily: + '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', + lineWidth: 0, + }, + autoRotate: true, + }, + overflowLabels: { + style: { + fontSize: 12, + fontFamily: + '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', + stroke: null, + lineWidth: 1, + }, + }, + pieLabels: { + labelHeight: 14, + offset: 8, + labelLine: { + style: { + lineWidth: 1, + }, + }, + autoRotate: true, + }, + 'bottom-axis-subTick-line': false, + 'circle-axis-subTick-line': false, + 'radius-axis-subTick-line': false, +}; diff --git a/libs/charts/base/src/lib/theme/dark.const.ts b/libs/charts/base/src/lib/theme/dark.const.ts index 4a895546d7..32d962e76e 100644 --- a/libs/charts/base/src/lib/theme/dark.const.ts +++ b/libs/charts/base/src/lib/theme/dark.const.ts @@ -1,4 +1,6 @@ +import { PRIZM_CHART_BASE_OPTIONS } from './base-options.const'; import { PrizmChartThemeObject } from './types'; +import { merge } from '@prizm-ui/helpers'; export const PRIZM_CHART_DARK_THEME_DATA_COLORS = [ '#339999', @@ -24,12 +26,11 @@ export const PRIZM_DARK_THEME_BACKGROUND_COLOR_PRIMARY = '#1e222a'; export const PRIZM_DARK_THEME_STROKE_HOVER_COLOR = '#ffffff'; -export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { +const PRIZM_CHART_DARK_THEME_COLOR_SCEME = { prizm: { components: { bar: { xAxis: { - minTickInterval: 10, grid: { line: { style: { @@ -42,13 +43,10 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { stroke: PRIZM_DARK_THEME_AXIS_COLOR, }, }, - range: [0, 1], }, }, area: { - color: PRIZM_CHART_DARK_THEME_DATA_COLORS, xAxis: { - minTickInterval: 10, grid: { line: { style: { @@ -61,10 +59,8 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { stroke: PRIZM_DARK_THEME_AXIS_COLOR, }, }, - range: [0, 1], }, yAxis: { - minTickInterval: 10, grid: { line: { style: { @@ -77,12 +73,10 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { stroke: PRIZM_DARK_THEME_AXIS_COLOR, }, }, - range: [0, 1], }, }, scatter: { xAxis: { - minTickInterval: 10, grid: { line: { style: { @@ -95,10 +89,8 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { stroke: PRIZM_DARK_THEME_AXIS_COLOR, }, }, - range: [0, 1], }, yAxis: { - minTickInterval: 10, grid: { line: { style: { @@ -111,44 +103,33 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { stroke: PRIZM_DARK_THEME_AXIS_COLOR, }, }, - range: [0, 1], }, }, waterfall: { - interactions: [{ type: 'element-active' }], state: { active: { - animate: { duration: 100, easing: 'easeLinear' }, style: { - lineWidth: 1, stroke: PRIZM_DARK_THEME_STROKE_HOVER_COLOR, }, }, }, }, pie: { - interactions: [{ type: 'element-active' }], state: { active: { - animate: { duration: 100, easing: 'easeLinear' }, style: { - lineWidth: 1, stroke: PRIZM_DARK_THEME_STROKE_HOVER_COLOR, }, }, }, pieStyle: { - lineWidth: 1, stroke: PRIZM_DARK_THEME_BACKGROUND_COLOR_PRIMARY, }, }, 'radial-bar': { - interactions: [{ type: 'element-active' }], state: { active: { - animate: { duration: 100, easing: 'easeLinear' }, style: { - lineWidth: 1, stroke: PRIZM_DARK_THEME_STROKE_HOVER_COLOR, }, }, @@ -161,14 +142,6 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { subColor: 'rgba(48, 51, 64, 1)', semanticRed: '#FF0033', semanticGreen: '#009900', - padding: 'auto', - fontFamily: - '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', - columnWidthRatio: 0.5, - maxColumnWidth: null, - minColumnWidth: null, - roseWidthRatio: 0.9999999, - multiplePieWidthRatio: 0.7692307692307692, // TODO: reseacrh why this colors here #dr sequenceColors: [ '#B8E1FF', @@ -181,149 +154,39 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { '#00318A', '#001D70', ], - shapes: { - point: [ - 'hollow-circle', - 'hollow-square', - 'hollow-bowtie', - 'hollow-diamond', - 'hollow-hexagon', - 'hollow-triangle', - 'hollow-triangle-down', - 'circle', - 'square', - 'bowtie', - 'diamond', - 'hexagon', - 'triangle', - 'triangle-down', - 'cross', - 'tick', - 'plus', - 'hyphen', - 'line', - ], - line: ['line', 'dash', 'dot', 'smooth'], - area: ['area', 'smooth', 'line', 'smooth-line'], - interval: ['rect', 'hollow-rect', 'line', 'tick'], - }, - sizes: [1, 10], components: { axis: { common: { title: { - autoRotate: true, - position: 'center', - spacing: 12, style: { fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, - fontSize: 12, - lineHeight: 12, - textBaseline: 'middle', - fontFamily: - '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', }, }, label: { - autoRotate: false, - autoEllipsis: false, - autoHide: { - type: 'equidistance', - cfg: { - minGap: 6, - }, - }, - offset: 8, style: { fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, - fontSize: 12, - lineHeight: 12, - fontFamily: - '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', }, }, line: { style: { - lineWidth: 1, stroke: PRIZM_DARK_THEME_AXIS_COLOR, }, }, grid: { line: { - type: 'line', style: { stroke: PRIZM_DARK_THEME_AXIS_COLOR, - lineWidth: 1, - lineDash: null, }, }, - alignTick: true, - animate: true, - }, - tickLine: null, - subTickLine: null, - animate: true, - }, - top: { - position: 'top', - grid: null, - title: { - style: { - fontSize: 12, - }, - }, - verticalLimitLength: 0.5, - }, - bottom: { - position: 'bottom', - grid: null, - title: { - style: { - fontSize: 12, - }, - }, - verticalLimitLength: 0.5, - }, - left: { - position: 'left', - title: { - style: { - fontSize: 12, - }, }, - line: null, - tickLine: null, - verticalLimitLength: 0.3333333333333333, - }, - right: { - position: 'right', - title: { - style: { - fontSize: 12, - }, - }, - line: null, - tickLine: null, - verticalLimitLength: 0.3333333333333333, }, circle: { - title: null, grid: { line: { - type: 'line', style: { stroke: PRIZM_DARK_THEME_AXIS_COLOR, - lineWidth: 1, - lineDash: null, }, }, - alignTick: true, - animate: true, - }, - line: { - style: { - lineWidth: 0, - }, }, tickLine: { style: { @@ -334,21 +197,15 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { radius: { title: { style: { - fontSize: 0, fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, }, }, grid: { line: { - type: 'circle', style: { stroke: PRIZM_DARK_THEME_AXIS_COLOR, - lineWidth: 1, - lineDash: null, }, }, - alignTick: true, - animate: true, }, label: { style: { @@ -359,34 +216,17 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { }, legend: { common: { - title: null, marker: { - symbol: 'circle', - spacing: 4, style: { - r: 4, fill: '#4075FF', }, }, itemName: { - spacing: 5, style: { fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, - fontFamily: - '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', - fontSize: 12, - lineHeight: 12, - fontWeight: 'normal', - textAlign: 'start', - textBaseline: 'middle', }, }, itemStates: { - active: { - nameStyle: { - opacity: 0.8, - }, - }, unchecked: { nameStyle: { fill: PRIZM_DARK_THEME_TEXT_COLOR_DISABLE, @@ -400,320 +240,132 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { nameStyle: { fill: PRIZM_DARK_THEME_TEXT_COLOR_DISABLE, }, - markerStyle: { - opacity: 0.2, - }, }, }, - flipPage: true, pageNavigator: { marker: { style: { - size: 12, inactiveFill: '#2c313d', - inactiveOpacity: 12, fill: '#6e778c', - opacity: 1, }, }, text: { style: { fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, - fontSize: 12, }, }, }, - animate: false, - maxItemWidth: 200, - itemSpacing: 16, - itemMarginBottom: 12, - padding: [8, 8, 8, 8], - legendItemMarginBottom: 16, - }, - right: { - layout: 'vertical', - padding: [0, 8, 0, 8], - }, - left: { - layout: 'vertical', - padding: [0, 8, 0, 8], - }, - top: { - layout: 'horizontal', - padding: [8, 0, 8, 0], - }, - bottom: { - layout: 'horizontal', - padding: [8, 0, 8, 0], }, continuous: { - title: null, - background: null, - track: {}, rail: { - type: 'color', - size: 12, - defaultLength: 100, style: { fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, - stroke: null, - lineWidth: 0, }, }, label: { - align: 'rail', - spacing: 12, - formatter: null, style: { fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, - fontSize: 12, - lineHeight: 16, - textBaseline: 'middle', - fontFamily: - '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', }, }, handler: { - size: 10, style: { fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, stroke: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, }, }, - slidable: true, - padding: [8, 8, 8, 8], }, }, tooltip: { - showContent: true, - follow: true, - showCrosshairs: false, - showMarkers: true, - shared: false, - enterable: false, - position: 'auto', marker: { - symbol: 'circle', stroke: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, - shadowBlur: 10, - shadowOffsetX: 0, - shadowOffsetY: 0, shadowColor: 'rgba(48, 51, 64, 1)', - lineWidth: 1, - r: 4, }, crosshairs: { line: { style: { stroke: 'rgba(244, 246, 251, 1)', - lineWidth: 1, }, }, - text: null, textBackground: { - padding: 2, style: { fill: 'rgba(0, 0, 0, 0.25)', - lineWidth: 0, - stroke: null, }, }, - follow: false, - }, - domStyles: { - 'g2-tooltip': { - position: 'absolute', - visibility: 'hidden', - zIndex: 8, - transition: - 'left 0.4s cubic-bezier(0.23, 1, 0.32, 1) 0s, top 0.4s cubic-bezier(0.23, 1, 0.32, 1) 0s', - backgroundColor: 'var(--prizm-background-fill-overlay)', - color: 'var(--prizm-text-icon-primary)', - fontFamily: 'Inter', - overflow: 'hidden', - opacity: 0.95, - boxShadow: 'var(--prizm-shadow-big-bottom)', - borderRadius: '2px', - fontSize: 14, - lineHeight: '12px', - padding: '0 12px 0 12px', - }, - 'g2-tooltip-title': { - marginBottom: '12px', - marginTop: '12px', - }, - 'g2-tooltip-list': { - margin: 0, - listStyleType: 'none', - padding: 0, - }, - 'g2-tooltip-list-item': { - listStyleType: 'none', - padding: 0, - marginBottom: '12px', - marginTop: '12px', - marginLeft: 0, - marginRight: 0, - color: 'var(--prizm-text-icon-secondary)', - }, - 'g2-tooltip-marker': { - width: '8px', - height: '8px', - borderRadius: '50%', - display: 'inline-block', - marginRight: '8px', - }, - 'g2-tooltip-value': { - display: 'inline-block', - float: 'right', - marginLeft: '30px', - }, }, }, annotation: { arc: { style: { stroke: PRIZM_DARK_THEME_AXIS_COLOR, - lineWidth: 1, }, - animate: true, }, line: { style: { stroke: PRIZM_DARK_THEME_AXIS_COLOR, - lineDash: null, - lineWidth: 1, }, text: { - position: 'start', - autoRotate: true, style: { fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, - stroke: null, - lineWidth: 0, - fontSize: 12, - textAlign: 'start', - fontFamily: - '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', - textBaseline: 'bottom', }, }, - animate: true, }, text: { style: { fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, - stroke: null, - lineWidth: 0, - fontSize: 12, - textBaseline: 'middle', - textAlign: 'start', - fontFamily: - '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', - }, - animate: true, + }, }, region: { - top: false, style: { - lineWidth: 0, - stroke: null, fill: '#000', - fillOpacity: 0.06, }, - animate: true, - }, - image: { - top: false, - animate: true, }, dataMarker: { - top: true, point: { style: { - r: 3, stroke: '#4075FF', - lineWidth: 2, }, }, line: { style: { stroke: PRIZM_DARK_THEME_AXIS_COLOR, - lineWidth: 1, }, - length: 16, }, text: { style: { - textAlign: 'start', fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, - stroke: null, - lineWidth: 0, - fontSize: 12, - fontFamily: - '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', }, }, - direction: 'upward', - autoAdjust: true, - animate: true, }, dataRegion: { style: { region: { fill: '#000', - fillOpacity: 0.06, }, text: { - textAlign: 'center', - textBaseline: 'bottom', fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, - stroke: null, - lineWidth: 0, - fontSize: 12, - fontFamily: - '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', }, }, - animate: true, }, }, slider: { common: { - padding: [8, 8, 8, 8], backgroundStyle: { fill: PRIZM_DARK_THEME_BACKGROUND_COLOR_PRIMARY, - opacity: 0.5, }, foregroundStyle: { fill: PRIZM_DARK_THEME_BACKGROUND_COLOR_PRIMARY, - opacity: 0.25, }, handlerStyle: { - width: 8, - height: 24, fill: PRIZM_DARK_THEME_BACKGROUND_COLOR_PRIMARY, - opacity: 1, stroke: '#6e778c', - lineWidth: 1, - radius: 2, highLightFill: '#FFF', }, textStyle: { fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, - opacity: 1, - fontSize: 12, - lineHeight: 12, - fontWeight: 'normal', - stroke: null, - lineWidth: 0, }, }, }, scrollbar: { - common: { - padding: [8, 8, 8, 8], - }, default: { style: { trackColor: PRIZM_DARK_THEME_BACKGROUND_COLOR_PRIMARY, @@ -728,56 +380,31 @@ export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = { }, }, labels: { - offset: 12, style: { fill: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, - fontSize: 12, - fontFamily: - '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', stroke: PRIZM_DARK_THEME_TEXT_COLOR_SECONDARY, - lineWidth: 0, }, fillColorDark: '#ffffff', fillColorLight: '#ffffff', - autoRotate: true, }, innerLabels: { style: { fill: '#FFFFFF', - fontSize: 12, - fontFamily: - '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', - stroke: '#FFFFFF', - lineWidth: 0, }, - autoRotate: true, }, overflowLabels: { style: { fill: '#FFFFFF', - fontSize: 12, - fontFamily: - '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', - stroke: null, - lineWidth: 1, }, }, - pieLabels: { - labelHeight: 14, - offset: 8, - labelLine: { - style: { - lineWidth: 1, - }, - }, - autoRotate: true, - }, - 'bottom-axis-subTick-line': false, - 'circle-axis-subTick-line': false, - 'radius-axis-subTick-line': false, styleSheet: { brandColor: PRIZM_CHART_DARK_THEME_DATA_COLORS[0], paletteQualitative10: PRIZM_CHART_DARK_THEME_DATA_COLORS, paletteQualitative20: PRIZM_CHART_DARK_THEME_DATA_COLORS, }, }; + +export const PRIZM_CHART_DARK_THEME: PrizmChartThemeObject = merge( + PRIZM_CHART_DARK_THEME_COLOR_SCEME, + PRIZM_CHART_BASE_OPTIONS +); diff --git a/libs/charts/base/src/lib/theme/light.const.ts b/libs/charts/base/src/lib/theme/light.const.ts index de15f4e3f4..29ba76d701 100644 --- a/libs/charts/base/src/lib/theme/light.const.ts +++ b/libs/charts/base/src/lib/theme/light.const.ts @@ -1,4 +1,6 @@ +import { merge } from '@prizm-ui/helpers'; import { PrizmChartThemeObject } from './types'; +import { PRIZM_CHART_BASE_OPTIONS } from './base-options.const'; export const PRIZM_CHART_LIGHT_THEME_DATA_COLORS = [ '#336666', @@ -24,12 +26,11 @@ export const PRIZM_LIGHT_THEME_BACKGROUND_COLOR_PRIMARY = '#ffffff'; export const PRIZM_LIGHT_THEME_STROKE_HOVER_COLOR = '#20222b'; -export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { +const PRIZM_CHART_LIGHT_THEME_COLOR_SCEME = { prizm: { components: { bar: { xAxis: { - minTickInterval: 10, grid: { line: { style: { @@ -42,12 +43,10 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, }, }, - range: [0, 1], }, }, area: { xAxis: { - minTickInterval: 10, grid: { line: { style: { @@ -60,10 +59,8 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, }, }, - range: [0, 1], }, yAxis: { - minTickInterval: 10, grid: { line: { style: { @@ -76,12 +73,10 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, }, }, - range: [0, 1], }, }, scatter: { xAxis: { - minTickInterval: 10, grid: { line: { style: { @@ -94,10 +89,8 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, }, }, - range: [0, 1], }, yAxis: { - minTickInterval: 10, grid: { line: { style: { @@ -110,44 +103,33 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, }, }, - range: [0, 1], }, }, waterfall: { - interactions: [{ type: 'element-active' }], state: { active: { - animate: { duration: 100, easing: 'easeLinear' }, style: { - lineWidth: 1, stroke: PRIZM_LIGHT_THEME_STROKE_HOVER_COLOR, }, }, }, }, pie: { - interactions: [{ type: 'element-active' }], state: { active: { - animate: { duration: 100, easing: 'easeLinear' }, style: { - lineWidth: 1, stroke: PRIZM_LIGHT_THEME_STROKE_HOVER_COLOR, }, }, }, pieStyle: { - lineWidth: 1, stroke: PRIZM_LIGHT_THEME_BACKGROUND_COLOR_PRIMARY, }, }, 'radial-bar': { - interactions: [{ type: 'element-active' }], state: { active: { - animate: { duration: 100, easing: 'easeLinear' }, style: { - lineWidth: 1, stroke: PRIZM_LIGHT_THEME_STROKE_HOVER_COLOR, }, }, @@ -160,14 +142,6 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { subColor: 'rgba(214, 219, 231, 1)', semanticRed: '#CC0000', semanticGreen: '#006600', - padding: 'auto', - fontFamily: - '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', - columnWidthRatio: 0.5, - maxColumnWidth: null, - minColumnWidth: null, - roseWidthRatio: 0.9999999, - multiplePieWidthRatio: 0.7692307692307692, // TODO: reseacrh why this colors here #dr sequenceColors: [ '#B8E1FF', @@ -180,149 +154,39 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { '#00318A', '#001D70', ], - shapes: { - point: [ - 'hollow-circle', - 'hollow-square', - 'hollow-bowtie', - 'hollow-diamond', - 'hollow-hexagon', - 'hollow-triangle', - 'hollow-triangle-down', - 'circle', - 'square', - 'bowtie', - 'diamond', - 'hexagon', - 'triangle', - 'triangle-down', - 'cross', - 'tick', - 'plus', - 'hyphen', - 'line', - ], - line: ['line', 'dash', 'dot', 'smooth'], - area: ['area', 'smooth', 'line', 'smooth-line'], - interval: ['rect', 'hollow-rect', 'line', 'tick'], - }, - sizes: [1, 10], components: { axis: { common: { title: { - autoRotate: true, - position: 'center', - spacing: 12, style: { fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, - fontSize: 12, - lineHeight: 12, - textBaseline: 'middle', - fontFamily: - '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', }, }, label: { - autoRotate: false, - autoEllipsis: false, - autoHide: { - type: 'equidistance', - cfg: { - minGap: 6, - }, - }, - offset: 8, style: { fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, - fontSize: 12, - lineHeight: 12, - fontFamily: - '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', }, }, line: { style: { - lineWidth: 1, stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, }, }, grid: { line: { - type: 'line', style: { stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, - lineWidth: 1, - lineDash: null, }, }, - alignTick: true, - animate: true, - }, - tickLine: null, - subTickLine: null, - animate: true, - }, - top: { - position: 'top', - grid: null, - title: { - style: { - fontSize: 12, - }, - }, - verticalLimitLength: 0.5, - }, - bottom: { - position: 'bottom', - grid: null, - title: { - style: { - fontSize: 12, - }, - }, - verticalLimitLength: 0.5, - }, - left: { - position: 'left', - title: { - style: { - fontSize: 12, - }, }, - line: null, - tickLine: null, - verticalLimitLength: 0.3333333333333333, - }, - right: { - position: 'right', - title: { - style: { - fontSize: 12, - }, - }, - line: null, - tickLine: null, - verticalLimitLength: 0.3333333333333333, }, circle: { - title: null, grid: { line: { - type: 'line', style: { stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, - lineWidth: 1, - lineDash: null, }, }, - alignTick: true, - animate: true, - }, - line: { - style: { - lineWidth: 0, - }, }, tickLine: { style: { @@ -333,21 +197,15 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { radius: { title: { style: { - fontSize: 0, fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, }, }, grid: { line: { - type: 'circle', style: { stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, - lineWidth: 1, - lineDash: null, }, }, - alignTick: true, - animate: true, }, label: { style: { @@ -358,34 +216,17 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { }, legend: { common: { - title: null, marker: { - symbol: 'circle', - spacing: 4, style: { - r: 4, fill: '#4075FF', }, }, itemName: { - spacing: 5, style: { fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, - fontFamily: - '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', - fontSize: 12, - lineHeight: 12, - fontWeight: 'normal', - textAlign: 'start', - textBaseline: 'middle', }, }, itemStates: { - active: { - nameStyle: { - opacity: 0.8, - }, - }, unchecked: { nameStyle: { fill: PRIZM_LIGHT_THEME_TEXT_COLOR_DISABLE, @@ -399,320 +240,132 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { nameStyle: { fill: PRIZM_LIGHT_THEME_TEXT_COLOR_DISABLE, }, - markerStyle: { - opacity: 0.2, - }, }, }, - flipPage: true, pageNavigator: { marker: { style: { - size: 12, inactiveFill: '#f3f4f5', - inactiveOpacity: 12, fill: '#6e778c', - opacity: 1, }, }, text: { style: { fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, - fontSize: 12, }, }, }, - animate: false, - maxItemWidth: 200, - itemSpacing: 16, - itemMarginBottom: 12, - padding: [8, 8, 8, 8], - legendItemMarginBottom: 16, - }, - right: { - layout: 'vertical', - padding: [0, 8, 0, 8], - }, - left: { - layout: 'vertical', - padding: [0, 8, 0, 8], - }, - top: { - layout: 'horizontal', - padding: [8, 0, 8, 0], - }, - bottom: { - layout: 'horizontal', - padding: [8, 0, 8, 0], }, continuous: { - title: null, - background: null, - track: {}, rail: { - type: 'color', - size: 12, - defaultLength: 100, style: { fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, - stroke: null, - lineWidth: 0, }, }, label: { - align: 'rail', - spacing: 12, - formatter: null, style: { fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, - fontSize: 12, - lineHeight: 16, - textBaseline: 'middle', - fontFamily: - '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', }, }, handler: { - size: 8, style: { fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, stroke: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, }, }, - slidable: true, - padding: [8, 8, 8, 8], }, }, tooltip: { - showContent: true, - follow: true, - showCrosshairs: false, - showMarkers: true, - shared: false, - enterable: false, - position: 'auto', marker: { - symbol: 'circle', stroke: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, - shadowBlur: 10, - shadowOffsetX: 0, - shadowOffsetY: 0, shadowColor: 'rgba(214, 219, 231, 1)', - lineWidth: 1, - r: 4, }, crosshairs: { line: { style: { stroke: '#1A1C24', - lineWidth: 1, }, }, - text: null, textBackground: { - padding: 2, style: { fill: 'rgba(0, 0, 0, 0.25)', - lineWidth: 0, - stroke: null, }, }, - follow: false, - }, - domStyles: { - 'g2-tooltip': { - position: 'absolute', - visibility: 'hidden', - zIndex: 8, - boxShadow: 'var(--prizm-shadow-big-bottom)', - transition: - 'left 0.4s cubic-bezier(0.23, 1, 0.32, 1) 0s, top 0.4s cubic-bezier(0.23, 1, 0.32, 1) 0s', - backgroundColor: 'var(--prizm-background-fill-overlay)', - color: 'var(--prizm-text-icon-primary)', - overflow: 'hidden', - fontFamily: 'Inter', - opacity: 0.95, - borderRadius: '2px', - fontSize: 14, - lineHeight: '12px', - padding: '0 12px 0 12px', - }, - 'g2-tooltip-title': { - marginBottom: '12px', - marginTop: '12px', - }, - 'g2-tooltip-list': { - margin: 0, - listStyleType: 'none', - padding: 0, - }, - 'g2-tooltip-list-item': { - listStyleType: 'none', - padding: 0, - marginBottom: '12px', - marginTop: '12px', - marginLeft: 0, - marginRight: 0, - color: 'var(--prizm-text-icon-secondary)', - }, - 'g2-tooltip-marker': { - width: '8px', - height: '8px', - borderRadius: '50%', - display: 'inline-block', - marginRight: '8px', - }, - 'g2-tooltip-value': { - display: 'inline-block', - float: 'right', - marginLeft: '30px', - }, }, }, annotation: { arc: { style: { stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, - lineWidth: 1, }, - animate: true, }, line: { style: { stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, - lineDash: null, - lineWidth: 1, }, text: { - position: 'start', - autoRotate: true, style: { fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, - stroke: null, - lineWidth: 0, - fontSize: 12, - textAlign: 'start', - fontFamily: - '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', - textBaseline: 'bottom', }, }, - animate: true, }, text: { style: { fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, - stroke: null, - lineWidth: 0, - fontSize: 12, - textBaseline: 'middle', - textAlign: 'start', - fontFamily: - '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', - }, - animate: true, + }, }, region: { - top: false, style: { - lineWidth: 0, - stroke: null, fill: '#000', - fillOpacity: 0.06, }, - animate: true, - }, - image: { - top: false, - animate: true, }, dataMarker: { - top: true, point: { style: { - r: 3, stroke: '#4075FF', - lineWidth: 2, }, }, line: { style: { stroke: PRIZM_LIGHT_THEME_AXIS_COLOR, - lineWidth: 1, }, - length: 16, }, text: { style: { - textAlign: 'start', fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, - stroke: null, - lineWidth: 0, - fontSize: 12, - fontFamily: - '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', }, }, - direction: 'upward', - autoAdjust: true, - animate: true, }, dataRegion: { style: { region: { fill: '#000', - fillOpacity: 0.06, }, text: { - textAlign: 'center', - textBaseline: 'bottom', fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, - stroke: null, - lineWidth: 0, - fontSize: 12, - fontFamily: - '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', }, }, - animate: true, }, }, slider: { common: { - padding: [8, 8, 8, 8], backgroundStyle: { fill: PRIZM_LIGHT_THEME_BACKGROUND_COLOR_PRIMARY, - opacity: 0.5, }, foregroundStyle: { fill: PRIZM_LIGHT_THEME_BACKGROUND_COLOR_PRIMARY, - opacity: 0.25, }, handlerStyle: { - width: 8, - height: 24, fill: PRIZM_LIGHT_THEME_BACKGROUND_COLOR_PRIMARY, - opacity: 1, stroke: '#6e778c', - lineWidth: 1, - radius: 2, highLightFill: '#FFF', }, textStyle: { fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, - opacity: 1, - fontSize: 12, - lineHeight: 12, - fontWeight: 'normal', - stroke: null, - lineWidth: 0, }, }, }, scrollbar: { - common: { - padding: [8, 8, 8, 8], - }, default: { style: { trackColor: PRIZM_LIGHT_THEME_BACKGROUND_COLOR_PRIMARY, @@ -727,56 +380,31 @@ export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = { }, }, labels: { - offset: 12, style: { fill: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, - fontSize: 12, - fontFamily: - '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', stroke: PRIZM_LIGHT_THEME_TEXT_COLOR_SECONDARY, - lineWidth: null, }, fillColorDark: '#2c3542', fillColorLight: '#ffffff', - autoRotate: true, }, innerLabels: { style: { fill: '#FFFFFF', - fontSize: 12, - fontFamily: - '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', - stroke: null, - lineWidth: 0, }, - autoRotate: true, }, overflowLabels: { style: { fill: '#FFFFFF', - fontSize: 12, - fontFamily: - '"Segoe UI", Roboto, "Helvetica Neue", Arial,\n "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol",\n "Noto Color Emoji"', - stroke: null, - lineWidth: 1, }, }, - pieLabels: { - labelHeight: 14, - offset: 8, - labelLine: { - style: { - lineWidth: 1, - }, - }, - autoRotate: true, - }, - 'bottom-axis-subTick-line': false, - 'circle-axis-subTick-line': false, - 'radius-axis-subTick-line': false, styleSheet: { brandColor: PRIZM_CHART_LIGHT_THEME_DATA_COLORS[0], paletteQualitative10: PRIZM_CHART_LIGHT_THEME_DATA_COLORS, paletteQualitative20: PRIZM_CHART_LIGHT_THEME_DATA_COLORS, }, }; + +export const PRIZM_CHART_LIGHT_THEME: PrizmChartThemeObject = merge( + PRIZM_CHART_LIGHT_THEME_COLOR_SCEME, + PRIZM_CHART_BASE_OPTIONS +); diff --git a/libs/charts/base/src/lib/theme/types.ts b/libs/charts/base/src/lib/theme/types.ts index e152cec090..462369153a 100644 --- a/libs/charts/base/src/lib/theme/types.ts +++ b/libs/charts/base/src/lib/theme/types.ts @@ -8,3 +8,5 @@ export enum PrizmChartDefaultTheme { export type PrizmChartTheme = string | PrizmTheme; export type PrizmChartThemeObject = Record; + +export type PrizmChartBaseOptions = Record; From 4c10f54b472b10e60f84d9c19753c6f575ea27cd Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 8 Apr 2024 14:31:17 +0300 Subject: [PATCH 130/291] fix: treemap stoke color and hover update --- libs/charts/base/src/lib/theme/base-options.const.ts | 8 ++++++++ libs/charts/base/src/lib/theme/dark.const.ts | 12 ++++++++++++ libs/charts/base/src/lib/theme/light.const.ts | 12 ++++++++++++ 3 files changed, 32 insertions(+) diff --git a/libs/charts/base/src/lib/theme/base-options.const.ts b/libs/charts/base/src/lib/theme/base-options.const.ts index 23e9fb446b..668b3625eb 100644 --- a/libs/charts/base/src/lib/theme/base-options.const.ts +++ b/libs/charts/base/src/lib/theme/base-options.const.ts @@ -46,6 +46,14 @@ export const PRIZM_CHART_BASE_OPTIONS: PrizmChartBaseOptions = { }, }, }, + treemap: { + interactions: [{ type: 'element-active' }], + state: { + active: { + animate: { duration: 100, easing: 'easeLinear' }, + }, + }, + }, }, }, padding: 'auto', diff --git a/libs/charts/base/src/lib/theme/dark.const.ts b/libs/charts/base/src/lib/theme/dark.const.ts index 32d962e76e..aa8371aa61 100644 --- a/libs/charts/base/src/lib/theme/dark.const.ts +++ b/libs/charts/base/src/lib/theme/dark.const.ts @@ -135,6 +135,18 @@ const PRIZM_CHART_DARK_THEME_COLOR_SCEME = { }, }, }, + treemap: { + rectStyle: { + stroke: PRIZM_DARK_THEME_BACKGROUND_COLOR_PRIMARY, + }, + state: { + active: { + style: { + stroke: PRIZM_DARK_THEME_STROKE_HOVER_COLOR, + }, + }, + }, + }, }, }, background: PRIZM_DARK_THEME_BACKGROUND_COLOR_PRIMARY, diff --git a/libs/charts/base/src/lib/theme/light.const.ts b/libs/charts/base/src/lib/theme/light.const.ts index 29ba76d701..6f9a42f2d5 100644 --- a/libs/charts/base/src/lib/theme/light.const.ts +++ b/libs/charts/base/src/lib/theme/light.const.ts @@ -135,6 +135,18 @@ const PRIZM_CHART_LIGHT_THEME_COLOR_SCEME = { }, }, }, + treemap: { + rectStyle: { + stroke: PRIZM_LIGHT_THEME_BACKGROUND_COLOR_PRIMARY, + }, + state: { + active: { + style: { + stroke: PRIZM_LIGHT_THEME_STROKE_HOVER_COLOR, + }, + }, + }, + }, }, }, background: PRIZM_LIGHT_THEME_BACKGROUND_COLOR_PRIMARY, From 59bffe66d8c8ae3cc8bf9aa05dd6f37f78332409 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 9 Apr 2024 07:57:46 +0300 Subject: [PATCH 131/291] fix: bar example tooltip and code fixed --- apps/doc/src/app/charts/bar/bar.component.html | 2 +- .../base/prizm-charts-bar-example.component.html | 2 +- .../base/prizm-charts-bar-example.component.ts | 12 +++++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/apps/doc/src/app/charts/bar/bar.component.html b/apps/doc/src/app/charts/bar/bar.component.html index 879151f14f..9b303ea7a2 100644 --- a/apps/doc/src/app/charts/bar/bar.component.html +++ b/apps/doc/src/app/charts/bar/bar.component.html @@ -8,7 +8,7 @@ - + diff --git a/apps/doc/src/app/charts/bar/examples/base/prizm-charts-bar-example.component.html b/apps/doc/src/app/charts/bar/examples/base/prizm-charts-bar-example.component.html index 9a93884a3a..153f77bdd9 100644 --- a/apps/doc/src/app/charts/bar/examples/base/prizm-charts-bar-example.component.html +++ b/apps/doc/src/app/charts/bar/examples/base/prizm-charts-bar-example.component.html @@ -4,7 +4,7 @@ [theme]="$any(prizmTheme.changesTheme$ | async)" [color]="color" xField="sales" - seriesField="sales" yField="type" + seriesField="sales" > 
    {{ data | json }}
    diff --git a/apps/doc/src/app/charts/bar/examples/base/prizm-charts-bar-example.component.ts b/apps/doc/src/app/charts/bar/examples/base/prizm-charts-bar-example.component.ts index c5466ea51e..b1e61d8211 100644 --- a/apps/doc/src/app/charts/bar/examples/base/prizm-charts-bar-example.component.ts +++ b/apps/doc/src/app/charts/bar/examples/base/prizm-charts-bar-example.component.ts @@ -50,17 +50,23 @@ export class PrizmChartsBarExampleComponent implements AfterViewInit { sales: 38, }, ]; - readonly color: PrizmChartsBarOptions['color'] = data => { - return data.sales > 40 ? 'red' : 'green'; + + readonly tooltipOptions = { + showTitle: false, + formatter: item => ({ name: item.type, value: item.sales }), }; constructor(public readonly prizmTheme: PrizmThemeService) {} + readonly color: PrizmChartsBarOptions['color'] = data => { + return data.sales > 40 ? 'red' : 'green'; + }; + ngAfterViewInit(): void { // we can update options manually this.bar.updateOptions({ legend: false, - // color: this.color + tooltip: this.tooltipOptions, }); } } From 24d18cfda3cb7c9bb06943632bfd880914fc031e Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 9 Apr 2024 15:29:16 +0300 Subject: [PATCH 132/291] fix: incorrect data colors display in charts #1505 --- .../charts/waterfall/waterfall.component.ts | 1 - .../base/src/lib/theme/base-options.const.ts | 21 +++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/apps/doc/src/app/charts/waterfall/waterfall.component.ts b/apps/doc/src/app/charts/waterfall/waterfall.component.ts index fa215b6e38..12bd38a26d 100644 --- a/apps/doc/src/app/charts/waterfall/waterfall.component.ts +++ b/apps/doc/src/app/charts/waterfall/waterfall.component.ts @@ -1,6 +1,5 @@ import { ChangeDetectionStrategy, Component } from '@angular/core'; import { RawLoaderContent, TuiDocExample } from '@prizm-ui/doc'; -import { PrizmSize } from '@prizm-ui/components'; import { PrizmChartsWaterfallItem } from '@prizm-ui/charts'; import { PrizmThemeService } from '@prizm-ui/theme'; diff --git a/libs/charts/base/src/lib/theme/base-options.const.ts b/libs/charts/base/src/lib/theme/base-options.const.ts index 668b3625eb..6e6b12c28c 100644 --- a/libs/charts/base/src/lib/theme/base-options.const.ts +++ b/libs/charts/base/src/lib/theme/base-options.const.ts @@ -10,10 +10,21 @@ export const PRIZM_CHART_BASE_OPTIONS: PrizmChartBaseOptions = { components: { bar: { xAxis: PRIZM_DEFAULT_AXIS_OPTIONS, + barStyle: { + fillOpacity: 1, + }, + }, + column: { + columnStyle: { + fillOpacity: 1, + }, }, area: { xAxis: PRIZM_DEFAULT_AXIS_OPTIONS, yAxis: PRIZM_DEFAULT_AXIS_OPTIONS, + areaStyle: { + lineOpacity: 1, + }, }, scatter: { xAxis: PRIZM_DEFAULT_AXIS_OPTIONS, @@ -26,6 +37,9 @@ export const PRIZM_CHART_BASE_OPTIONS: PrizmChartBaseOptions = { animate: { duration: 100, easing: 'easeLinear' }, }, }, + waterfallStyle: { + fillOpacity: 1, + }, }, pie: { interactions: [{ type: 'element-active' }], @@ -36,6 +50,7 @@ export const PRIZM_CHART_BASE_OPTIONS: PrizmChartBaseOptions = { }, pieStyle: { lineWidth: 1, + fillOpacity: 1, }, }, 'radial-bar': { @@ -45,6 +60,9 @@ export const PRIZM_CHART_BASE_OPTIONS: PrizmChartBaseOptions = { animate: { duration: 100, easing: 'easeLinear' }, }, }, + barStyle: { + fillOpacity: 1, + }, }, treemap: { interactions: [{ type: 'element-active' }], @@ -53,6 +71,9 @@ export const PRIZM_CHART_BASE_OPTIONS: PrizmChartBaseOptions = { animate: { duration: 100, easing: 'easeLinear' }, }, }, + rectStyle: { + fillOpacity: 1, + }, }, }, }, From e78bf0e02a83e20d49817d7247f794b2450a80a0 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 9 Apr 2024 16:50:33 +0300 Subject: [PATCH 133/291] fix: remove pie live demo example extra properties --- apps/doc/src/app/charts/pie/pie.component.html | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/apps/doc/src/app/charts/pie/pie.component.html b/apps/doc/src/app/charts/pie/pie.component.html index ddf3e6a854..953328083a 100644 --- a/apps/doc/src/app/charts/pie/pie.component.html +++ b/apps/doc/src/app/charts/pie/pie.component.html @@ -28,22 +28,6 @@ - - Width - - - - Height - - Date: Tue, 9 Apr 2024 17:09:20 +0300 Subject: [PATCH 134/291] feat: add decimal input to documentation --- apps/doc/src/app/charts/gauge/gauge.component.html | 2 +- .../documentation/documentation.component.html | 9 +++++++++ .../lib/components/documentation/documentation.module.ts | 2 ++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/apps/doc/src/app/charts/gauge/gauge.component.html b/apps/doc/src/app/charts/gauge/gauge.component.html index 6ff1ad0644..41f86c043e 100644 --- a/apps/doc/src/app/charts/gauge/gauge.component.html +++ b/apps/doc/src/app/charts/gauge/gauge.component.html @@ -50,7 +50,7 @@ Percent diff --git a/libs/doc/base/src/lib/components/documentation/documentation.component.html b/libs/doc/base/src/lib/components/documentation/documentation.component.html index 740b16cf48..e55529fb15 100644 --- a/libs/doc/base/src/lib/components/documentation/documentation.component.html +++ b/libs/doc/base/src/lib/components/documentation/documentation.component.html @@ -157,6 +157,15 @@

    {{ heading }}

    tuiTextfieldSize="m" >     + + diff --git a/libs/doc/base/src/lib/components/documentation/documentation.module.ts b/libs/doc/base/src/lib/components/documentation/documentation.module.ts index 4ea02c7276..e73cc47d20 100644 --- a/libs/doc/base/src/lib/components/documentation/documentation.module.ts +++ b/libs/doc/base/src/lib/components/documentation/documentation.module.ts @@ -17,6 +17,7 @@ import { TuiBadgeModule, TuiDataListWrapperModule, TuiInputCountModule, + TuiInputNumberModule, TuiSelectModule, TuiToggleModule, } from '@taiga-ui/kit'; @@ -52,6 +53,7 @@ import { PrizmCallFuncModule, PrizmLetModule } from '@prizm-ui/helpers'; TuiDataListWrapperModule, TuiNotificationModule, PrizmCallFuncModule, + TuiInputNumberModule, ], declarations: [PrizmDocDocumentationComponent, PrizmDocDocumentationPropertyConnectorDirective], exports: [PrizmDocDocumentationComponent, PrizmDocDocumentationPropertyConnectorDirective], From 438d21ce5776c65b44e0103d94d879e239c8a5f5 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 11 Apr 2024 11:12:07 +0300 Subject: [PATCH 135/291] fix: add v3 prefix for theme colors --- libs/charts/base/src/lib/theme/base-options.const.ts | 8 ++++---- libs/charts/base/src/lib/theme/dark.const.ts | 2 +- libs/charts/base/src/lib/theme/light.const.ts | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libs/charts/base/src/lib/theme/base-options.const.ts b/libs/charts/base/src/lib/theme/base-options.const.ts index 6e6b12c28c..d495ae559d 100644 --- a/libs/charts/base/src/lib/theme/base-options.const.ts +++ b/libs/charts/base/src/lib/theme/base-options.const.ts @@ -387,12 +387,12 @@ export const PRIZM_CHART_BASE_OPTIONS: PrizmChartBaseOptions = { zIndex: 8, transition: 'left 0.4s cubic-bezier(0.23, 1, 0.32, 1) 0s, top 0.4s cubic-bezier(0.23, 1, 0.32, 1) 0s', - backgroundColor: 'var(--prizm-background-fill-overlay)', - color: 'var(--prizm-text-icon-primary)', + backgroundColor: 'var(--prizm-v3-background-fill-overlay)', + color: 'var(--prizm-v3-text-icon-primary)', fontFamily: 'Inter', overflow: 'hidden', opacity: 0.95, - boxShadow: 'var(--prizm-shadow-big-bottom)', + boxShadow: 'var(--prizm-v3-shadow-big-bottom)', borderRadius: '2px', fontSize: 14, lineHeight: '12px', @@ -414,7 +414,7 @@ export const PRIZM_CHART_BASE_OPTIONS: PrizmChartBaseOptions = { marginTop: '12px', marginLeft: 0, marginRight: 0, - color: 'var(--prizm-text-icon-secondary)', + color: 'var(--prizm-v3-text-icon-secondary)', }, 'g2-tooltip-marker': { width: '8px', diff --git a/libs/charts/base/src/lib/theme/dark.const.ts b/libs/charts/base/src/lib/theme/dark.const.ts index aa8371aa61..4841c89337 100644 --- a/libs/charts/base/src/lib/theme/dark.const.ts +++ b/libs/charts/base/src/lib/theme/dark.const.ts @@ -1,6 +1,6 @@ +import { merge } from 'lodash'; import { PRIZM_CHART_BASE_OPTIONS } from './base-options.const'; import { PrizmChartThemeObject } from './types'; -import { merge } from '@prizm-ui/helpers'; export const PRIZM_CHART_DARK_THEME_DATA_COLORS = [ '#339999', diff --git a/libs/charts/base/src/lib/theme/light.const.ts b/libs/charts/base/src/lib/theme/light.const.ts index 6f9a42f2d5..d11c5d8716 100644 --- a/libs/charts/base/src/lib/theme/light.const.ts +++ b/libs/charts/base/src/lib/theme/light.const.ts @@ -1,6 +1,6 @@ -import { merge } from '@prizm-ui/helpers'; import { PrizmChartThemeObject } from './types'; import { PRIZM_CHART_BASE_OPTIONS } from './base-options.const'; +import { merge } from 'lodash'; export const PRIZM_CHART_LIGHT_THEME_DATA_COLORS = [ '#336666', From b0b7d767c244361f0b6dd8c79fd68be8aa1447a6 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Thu, 11 Apr 2024 13:24:10 +0400 Subject: [PATCH 136/291] fix: changed example icon and imports #1510 --- .../src/app/components/navigation/navigation-example.const.ts | 2 +- .../prizm-navigation-item-expandable.component.ts | 2 +- .../prizm-navigation-item-simple.component.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/doc/src/app/components/navigation/navigation-example.const.ts b/apps/doc/src/app/components/navigation/navigation-example.const.ts index 063e74dac2..4e7ffed1a7 100644 --- a/apps/doc/src/app/components/navigation/navigation-example.const.ts +++ b/apps/doc/src/app/components/navigation/navigation-example.const.ts @@ -87,7 +87,7 @@ export const NAVIGATION_EXAMPLE: INavigationTree[] = [ }, { title: 'Очень очень длинный раздел 4', - icon: 'clapperboard-open', + icon: 'transport-airplane', isExpanded: true, children: [ { diff --git a/libs/components/src/lib/components/navigation/components/prizm-navigation-item-expandable/prizm-navigation-item-expandable.component.ts b/libs/components/src/lib/components/navigation/components/prizm-navigation-item-expandable/prizm-navigation-item-expandable.component.ts index a555f9427a..eec881faf5 100644 --- a/libs/components/src/lib/components/navigation/components/prizm-navigation-item-expandable/prizm-navigation-item-expandable.component.ts +++ b/libs/components/src/lib/components/navigation/components/prizm-navigation-item-expandable/prizm-navigation-item-expandable.component.ts @@ -5,7 +5,7 @@ import { BehaviorSubject, combineLatest, Observable } from 'rxjs'; import { map } from 'rxjs/operators'; import { ActiveNavigationItemService } from '../../services/active-navigation-item.service'; import { PrizmAbstractTestId } from '@prizm-ui/core'; -import { prizmIsTextOverflow } from '@prizm-ui/components'; +import { prizmIsTextOverflow } from '../../../../util'; @Component({ selector: 'prizm-navigation-item-expandable', diff --git a/libs/components/src/lib/components/navigation/components/prizm-navigation-item-simple/prizm-navigation-item-simple.component.ts b/libs/components/src/lib/components/navigation/components/prizm-navigation-item-simple/prizm-navigation-item-simple.component.ts index bd3f46e50a..d5f0acbdc0 100644 --- a/libs/components/src/lib/components/navigation/components/prizm-navigation-item-simple/prizm-navigation-item-simple.component.ts +++ b/libs/components/src/lib/components/navigation/components/prizm-navigation-item-simple/prizm-navigation-item-simple.component.ts @@ -4,7 +4,7 @@ import { BehaviorSubject, combineLatest, Observable } from 'rxjs'; import { ActiveNavigationItemService } from '../../services/active-navigation-item.service'; import { map } from 'rxjs/operators'; import { PrizmAbstractTestId } from '@prizm-ui/core'; -import { prizmIsTextOverflow } from '@prizm-ui/components'; +import { prizmIsTextOverflow } from '../../../../util'; @Component({ selector: 'prizm-navigation-item-simple', From aff1d224dfb00c9f045158e38bc8ed6f351d2477 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 11 Apr 2024 16:30:03 +0300 Subject: [PATCH 137/291] fix: change scatter point styles --- libs/charts/base/src/lib/theme/base-options.const.ts | 3 +++ libs/charts/base/src/lib/theme/dark.const.ts | 7 +++++++ libs/charts/base/src/lib/theme/light.const.ts | 7 +++++++ 3 files changed, 17 insertions(+) diff --git a/libs/charts/base/src/lib/theme/base-options.const.ts b/libs/charts/base/src/lib/theme/base-options.const.ts index d495ae559d..1a491071a2 100644 --- a/libs/charts/base/src/lib/theme/base-options.const.ts +++ b/libs/charts/base/src/lib/theme/base-options.const.ts @@ -29,6 +29,9 @@ export const PRIZM_CHART_BASE_OPTIONS: PrizmChartBaseOptions = { scatter: { xAxis: PRIZM_DEFAULT_AXIS_OPTIONS, yAxis: PRIZM_DEFAULT_AXIS_OPTIONS, + pointStyle: { + stroke: null, + }, }, waterfall: { interactions: [{ type: 'element-active' }], diff --git a/libs/charts/base/src/lib/theme/dark.const.ts b/libs/charts/base/src/lib/theme/dark.const.ts index 4841c89337..eff603bfe1 100644 --- a/libs/charts/base/src/lib/theme/dark.const.ts +++ b/libs/charts/base/src/lib/theme/dark.const.ts @@ -104,6 +104,13 @@ const PRIZM_CHART_DARK_THEME_COLOR_SCEME = { }, }, }, + state: { + active: { + style: { + stroke: PRIZM_DARK_THEME_STROKE_HOVER_COLOR, + }, + }, + }, }, waterfall: { state: { diff --git a/libs/charts/base/src/lib/theme/light.const.ts b/libs/charts/base/src/lib/theme/light.const.ts index d11c5d8716..06588ff47f 100644 --- a/libs/charts/base/src/lib/theme/light.const.ts +++ b/libs/charts/base/src/lib/theme/light.const.ts @@ -104,6 +104,13 @@ const PRIZM_CHART_LIGHT_THEME_COLOR_SCEME = { }, }, }, + state: { + active: { + style: { + stroke: PRIZM_LIGHT_THEME_STROKE_HOVER_COLOR, + }, + }, + }, }, waterfall: { state: { From 836ce8e458ebb7e2a3b16afff324de7566a550fc Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 11 Apr 2024 18:21:59 +0300 Subject: [PATCH 138/291] fix: live demo scatter incorrect data --- apps/doc/src/app/charts/scatter/scatter.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/doc/src/app/charts/scatter/scatter.component.ts b/apps/doc/src/app/charts/scatter/scatter.component.ts index 192772b4cc..552a64101a 100644 --- a/apps/doc/src/app/charts/scatter/scatter.component.ts +++ b/apps/doc/src/app/charts/scatter/scatter.component.ts @@ -210,7 +210,7 @@ export class ScatterComponent { Team: 'Viktoria Plzen', 'xG conceded': 0.33, 'Shot conceded': 7, - Result: 3, + Result: '3', }, { 'H/A': 'H', From c3d046564339b4f2f6c2314336366547fc3af77f Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 12 Apr 2024 11:49:01 +0300 Subject: [PATCH 139/291] fix: change min max validation for input number --- .../input-number/input-number.component.ts | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/libs/components/src/lib/components/input/input-number/input-number.component.ts b/libs/components/src/lib/components/input/input-number/input-number.component.ts index eb7378d991..c0e9b21218 100644 --- a/libs/components/src/lib/components/input/input-number/input-number.component.ts +++ b/libs/components/src/lib/components/input/input-number/input-number.component.ts @@ -111,15 +111,9 @@ export class PrizmInputNumberComponent extends PrizmInputControl impleme @HostListener('input', ['$event.data']) @HostListener('paste', ['$event.clipboardData.getData("Text")']) public onInput(data: string) { - this.validateMax(); this.input$$.next(data); } - @HostListener('blur') - public onBlur() { - this.validateMin(); - } - constructor( @Self() public readonly ngControl: NgControl, @Host() private readonly el: ElementRef @@ -133,20 +127,6 @@ export class PrizmInputNumberComponent extends PrizmInputControl impleme this.stateChanges.next(); } - private validateMax() { - if (this.max !== null && this.max < this.value) { - this.el.nativeElement.value = this.max.toString(); - this.stateChanges.next(); - } - } - - private validateMin() { - if (this.min !== null && this.min > this.value) { - this.stateChanges.next(); - return; - } - } - public clear(ev: MouseEvent): void { this.ngControl.control?.setValue(null); this.markAsTouched(); From d434a4b11f22ef552cb76f4d475cb271647d9083 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Thu, 11 Apr 2024 16:39:15 +0400 Subject: [PATCH 140/291] fix: changed filesValidationErrors type in examples #1371 --- .../examples/auto-upload/auto-upload.component.html | 2 +- .../file-upload/examples/auto-upload/auto-upload.component.ts | 2 +- .../file-upload/examples/basic/basic.component.html | 2 +- .../components/file-upload/examples/basic/basic.component.ts | 2 +- .../examples/i18n/file-upload-i18n-example.component.html | 2 +- .../examples/i18n/file-upload-i18n-example.component.ts | 2 +- .../components/file-upload/file-upload-example.component.html | 4 ++-- .../components/file-upload/file-upload-example.component.ts | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/apps/doc/src/app/components/file-upload/examples/auto-upload/auto-upload.component.html b/apps/doc/src/app/components/file-upload/examples/auto-upload/auto-upload.component.html index 2983f6ad2e..62e4b34823 100644 --- a/apps/doc/src/app/components/file-upload/examples/auto-upload/auto-upload.component.html +++ b/apps/doc/src/app/components/file-upload/examples/auto-upload/auto-upload.component.html @@ -6,7 +6,7 @@ [maxFileSize]="1000000" [disabled]="disabled" (filesChange)="onFilesChange($event)" - (filesValidationErrors)="onfilesValidationErrors($any($event))" + (filesValidationErrors)="onfilesValidationErrors($event)" (filesCountError)="onFilesCountError($event)" (retry)="retry($event)" > diff --git a/apps/doc/src/app/components/file-upload/examples/auto-upload/auto-upload.component.ts b/apps/doc/src/app/components/file-upload/examples/auto-upload/auto-upload.component.ts index 5304fb93be..4ea734bf7d 100644 --- a/apps/doc/src/app/components/file-upload/examples/auto-upload/auto-upload.component.ts +++ b/apps/doc/src/app/components/file-upload/examples/auto-upload/auto-upload.component.ts @@ -21,7 +21,7 @@ export class PrizmFileAutoUploadExampleComponent implements OnDestroy { } } - public onfilesValidationErrors(errors: PrizmFileValidationErrors): void { + public onfilesValidationErrors(errors: { [key: string]: PrizmFileValidationErrors }): void { for (const filename of Object.keys(errors)) { this.toastService.create(JSON.stringify(errors[filename]), { title: `Файл ${filename} не прошел валидацию`, diff --git a/apps/doc/src/app/components/file-upload/examples/basic/basic.component.html b/apps/doc/src/app/components/file-upload/examples/basic/basic.component.html index 96838ea9d3..531c1fc707 100644 --- a/apps/doc/src/app/components/file-upload/examples/basic/basic.component.html +++ b/apps/doc/src/app/components/file-upload/examples/basic/basic.component.html @@ -6,7 +6,7 @@ [maxFileSize]="1000000" [disabled]="disabled" (filesChange)="onFilesChange($event)" - (filesValidationErrors)="onfilesValidationErrors($any($event))" + (filesValidationErrors)="onfilesValidationErrors($event)" (filesCountError)="onFilesCountError($event)" (retry)="retry($event)" > diff --git a/apps/doc/src/app/components/file-upload/examples/basic/basic.component.ts b/apps/doc/src/app/components/file-upload/examples/basic/basic.component.ts index ca1c30c501..e9d9502caf 100644 --- a/apps/doc/src/app/components/file-upload/examples/basic/basic.component.ts +++ b/apps/doc/src/app/components/file-upload/examples/basic/basic.component.ts @@ -19,7 +19,7 @@ export class PrizmFileUploadBasicExampleComponent implements OnDestroy { this.files = files; } - public onfilesValidationErrors(errors: PrizmFileValidationErrors): void { + public onfilesValidationErrors(errors: { [key: string]: PrizmFileValidationErrors }): void { for (const filename of Object.keys(errors)) { this.toastService.create(JSON.stringify(errors[filename]), { title: `Файл ${filename} не прошел валидацию`, diff --git a/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.html b/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.html index edd041812d..409f1eae68 100644 --- a/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.html +++ b/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.html @@ -6,7 +6,7 @@ [maxFileSize]="1000000" [disabled]="disabled" (filesChange)="onFilesChange($event)" - (filesValidationErrors)="onfilesValidationErrors($any($event))" + (filesValidationErrors)="onfilesValidationErrors($event)" (filesCountError)="onFilesCountError($event)" (retry)="retry($event)" > diff --git a/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.ts b/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.ts index 28b1c3c9cb..6d595b7883 100644 --- a/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.ts +++ b/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.ts @@ -41,7 +41,7 @@ export class PrizmFileUploadI18nExampleComponent { } } - public onfilesValidationErrors(errors: PrizmFileValidationErrors): void { + public onfilesValidationErrors(errors: { [key: string]: PrizmFileValidationErrors }): void { for (const filename of Object.keys(errors)) { this.toastService.create(JSON.stringify(errors[filename]), { title: `Файл ${filename} не прошел валидацию`, diff --git a/apps/doc/src/app/components/file-upload/file-upload-example.component.html b/apps/doc/src/app/components/file-upload/file-upload-example.component.html index 13e8bc242b..ca5d4cfaaf 100644 --- a/apps/doc/src/app/components/file-upload/file-upload-example.component.html +++ b/apps/doc/src/app/components/file-upload/file-upload-example.component.html @@ -29,7 +29,7 @@ [maxFileSize]="maxFileSize" [disabled]="disabled" (filesChange)="onFilesChange($event)" - (filesValidationErrors)="onfilesValidationErrors($any($event))" + (filesValidationErrors)="onfilesValidationErrors($event)" (filesCountError)="onFilesCountError($event)" (retry)="retry($event)" > @@ -144,7 +144,7 @@ documentationPropertyName="filesValidationErrors" documentationPropertyType="Event" documentationPropertyMode="output" - documentationPropertyType="Map" + documentationPropertyType="[p: string]: PrizmFileValidationErrors" > FilesValidationErrors diff --git a/apps/doc/src/app/components/file-upload/file-upload-example.component.ts b/apps/doc/src/app/components/file-upload/file-upload-example.component.ts index 914ca2c8ff..6a509b46cd 100644 --- a/apps/doc/src/app/components/file-upload/file-upload-example.component.ts +++ b/apps/doc/src/app/components/file-upload/file-upload-example.component.ts @@ -50,7 +50,7 @@ export class PrizmFileUploadExampleComponent implements OnDestroy { this.files = files; } - public onfilesValidationErrors(errors: PrizmFileValidationErrors): void { + public onfilesValidationErrors(errors: { [key: string]: PrizmFileValidationErrors }): void { for (const filename of Object.keys(errors)) { this.toastService.create(JSON.stringify(errors[filename]), { title: `Файл ${filename} не прошел валидацию`, From 7bc2b36b9d04227606792889f9866ace10a3b591 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Mon, 15 Apr 2024 13:37:10 +0400 Subject: [PATCH 141/291] fix: add resizeObserver for nav-item for hint correct display #1510 --- .../navigation/navigation-example.const.ts | 2 +- ...-navigation-item-expandable.component.html | 1 + ...zm-navigation-item-expandable.component.ts | 35 ++++++++++++++++--- ...rizm-navigation-item-simple.component.html | 1 + .../prizm-navigation-item-simple.component.ts | 32 +++++++++++++++-- 5 files changed, 63 insertions(+), 8 deletions(-) diff --git a/apps/doc/src/app/components/navigation/navigation-example.const.ts b/apps/doc/src/app/components/navigation/navigation-example.const.ts index 4e7ffed1a7..62e391aa8a 100644 --- a/apps/doc/src/app/components/navigation/navigation-example.const.ts +++ b/apps/doc/src/app/components/navigation/navigation-example.const.ts @@ -87,7 +87,7 @@ export const NAVIGATION_EXAMPLE: INavigationTree[] = [ }, { title: 'Очень очень длинный раздел 4', - icon: 'transport-airplane', + icon: 'battery-80', isExpanded: true, children: [ { diff --git a/libs/components/src/lib/components/navigation/components/prizm-navigation-item-expandable/prizm-navigation-item-expandable.component.html b/libs/components/src/lib/components/navigation/components/prizm-navigation-item-expandable/prizm-navigation-item-expandable.component.html index 9158b956b0..cf4967f5b7 100644 --- a/libs/components/src/lib/components/navigation/components/prizm-navigation-item-expandable/prizm-navigation-item-expandable.component.html +++ b/libs/components/src/lib/components/navigation/components/prizm-navigation-item-expandable/prizm-navigation-item-expandable.component.html @@ -1,6 +1,7 @@
    { + this.cdRef.markForCheck(); + }); + this.resizeObserver.observe(this.container.nativeElement); + } + + ngOnDestroy(): void { + this.resizeObserver.disconnect(); + } + public toggle($event: Event): void { $event.stopPropagation(); this.isExpanded = !this.isExpanded; diff --git a/libs/components/src/lib/components/navigation/components/prizm-navigation-item-simple/prizm-navigation-item-simple.component.html b/libs/components/src/lib/components/navigation/components/prizm-navigation-item-simple/prizm-navigation-item-simple.component.html index f4cc06c95f..9db9dc87d8 100644 --- a/libs/components/src/lib/components/navigation/components/prizm-navigation-item-simple/prizm-navigation-item-simple.component.html +++ b/libs/components/src/lib/components/navigation/components/prizm-navigation-item-simple/prizm-navigation-item-simple.component.html @@ -1,5 +1,6 @@
    { + this.cdRef.markForCheck(); + }); + this.resizeObserver.observe(this.container.nativeElement); + } + + ngOnDestroy(): void { + this.resizeObserver.disconnect(); + } + public navClick(): void { const data = this.data$.getValue(); const current = this.activeItemService.activeItem$.getValue(); From 0526974a76f09d2f85e90e6614d694bfcb89303d Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Mon, 15 Apr 2024 14:20:20 +0400 Subject: [PATCH 142/291] fix: icons replaced with buttons #1486 --- .../table-editable-row-example.component.html | 51 ++++++++++--------- .../table-editable-row-example.component.less | 13 +---- .../table-filter-example.component.html | 11 ++-- .../table-filter-example.component.less | 16 +----- .../src/lib/components/table/table.module.ts | 2 + .../lib/components/table/th/th.component.html | 9 +++- 6 files changed, 47 insertions(+), 55 deletions(-) diff --git a/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.html b/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.html index c6d2a8a2fc..41fe02232b 100644 --- a/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.html +++ b/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.html @@ -50,36 +50,41 @@
    - - - + + +
    diff --git a/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less b/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less index 4f9b5787c7..1ac53ccb4b 100644 --- a/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less +++ b/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less @@ -17,18 +17,7 @@ display: flex; align-items: center; justify-content: center; - gap: 8px; - - .edit-buttons { - height: 16px; - width: 16px; - - display: flex; - - &:hover { - color: #337eff; - } - } + gap: 4px; } .row { diff --git a/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.html b/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.html index 68ac1d9b5b..28550243c1 100644 --- a/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.html +++ b/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.html @@ -12,12 +12,15 @@ [content]="dropdown" prizmDropdownHostWidth="auto" > - + icon="sort-filter" + prizmIconButton + appearanceType="ghost" + size="s" + > Количество diff --git a/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.less b/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.less index 40cfaa59f4..c501d0895c 100644 --- a/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.less +++ b/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.less @@ -11,21 +11,7 @@ margin-left: auto; &__category { - height: 24px; - width: 24px; - - display: flex; - align-items: center; - justify-content: center; - - color: #777b92; - - cursor: pointer; - - &_active, - &:hover { - color: #337eff; - } + margin-left: 4px; } } diff --git a/libs/components/src/lib/components/table/table.module.ts b/libs/components/src/lib/components/table/table.module.ts index 965e2c491f..e9d26c54a3 100644 --- a/libs/components/src/lib/components/table/table.module.ts +++ b/libs/components/src/lib/components/table/table.module.ts @@ -26,6 +26,7 @@ import { PrizmTableLoadingDirective } from './directives/loading.directive'; import { PrizmTableEmptyDirective } from './directives/empty.directive'; import { PrizmTableRowInitDirective } from './directives/row-init.directive'; import { PrizmTrDirective } from './tr/tr.directive'; +import { PrizmButtonComponent } from '../button'; @NgModule({ imports: [ @@ -35,6 +36,7 @@ import { PrizmTrDirective } from './tr/tr.directive'; PrizmMapperPipeModule, PolymorphModule, PrizmIconModule, + PrizmButtonComponent, ], declarations: [ PrizmTableTreeLoadingDirective, diff --git a/libs/components/src/lib/components/table/th/th.component.html b/libs/components/src/lib/components/table/th/th.component.html index 7555a9a7b3..8b49279994 100644 --- a/libs/components/src/lib/components/table/th/th.component.html +++ b/libs/components/src/lib/components/table/th/th.component.html @@ -5,7 +5,14 @@ {{ num ?? '0' }} - + From fdafd6574e4c03d5f61fd785534e9a708c203dea Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Mon, 15 Apr 2024 17:46:19 +0400 Subject: [PATCH 143/291] fix: fix th width with sort #1561 --- libs/components/src/lib/components/table/th/th.style.less | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/components/src/lib/components/table/th/th.style.less b/libs/components/src/lib/components/table/th/th.style.less index 73d2e85c01..15ef7f2223 100644 --- a/libs/components/src/lib/components/table/th/th.style.less +++ b/libs/components/src/lib/components/table/th/th.style.less @@ -80,9 +80,14 @@ justify-content: center; &_active { - color: var(--prizm-v3-button-primary-solid-active); + color: var(--prizm-v3-button-primary-solid-default); } } + + &__number { + min-width: 16px; + text-align: end; + } } } From 66f62556c28858b238a40922013d79444ef37e7f Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Mon, 15 Apr 2024 17:49:27 +0400 Subject: [PATCH 144/291] fix: edit actions th width changed #1486 --- .../table-editable-row-example.component.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less b/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less index 1ac53ccb4b..8fa798fd82 100644 --- a/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less +++ b/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less @@ -49,7 +49,7 @@ .head { &__actions { - width: 100px; + width: 113px; } } } From 5c4a2f6eba054afdf193f0f423aceba2315daf1d Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 15 Apr 2024 16:49:52 +0300 Subject: [PATCH 145/291] fix: add min max input number example --- ...nput-number-min-max-example.component.html | 33 +++++++++++++++++++ ...nput-number-min-max-example.component.less | 0 .../input-number-min-max-example.component.ts | 16 +++++++++ .../input-number-example.component.html | 8 +++++ .../input-number-example.component.ts | 7 ++++ .../input-number-example.module.ts | 2 ++ 6 files changed, 66 insertions(+) create mode 100644 apps/doc/src/app/components/input/input-number/examples/input-number-min-max-example/input-number-min-max-example.component.html create mode 100644 apps/doc/src/app/components/input/input-number/examples/input-number-min-max-example/input-number-min-max-example.component.less create mode 100644 apps/doc/src/app/components/input/input-number/examples/input-number-min-max-example/input-number-min-max-example.component.ts diff --git a/apps/doc/src/app/components/input/input-number/examples/input-number-min-max-example/input-number-min-max-example.component.html b/apps/doc/src/app/components/input/input-number/examples/input-number-min-max-example/input-number-min-max-example.component.html new file mode 100644 index 0000000000..a237f1a27e --- /dev/null +++ b/apps/doc/src/app/components/input/input-number/examples/input-number-min-max-example/input-number-min-max-example.component.html @@ -0,0 +1,33 @@ + + + + + +
    + +

    Пользовательский текст валидации

    + +
    + + + + + Максимально допустимное значение - {{ max }}, минимально допустимое значение - {{ min }} + + diff --git a/apps/doc/src/app/components/input/input-number/examples/input-number-min-max-example/input-number-min-max-example.component.less b/apps/doc/src/app/components/input/input-number/examples/input-number-min-max-example/input-number-min-max-example.component.less new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/doc/src/app/components/input/input-number/examples/input-number-min-max-example/input-number-min-max-example.component.ts b/apps/doc/src/app/components/input/input-number/examples/input-number-min-max-example/input-number-min-max-example.component.ts new file mode 100644 index 0000000000..0b319a91a1 --- /dev/null +++ b/apps/doc/src/app/components/input/input-number/examples/input-number-min-max-example/input-number-min-max-example.component.ts @@ -0,0 +1,16 @@ +import { ChangeDetectionStrategy, Component } from '@angular/core'; +import { UntypedFormControl } from '@angular/forms'; + +@Component({ + selector: 'prizm-input-number-min-max-example', + templateUrl: './input-number-min-max-example.component.html', + styleUrls: ['./input-number-min-max-example.component.less'], + changeDetection: ChangeDetectionStrategy.OnPush, +}) +export class InputNumberMinMaxExampleComponent { + public minMaxInputControl = new UntypedFormControl(); + public minMaxInputControlCustom = new UntypedFormControl(); + + public min = 10; + public max = 80; +} diff --git a/apps/doc/src/app/components/input/input-number/input-number-example.component.html b/apps/doc/src/app/components/input/input-number/input-number-example.component.html index 2cdb04ac09..f0116b8d82 100644 --- a/apps/doc/src/app/components/input/input-number/input-number-example.component.html +++ b/apps/doc/src/app/components/input/input-number/input-number-example.component.html @@ -23,6 +23,14 @@ + + + +     diff --git a/apps/doc/src/app/components/input/input-number/input-number-example.component.ts b/apps/doc/src/app/components/input/input-number/input-number-example.component.ts index 4a838f73a9..33a2490a35 100644 --- a/apps/doc/src/app/components/input/input-number/input-number-example.component.ts +++ b/apps/doc/src/app/components/input/input-number/input-number-example.component.ts @@ -91,5 +91,12 @@ export class InputNumberExampleComponent { HTML: import('./examples/input-number-invalid-example/input-number-invalid-example.component.html?raw'), }; + public readonly prizmInputNumberMinMax: TuiDocExample = { + TypeScript: import( + './examples/input-number-min-max-example/input-number-min-max-example.component.ts?raw' + ), + HTML: import('./examples/input-number-min-max-example/input-number-min-max-example.component.html?raw'), + }; + readonly setupModule: RawLoaderContent = import('./examples/setup-module.md?raw'); } diff --git a/apps/doc/src/app/components/input/input-number/input-number-example.module.ts b/apps/doc/src/app/components/input/input-number/input-number-example.module.ts index 5ba7b5e74c..f65d9a7927 100644 --- a/apps/doc/src/app/components/input/input-number/input-number-example.module.ts +++ b/apps/doc/src/app/components/input/input-number/input-number-example.module.ts @@ -10,6 +10,7 @@ import { PrizmInputNumberModule } from '@prizm-ui/components'; import { InputNumberCounterExampleComponent } from './examples/input-number-counter-example/input-number-counter-example.component'; import { InputNumberCounterFloatExampleComponent } from './examples/input-number-counter-float-example/input-number-counter-float-example.component'; import { InputNumberInvalidExampleComponent } from './examples/input-number-invalid-example/input-number-invalid-example.component'; +import { InputNumberMinMaxExampleComponent } from './examples/input-number-min-max-example/input-number-min-max-example.component'; @NgModule({ imports: [ @@ -26,6 +27,7 @@ import { InputNumberInvalidExampleComponent } from './examples/input-number-inva InputNumberBasicExampleComponent, InputNumberExampleComponent, InputNumberCounterExampleComponent, + InputNumberMinMaxExampleComponent, ], exports: [InputNumberExampleComponent], }) From 36de9cd80d2c0ecebd28772461ed6e1991d48d77 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Tue, 16 Apr 2024 14:44:24 +0400 Subject: [PATCH 146/291] fix: changed filesValidationErrors type in live demo #1371 --- .../components/file-upload/file-upload-example.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/doc/src/app/components/file-upload/file-upload-example.component.html b/apps/doc/src/app/components/file-upload/file-upload-example.component.html index ca5d4cfaaf..b647f6bfd9 100644 --- a/apps/doc/src/app/components/file-upload/file-upload-example.component.html +++ b/apps/doc/src/app/components/file-upload/file-upload-example.component.html @@ -144,7 +144,7 @@ documentationPropertyName="filesValidationErrors" documentationPropertyType="Event" documentationPropertyMode="output" - documentationPropertyType="[p: string]: PrizmFileValidationErrors" + documentationPropertyType="Map" > FilesValidationErrors From 9c46b3509462275bcfcc0e65af4e569886b4cafb Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Tue, 16 Apr 2024 18:46:35 +0400 Subject: [PATCH 147/291] fix: changed filesValidationErrors type in Internationalization example #1371 --- .../language-switcher/language-switcher-example.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/doc/src/app/how-to-work/internationalization/examples/language-switcher/language-switcher-example.component.ts b/apps/doc/src/app/how-to-work/internationalization/examples/language-switcher/language-switcher-example.component.ts index f232eb92a4..2c5df99ad1 100644 --- a/apps/doc/src/app/how-to-work/internationalization/examples/language-switcher/language-switcher-example.component.ts +++ b/apps/doc/src/app/how-to-work/internationalization/examples/language-switcher/language-switcher-example.component.ts @@ -53,7 +53,7 @@ export class PrizmLanguageSwitcherExampleComponent { } } - public onfilesValidationErrors(errors: PrizmFileValidationErrors): void { + public onfilesValidationErrors(errors: { [key: string]: PrizmFileValidationErrors }): void { for (const filename of Object.keys(errors)) { this.toastService.create(JSON.stringify(errors[filename]), { title: `Файл ${filename} не прошел валидацию`, From 2a7a4f48ee0208c43dae6fecb016e8797ccf76e7 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Tue, 16 Apr 2024 19:11:32 +0400 Subject: [PATCH 148/291] fix: tree button animation #1561 --- .../tree-button/tree-button.component.html | 13 +++---------- .../tree-button/tree-button.component.less | 8 ++++++++ 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/libs/components/src/lib/components/tree-button/tree-button.component.html b/libs/components/src/lib/components/tree-button/tree-button.component.html index 319e3ca8ff..3fa3566905 100644 --- a/libs/components/src/lib/components/tree-button/tree-button.component.html +++ b/libs/components/src/lib/components/tree-button/tree-button.component.html @@ -1,14 +1,7 @@ - - - - - - - - - - + + + diff --git a/libs/components/src/lib/components/tree-button/tree-button.component.less b/libs/components/src/lib/components/tree-button/tree-button.component.less index 37e1c13de6..907fe00031 100644 --- a/libs/components/src/lib/components/tree-button/tree-button.component.less +++ b/libs/components/src/lib/components/tree-button/tree-button.component.less @@ -5,3 +5,11 @@ .hide { visibility: var(--prizm-tree-button-hide-visibility, hidden); } + +.chevron { + transition: 0.3s; + + &_expanded { + transform: rotate(90deg); + } +} From 71fb12ba7f7d61f51d287380ae36adef9a63d628 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Wed, 17 Apr 2024 10:22:54 +0400 Subject: [PATCH 149/291] Revert "fix: tree button animation #1561" This reverts commit 2a7a4f48ee0208c43dae6fecb016e8797ccf76e7. --- .../tree-button/tree-button.component.html | 13 ++++++++++--- .../tree-button/tree-button.component.less | 8 -------- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/libs/components/src/lib/components/tree-button/tree-button.component.html b/libs/components/src/lib/components/tree-button/tree-button.component.html index 3fa3566905..319e3ca8ff 100644 --- a/libs/components/src/lib/components/tree-button/tree-button.component.html +++ b/libs/components/src/lib/components/tree-button/tree-button.component.html @@ -1,7 +1,14 @@ - - - + + + + + + + + + + diff --git a/libs/components/src/lib/components/tree-button/tree-button.component.less b/libs/components/src/lib/components/tree-button/tree-button.component.less index 907fe00031..37e1c13de6 100644 --- a/libs/components/src/lib/components/tree-button/tree-button.component.less +++ b/libs/components/src/lib/components/tree-button/tree-button.component.less @@ -5,11 +5,3 @@ .hide { visibility: var(--prizm-tree-button-hide-visibility, hidden); } - -.chevron { - transition: 0.3s; - - &_expanded { - transform: rotate(90deg); - } -} From 28e70ea6cdc05483607c8fdc1e978ccc4b58ed15 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Wed, 17 Apr 2024 10:24:39 +0400 Subject: [PATCH 150/291] Revert "fix: edit actions th width changed #1486" This reverts commit 66f62556c28858b238a40922013d79444ef37e7f. --- .../table-editable-row-example.component.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less b/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less index 8fa798fd82..1ac53ccb4b 100644 --- a/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less +++ b/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less @@ -49,7 +49,7 @@ .head { &__actions { - width: 113px; + width: 100px; } } } From c1cda590cd3974f8b955d17f0ddee0f3517c9ad1 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Wed, 17 Apr 2024 10:24:50 +0400 Subject: [PATCH 151/291] Revert "fix: fix th width with sort #1561" This reverts commit fdafd6574e4c03d5f61fd785534e9a708c203dea. --- libs/components/src/lib/components/table/th/th.style.less | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/libs/components/src/lib/components/table/th/th.style.less b/libs/components/src/lib/components/table/th/th.style.less index 15ef7f2223..73d2e85c01 100644 --- a/libs/components/src/lib/components/table/th/th.style.less +++ b/libs/components/src/lib/components/table/th/th.style.less @@ -80,14 +80,9 @@ justify-content: center; &_active { - color: var(--prizm-v3-button-primary-solid-default); + color: var(--prizm-v3-button-primary-solid-active); } } - - &__number { - min-width: 16px; - text-align: end; - } } } From 61e2c92fa225b2636c71aa4746b65d6a61b65659 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Wed, 17 Apr 2024 10:25:00 +0400 Subject: [PATCH 152/291] Revert "fix: icons replaced with buttons #1486" This reverts commit 0526974a76f09d2f85e90e6614d694bfcb89303d. --- .../table-editable-row-example.component.html | 51 +++++++++---------- .../table-editable-row-example.component.less | 13 ++++- .../table-filter-example.component.html | 11 ++-- .../table-filter-example.component.less | 16 +++++- .../src/lib/components/table/table.module.ts | 2 - .../lib/components/table/th/th.component.html | 9 +--- 6 files changed, 55 insertions(+), 47 deletions(-) diff --git a/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.html b/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.html index 41fe02232b..c6d2a8a2fc 100644 --- a/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.html +++ b/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.html @@ -50,41 +50,36 @@
    - - - - + size="16" + iconClass="delete" + >
    diff --git a/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less b/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less index 1ac53ccb4b..4f9b5787c7 100644 --- a/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less +++ b/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less @@ -17,7 +17,18 @@ display: flex; align-items: center; justify-content: center; - gap: 4px; + gap: 8px; + + .edit-buttons { + height: 16px; + width: 16px; + + display: flex; + + &:hover { + color: #337eff; + } + } } .row { diff --git a/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.html b/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.html index 28550243c1..68ac1d9b5b 100644 --- a/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.html +++ b/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.html @@ -12,15 +12,12 @@ [content]="dropdown" prizmDropdownHostWidth="auto" > - + iconClass="sort-filter" + > Количество diff --git a/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.less b/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.less index c501d0895c..40cfaa59f4 100644 --- a/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.less +++ b/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.less @@ -11,7 +11,21 @@ margin-left: auto; &__category { - margin-left: 4px; + height: 24px; + width: 24px; + + display: flex; + align-items: center; + justify-content: center; + + color: #777b92; + + cursor: pointer; + + &_active, + &:hover { + color: #337eff; + } } } diff --git a/libs/components/src/lib/components/table/table.module.ts b/libs/components/src/lib/components/table/table.module.ts index e9d26c54a3..965e2c491f 100644 --- a/libs/components/src/lib/components/table/table.module.ts +++ b/libs/components/src/lib/components/table/table.module.ts @@ -26,7 +26,6 @@ import { PrizmTableLoadingDirective } from './directives/loading.directive'; import { PrizmTableEmptyDirective } from './directives/empty.directive'; import { PrizmTableRowInitDirective } from './directives/row-init.directive'; import { PrizmTrDirective } from './tr/tr.directive'; -import { PrizmButtonComponent } from '../button'; @NgModule({ imports: [ @@ -36,7 +35,6 @@ import { PrizmButtonComponent } from '../button'; PrizmMapperPipeModule, PolymorphModule, PrizmIconModule, - PrizmButtonComponent, ], declarations: [ PrizmTableTreeLoadingDirective, diff --git a/libs/components/src/lib/components/table/th/th.component.html b/libs/components/src/lib/components/table/th/th.component.html index 8b49279994..7555a9a7b3 100644 --- a/libs/components/src/lib/components/table/th/th.component.html +++ b/libs/components/src/lib/components/table/th/th.component.html @@ -5,14 +5,7 @@ {{ num ?? '0' }} - +     From b80ce4baa8cd15b12b65ab5d2d463c4a45af512e Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 16 Apr 2024 16:35:45 +0300 Subject: [PATCH 153/291] fix: remove default title for input number #1599 --- .../input-number/input-number-example.component.html | 10 ++++++++++ .../input-number/input-number-example.component.ts | 1 + .../input/input-number/input-number.component.ts | 4 ++++ 3 files changed, 15 insertions(+) diff --git a/apps/doc/src/app/components/input/input-number/input-number-example.component.html b/apps/doc/src/app/components/input/input-number/input-number-example.component.html index f0116b8d82..b9eec13c5f 100644 --- a/apps/doc/src/app/components/input/input-number/input-number-example.component.html +++ b/apps/doc/src/app/components/input/input-number/input-number-example.component.html @@ -114,6 +114,7 @@

    Counter

    [prizmHintDirection]="prizmHintDirection" [prizmHintCanShow]="prizmHintCanShow" [required]="required" + [title]="title" prizmInputNumber /> @@ -167,6 +168,15 @@

    Counter

    Placeholder     + + Title attributre + + impleme @HostBinding('attr.placeholder') placeholder?: string; + @Input() + @HostBinding('attr.title') + title = ''; + @Input() min: number | null = null; @Input() max: number | null = null; // TODO later create input with support zero postfix for number From 1d9e0d9f9cb85bc90919506338a6570734e2cc6f Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 16 Apr 2024 17:34:37 +0300 Subject: [PATCH 154/291] fix: hint status text for required input not shown after force clear #1598 --- .../input/common/input-layout/input-layout.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/components/src/lib/components/input/common/input-layout/input-layout.component.ts b/libs/components/src/lib/components/input/common/input-layout/input-layout.component.ts index abcc5e43a2..230d7fd21b 100644 --- a/libs/components/src/lib/components/input/common/input-layout/input-layout.component.ts +++ b/libs/components/src/lib/components/input/common/input-layout/input-layout.component.ts @@ -140,6 +140,7 @@ export class PrizmInputLayoutComponent readonly onClearClick = (event: MouseEvent) => { this.clear.next(event); this.control.clear(event); + this.control.stateChanges.next(); this.actualizeStatusIcon(); }; From cb7f9b0f0c688f5329b6c470621a5bbfe18c4726 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 16 Apr 2024 18:20:02 +0300 Subject: [PATCH 155/291] fix: add subtext to input number minmax validation example --- .../input-number-min-max-example.component.html | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/apps/doc/src/app/components/input/input-number/examples/input-number-min-max-example/input-number-min-max-example.component.html b/apps/doc/src/app/components/input/input-number/examples/input-number-min-max-example/input-number-min-max-example.component.html index a237f1a27e..f32cf6274b 100644 --- a/apps/doc/src/app/components/input/input-number/examples/input-number-min-max-example/input-number-min-max-example.component.html +++ b/apps/doc/src/app/components/input/input-number/examples/input-number-min-max-example/input-number-min-max-example.component.html @@ -17,7 +17,12 @@
    - + - - Максимально допустимное значение - {{ max }}, минимально допустимое значение - {{ min }} + + + Максимально допустимное значение - {{ max }}, минимально допустимое значение - {{ min }} + +
    1111
     From cdc68adfa15f2e1989e3e210d9752e302896e806 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Tue, 2 Apr 2024 13:04:37 +0400 Subject: [PATCH 156/291] fix: fixed rows selector width #1466 --- .../src/lib/components/paginator/prizm-paginator.component.less | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/components/src/lib/components/paginator/prizm-paginator.component.less b/libs/components/src/lib/components/paginator/prizm-paginator.component.less index 157d538c17..110f58c4ac 100644 --- a/libs/components/src/lib/components/paginator/prizm-paginator.component.less +++ b/libs/components/src/lib/components/paginator/prizm-paginator.component.less @@ -52,6 +52,7 @@ } .rows-selector { + display: flex; margin-right: 12px; width: 100px; min-width: 100px; From d8376c3e72a36f2dad7e3770f9cc2ac780f46862 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Mon, 15 Apr 2024 14:20:20 +0400 Subject: [PATCH 157/291] fix: icons replaced with buttons #1486 --- .../table-editable-row-example.component.html | 51 ++++++++++--------- .../table-editable-row-example.component.less | 13 +---- .../table-filter-example.component.html | 11 ++-- .../table-filter-example.component.less | 16 +----- .../src/lib/components/table/table.module.ts | 2 + .../lib/components/table/th/th.component.html | 9 +++- 6 files changed, 47 insertions(+), 55 deletions(-) diff --git a/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.html b/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.html index c6d2a8a2fc..41fe02232b 100644 --- a/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.html +++ b/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.html @@ -50,36 +50,41 @@
    - - - + + +
    diff --git a/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less b/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less index 4f9b5787c7..1ac53ccb4b 100644 --- a/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less +++ b/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less @@ -17,18 +17,7 @@ display: flex; align-items: center; justify-content: center; - gap: 8px; - - .edit-buttons { - height: 16px; - width: 16px; - - display: flex; - - &:hover { - color: #337eff; - } - } + gap: 4px; } .row { diff --git a/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.html b/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.html index 68ac1d9b5b..28550243c1 100644 --- a/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.html +++ b/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.html @@ -12,12 +12,15 @@ [content]="dropdown" prizmDropdownHostWidth="auto" > - + icon="sort-filter" + prizmIconButton + appearanceType="ghost" + size="s" + > Количество diff --git a/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.less b/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.less index 40cfaa59f4..c501d0895c 100644 --- a/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.less +++ b/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.less @@ -11,21 +11,7 @@ margin-left: auto; &__category { - height: 24px; - width: 24px; - - display: flex; - align-items: center; - justify-content: center; - - color: #777b92; - - cursor: pointer; - - &_active, - &:hover { - color: #337eff; - } + margin-left: 4px; } } diff --git a/libs/components/src/lib/components/table/table.module.ts b/libs/components/src/lib/components/table/table.module.ts index 965e2c491f..e9d26c54a3 100644 --- a/libs/components/src/lib/components/table/table.module.ts +++ b/libs/components/src/lib/components/table/table.module.ts @@ -26,6 +26,7 @@ import { PrizmTableLoadingDirective } from './directives/loading.directive'; import { PrizmTableEmptyDirective } from './directives/empty.directive'; import { PrizmTableRowInitDirective } from './directives/row-init.directive'; import { PrizmTrDirective } from './tr/tr.directive'; +import { PrizmButtonComponent } from '../button'; @NgModule({ imports: [ @@ -35,6 +36,7 @@ import { PrizmTrDirective } from './tr/tr.directive'; PrizmMapperPipeModule, PolymorphModule, PrizmIconModule, + PrizmButtonComponent, ], declarations: [ PrizmTableTreeLoadingDirective, diff --git a/libs/components/src/lib/components/table/th/th.component.html b/libs/components/src/lib/components/table/th/th.component.html index 7555a9a7b3..8b49279994 100644 --- a/libs/components/src/lib/components/table/th/th.component.html +++ b/libs/components/src/lib/components/table/th/th.component.html @@ -5,7 +5,14 @@ {{ num ?? '0' }} - +     From 0121e22ee2e58afff1a380bc44d63f5ac353bf7a Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Mon, 15 Apr 2024 17:46:19 +0400 Subject: [PATCH 158/291] fix: fix th width with sort #1561 --- libs/components/src/lib/components/table/th/th.style.less | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libs/components/src/lib/components/table/th/th.style.less b/libs/components/src/lib/components/table/th/th.style.less index 73d2e85c01..15ef7f2223 100644 --- a/libs/components/src/lib/components/table/th/th.style.less +++ b/libs/components/src/lib/components/table/th/th.style.less @@ -80,9 +80,14 @@ justify-content: center; &_active { - color: var(--prizm-v3-button-primary-solid-active); + color: var(--prizm-v3-button-primary-solid-default); } } + + &__number { + min-width: 16px; + text-align: end; + } } } From 52478439f60491ed2067e87ed367c8f5a273bec8 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Mon, 15 Apr 2024 17:49:27 +0400 Subject: [PATCH 159/291] fix: edit actions th width changed #1486 --- .../table-editable-row-example.component.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less b/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less index 1ac53ccb4b..8fa798fd82 100644 --- a/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less +++ b/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less @@ -49,7 +49,7 @@ .head { &__actions { - width: 100px; + width: 113px; } } } From e847c4bf113d2a03b1c0ea3c2ec019898626976e Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 18 Apr 2024 10:54:26 +0300 Subject: [PATCH 160/291] chore: version 1.16.0 up tp 1.17.0 --- .github/workflows/beta-publish-ng14.yml | 2 +- .github/workflows/main-publish-ng14.yml | 2 +- .github/workflows/pre-release-publish-ng14.yml | 2 +- apps/doc/src/app/version-manager/current.const.ts | 2 +- .../src/app/version-manager/current.const.ts.ng14 | 2 +- .../src/app/version-manager/versions.constants.ts | 12 ++++++------ libs/ast/package.json.ng14 | 2 +- libs/charts/base/package.json.ng14 | 6 +++--- libs/components/package.json.ng14 | 10 +++++----- libs/core/package.json.ng14 | 2 +- libs/helpers/package.json.ng14 | 2 +- libs/i18n/package.json.ng14 | 2 +- libs/icons/base/package.json.ng14 | 4 ++-- libs/icons/flags/package.json.ng14 | 4 ++-- libs/nxmv/package.json.ng14 | 2 +- libs/plugin/package.json.ng14 | 4 ++-- libs/schematics/package.json.ng14 | 2 +- libs/theme/package.json.ng14 | 6 +++--- package.json.ng14 | 2 +- 19 files changed, 35 insertions(+), 35 deletions(-) diff --git a/.github/workflows/beta-publish-ng14.yml b/.github/workflows/beta-publish-ng14.yml index dab5343eab..d32c3e7774 100644 --- a/.github/workflows/beta-publish-ng14.yml +++ b/.github/workflows/beta-publish-ng14.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng14beta --json 2>/dev/null || echo '1.14.0-ng14beta.0') | jq '([.[] | select(startswith("1.14.0-ng14beta"))] | last // "1.14.0-ng14beta.0")' 2>/dev/null || echo '1.14.0-ng14beta.0' + (npm view @prizm-ui/components versions --tag ng14beta --json 2>/dev/null || echo '1.17.0-ng14beta.0') | jq '([.[] | select(startswith("1.17.0-ng14beta"))] | last // "1.17.0-ng14beta.0")' 2>/dev/null || echo '1.17.0-ng14beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng14.yml b/.github/workflows/main-publish-ng14.yml index 4ee02f7635..fb3b5ccec7 100644 --- a/.github/workflows/main-publish-ng14.yml +++ b/.github/workflows/main-publish-ng14.yml @@ -58,7 +58,7 @@ jobs: - name: Set up environment variables run: | last_v1_version=$( - echo '1.14.0' + echo '1.17.0' ) echo "LAST_V1_VERSION=${last_v1_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng14.yml b/.github/workflows/pre-release-publish-ng14.yml index 83f57b1665..11cdce2a7f 100644 --- a/.github/workflows/pre-release-publish-ng14.yml +++ b/.github/workflows/pre-release-publish-ng14.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng14next --json 2>/dev/null || echo '1.14.0-ng14next.0') | jq '([.[] | select(startswith("1.14.0-ng14next"))] | last // "1.14.0-ng14next.0")' 2>/dev/null || echo '1.14.0-ng14next.0' + (npm view @prizm-ui/components versions --tag ng14next --json 2>/dev/null || echo '1.17.0-ng14next.0') | jq '([.[] | select(startswith("1.17.0-ng14next"))] | last // "1.17.0-ng14next.0")' 2>/dev/null || echo '1.17.0-ng14next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/apps/doc/src/app/version-manager/current.const.ts b/apps/doc/src/app/version-manager/current.const.ts index a7db703f9f..a87de4bad2 100644 --- a/apps/doc/src/app/version-manager/current.const.ts +++ b/apps/doc/src/app/version-manager/current.const.ts @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '1.16.0'; +export const PRIZM_CURRENT_VERSION = '1.17.0'; diff --git a/apps/doc/src/app/version-manager/current.const.ts.ng14 b/apps/doc/src/app/version-manager/current.const.ts.ng14 index a7db703f9f..a87de4bad2 100644 --- a/apps/doc/src/app/version-manager/current.const.ts.ng14 +++ b/apps/doc/src/app/version-manager/current.const.ts.ng14 @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '1.16.0'; +export const PRIZM_CURRENT_VERSION = '1.17.0'; diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index 7c7999c3ce..903ff7b483 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -30,8 +30,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ }, }, { - label: '1.16.0 (ng14)', - version: '1.16.0', + label: '1.17.0 (ng14)', + version: '1.17.0', stackblitz: 'https://stackblitz.com/edit/prizm-v1-demo', link: new URL('https://prizm-v1.web.app'), otherLinks: [], @@ -54,8 +54,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '1.16.0-next (ng14)', - version: '1.16.0-next', + label: '1.17.0-next (ng14)', + version: '1.17.0-next', stackblitz: 'https://stackblitz.com/edit/prizm-v1-next-demo', link: new URL('https://prizm-v1-next.web.app'), otherLinks: [], @@ -75,8 +75,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '1.16.0-beta (ng14)', - version: '1.16.0-beta', + label: '1.17.0-beta (ng14)', + version: '1.17.0-beta', stackblitz: 'https://stackblitz.com/edit/prizm-v1-beta-demo', link: new URL('https://prizm-v1-beta.web.app'), otherLinks: [], diff --git a/libs/ast/package.json.ng14 b/libs/ast/package.json.ng14 index 69345c645b..a696d133c5 100644 --- a/libs/ast/package.json.ng14 +++ b/libs/ast/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "1.16.0", + "version": "1.17.0", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json.ng14 b/libs/charts/base/package.json.ng14 index b7eecffc8e..a1c56fcddd 100644 --- a/libs/charts/base/package.json.ng14 +++ b/libs/charts/base/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "1.16.0", + "version": "1.17.0", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/theme": "^1.16.0", - "@prizm-ui/helpers": "^1.16.0", + "@prizm-ui/theme": "^1.17.0", + "@prizm-ui/helpers": "^1.17.0", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/package.json.ng14 b/libs/components/package.json.ng14 index 62666341a5..bb87af7467 100644 --- a/libs/components/package.json.ng14 +++ b/libs/components/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "1.16.0", + "version": "1.17.0", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -17,10 +17,10 @@ "@ng-web-apis/resize-observer": "2.0.0", "@ng-web-apis/intersection-observer": "2.0.0", "@ng-web-apis/mutation-observer": "2.0.0", - "@prizm-ui/helpers": "^1.16.0", - "@prizm-ui/core": "^1.16.0", - "@prizm-ui/i18n": "^1.16.0", - "@prizm-ui/theme": "^1.16.0" + "@prizm-ui/helpers": "^1.17.0", + "@prizm-ui/core": "^1.17.0", + "@prizm-ui/i18n": "^1.17.0", + "@prizm-ui/theme": "^1.17.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json.ng14 b/libs/core/package.json.ng14 index ac76f8e97b..4a60f6a10c 100644 --- a/libs/core/package.json.ng14 +++ b/libs/core/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "1.16.0", + "version": "1.17.0", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json.ng14 b/libs/helpers/package.json.ng14 index 137740df92..146c247f82 100644 --- a/libs/helpers/package.json.ng14 +++ b/libs/helpers/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "1.16.0", + "version": "1.17.0", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json.ng14 b/libs/i18n/package.json.ng14 index 44aa5878e2..b6e9caa2c3 100644 --- a/libs/i18n/package.json.ng14 +++ b/libs/i18n/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "1.16.0", + "version": "1.17.0", "peerDependencies": { "@angular/core": "^14.2.0" }, diff --git a/libs/icons/base/package.json.ng14 b/libs/icons/base/package.json.ng14 index a2296feecc..d8e8313c7a 100644 --- a/libs/icons/base/package.json.ng14 +++ b/libs/icons/base/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "1.16.0", + "version": "1.17.0", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/core": "^1.16.0" + "@prizm-ui/core": "^1.17.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json.ng14 b/libs/icons/flags/package.json.ng14 index 3a4bc78ded..59d81e978d 100644 --- a/libs/icons/flags/package.json.ng14 +++ b/libs/icons/flags/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "1.16.0", + "version": "1.17.0", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/core": "^1.16.0" + "@prizm-ui/core": "^1.17.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json.ng14 b/libs/nxmv/package.json.ng14 index f72add0944..42c1adc08f 100644 --- a/libs/nxmv/package.json.ng14 +++ b/libs/nxmv/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "1.16.0", + "version": "1.17.0", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json.ng14 b/libs/plugin/package.json.ng14 index 3e22f7761a..21cd4858f2 100644 --- a/libs/plugin/package.json.ng14 +++ b/libs/plugin/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "1.16.0", + "version": "1.17.0", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^1.16.0" + "@prizm-ui/ast": "^1.17.0" } } diff --git a/libs/schematics/package.json.ng14 b/libs/schematics/package.json.ng14 index ac444b4660..8ecb0b6faa 100644 --- a/libs/schematics/package.json.ng14 +++ b/libs/schematics/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "1.16.0", + "version": "1.17.0", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json.ng14 b/libs/theme/package.json.ng14 index 5595e9b00e..1cdf56e8ef 100644 --- a/libs/theme/package.json.ng14 +++ b/libs/theme/package.json.ng14 @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "1.16.0", + "version": "1.17.0", "peerDependencies": { "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/core": "^1.16.0", - "@prizm-ui/helpers": "^1.16.0" + "@prizm-ui/core": "^1.17.0", + "@prizm-ui/helpers": "^1.17.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json.ng14 b/package.json.ng14 index 31c002fd20..feca95a191 100644 --- a/package.json.ng14 +++ b/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "1.16.0", + "version": "1.17.0", "license": "MIT", "husky": { "hooks": { From 3ccd47f31bbd8f87a3e40776b1e16b3eb9c31b7d Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 18 Apr 2024 11:14:16 +0300 Subject: [PATCH 161/291] chore: version 2.13.0 up tp 2.14.0 --- .github/workflows/beta-publish-ng15.yml | 2 +- .github/workflows/main-publish-ng15.yml | 2 +- .github/workflows/pre-release-publish-ng15.yml | 2 +- .../src/app/version-manager/current.const.ts.ng15 | 2 +- .../src/app/version-manager/versions.constants.ts | 12 ++++++------ libs/ast/package.json.ng15 | 2 +- libs/charts/base/package.json.ng15 | 6 +++--- libs/components/package.json.ng15 | 10 +++++----- libs/core/package.json.ng15 | 2 +- libs/helpers/package.json.ng15 | 2 +- libs/i18n/package.json.ng15 | 2 +- libs/icons/base/package.json.ng15 | 4 ++-- libs/icons/flags/package.json.ng15 | 4 ++-- libs/nxmv/package.json.ng15 | 2 +- libs/plugin/package.json.ng15 | 4 ++-- libs/schematics/package.json.ng15 | 2 +- libs/theme/package.json.ng15 | 6 +++--- package.json.ng15 | 2 +- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/beta-publish-ng15.yml b/.github/workflows/beta-publish-ng15.yml index d87c2ac663..a9ec9ce8f3 100644 --- a/.github/workflows/beta-publish-ng15.yml +++ b/.github/workflows/beta-publish-ng15.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng15beta --json 2>/dev/null || echo '2.11.0-ng15beta.0') | jq '([.[] | select(startswith("2.11.0-ng15beta"))] | last // "2.11.0-ng15beta.0")' 2>/dev/null || echo '2.11.0-ng15beta.0' + (npm view @prizm-ui/components versions --tag ng15beta --json 2>/dev/null || echo '2.14.0-ng15beta.0') | jq '([.[] | select(startswith("2.14.0-ng15beta"))] | last // "2.14.0-ng15beta.0")' 2>/dev/null || echo '2.14.0-ng15beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng15.yml b/.github/workflows/main-publish-ng15.yml index 64fc92ff59..f86389d22a 100644 --- a/.github/workflows/main-publish-ng15.yml +++ b/.github/workflows/main-publish-ng15.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_v2_version=$( - echo '2.11.0' + echo '2.14.0' ) echo "LAST_V2_VERSION=${last_v2_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng15.yml b/.github/workflows/pre-release-publish-ng15.yml index add3fa67db..0d29aadefe 100644 --- a/.github/workflows/pre-release-publish-ng15.yml +++ b/.github/workflows/pre-release-publish-ng15.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng15next --json 2>/dev/null || echo '2.11.0-ng15next.0') | jq '([.[] | select(startswith("2.11.0-ng15next"))] | last // "2.11.0-ng15next.0")' 2>/dev/null || echo '2.11.0-ng15next.0' + (npm view @prizm-ui/components versions --tag ng15next --json 2>/dev/null || echo '2.14.0-ng15next.0') | jq '([.[] | select(startswith("2.14.0-ng15next"))] | last // "2.14.0-ng15next.0")' 2>/dev/null || echo '2.14.0-ng15next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/apps/doc/src/app/version-manager/current.const.ts.ng15 b/apps/doc/src/app/version-manager/current.const.ts.ng15 index 34b25f91d7..ee84901a89 100644 --- a/apps/doc/src/app/version-manager/current.const.ts.ng15 +++ b/apps/doc/src/app/version-manager/current.const.ts.ng15 @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '2.13.0'; +export const PRIZM_CURRENT_VERSION = '2.14.0'; diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index 903ff7b483..9fd81ebf7b 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -20,8 +20,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ }, }, { - label: '2.13.0 (ng15)', - version: '2.13.0', + label: '2.14.0 (ng15)', + version: '2.14.0', stackblitz: 'https://stackblitz.com/edit/prizm-v2-demo', link: new URL('https://prizm-v2.web.app'), otherLinks: [], @@ -47,9 +47,9 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '2.13.0-next (ng15)', + label: '2.14.0-next (ng15)', stackblitz: 'https://stackblitz.com/edit/prizm-v2-next-demo', - version: '2.13.0-next', + version: '2.14.0-next', link: new URL('https://prizm-v2-next.web.app'), otherLinks: [], }, @@ -68,8 +68,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '2.13.0-beta (ng15)', - version: '2.13.0-beta', + label: '2.14.0-beta (ng15)', + version: '2.14.0-beta', stackblitz: 'https://stackblitz.com/edit/prizm-v2-beta-demo', link: new URL('https://prizm-v2-beta.web.app'), otherLinks: [], diff --git a/libs/ast/package.json.ng15 b/libs/ast/package.json.ng15 index 02bf987252..c97b416972 100644 --- a/libs/ast/package.json.ng15 +++ b/libs/ast/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "2.13.0", + "version": "2.14.0", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json.ng15 b/libs/charts/base/package.json.ng15 index f8da5e1221..81b336e160 100644 --- a/libs/charts/base/package.json.ng15 +++ b/libs/charts/base/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "2.13.0", + "version": "2.14.0", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/theme": "^2.13.0", - "@prizm-ui/helpers": "^2.13.0", + "@prizm-ui/theme": "^2.14.0", + "@prizm-ui/helpers": "^2.14.0", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/package.json.ng15 b/libs/components/package.json.ng15 index 41e94c6f48..9984e48b52 100644 --- a/libs/components/package.json.ng15 +++ b/libs/components/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "2.13.0", + "version": "2.14.0", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -18,10 +18,10 @@ "@ng-web-apis/resize-observer": "2.0.0", "@ng-web-apis/intersection-observer": "2.0.0", "@ng-web-apis/mutation-observer": "2.0.0", - "@prizm-ui/helpers": "^2.13.0", - "@prizm-ui/core": "^2.13.0", - "@prizm-ui/i18n": "^2.13.0", - "@prizm-ui/theme": "^2.13.0" + "@prizm-ui/helpers": "^2.14.0", + "@prizm-ui/core": "^2.14.0", + "@prizm-ui/i18n": "^2.14.0", + "@prizm-ui/theme": "^2.14.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json.ng15 b/libs/core/package.json.ng15 index 2af0d6152e..06fa7f2c89 100644 --- a/libs/core/package.json.ng15 +++ b/libs/core/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "2.13.0", + "version": "2.14.0", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json.ng15 b/libs/helpers/package.json.ng15 index 1854e91959..7ddbc09244 100644 --- a/libs/helpers/package.json.ng15 +++ b/libs/helpers/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "2.13.0", + "version": "2.14.0", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json.ng15 b/libs/i18n/package.json.ng15 index 9c215c6714..75cd858ff6 100644 --- a/libs/i18n/package.json.ng15 +++ b/libs/i18n/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "2.13.0", + "version": "2.14.0", "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0" diff --git a/libs/icons/base/package.json.ng15 b/libs/icons/base/package.json.ng15 index 515fb82d58..8c960841e2 100644 --- a/libs/icons/base/package.json.ng15 +++ b/libs/icons/base/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "2.13.0", + "version": "2.14.0", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/core": "^2.13.0" + "@prizm-ui/core": "^2.14.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json.ng15 b/libs/icons/flags/package.json.ng15 index 570a6b0e19..7f33cd261a 100644 --- a/libs/icons/flags/package.json.ng15 +++ b/libs/icons/flags/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "2.13.0", + "version": "2.14.0", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/core": "^2.13.0" + "@prizm-ui/core": "^2.14.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json.ng15 b/libs/nxmv/package.json.ng15 index 1aa3b6d526..b1e9651afe 100644 --- a/libs/nxmv/package.json.ng15 +++ b/libs/nxmv/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "2.13.0", + "version": "2.14.0", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json.ng15 b/libs/plugin/package.json.ng15 index 92b7fc1fb1..c0c634d7aa 100644 --- a/libs/plugin/package.json.ng15 +++ b/libs/plugin/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "2.13.0", + "version": "2.14.0", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^2.13.0" + "@prizm-ui/ast": "^2.14.0" } } diff --git a/libs/schematics/package.json.ng15 b/libs/schematics/package.json.ng15 index 3c07d7c071..c83980bd15 100644 --- a/libs/schematics/package.json.ng15 +++ b/libs/schematics/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "2.13.0", + "version": "2.14.0", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json.ng15 b/libs/theme/package.json.ng15 index ecd67db8f9..aff548521b 100644 --- a/libs/theme/package.json.ng15 +++ b/libs/theme/package.json.ng15 @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "2.13.0", + "version": "2.14.0", "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/core": "^2.13.0", - "@prizm-ui/helpers": "^2.13.0" + "@prizm-ui/core": "^2.14.0", + "@prizm-ui/helpers": "^2.14.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json.ng15 b/package.json.ng15 index 9183940b31..2d9ae63d0c 100644 --- a/package.json.ng15 +++ b/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "2.13.0", + "version": "2.14.0", "license": "MIT", "husky": { "hooks": { From b30fc273da08855a2b0b7e616804ed0250623291 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Wed, 17 Apr 2024 10:07:10 +0400 Subject: [PATCH 162/291] fix: changed content-box width in toast #1433 --- .../src/lib/components/toast/toast/toast.component.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/components/src/lib/components/toast/toast/toast.component.less b/libs/components/src/lib/components/toast/toast/toast.component.less index 40613bbc1c..51d99a342b 100644 --- a/libs/components/src/lib/components/toast/toast/toast.component.less +++ b/libs/components/src/lib/components/toast/toast/toast.component.less @@ -18,7 +18,7 @@ .content-box { display: flex; - width: calc(100% - 72px); + width: 100%; word-wrap: break-word; flex-flow: column; justify-content: space-between; From b4ecf9ee577490471b4f1e5e720d7c5835946be8 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 18 Apr 2024 11:43:02 +0300 Subject: [PATCH 163/291] chore: version 3.12.0 up tp 3.13.0 --- .github/workflows/beta-publish-ng16.yml | 2 +- .github/workflows/main-publish-ng16.yml | 2 +- .github/workflows/pre-release-publish-ng16.yml | 2 +- .../src/app/version-manager/current.const.ts.ng16 | 2 +- .../src/app/version-manager/versions.constants.ts | 12 ++++++------ libs/ast/package.json | 2 +- libs/ast/package.json.ng16 | 2 +- libs/charts/base/package.json | 6 +++--- libs/charts/base/package.json.ng16 | 6 +++--- libs/components/package.json | 10 +++++----- libs/components/package.json.ng16 | 10 +++++----- libs/core/package.json | 2 +- libs/core/package.json.ng16 | 2 +- libs/helpers/package.json | 2 +- libs/helpers/package.json.ng16 | 2 +- libs/i18n/package.json | 2 +- libs/i18n/package.json.ng16 | 2 +- libs/icons/base/package.json | 4 ++-- libs/icons/base/package.json.ng16 | 4 ++-- libs/icons/flags/package.json | 4 ++-- libs/icons/flags/package.json.ng16 | 4 ++-- libs/nxmv/package.json | 2 +- libs/nxmv/package.json.ng16 | 2 +- libs/plugin/package.json | 4 ++-- libs/plugin/package.json.ng16 | 4 ++-- libs/schematics/package.json | 2 +- libs/schematics/package.json.ng16 | 2 +- libs/theme/package.json | 6 +++--- libs/theme/package.json.ng16 | 6 +++--- package.json | 2 +- package.json.ng16 | 2 +- 31 files changed, 58 insertions(+), 58 deletions(-) diff --git a/.github/workflows/beta-publish-ng16.yml b/.github/workflows/beta-publish-ng16.yml index 4150243376..6d0dadfb24 100644 --- a/.github/workflows/beta-publish-ng16.yml +++ b/.github/workflows/beta-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng16beta --json 2>/dev/null || echo '3.10.0-beta.0') | jq '([.[] | select(startswith("3.10.0-beta"))] | last // "3.10.0-beta.0")' 2>/dev/null || echo '3.10.0-beta.0' + (npm view @prizm-ui/components versions --tag ng16beta --json 2>/dev/null || echo '3.13.0-beta.0') | jq '([.[] | select(startswith("3.13.0-beta"))] | last // "3.13.0-beta.0")' 2>/dev/null || echo '3.13.0-beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng16.yml b/.github/workflows/main-publish-ng16.yml index 105f5b81e3..548c84c8cb 100644 --- a/.github/workflows/main-publish-ng16.yml +++ b/.github/workflows/main-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_v3_version=$( - echo '3.10.0' + echo '3.13.0' ) echo "LAST_V3_VERSION=${last_v3_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng16.yml b/.github/workflows/pre-release-publish-ng16.yml index 3b88abcbe3..94efb00c51 100644 --- a/.github/workflows/pre-release-publish-ng16.yml +++ b/.github/workflows/pre-release-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng16next --json 2>/dev/null || echo '3.10.0-next.0') | jq '([.[] | select(startswith("3.10.0-next"))] | last // "3.10.0-next.0")' 2>/dev/null || echo '3.10.0-next.0' + (npm view @prizm-ui/components versions --tag ng16next --json 2>/dev/null || echo '3.13.0-next.0') | jq '([.[] | select(startswith("3.13.0-next"))] | last // "3.13.0-next.0")' 2>/dev/null || echo '3.13.0-next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/apps/doc/src/app/version-manager/current.const.ts.ng16 b/apps/doc/src/app/version-manager/current.const.ts.ng16 index 4990b091f3..eca4105a4e 100644 --- a/apps/doc/src/app/version-manager/current.const.ts.ng16 +++ b/apps/doc/src/app/version-manager/current.const.ts.ng16 @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '3.12.0'; +export const PRIZM_CURRENT_VERSION = '3.13.0'; diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index 9fd81ebf7b..dae57db107 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -10,8 +10,8 @@ export interface PrizmVersionMeta { export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ { - label: '3.12.0 (ng16)', - version: '3.12.0', + label: '3.13.0 (ng16)', + version: '3.13.0', stackblitz: 'https://stackblitz.com/edit/prizm-v3-demo', link: new URL('http://prizm.site'), otherLinks: [new URL('https://prizm-v3.web.app')], @@ -40,8 +40,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ }, }, { - label: '3.12.0-next (ng16)', - version: '3.12.0-next', + label: '3.13.0-next (ng16)', + version: '3.13.0-next', stackblitz: 'https://stackblitz.com/edit/prizm-v3-next-demo', link: new URL('https://prizm-v3-next.web.app'), otherLinks: [], @@ -61,8 +61,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '3.12.0-beta (ng16)', - version: '3.12.0-beta', + label: '3.13.0-beta (ng16)', + version: '3.13.0-beta', stackblitz: 'https://stackblitz.com/edit/prizm-v3-beta-demo', link: new URL('https://prizm-v3-beta.web.app'), otherLinks: [], diff --git a/libs/ast/package.json b/libs/ast/package.json index dd52cd82fc..d7d4c62b1c 100644 --- a/libs/ast/package.json +++ b/libs/ast/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "3.12.0", + "version": "3.13.0", "private": false, "publishConfig": { "access": "public", diff --git a/libs/ast/package.json.ng16 b/libs/ast/package.json.ng16 index dd52cd82fc..d7d4c62b1c 100644 --- a/libs/ast/package.json.ng16 +++ b/libs/ast/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "3.12.0", + "version": "3.13.0", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json b/libs/charts/base/package.json index ba60feb422..d97deb49cd 100644 --- a/libs/charts/base/package.json +++ b/libs/charts/base/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "3.12.0", + "version": "3.13.0", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/theme": "^3.12.0", - "@prizm-ui/helpers": "^3.12.0", + "@prizm-ui/theme": "^3.13.0", + "@prizm-ui/helpers": "^3.13.0", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/charts/base/package.json.ng16 b/libs/charts/base/package.json.ng16 index ba60feb422..d97deb49cd 100644 --- a/libs/charts/base/package.json.ng16 +++ b/libs/charts/base/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "3.12.0", + "version": "3.13.0", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/theme": "^3.12.0", - "@prizm-ui/helpers": "^3.12.0", + "@prizm-ui/theme": "^3.13.0", + "@prizm-ui/helpers": "^3.13.0", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/package.json b/libs/components/package.json index 789902f526..4f7f69c582 100644 --- a/libs/components/package.json +++ b/libs/components/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "3.12.0", + "version": "3.13.0", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -18,10 +18,10 @@ "@ng-web-apis/resize-observer": "^3.0.0", "@ng-web-apis/intersection-observer": "^3.0.0", "@ng-web-apis/mutation-observer": "^3.0.0", - "@prizm-ui/helpers": "^3.12.0", - "@prizm-ui/core": "^3.12.0", - "@prizm-ui/i18n": "^3.12.0", - "@prizm-ui/theme": "^3.12.0" + "@prizm-ui/helpers": "^3.13.0", + "@prizm-ui/core": "^3.13.0", + "@prizm-ui/i18n": "^3.13.0", + "@prizm-ui/theme": "^3.13.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/components/package.json.ng16 b/libs/components/package.json.ng16 index 789902f526..4f7f69c582 100644 --- a/libs/components/package.json.ng16 +++ b/libs/components/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "3.12.0", + "version": "3.13.0", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -18,10 +18,10 @@ "@ng-web-apis/resize-observer": "^3.0.0", "@ng-web-apis/intersection-observer": "^3.0.0", "@ng-web-apis/mutation-observer": "^3.0.0", - "@prizm-ui/helpers": "^3.12.0", - "@prizm-ui/core": "^3.12.0", - "@prizm-ui/i18n": "^3.12.0", - "@prizm-ui/theme": "^3.12.0" + "@prizm-ui/helpers": "^3.13.0", + "@prizm-ui/core": "^3.13.0", + "@prizm-ui/i18n": "^3.13.0", + "@prizm-ui/theme": "^3.13.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json b/libs/core/package.json index 71d52a3e3a..5b4560f7e0 100644 --- a/libs/core/package.json +++ b/libs/core/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "3.12.0", + "version": "3.13.0", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/core/package.json.ng16 b/libs/core/package.json.ng16 index 71d52a3e3a..5b4560f7e0 100644 --- a/libs/core/package.json.ng16 +++ b/libs/core/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "3.12.0", + "version": "3.13.0", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json b/libs/helpers/package.json index c153667946..88bc9b6160 100644 --- a/libs/helpers/package.json +++ b/libs/helpers/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "3.12.0", + "version": "3.13.0", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/helpers/package.json.ng16 b/libs/helpers/package.json.ng16 index c153667946..88bc9b6160 100644 --- a/libs/helpers/package.json.ng16 +++ b/libs/helpers/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "3.12.0", + "version": "3.13.0", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json b/libs/i18n/package.json index d02a6fcb99..83c0de4ce1 100644 --- a/libs/i18n/package.json +++ b/libs/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "3.12.0", + "version": "3.13.0", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0" diff --git a/libs/i18n/package.json.ng16 b/libs/i18n/package.json.ng16 index d02a6fcb99..83c0de4ce1 100644 --- a/libs/i18n/package.json.ng16 +++ b/libs/i18n/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "3.12.0", + "version": "3.13.0", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0" diff --git a/libs/icons/base/package.json b/libs/icons/base/package.json index 296d48fa38..8bddede1af 100644 --- a/libs/icons/base/package.json +++ b/libs/icons/base/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "3.12.0", + "version": "3.13.0", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.12.0" + "@prizm-ui/core": "^3.13.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/base/package.json.ng16 b/libs/icons/base/package.json.ng16 index 296d48fa38..8bddede1af 100644 --- a/libs/icons/base/package.json.ng16 +++ b/libs/icons/base/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "3.12.0", + "version": "3.13.0", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.12.0" + "@prizm-ui/core": "^3.13.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json b/libs/icons/flags/package.json index cafc0a3f46..eafc7c544f 100644 --- a/libs/icons/flags/package.json +++ b/libs/icons/flags/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "3.12.0", + "version": "3.13.0", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.12.0" + "@prizm-ui/core": "^3.13.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json.ng16 b/libs/icons/flags/package.json.ng16 index cafc0a3f46..eafc7c544f 100644 --- a/libs/icons/flags/package.json.ng16 +++ b/libs/icons/flags/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "3.12.0", + "version": "3.13.0", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.12.0" + "@prizm-ui/core": "^3.13.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json b/libs/nxmv/package.json index 63fb06bf99..db7f54bccc 100644 --- a/libs/nxmv/package.json +++ b/libs/nxmv/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "3.12.0", + "version": "3.13.0", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/nxmv/package.json.ng16 b/libs/nxmv/package.json.ng16 index 63fb06bf99..db7f54bccc 100644 --- a/libs/nxmv/package.json.ng16 +++ b/libs/nxmv/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "3.12.0", + "version": "3.13.0", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json b/libs/plugin/package.json index b1e47c0f42..5a35182261 100644 --- a/libs/plugin/package.json +++ b/libs/plugin/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "3.12.0", + "version": "3.13.0", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^3.12.0" + "@prizm-ui/ast": "^3.13.0" } } diff --git a/libs/plugin/package.json.ng16 b/libs/plugin/package.json.ng16 index b1e47c0f42..5a35182261 100644 --- a/libs/plugin/package.json.ng16 +++ b/libs/plugin/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "3.12.0", + "version": "3.13.0", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^3.12.0" + "@prizm-ui/ast": "^3.13.0" } } diff --git a/libs/schematics/package.json b/libs/schematics/package.json index f1afd5c53b..0bd7ba36a8 100644 --- a/libs/schematics/package.json +++ b/libs/schematics/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "3.12.0", + "version": "3.13.0", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/schematics/package.json.ng16 b/libs/schematics/package.json.ng16 index f1afd5c53b..0bd7ba36a8 100644 --- a/libs/schematics/package.json.ng16 +++ b/libs/schematics/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "3.12.0", + "version": "3.13.0", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json b/libs/theme/package.json index 12092d5c9b..85a0369877 100644 --- a/libs/theme/package.json +++ b/libs/theme/package.json @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "3.12.0", + "version": "3.13.0", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.12.0", - "@prizm-ui/helpers": "^3.12.0" + "@prizm-ui/core": "^3.13.0", + "@prizm-ui/helpers": "^3.13.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/theme/package.json.ng16 b/libs/theme/package.json.ng16 index 12092d5c9b..85a0369877 100644 --- a/libs/theme/package.json.ng16 +++ b/libs/theme/package.json.ng16 @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "3.12.0", + "version": "3.13.0", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.12.0", - "@prizm-ui/helpers": "^3.12.0" + "@prizm-ui/core": "^3.13.0", + "@prizm-ui/helpers": "^3.13.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json b/package.json index aa6d18161d..e674f7da91 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "3.12.0", + "version": "3.13.0", "license": "MIT", "husky": { "hooks": { diff --git a/package.json.ng16 b/package.json.ng16 index aa6d18161d..e674f7da91 100644 --- a/package.json.ng16 +++ b/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "3.12.0", + "version": "3.13.0", "license": "MIT", "husky": { "hooks": { From 8eb521b1e9deb3769a86c704599f924422ae4ff3 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 18 Apr 2024 11:53:36 +0300 Subject: [PATCH 164/291] feat: changelog update --- .../app/about-prizm/changelog/CHANGELOG.md | 45 +++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index e01e493fc0..99f177f6f7 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -2,6 +2,51 @@ All notable changes to this project will be documented in this file. +## [1.17.0, 2.14.0, 3.13.0](https://github.com/zyfra/Prizm) (21-04-2023) + +## Features + +- feat(component/cron): added custom title #1431 +- feat(charts): update colors for charts to new schema #1196 +- feat(documentation): add decimal input type to live demo documentation + +### Bug fixes + +- fix(components/input-number): manual input works incorrect when min set for input number #1580 +- fix(components/input-number) remove default title for input number #1599 +- fix(components/inputs): hint status text for required input not shown after force clear #1598 +- fix(component/navigation): hidden overflow for navigation titles. added hints #1510 +- fix(component/header): hidden overflow for navigation titles. added hints #1510 +- fix(component/file-upload): if the name is long it doesn't overlap upload bar. name becomes truncated. expansion remains #1541 +- fix(component/toggle): removed hover and focus if loading #1485 +- fix(documentation): changed filesValidationErrors type in examples and live demo #1371 +- fix(components/paginator): fixed width of rows selector #1466 +- fix(components/column-settings): incorrect display of one unhidden column in column settings #1036 +- fix(theme): remove redundant token from default theme +- fix(charts): charts tolltip background color error #1488 +- fix(charts/bar): bar chart changing postion on theme chage #1492 +- fix(charts/bar): bar chart x axis shpould be shown for both themes #1490 +- fix(charts): not all charts ascept theming #1489 +- fix(charts/pie/waterfall/radial-bar): wrong stroke color on hover in pie, waterfall and radial bar charts #1508 +- fix(charts/pie): pie line style update for dark theme +- fix(charts): incorrect data colors displayed in charts #1505 +- fix(documentation/scatter): points on the scatter are not completely hidden when it's hidden in legend #1493 +- fix(documentation/bar): incorrect examples for bar stacked and bar groupd charts #1507 +- fix(documentation/pie): removed extra properties from pie live demo tab +- fix(documentation/gauge): change percent input type for live demo +- fix(documentation/bar): colors in bar example works incorrect when theme chages #1491 +- fix(documentation/typography): typography page changed #1497 #1498 +- fix(documentation/sticky): fix scroll in sticky example #670 +- fix(documentation/card): removed shadow variant duplicate #1434 +- fix(documentation): changelog headers formatting #1499 +- fix(documentation/ast): removed first empty string in ast code examples #1501 +- fix(documentation/checkbox): fixed description of checkbox module import #1527 +- fix(documentation/table): search for server sort example fixed #1107 + +### Refactor + +- refactor(charts): replace chart base options from theming to separate object + ## [1.16.0, 2.13.0, 3.12.0](https://github.com/zyfra/Prizm) (23-03-2023) ## Features From 614ffec43c23faf9b891730f71d0157e89b676bd Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 18 Apr 2024 12:13:26 +0300 Subject: [PATCH 165/291] chore: recall changes in package json files --- apps/doc/src/app/version-manager/current.const.ts | 2 +- libs/ast/package.json | 2 +- libs/components/package.json | 10 +++++----- libs/core/package.json | 2 +- libs/helpers/package.json | 2 +- libs/i18n/package.json | 2 +- libs/icons/base/package.json | 4 ++-- libs/icons/flags/package.json | 4 ++-- libs/nxmv/package.json | 2 +- libs/plugin/package.json | 4 ++-- libs/schematics/package.json | 2 +- libs/theme/package.json | 6 +++--- package.json | 2 +- 13 files changed, 22 insertions(+), 22 deletions(-) diff --git a/apps/doc/src/app/version-manager/current.const.ts b/apps/doc/src/app/version-manager/current.const.ts index a87de4bad2..a7db703f9f 100644 --- a/apps/doc/src/app/version-manager/current.const.ts +++ b/apps/doc/src/app/version-manager/current.const.ts @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '1.17.0'; +export const PRIZM_CURRENT_VERSION = '1.16.0'; diff --git a/libs/ast/package.json b/libs/ast/package.json index d7d4c62b1c..dd52cd82fc 100644 --- a/libs/ast/package.json +++ b/libs/ast/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "3.13.0", + "version": "3.12.0", "private": false, "publishConfig": { "access": "public", diff --git a/libs/components/package.json b/libs/components/package.json index 4f7f69c582..789902f526 100644 --- a/libs/components/package.json +++ b/libs/components/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "3.13.0", + "version": "3.12.0", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -18,10 +18,10 @@ "@ng-web-apis/resize-observer": "^3.0.0", "@ng-web-apis/intersection-observer": "^3.0.0", "@ng-web-apis/mutation-observer": "^3.0.0", - "@prizm-ui/helpers": "^3.13.0", - "@prizm-ui/core": "^3.13.0", - "@prizm-ui/i18n": "^3.13.0", - "@prizm-ui/theme": "^3.13.0" + "@prizm-ui/helpers": "^3.12.0", + "@prizm-ui/core": "^3.12.0", + "@prizm-ui/i18n": "^3.12.0", + "@prizm-ui/theme": "^3.12.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json b/libs/core/package.json index 5b4560f7e0..71d52a3e3a 100644 --- a/libs/core/package.json +++ b/libs/core/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "3.13.0", + "version": "3.12.0", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json b/libs/helpers/package.json index 88bc9b6160..c153667946 100644 --- a/libs/helpers/package.json +++ b/libs/helpers/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "3.13.0", + "version": "3.12.0", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json b/libs/i18n/package.json index 83c0de4ce1..d02a6fcb99 100644 --- a/libs/i18n/package.json +++ b/libs/i18n/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "3.13.0", + "version": "3.12.0", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0" diff --git a/libs/icons/base/package.json b/libs/icons/base/package.json index 8bddede1af..296d48fa38 100644 --- a/libs/icons/base/package.json +++ b/libs/icons/base/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "3.13.0", + "version": "3.12.0", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.13.0" + "@prizm-ui/core": "^3.12.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json b/libs/icons/flags/package.json index eafc7c544f..cafc0a3f46 100644 --- a/libs/icons/flags/package.json +++ b/libs/icons/flags/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "3.13.0", + "version": "3.12.0", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.13.0" + "@prizm-ui/core": "^3.12.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json b/libs/nxmv/package.json index db7f54bccc..63fb06bf99 100644 --- a/libs/nxmv/package.json +++ b/libs/nxmv/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "3.13.0", + "version": "3.12.0", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json b/libs/plugin/package.json index 5a35182261..b1e47c0f42 100644 --- a/libs/plugin/package.json +++ b/libs/plugin/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "3.13.0", + "version": "3.12.0", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^3.13.0" + "@prizm-ui/ast": "^3.12.0" } } diff --git a/libs/schematics/package.json b/libs/schematics/package.json index 0bd7ba36a8..f1afd5c53b 100644 --- a/libs/schematics/package.json +++ b/libs/schematics/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "3.13.0", + "version": "3.12.0", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json b/libs/theme/package.json index 85a0369877..12092d5c9b 100644 --- a/libs/theme/package.json +++ b/libs/theme/package.json @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "3.13.0", + "version": "3.12.0", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.13.0", - "@prizm-ui/helpers": "^3.13.0" + "@prizm-ui/core": "^3.12.0", + "@prizm-ui/helpers": "^3.12.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json b/package.json index e674f7da91..aa6d18161d 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "3.13.0", + "version": "3.12.0", "license": "MIT", "husky": { "hooks": { From 11c27b68960bafcc3bbeada458b0d7a4e0d01e5b Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Thu, 18 Apr 2024 12:28:56 +0300 Subject: [PATCH 166/291] feat: checklist for release 4x version --- .../prepare_release_for_4.md | 69 +++++++++++++++++++ 1 file changed, 69 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE/prepare_release_for_4.md diff --git a/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_4.md b/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_4.md new file mode 100644 index 0000000000..96d01ad406 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_4.md @@ -0,0 +1,69 @@ +## [NEW_VERSION](https://github.com/zyfra/Prizm) (CURRENT_DATE) + +### Features + +- List of new features, example: +- feat(component/cron): added custom title #1431) + +### Bug Fixes + +- List of new fixes, example: +- fix(components/input-number) remove default title for input number #1599 + +### Refactor + +- List of new refactors, example: +- refactor(charts): replace chart base options from theming to separate object #1000 + +### Breacking Changes + +- List of bc, example: +- bc(charts): removed function #1000 + +## Следует обратить внимание на ревью + +### Checklist: + +- [ ] Замените NEW_VERSION на новую версию в этом PR +- [ ] Замените CURRENT_DATE на текущую дату в этом PR +- [ ] Добавить в каждый тип ваши изменения в этом PR +- [ ] Удалите не нужные группы изменений для этого PR (Features, Bug Fixes, Breacking Changes, Refactor) +- [ ] Добавить изменения в changelog о новой версии +- [ ] Изменить версия в CI для деплоя (пока не автоматизировали + - [ ] .github/workflows/beta-publish-ng17.yml + - [ ] .github/workflows/main-publish-ng17.yml + - [ ] .github/workflows/pre-release-publish-ng17.yml +- [ ] Изменить версии в доке на новую + - [ ] apps/doc/src/app/version-manager/current.const.ts + - [ ] apps/doc/src/app/version-manager/current.const.ts.ng17 +- [ ] Изменить версии в массиве версий + - apps/doc/src/app/version-manager/versions.constants.ts +- [ ] Изменить версию в root package файле + - [ ] package.json + - [ ] package.json.ng17 +- [ ] Изменить версию package файлов в каждой библиотеке (на данный момент это 13 библиотек) + - [ ] libs/ast/package.json + - [ ] libs/ast/package.json.ng17 + - [ ] libs/charts/base/package.json + - [ ] libs/charts/base/package.json.ng17 + - [ ] libs/components/package.json + - [ ] libs/components/package.json.ng17 + - [ ] libs/core/package.json + - [ ] libs/core/package.json.ng17 + - [ ] libs/helpers/package.json + - [ ] libs/helpers/package.json.ng17 + - [ ] libs/i18n/package.json + - [ ] libs/i18n/package.json.ng17 + - [ ] libs/icons/base/package.json + - [ ] libs/icons/base/package.json.ng17 + - [ ] libs/icons/flags/package.json + - [ ] libs/icons/flags/package.json.ng17 + - [ ] libs/icons/loader/package.json + - [ ] libs/nxmv/package.json + - [ ] libs/nxmv/package.json.ng17 + - [ ] libs/plugin/package.json + - [ ] libs/plugin/package.json.ng17 + - [ ] libs/schematics/package.json + - [ ] libs/schematics/package.json.ng17 + - [ ] libs/theme/package.json + - [ ] libs/theme/package.json.ng17 From 228687935accd6826f80d02d62f22696a4880348 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Thu, 18 Apr 2024 12:32:43 +0300 Subject: [PATCH 167/291] feat: checklist for release 4x version --- .github/PULL_REQUEST_TEMPLATE/prepare_release_for_4.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_4.md b/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_4.md index 96d01ad406..b4759e5b8f 100644 --- a/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_4.md +++ b/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_4.md @@ -29,14 +29,14 @@ - [ ] Добавить в каждый тип ваши изменения в этом PR - [ ] Удалите не нужные группы изменений для этого PR (Features, Bug Fixes, Breacking Changes, Refactor) - [ ] Добавить изменения в changelog о новой версии -- [ ] Изменить версия в CI для деплоя (пока не автоматизировали +- [ ] Изменить версии в CI для деплоя (пока не автоматизировали) - [ ] .github/workflows/beta-publish-ng17.yml - [ ] .github/workflows/main-publish-ng17.yml - [ ] .github/workflows/pre-release-publish-ng17.yml - [ ] Изменить версии в доке на новую - [ ] apps/doc/src/app/version-manager/current.const.ts - [ ] apps/doc/src/app/version-manager/current.const.ts.ng17 -- [ ] Изменить версии в массиве версий +- [ ] Изменить версии в соответствующем массиве - apps/doc/src/app/version-manager/versions.constants.ts - [ ] Изменить версию в root package файле - [ ] package.json From 197020d4bccb835f0659d9c57922bbc325a2a0fa Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Thu, 18 Apr 2024 12:41:12 +0300 Subject: [PATCH 168/291] feat: checklist for release 4x version --- .github/PULL_REQUEST_TEMPLATE/prepare_release_for_4.md | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_4.md b/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_4.md index b4759e5b8f..67f81a7b1f 100644 --- a/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_4.md +++ b/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_4.md @@ -67,3 +67,4 @@ - [ ] libs/schematics/package.json.ng17 - [ ] libs/theme/package.json - [ ] libs/theme/package.json.ng17 +- [ ] Составить readMe файл с описанием изменений на русском From f139360799bb761494ad2361817494260b4e67e7 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 18 Apr 2024 12:52:35 +0300 Subject: [PATCH 169/291] feat: checklist for release 3x version --- .../prepare_release_for_3.md.md | 89 +++++++++++++++++++ 1 file changed, 89 insertions(+) create mode 100644 .github/PULL_REQUEST_TEMPLATE/prepare_release_for_3.md.md diff --git a/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_3.md.md b/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_3.md.md new file mode 100644 index 0000000000..2a388a8eb9 --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_3.md.md @@ -0,0 +1,89 @@ +## [NEW_VERSION](https://github.com/zyfra/Prizm) (CURRENT_DATE) + +### Features + +- List of new features, example: +- feat(component/cron): added custom title #1431 + +### Bug Fixes + +- List of new fixes, example: +- fix(components/input-number) remove default title for input number #1599 + +### Refactor + +- List of new refactors, example: +- refactor(charts): replace chart base options from theming to separate object #1000 + +### Breacking Changes + +- List of bc, example: +- bc(charts): removed function #1000 + +## Следует обратить внимание на ревью + +### Checklist: + +- [ ] Замените NEW_VERSION на новую версию в этом PR +- [ ] Замените CURRENT_DATE на текущую дату в этом PR +- [ ] Добавить в каждый тип ваши изменения в этом PR +- [ ] Удалите не нужные группы изменений для этого PR (Features, Bug Fixes, Breacking Changes, Refactor) +- [ ] Добавить изменения в changelog о новой версии +- [ ] Изменить версии в CI для деплоя (пока не автоматизировали) + - [ ] .github/workflows/beta-publish-ng14.yml + - [ ] .github/workflows/main-publish-ng14.yml + - [ ] .github/workflows/pre-release-publish-ng14.yml + - [ ] .github/workflows/beta-publish-ng15.yml + - [ ] .github/workflows/main-publish-ng15.yml + - [ ] .github/workflows/pre-release-publish-ng15.yml + - [ ] .github/workflows/beta-publish-ng16.yml + - [ ] .github/workflows/main-publish-ng16.yml + - [ ] .github/workflows/pre-release-publish-ng16.yml +- [ ] Изменить версии в доке на новую + - [ ] apps/doc/src/app/version-manager/current.const.ts.ng14 + - [ ] apps/doc/src/app/version-manager/current.const.ts.ng15 + - [ ] apps/doc/src/app/version-manager/current.const.ts.ng16 +- [ ] Изменить версии в соответствующем массиве + - apps/doc/src/app/version-manager/versions.constants.ts +- [ ] Изменить версию в root package файле + - [ ] package.json.ng14 + - [ ] package.json.ng15 + - [ ] package.json.ng16 +- [ ] Изменить версию package файлов в каждой библиотеке (в версиях 3x и ниже это 12 библиотек) + - [ ] libs/ast/package.json.ng14 + - [ ] libs/ast/package.json.ng15 + - [ ] libs/ast/package.json.ng16 + - [ ] libs/charts/base/package.json.ng14 + - [ ] libs/charts/base/package.json.ng15 + - [ ] libs/charts/base/package.json.ng16 + - [ ] libs/components/package.json.ng14 + - [ ] libs/components/package.json.ng15 + - [ ] libs/components/package.json.ng16 + - [ ] libs/core/package.json.ng14 + - [ ] libs/core/package.json.ng15 + - [ ] libs/core/package.json.ng16 + - [ ] libs/helpers/package.json.ng14 + - [ ] libs/helpers/package.json.ng15 + - [ ] libs/helpers/package.json.ng16 + - [ ] libs/i18n/package.json.ng14 + - [ ] libs/i18n/package.json.ng15 + - [ ] libs/i18n/package.json.ng16 + - [ ] libs/icons/base/package.json.ng14 + - [ ] libs/icons/base/package.json.ng15 + - [ ] libs/icons/base/package.json.ng16 + - [ ] libs/icons/flags/package.json.ng14 + - [ ] libs/icons/flags/package.json.ng15 + - [ ] libs/icons/flags/package.json.ng16 + - [ ] libs/nxmv/package.json.ng14 + - [ ] libs/nxmv/package.json.ng15 + - [ ] libs/nxmv/package.json.ng16 + - [ ] libs/plugin/package.json.ng14 + - [ ] libs/plugin/package.json.ng15 + - [ ] libs/plugin/package.json.ng16 + - [ ] libs/schematics/package.json.ng14 + - [ ] libs/schematics/package.json.ng15 + - [ ] libs/schematics/package.json.ng16 + - [ ] libs/theme/package.json.ng14 + - [ ] libs/theme/package.json.ng15 + - [ ] libs/theme/package.json.ng16 +- [ ] Составить readMe файл с описанием изменений на русском From c03678a4fff10fec725dc0a7b507dbe5eba1d598 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Thu, 18 Apr 2024 12:54:27 +0300 Subject: [PATCH 170/291] Update .github/PULL_REQUEST_TEMPLATE/prepare_release_for_4.md Co-authored-by: ickisIckis --- .github/PULL_REQUEST_TEMPLATE/prepare_release_for_4.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_4.md b/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_4.md index 67f81a7b1f..761f60b2a6 100644 --- a/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_4.md +++ b/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_4.md @@ -3,7 +3,7 @@ ### Features - List of new features, example: -- feat(component/cron): added custom title #1431) +- feat(component/cron): added custom title #1431 ### Bug Fixes From fb0f45170a66ffec771fc24a924337e9e404813b Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Thu, 18 Apr 2024 14:02:38 +0400 Subject: [PATCH 171/291] fix: added scroll to navigation menu #1585 --- ...prizm-navigation-menu-group.component.less | 1 - .../prizm-navigation-menu.component.html | 58 ++++++++++--------- .../prizm-navigation-menu.component.less | 17 +----- .../prizm-navigation-menu.component.ts | 2 + 4 files changed, 36 insertions(+), 42 deletions(-) diff --git a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-group/prizm-navigation-menu-group.component.less b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-group/prizm-navigation-menu-group.component.less index b0b5afd0ad..2cf46e82be 100644 --- a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-group/prizm-navigation-menu-group.component.less +++ b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-group/prizm-navigation-menu-group.component.less @@ -6,7 +6,6 @@ .prizm-navigation-menu-group { --prizm-empty-message__padding: 16px 32px; - border-bottom: 1px solid var(--prizm-v3-background-stroke); &_expanded:has(.empty-message) { border-bottom: none; diff --git a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.html b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.html index 3348e1c6bd..e91327b398 100644 --- a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.html +++ b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.html @@ -36,32 +36,36 @@ [toolbarExtraTemplate]="toolbarExtraTemplate" > + +
    + +
    + + +
    +
    + +
    +     -
    - -
    - - -
    -
    - -
    -     - - -
    - -
    -     -
    + +
    + +
    +     +
    +
    diff --git a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.less b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.less index a1827324ef..93da8b6452 100644 --- a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.less +++ b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.less @@ -7,6 +7,7 @@ height: 100%; background: var(--prizm-v3-background-fill-primary); border-right: 1px solid var(--prizm-v3-background-stroke); + border-bottom: 1px solid var(--prizm-v3-background-stroke); &__header { overflow: hidden; @@ -54,16 +55,13 @@ } } - .no-groups-content { - overflow: auto; - height: 100%; + .scrollable { + width: 100%; } .groups-content { display: flex; flex-direction: column; - overflow: hidden; - height: 100%; &__top { flex: 1; @@ -78,12 +76,3 @@ } } } - -&::-webkit-scrollbar { - width: 0px; - background: transparent; -} - -&::-webkit-scrollbar-track { - background: transparent; -} diff --git a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.ts b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.ts index d77eeeda8a..349e170468 100644 --- a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.ts +++ b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.ts @@ -36,6 +36,7 @@ import { PolymorphOutletDirective, PrizmHintDirective, PrizmHoveredDirective } f import { PrizmAccordionComponent } from '../../../accordion'; import { PrizmNavigationMenuToolbarComponent } from '../prizm-navigation-menu-toolbar/prizm-navigation-menu-toolbar.component'; import { prizmIsTextOverflow } from '../../../../util'; +import { PrizmScrollbarComponent } from '../../../scrollbar'; @Component({ selector: 'prizm-navigation-menu', @@ -55,6 +56,7 @@ import { prizmIsTextOverflow } from '../../../../util'; PrizmNavigationMenuGroupComponent, PrizmNavigationMenuToolbarComponent, PrizmHintDirective, + PrizmScrollbarComponent, ], providers: [PrizmNavigationMenuService, PrizmNavigationMenuToolbarService, PrizmDestroyService], }) From 021d830c8c3284ed1b31b58839249887def168a3 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 18 Apr 2024 15:30:33 +0300 Subject: [PATCH 172/291] fix: release template filename fix --- .../{prepare_release_for_3.md.md => prepare_release_for_3.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/PULL_REQUEST_TEMPLATE/{prepare_release_for_3.md.md => prepare_release_for_3.md} (100%) diff --git a/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_3.md.md b/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_3.md similarity index 100% rename from .github/PULL_REQUEST_TEMPLATE/prepare_release_for_3.md.md rename to .github/PULL_REQUEST_TEMPLATE/prepare_release_for_3.md From ece6969fc3f484c62612cc125cdcfd80c3d296c9 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 18 Apr 2024 15:35:00 +0300 Subject: [PATCH 173/291] feat: changelog update --- apps/doc/src/app/about-prizm/changelog/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index 99f177f6f7..4532da776f 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -6,6 +6,8 @@ All notable changes to this project will be documented in this file. ## Features +- feat: checklist for release 4x version #1611 +- feat: checklist for release 3x version #1612 - feat(component/cron): added custom title #1431 - feat(charts): update colors for charts to new schema #1196 - feat(documentation): add decimal input type to live demo documentation From d362adab40c0d5f5c5bce925e8af7ccbe9a64694 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Thu, 18 Apr 2024 17:38:58 +0400 Subject: [PATCH 174/291] fix: returned menu group border #1585 --- .../prizm-navigation-menu-group.component.less | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-group/prizm-navigation-menu-group.component.less b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-group/prizm-navigation-menu-group.component.less index 2cf46e82be..7ee37e0d5e 100644 --- a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-group/prizm-navigation-menu-group.component.less +++ b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-group/prizm-navigation-menu-group.component.less @@ -6,6 +6,7 @@ .prizm-navigation-menu-group { --prizm-empty-message__padding: 16px 32px; + border-bottom: 1px solid var(--prizm-background-stroke); &_expanded:has(.empty-message) { border-bottom: none; From e7f96067e1d5463379309bf89b221484d600a7c5 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Fri, 19 Apr 2024 11:42:24 +0400 Subject: [PATCH 175/291] fix: cron selected working with specified tabs #1494 --- .../src/lib/components/cron/cron.component.ts | 50 ++++++++++++++----- 1 file changed, 38 insertions(+), 12 deletions(-) diff --git a/libs/components/src/lib/components/cron/cron.component.ts b/libs/components/src/lib/components/cron/cron.component.ts index 2e0df746cf..195748b0e5 100644 --- a/libs/components/src/lib/components/cron/cron.component.ts +++ b/libs/components/src/lib/components/cron/cron.component.ts @@ -11,7 +11,17 @@ import { PrizmDestroyService, PrizmLetDirective } from '@prizm-ui/helpers'; import { PrizmSwitcherItem } from '../switcher'; import { UntypedFormControl } from '@angular/forms'; import { PrizmCronService, prizmI18nInitWithKey } from '../../services'; -import { distinctUntilChanged, filter, first, map, skip, startWith, takeUntil, tap } from 'rxjs/operators'; +import { + distinctUntilChanged, + filter, + first, + map, + observeOn, + skip, + startWith, + takeUntil, + tap, +} from 'rxjs/operators'; import { PrizmCronUiSecondState } from './cron-ui-second.state'; import { PrizmCronUiMinuteState } from './cron-ui-minute.state'; import { PrizmCronUiHourState } from './cron-ui-hour.state'; @@ -21,7 +31,7 @@ import { prizmIsTextOverflow } from '../../util'; import { PrizmCronPeriod, PrizmCronTabItem, PrizmCronTabSpecifiedList } from './model'; import { PrizmCronUiDayState } from './cron-ui-day.state'; import { prizmDefaultProp } from '@prizm-ui/core'; -import { combineLatest, concat, Observable, timer } from 'rxjs'; +import { asapScheduler, BehaviorSubject, combineLatest, concat, Observable, timer } from 'rxjs'; import { PRIZM_LANGUAGE, PrizmLanguage, PrizmLanguageCron } from '@prizm-ui/i18n'; import { prizmCronHRToString } from '../cron-human-readable/human-readable/crons-i18n'; import { PRIZM_CRON } from '../../tokens'; @@ -133,21 +143,17 @@ export class PrizmCronComponent extends PrizmAbstractTestId implements OnInit { @Input() set selected(selected: PrizmCronTabItem) { - this.selectedSwitcherIdx = this.switchers.findIndex(i => i.id === selected); + this.selected$.next(selected); } @Input() specifiedList: PrizmCronTabSpecifiedList | null = null; @Input() set tabs(tabs: PrizmCronTabItem[]) { - this.switchers = this.switchers.map(i => { - i.hide = !tabs.includes(i.id as any); - return i; - }); - - if (tabs.length && !tabs.includes(this.selected)) { - this.selectedChange.emit((this.selected = tabs[0])); - } + this.tabs$.next(tabs); } + private tabs$: BehaviorSubject = new BehaviorSubject([]); + private selected$: BehaviorSubject = new BehaviorSubject('second'); + public switchers: PrizmSwitcherItem[] = [ { title: 'Секунды', @@ -211,6 +217,26 @@ export class PrizmCronComponent extends PrizmAbstractTestId implements OnInit { this.cronUiMinuteState.init(); this.initEndDateStateChanger(); this.saveInitialValue(); + + this.tabs$.pipe(takeUntil(this.destroy$), observeOn(asapScheduler)).subscribe(tabs => { + if (tabs.length) { + this.switchers = this.switchers.map(i => { + i.hide = !tabs.includes(i.id as any); + return i; + }); + } + }); + + this.selected$.pipe(takeUntil(this.destroy$), observeOn(asapScheduler)).subscribe(selected => { + this.selectedSwitcherIdx = this.switchers.findIndex(i => i.id === selected); + + const tabs = this.tabs$.getValue(); + if (tabs.length && !tabs.includes(selected)) { + this.selectedChange.emit(tabs[0]); + } else { + this.selectedChange.emit(selected); + } + }); } private endDateStateCorrector(): void { @@ -308,6 +334,6 @@ export class PrizmCronComponent extends PrizmAbstractTestId implements OnInit { public indexChanged(index: number): void { const selected = this.switchers.find((_, i) => i === index); - this.selectedChange.emit((this.selected = selected?.id as any)); + this.selected = selected?.id as any; } } From 0445cf8cb5ef2da08f0a91e416c97f3cda719164 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Fri, 19 Apr 2024 13:57:58 +0400 Subject: [PATCH 176/291] fix: added scroll to navigation menu #1585 --- ...prizm-navigation-menu-group.component.less | 2 +- .../prizm-navigation-menu.component.html | 30 +++++++++---------- .../prizm-navigation-menu.component.less | 13 +++++--- 3 files changed, 25 insertions(+), 20 deletions(-) diff --git a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-group/prizm-navigation-menu-group.component.less b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-group/prizm-navigation-menu-group.component.less index 7ee37e0d5e..b0b5afd0ad 100644 --- a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-group/prizm-navigation-menu-group.component.less +++ b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-group/prizm-navigation-menu-group.component.less @@ -6,7 +6,7 @@ .prizm-navigation-menu-group { --prizm-empty-message__padding: 16px 32px; - border-bottom: 1px solid var(--prizm-background-stroke); + border-bottom: 1px solid var(--prizm-v3-background-stroke); &_expanded:has(.empty-message) { border-bottom: none; diff --git a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.html b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.html index e91327b398..7c46859ea7 100644 --- a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.html +++ b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.html @@ -36,23 +36,23 @@ [toolbarExtraTemplate]="toolbarExtraTemplate" > - -
    - + +
    + +
    -
    - -
    -     + +
    + +
    + - -
    + + +
    -     -
    - + + +
    diff --git a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.less b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.less index 93da8b6452..3448d4c45d 100644 --- a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.less +++ b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.less @@ -7,7 +7,6 @@ height: 100%; background: var(--prizm-v3-background-fill-primary); border-right: 1px solid var(--prizm-v3-background-stroke); - border-bottom: 1px solid var(--prizm-v3-background-stroke); &__header { overflow: hidden; @@ -56,23 +55,29 @@ } .scrollable { - width: 100%; + height: 100%; + } + + .no-groups-content { + &__empty { + height: 100%; + } } .groups-content { + height: 100%; + overflow: hidden; display: flex; flex-direction: column; &__top { flex: 1; - overflow: auto; display: flex; flex-direction: column; } &__bottom { flex-shrink: 1; - overflow: hidden; } } } From 4d5cae0445def6e6658c17e7108184381174e0a2 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Fri, 19 Apr 2024 15:33:06 +0400 Subject: [PATCH 177/291] fix: bottom border of group removed. added top border #1585 --- .../prizm-navigation-menu-group.component.less | 2 +- .../prizm-navigation-menu/prizm-navigation-menu.component.less | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-group/prizm-navigation-menu-group.component.less b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-group/prizm-navigation-menu-group.component.less index b0b5afd0ad..da77bdf2ca 100644 --- a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-group/prizm-navigation-menu-group.component.less +++ b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu-group/prizm-navigation-menu-group.component.less @@ -6,7 +6,7 @@ .prizm-navigation-menu-group { --prizm-empty-message__padding: 16px 32px; - border-bottom: 1px solid var(--prizm-v3-background-stroke); + border-top: 1px solid var(--prizm-v3-background-stroke); &_expanded:has(.empty-message) { border-bottom: none; diff --git a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.less b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.less index 3448d4c45d..281da36c46 100644 --- a/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.less +++ b/libs/components/src/lib/components/navigation-menu/components/prizm-navigation-menu/prizm-navigation-menu.component.less @@ -10,7 +10,6 @@ &__header { overflow: hidden; - border-bottom: 1px solid var(--prizm-v3-background-stroke); } &__content { From 1b5a6f7837406b0d7b845e3f8f5e8967f7b00796 Mon Sep 17 00:00:00 2001 From: Alexandr Fedorov Date: Thu, 18 Apr 2024 15:31:17 +0400 Subject: [PATCH 178/291] feat: fixed cron title overflow #1431 --- libs/components/src/lib/components/cron/cron.component.html | 1 + libs/components/src/lib/components/cron/cron.component.less | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/libs/components/src/lib/components/cron/cron.component.html b/libs/components/src/lib/components/cron/cron.component.html index 9bd66ab213..36ff2b9372 100644 --- a/libs/components/src/lib/components/cron/cron.component.html +++ b/libs/components/src/lib/components/cron/cron.component.html @@ -13,6 +13,7 @@
    Date: Mon, 22 Apr 2024 13:31:05 +0300 Subject: [PATCH 179/291] fix: update native time value for min0max date time limit #1618 --- .../input-layout-date-time.component.ts | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.ts b/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.ts index 50829aa049..dddb9a33ed 100644 --- a/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.ts +++ b/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.ts @@ -334,10 +334,16 @@ export class PrizmInputLayoutDateTimeComponent if (date) time = this.limitTime(date, time, dateMin, dateMax); - this.focusableElement?.updateNativeValues({ - idx: 0, - value: date?.toString() ?? '', - }); + this.focusableElement?.updateNativeValues( + { + idx: 0, + value: date?.toString() ?? '', + }, + { + idx: 1, + value: time?.toString() ?? '', + } + ); // force update native value this.nativeValue$$.next([ From 0e3d0c0b59ff56e08cfbb051056e0424f8709c73 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 22 Apr 2024 15:41:41 +0300 Subject: [PATCH 180/291] feat: changelog update --- apps/doc/src/app/about-prizm/changelog/CHANGELOG.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index 4532da776f..e5d649c0c8 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. -## [1.17.0, 2.14.0, 3.13.0](https://github.com/zyfra/Prizm) (21-04-2023) +## [1.17.0, 2.14.0, 3.13.0](https://github.com/zyfra/Prizm) (22-04-2023) ## Features @@ -24,6 +24,7 @@ All notable changes to this project will be documented in this file. - fix(documentation): changed filesValidationErrors type in examples and live demo #1371 - fix(components/paginator): fixed width of rows selector #1466 - fix(components/column-settings): incorrect display of one unhidden column in column settings #1036 +- fix(components/input-layout-date-time): incorrect min max work for manual input #1618 - fix(theme): remove redundant token from default theme - fix(charts): charts tolltip background color error #1488 - fix(charts/bar): bar chart changing postion on theme chage #1492 From 2e465c6ef480f07c0c80fdefc189fbaea6375c04 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 22 Apr 2024 16:04:11 +0300 Subject: [PATCH 181/291] feat: update changelog --- apps/doc/src/app/about-prizm/changelog/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index e5d649c0c8..65e424596b 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -24,7 +24,7 @@ All notable changes to this project will be documented in this file. - fix(documentation): changed filesValidationErrors type in examples and live demo #1371 - fix(components/paginator): fixed width of rows selector #1466 - fix(components/column-settings): incorrect display of one unhidden column in column settings #1036 -- fix(components/input-layout-date-time): incorrect min max work for manual input #1618 +- fix(components/input-layout-date-time): incorrect min max work for manual input #1618, #883 - fix(theme): remove redundant token from default theme - fix(charts): charts tolltip background color error #1488 - fix(charts/bar): bar chart changing postion on theme chage #1492 From 67f0b19931cbec16a9b9e0b37b6ccea8c32ed384 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 22 Apr 2024 17:26:51 +0300 Subject: [PATCH 182/291] fix: changelog formatting #1499 --- apps/doc/src/app/about-prizm/changelog/CHANGELOG.md | 8 ++++---- .../app/about-prizm/changelog/changelog.component.less | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index 65e424596b..e0266bfef8 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -52,7 +52,7 @@ All notable changes to this project will be documented in this file. ## [1.16.0, 2.13.0, 3.12.0](https://github.com/zyfra/Prizm) (23-03-2023) -## Features +### Features - feat(components/breadcrumbs): change the focus to focus-visible for breadcrumbs #1297 - feat(components/checkbox): change the focus to focus-visible for checkbox #1297 @@ -111,7 +111,7 @@ All notable changes to this project will be documented in this file. ## [1.15.0, 2.12.0, 3.11.0](https://github.com/zyfra/Prizm) (30-01-2023) -## Features +### Features - feat(components/navigation-menu): add hint to navigation menu items and titles when text overflows #1216, #1312 - feat(components/accordion): add hint to accordion title when text overflows #1216, #1312 @@ -127,7 +127,7 @@ All notable changes to this project will be documented in this file. ## [1.14.0, 2.11.0, 3.10.0](https://github.com/zyfra/Prizm) (19-01-2023) -## Features +### Features - feat(doc): save current theme in local storage on change @@ -139,7 +139,7 @@ All notable changes to this project will be documented in this file. ## [1.13.0, 2.10.0, 3.9.0](https://github.com/zyfra/Prizm) (29-12-2023) -## Features +### Features - feat(components/sticky): update on changes #1085 - feat(component/event-zone): directive to standalone #1260 #1276 diff --git a/apps/doc/src/app/about-prizm/changelog/changelog.component.less b/apps/doc/src/app/about-prizm/changelog/changelog.component.less index 7c00db53df..d83dacebd9 100644 --- a/apps/doc/src/app/about-prizm/changelog/changelog.component.less +++ b/apps/doc/src/app/about-prizm/changelog/changelog.component.less @@ -5,6 +5,10 @@ markdown { display: none; } + & > :nth-child(3) { + margin-top: 0; + } + > * { margin-left: 1.25rem; } From 655757e8f89610d5d9681d4c78928b3397d0ac5a Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 22 Apr 2024 17:49:52 +0300 Subject: [PATCH 183/291] fix: changelog fix --- apps/doc/src/app/about-prizm/changelog/CHANGELOG.md | 2 +- .../src/app/about-prizm/changelog/changelog.component.less | 4 ---- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index e0266bfef8..1a88991b70 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -4,7 +4,7 @@ All notable changes to this project will be documented in this file. ## [1.17.0, 2.14.0, 3.13.0](https://github.com/zyfra/Prizm) (22-04-2023) -## Features +### Features - feat: checklist for release 4x version #1611 - feat: checklist for release 3x version #1612 diff --git a/apps/doc/src/app/about-prizm/changelog/changelog.component.less b/apps/doc/src/app/about-prizm/changelog/changelog.component.less index d83dacebd9..7c00db53df 100644 --- a/apps/doc/src/app/about-prizm/changelog/changelog.component.less +++ b/apps/doc/src/app/about-prizm/changelog/changelog.component.less @@ -5,10 +5,6 @@ markdown { display: none; } - & > :nth-child(3) { - margin-top: 0; - } - > * { margin-left: 1.25rem; } From 6aeaac7c736f2cb8008698bbc598ba7bf2316639 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 25 Apr 2024 10:38:44 +0300 Subject: [PATCH 184/291] fix: cron months blinks on hover #1642 --- .../components/cron/components/schedule/schedule.component.less | 1 + .../components/cron/components/schedule/schedule.component.ts | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/components/src/lib/components/cron/components/schedule/schedule.component.less b/libs/components/src/lib/components/cron/components/schedule/schedule.component.less index 8e23b060d3..5e096d5c98 100644 --- a/libs/components/src/lib/components/cron/components/schedule/schedule.component.less +++ b/libs/components/src/lib/components/cron/components/schedule/schedule.component.less @@ -13,6 +13,7 @@ justify-content: center; padding: 0 4px; color: var(--prizm-v3-text-icon-secondary); + border: 1px solid transparent; &.item.selected { background-color: var(--prizm-v3-button-primary-solid-default); diff --git a/libs/components/src/lib/components/cron/components/schedule/schedule.component.ts b/libs/components/src/lib/components/cron/components/schedule/schedule.component.ts index 3f0be04678..29adf67ab1 100644 --- a/libs/components/src/lib/components/cron/components/schedule/schedule.component.ts +++ b/libs/components/src/lib/components/cron/components/schedule/schedule.component.ts @@ -4,7 +4,6 @@ import { ContentChild, EventEmitter, Input, - OnInit, Output, TemplateRef, } from '@angular/core'; From da22f2d9d45a9eaefabaddb1fa140b8299a459af Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 25 Apr 2024 14:21:40 +0300 Subject: [PATCH 185/291] fix: only sort button click should fire sorting --- .../src/lib/components/table/th/th.component.html | 7 ++++--- libs/components/src/lib/components/table/th/th.style.less | 4 ---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/libs/components/src/lib/components/table/th/th.component.html b/libs/components/src/lib/components/table/th/th.component.html index 8b49279994..f3e9351f10 100644 --- a/libs/components/src/lib/components/table/th/th.component.html +++ b/libs/components/src/lib/components/table/th/th.component.html @@ -1,7 +1,7 @@ - - +
     diff --git a/libs/components/src/lib/components/table/th/th.style.less b/libs/components/src/lib/components/table/th/th.style.less index 15ef7f2223..04695454f8 100644 --- a/libs/components/src/lib/components/table/th/th.style.less +++ b/libs/components/src/lib/components/table/th/th.style.less @@ -66,10 +66,6 @@ font-weight: 600; color: var(--prizm-v3-text-icon-tertiary); - border: none; - outline: none; - background: transparent; - .sort__block { margin-left: 4px; display: flex; From ba811f24164fa95fdb00d0f578630325648fa4e2 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 25 Apr 2024 14:26:51 +0300 Subject: [PATCH 186/291] fix: table head height on every table size should be 32px #1643 --- .../src/lib/components/table/th/th.style.less | 35 +------------------ 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/libs/components/src/lib/components/table/th/th.style.less b/libs/components/src/lib/components/table/th/th.style.less index 04695454f8..56b2a56a49 100644 --- a/libs/components/src/lib/components/table/th/th.style.less +++ b/libs/components/src/lib/components/table/th/th.style.less @@ -1,9 +1,6 @@ -@height-s: 24px; -@height-m: 32px; -@height-l: 40px; - :host { padding: 0 8px; + height: 32px; border: 1px solid var(--prizm-v3-table-stroke-cell-default); background: var(--prizm-v3-table-fill-header-default); @@ -86,33 +83,3 @@ } } } - -:host-context([data-size='s']), -:host-context([data-size='xs']) { - height: @height-s; -} - -:host-context([data-size='m']) { - height: @height-m; -} - -:host-context([data-size='l']) { - height: @height-l; -} - -:host-context(tr:not(:first-child)) { - border-top: none; -} - -:host-context(table[data-size='s'] thead tr:nth-child(2)), -:host-context(table[data-size='xs'] thead tr:nth-child(2)) { - top: @height-s; -} - -:host-context(table[data-size='m'] thead tr:nth-child(2)) { - top: @height-m; -} - -:host-context(table[data-size='l'] thead tr:nth-child(2)) { - top: @height-l; -} From 7f43434cce13ad829eecbad06df0c9d1c859566b Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 26 Apr 2024 13:39:11 +0300 Subject: [PATCH 187/291] fix: editable row example td cursor changed --- .../table-editable-row-example.component.less | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less b/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less index 8fa798fd82..e9280bf7ab 100644 --- a/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less +++ b/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less @@ -9,7 +9,12 @@ } } + td:has(.edit-buttons-container) { + padding: 0; + } + .edit-buttons-container { + cursor: default; height: 100%; width: 100%; padding: 0 8px; From 2bd9e561788a6dfa41ee0f8e4fb2239843c804b9 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 26 Apr 2024 13:44:08 +0300 Subject: [PATCH 188/291] fix: add hover on table tree button --- .../src/lib/components/tree-button/tree-button.component.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/components/src/lib/components/tree-button/tree-button.component.less b/libs/components/src/lib/components/tree-button/tree-button.component.less index 37e1c13de6..b952f089a9 100644 --- a/libs/components/src/lib/components/tree-button/tree-button.component.less +++ b/libs/components/src/lib/components/tree-button/tree-button.component.less @@ -1,5 +1,9 @@ :host { display: inline-flex; + + &:hover { + color: var(--prizm-button-primary-solid-hover); + } } .hide { From 29f2f96341deaa784e4d0efcf592d817902dadd9 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 26 Apr 2024 23:13:41 +0300 Subject: [PATCH 189/291] fix: table filter example styles fix --- .../table-filter-example/table-filter-example.component.less | 1 + .../src/lib/components/tree-button/tree-button.component.less | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.less b/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.less index c501d0895c..64d4e8169e 100644 --- a/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.less +++ b/apps/doc/src/app/components/table/examples/table-filter-example/table-filter-example.component.less @@ -9,6 +9,7 @@ .filter { margin-left: auto; + width: 24px; &__category { margin-left: 4px; diff --git a/libs/components/src/lib/components/tree-button/tree-button.component.less b/libs/components/src/lib/components/tree-button/tree-button.component.less index b952f089a9..3c83da8b09 100644 --- a/libs/components/src/lib/components/tree-button/tree-button.component.less +++ b/libs/components/src/lib/components/tree-button/tree-button.component.less @@ -2,7 +2,7 @@ display: inline-flex; &:hover { - color: var(--prizm-button-primary-solid-hover); + color: var(--prizm-v3-button-primary-solid-hover); } } From 34e17f22ff1068ccc451f37bff04972c277ae7e8 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 26 Apr 2024 22:06:20 +0300 Subject: [PATCH 190/291] fix: table row default cursor --- .../table-editable-row-example.component.less | 1 - apps/doc/src/app/components/table/table-example.component.ts | 2 +- libs/components/src/lib/components/table/tr/tr.component.less | 3 +-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less b/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less index e9280bf7ab..b61c8177dc 100644 --- a/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less +++ b/apps/doc/src/app/components/table/examples/table-editable-row-example/table-editable-row-example.component.less @@ -14,7 +14,6 @@ } .edit-buttons-container { - cursor: default; height: 100%; width: 100%; padding: 0 8px; diff --git a/apps/doc/src/app/components/table/table-example.component.ts b/apps/doc/src/app/components/table/table-example.component.ts index 2c0c5ef53a..85161a1b24 100644 --- a/apps/doc/src/app/components/table/table-example.component.ts +++ b/apps/doc/src/app/components/table/table-example.component.ts @@ -14,7 +14,7 @@ export class TableExampleComponent { public products: ITableProduct[] = TABLE_EXAMPLE_DATA_1; public prizmTableRowOddBackground: string | null = null; public prizmTableRowBackground: string | null = null; - public prizmTableRowCursor = 'pointer'; + public prizmTableRowCursor = 'default'; public prizmTableRowHoverBackground: string | null = null; public prizmTableActiveRowMarkerColor: string | null = null; public columns: string[] = ['code', 'name', 'category', 'count']; diff --git a/libs/components/src/lib/components/table/tr/tr.component.less b/libs/components/src/lib/components/table/tr/tr.component.less index 0b3ac03ef7..9075ec757c 100644 --- a/libs/components/src/lib/components/table/tr/tr.component.less +++ b/libs/components/src/lib/components/table/tr/tr.component.less @@ -1,6 +1,5 @@ [prizmTbody] tr[prizmTr] { - cursor: var(--prizm-table-row-cursor, pointer); - + cursor: var(--prizm-table-row-cursor, default); color: var(--prizm-v3-text-icon-secondary); background: var(--prizm-table-row-background, var(--prizm-v3-background-fill-primary)); From f94504c0b15e12643cddf23c42f055366cacf609 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 26 Apr 2024 22:18:51 +0300 Subject: [PATCH 191/291] fix: table group example text fix --- .../table-dynamic-row-group-example.component.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/doc/src/app/components/table/examples/table-dynamic-row-group-example/table-dynamic-row-group-example.component.html b/apps/doc/src/app/components/table/examples/table-dynamic-row-group-example/table-dynamic-row-group-example.component.html index 95d4f043e6..0fdab3aebb 100644 --- a/apps/doc/src/app/components/table/examples/table-dynamic-row-group-example/table-dynamic-row-group-example.component.html +++ b/apps/doc/src/app/components/table/examples/table-dynamic-row-group-example/table-dynamic-row-group-example.component.html @@ -11,7 +11,7 @@ - + Date: Sat, 27 Apr 2024 13:13:51 +0300 Subject: [PATCH 192/291] fix: scroll theme works incorrect #1657 --- .../scrollbar/scroll-controls.component.html | 4 ++-- .../components/scrollbar/scroll-controls.component.ts | 10 +--------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/libs/components/src/lib/components/scrollbar/scroll-controls.component.html b/libs/components/src/lib/components/scrollbar/scroll-controls.component.html index f3ac602835..33fafc6b51 100644 --- a/libs/components/src/lib/components/scrollbar/scroll-controls.component.html +++ b/libs/components/src/lib/components/scrollbar/scroll-controls.component.html @@ -6,7 +6,7 @@ [class.bar_has-horizontal]="bars[1]" prizmScrollbarWrapper > -
    +
    -
    +
    diff --git a/libs/components/src/lib/components/scrollbar/scroll-controls.component.ts b/libs/components/src/lib/components/scrollbar/scroll-controls.component.ts index 1cb09649e9..493770e467 100644 --- a/libs/components/src/lib/components/scrollbar/scroll-controls.component.ts +++ b/libs/components/src/lib/components/scrollbar/scroll-controls.component.ts @@ -9,7 +9,6 @@ import { PRIZM_ANIMATION_OPTIONS, PRIZM_SCROLL_REF } from '../../tokens'; import { AnimationOptions } from '@angular/animations'; import { PrizmAbstractTestId } from '../../abstract/interactive'; import { PrizmLetDirective } from '@prizm-ui/helpers'; -import { PrizmThemeModule } from '@prizm-ui/theme'; import { PrizmScrollbarWrapperDirective } from './scrollbar-wrapper.directive'; import { PrizmScrollbarDirective } from './scrollbar.directive'; @@ -20,14 +19,7 @@ import { PrizmScrollbarDirective } from './scrollbar.directive'; changeDetection: ChangeDetectionStrategy.OnPush, animations: [prizmFadeIn], standalone: true, - imports: [ - NgIf, - AsyncPipe, - PrizmLetDirective, - PrizmThemeModule, - PrizmScrollbarWrapperDirective, - PrizmScrollbarDirective, - ], + imports: [NgIf, AsyncPipe, PrizmLetDirective, PrizmScrollbarWrapperDirective, PrizmScrollbarDirective], }) export class PrizmScrollControlsComponent extends PrizmAbstractTestId { override readonly testId_ = 'ui_scroll_controls'; From 1a54c5491b8040032627493504e729d7e6105a4d Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Sun, 28 Apr 2024 13:32:14 +0300 Subject: [PATCH 193/291] fix: table examples styles improvement #1655 --- .../table-track-by-example.component.less | 4 ---- .../src/app/components/table/table-example.component.html | 6 +----- .../src/lib/components/table/tbody/tbody.component.less | 4 ++++ 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/apps/doc/src/app/components/table/examples/table-track-by-example/table-track-by-example.component.less b/apps/doc/src/app/components/table/examples/table-track-by-example/table-track-by-example.component.less index 0fe37ae38e..bed8398e03 100644 --- a/apps/doc/src/app/components/table/examples/table-track-by-example/table-track-by-example.component.less +++ b/apps/doc/src/app/components/table/examples/table-track-by-example/table-track-by-example.component.less @@ -8,10 +8,6 @@ } } - tr { - height: 100px; - } - .overlay-tpl { width: 200px; height: 200px; diff --git a/apps/doc/src/app/components/table/table-example.component.html b/apps/doc/src/app/components/table/table-example.component.html index 3c35e84cd6..aa55918e87 100644 --- a/apps/doc/src/app/components/table/table-example.component.html +++ b/apps/doc/src/app/components/table/table-example.component.html @@ -62,11 +62,7 @@ - + diff --git a/libs/components/src/lib/components/table/tbody/tbody.component.less b/libs/components/src/lib/components/table/tbody/tbody.component.less index eb79e31bf5..7c6a71bb33 100644 --- a/libs/components/src/lib/components/table/tbody/tbody.component.less +++ b/libs/components/src/lib/components/table/tbody/tbody.component.less @@ -43,6 +43,10 @@ &_expanded { transform: rotate(90deg); } + + &:hover { + color: var(--prizm-v3-button-primary-solid-hover); + } } &__content { From 60d48fa9e276f083085dcd01ae1c67898c849ba1 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 13 May 2024 14:21:32 +0300 Subject: [PATCH 194/291] fix: style fix for table head border top #1643 --- libs/components/src/lib/components/table/th/th.style.less | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/libs/components/src/lib/components/table/th/th.style.less b/libs/components/src/lib/components/table/th/th.style.less index 56b2a56a49..2dc2f332f9 100644 --- a/libs/components/src/lib/components/table/th/th.style.less +++ b/libs/components/src/lib/components/table/th/th.style.less @@ -83,3 +83,7 @@ } } } + +:host-context(tr:not(:first-child)) { + border-top: none; +} From f1ee3420efd9cf2d19006bc5c5ef785f400a48b7 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 14 May 2024 11:38:24 +0300 Subject: [PATCH 195/291] feat(components/table): add 5 lines rowspan support for table head #000 --- .../table-sort-example.component.html | 16 +++++++++++++--- .../table-sort-example.component.ts | 4 ++++ .../src/lib/components/table/th/th.style.less | 15 ++++++++++++++- 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/apps/doc/src/app/components/table/examples/table-sort-example/table-sort-example.component.html b/apps/doc/src/app/components/table/examples/table-sort-example/table-sort-example.component.html index 61fde27cfa..d9796c4176 100644 --- a/apps/doc/src/app/components/table/examples/table-sort-example/table-sort-example.component.html +++ b/apps/doc/src/app/components/table/examples/table-sort-example/table-sort-example.component.html @@ -5,10 +5,10 @@ - + - - + + + + + diff --git a/apps/doc/src/app/components/table/examples/table-sort-example/table-sort-example.component.ts b/apps/doc/src/app/components/table/examples/table-sort-example/table-sort-example.component.ts index 060b8164fb..77b2a15271 100644 --- a/apps/doc/src/app/components/table/examples/table-sort-example/table-sort-example.component.ts +++ b/apps/doc/src/app/components/table/examples/table-sort-example/table-sort-example.component.ts @@ -108,4 +108,8 @@ export class TableSortExampleComponent { (product[key] as string).toLowerCase().includes(this.searchString as string) ); } + + public doSomething(value: string, key: T): void { + console.log(value, key); + } } diff --git a/libs/components/src/lib/components/table/th/th.style.less b/libs/components/src/lib/components/table/th/th.style.less index 2dc2f332f9..6e329e859b 100644 --- a/libs/components/src/lib/components/table/th/th.style.less +++ b/libs/components/src/lib/components/table/th/th.style.less @@ -1,6 +1,9 @@ +@height: 32px; +@rows: 5; + :host { padding: 0 8px; - height: 32px; + height: @height; border: 1px solid var(--prizm-v3-table-stroke-cell-default); background: var(--prizm-v3-table-fill-header-default); @@ -87,3 +90,13 @@ :host-context(tr:not(:first-child)) { border-top: none; } + +.tr-position-top(@n) when (@n <= @rows) { + :host-context(table thead tr:nth-child(@{n})) { + top: @height * (@n - 1); + } + + .tr-position-top(@n + 1); +} + +.tr-position-top(2); From ba0f49dcfaa168e062e20b232594721ee94fe550 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Wed, 15 May 2024 15:11:11 +0300 Subject: [PATCH 196/291] fix: revert fix for 32px height of table head for v3 as bc #000 --- .../src/lib/components/table/th/th.style.less | 86 +++++++++++++++---- 1 file changed, 68 insertions(+), 18 deletions(-) diff --git a/libs/components/src/lib/components/table/th/th.style.less b/libs/components/src/lib/components/table/th/th.style.less index 6e329e859b..e70c36b794 100644 --- a/libs/components/src/lib/components/table/th/th.style.less +++ b/libs/components/src/lib/components/table/th/th.style.less @@ -1,9 +1,9 @@ -@height: 32px; -@rows: 5; +@height-s: 24px; +@height-m: 32px; +@height-l: 40px; :host { padding: 0 8px; - height: @height; border: 1px solid var(--prizm-v3-table-stroke-cell-default); background: var(--prizm-v3-table-fill-header-default); @@ -25,15 +25,6 @@ &:not(:first-child) { border-left: none; } - // TODO: for 4.0 - // &:has([prizmInput]:hover) { - // box-shadow: 0 0 0 1px var(--prizm-v3-table-stroke-cell-hover) inset; - // } - - // &:has([prizmInput]:focus) { - // background-color: var(--prizm-v3-background-fill-primary); - // box-shadow: 0 0 0 1px var(--prizm-v3-table-stroke-cell-active) inset; - // } .resize-bar { height: 100%; @@ -91,12 +82,71 @@ border-top: none; } -.tr-position-top(@n) when (@n <= @rows) { - :host-context(table thead tr:nth-child(@{n})) { - top: @height * (@n - 1); - } +:host-context([data-size='s']), +:host-context([data-size='xs']) { + height: @height-s; +} + +:host-context([data-size='m']) { + height: @height-m; +} + +:host-context([data-size='l']) { + height: @height-l; +} + +:host-context(tr:not(:first-child)) { + border-top: none; +} + +:host-context(table[data-size='s'] thead tr:nth-child(2)), +:host-context(table[data-size='xs'] thead tr:nth-child(2)) { + top: @height-s; +} + +:host-context(table[data-size='m'] thead tr:nth-child(2)) { + top: @height-m; +} + +:host-context(table[data-size='l'] thead tr:nth-child(2)) { + top: @height-l; +} + +:host-context(table[data-size='s'] thead tr:nth-child(3)), +:host-context(table[data-size='xs'] thead tr:nth-child(3)) { + top: @height-s * 2; +} + +:host-context(table[data-size='m'] thead tr:nth-child(3)) { + top: @height-m * 2; +} + +:host-context(table[data-size='l'] thead tr:nth-child(3)) { + top: @height-l * 2; +} + +:host-context(table[data-size='s'] thead tr:nth-child(4)), +:host-context(table[data-size='xs'] thead tr:nth-child(4)) { + top: @height-s * 3; +} + +:host-context(table[data-size='m'] thead tr:nth-child(4)) { + top: @height-m * 3; +} + +:host-context(table[data-size='l'] thead tr:nth-child(4)) { + top: @height-l * 3; +} + +:host-context(table[data-size='s'] thead tr:nth-child(5)), +:host-context(table[data-size='xs'] thead tr:nth-child(5)) { + top: @height-s * 4; +} - .tr-position-top(@n + 1); +:host-context(table[data-size='m'] thead tr:nth-child(5)) { + top: @height-m * 4; } -.tr-position-top(2); +:host-context(table[data-size='l'] thead tr:nth-child(5)) { + top: @height-l * 4; +} From e93e0ab61c3459fa27625556e81c851d4aebe584 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 17 May 2024 11:49:24 +0300 Subject: [PATCH 197/291] fix(doc/dialog): add dismissable prop to live demo #1551 --- .../dialogs/dialog/dialog-example.component.html | 8 ++++++++ .../components/dialogs/dialog/dialog-example.component.ts | 2 ++ 2 files changed, 10 insertions(+) diff --git a/apps/doc/src/app/components/dialogs/dialog/dialog-example.component.html b/apps/doc/src/app/components/dialogs/dialog/dialog-example.component.html index 1b40073d7f..841013afb1 100644 --- a/apps/doc/src/app/components/dialogs/dialog/dialog-example.component.html +++ b/apps/doc/src/app/components/dialogs/dialog/dialog-example.component.html @@ -87,6 +87,14 @@ Backdrop + + Dismissable + + >> | null = null; + public dismissable = true; public readonly exampleModule: RawLoaderContent = import('./examples/setup-module.md?raw'); @@ -115,6 +116,7 @@ export class DialogExampleComponent { position: this.position, closeWord: this.closeWord, size: this.size, + dismissible: this.dismissable, }) .subscribe(result => console.log('result from dialog', { result })); } From 2ef6bd247d80270da42d08555f190282e6dc54a0 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 17 May 2024 11:53:41 +0300 Subject: [PATCH 198/291] fix(doc/dialog): fix spelling error #000 --- .../components/dialogs/dialog/dialog-example.component.html | 6 +++--- .../components/dialogs/dialog/dialog-example.component.ts | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/doc/src/app/components/dialogs/dialog/dialog-example.component.html b/apps/doc/src/app/components/dialogs/dialog/dialog-example.component.html index 841013afb1..ca72610a61 100644 --- a/apps/doc/src/app/components/dialogs/dialog/dialog-example.component.html +++ b/apps/doc/src/app/components/dialogs/dialog/dialog-example.component.html @@ -88,11 +88,11 @@ - Dismissable + Dismissible >> | null = null; - public dismissable = true; + public dismissible = true; public readonly exampleModule: RawLoaderContent = import('./examples/setup-module.md?raw'); @@ -116,7 +116,7 @@ export class DialogExampleComponent { position: this.position, closeWord: this.closeWord, size: this.size, - dismissible: this.dismissable, + dismissible: this.dismissible, }) .subscribe(result => console.log('result from dialog', { result })); } From 5bc6c51113e5673eab396a41d2f6ec7737ece41b Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 17 May 2024 15:48:09 +0300 Subject: [PATCH 199/291] feat(chore/release): 1.17.0 up to 1.17.1 #000 --- .github/workflows/beta-publish-ng14.yml | 2 +- .github/workflows/main-publish-ng14.yml | 2 +- .github/workflows/pre-release-publish-ng14.yml | 2 +- .../src/app/version-manager/current.const.ts.ng14 | 2 +- .../src/app/version-manager/versions.constants.ts | 12 ++++++------ libs/ast/package.json.ng14 | 2 +- libs/charts/base/package.json.ng14 | 6 +++--- libs/components/package.json.ng14 | 10 +++++----- libs/core/package.json.ng14 | 2 +- libs/helpers/package.json.ng14 | 2 +- libs/i18n/package.json.ng14 | 2 +- libs/icons/base/package.json.ng14 | 4 ++-- libs/icons/flags/package.json.ng14 | 4 ++-- libs/nxmv/package.json.ng14 | 2 +- libs/plugin/package.json.ng14 | 4 ++-- libs/schematics/package.json.ng14 | 2 +- libs/theme/package.json.ng14 | 6 +++--- package.json.ng14 | 2 +- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/beta-publish-ng14.yml b/.github/workflows/beta-publish-ng14.yml index d32c3e7774..9e212e99ce 100644 --- a/.github/workflows/beta-publish-ng14.yml +++ b/.github/workflows/beta-publish-ng14.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng14beta --json 2>/dev/null || echo '1.17.0-ng14beta.0') | jq '([.[] | select(startswith("1.17.0-ng14beta"))] | last // "1.17.0-ng14beta.0")' 2>/dev/null || echo '1.17.0-ng14beta.0' + (npm view @prizm-ui/components versions --tag ng14beta --json 2>/dev/null || echo '1.17.1-ng14beta.0') | jq '([.[] | select(startswith("1.17.1-ng14beta"))] | last // "1.17.1-ng14beta.0")' 2>/dev/null || echo '1.17.1-ng14beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng14.yml b/.github/workflows/main-publish-ng14.yml index fb3b5ccec7..284394a291 100644 --- a/.github/workflows/main-publish-ng14.yml +++ b/.github/workflows/main-publish-ng14.yml @@ -58,7 +58,7 @@ jobs: - name: Set up environment variables run: | last_v1_version=$( - echo '1.17.0' + echo '1.17.1' ) echo "LAST_V1_VERSION=${last_v1_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng14.yml b/.github/workflows/pre-release-publish-ng14.yml index 11cdce2a7f..c9b6603ee6 100644 --- a/.github/workflows/pre-release-publish-ng14.yml +++ b/.github/workflows/pre-release-publish-ng14.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng14next --json 2>/dev/null || echo '1.17.0-ng14next.0') | jq '([.[] | select(startswith("1.17.0-ng14next"))] | last // "1.17.0-ng14next.0")' 2>/dev/null || echo '1.17.0-ng14next.0' + (npm view @prizm-ui/components versions --tag ng14next --json 2>/dev/null || echo '1.17.1-ng14next.0') | jq '([.[] | select(startswith("1.17.1-ng14next"))] | last // "1.17.1-ng14next.0")' 2>/dev/null || echo '1.17.1-ng14next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/apps/doc/src/app/version-manager/current.const.ts.ng14 b/apps/doc/src/app/version-manager/current.const.ts.ng14 index a87de4bad2..f8eeb8a051 100644 --- a/apps/doc/src/app/version-manager/current.const.ts.ng14 +++ b/apps/doc/src/app/version-manager/current.const.ts.ng14 @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '1.17.0'; +export const PRIZM_CURRENT_VERSION = '1.17.1'; diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index dae57db107..d5b6e3f54f 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -30,8 +30,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ }, }, { - label: '1.17.0 (ng14)', - version: '1.17.0', + label: '1.17.1 (ng14)', + version: '1.17.1', stackblitz: 'https://stackblitz.com/edit/prizm-v1-demo', link: new URL('https://prizm-v1.web.app'), otherLinks: [], @@ -54,8 +54,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '1.17.0-next (ng14)', - version: '1.17.0-next', + label: '1.17.1-next (ng14)', + version: '1.17.1-next', stackblitz: 'https://stackblitz.com/edit/prizm-v1-next-demo', link: new URL('https://prizm-v1-next.web.app'), otherLinks: [], @@ -75,8 +75,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '1.17.0-beta (ng14)', - version: '1.17.0-beta', + label: '1.17.1-beta (ng14)', + version: '1.17.1-beta', stackblitz: 'https://stackblitz.com/edit/prizm-v1-beta-demo', link: new URL('https://prizm-v1-beta.web.app'), otherLinks: [], diff --git a/libs/ast/package.json.ng14 b/libs/ast/package.json.ng14 index a696d133c5..4835e2bd7a 100644 --- a/libs/ast/package.json.ng14 +++ b/libs/ast/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "1.17.0", + "version": "1.17.1", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json.ng14 b/libs/charts/base/package.json.ng14 index a1c56fcddd..78d2f68bd2 100644 --- a/libs/charts/base/package.json.ng14 +++ b/libs/charts/base/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "1.17.0", + "version": "1.17.1", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/theme": "^1.17.0", - "@prizm-ui/helpers": "^1.17.0", + "@prizm-ui/theme": "^1.17.1", + "@prizm-ui/helpers": "^1.17.1", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/package.json.ng14 b/libs/components/package.json.ng14 index bb87af7467..a350cac5cc 100644 --- a/libs/components/package.json.ng14 +++ b/libs/components/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "1.17.0", + "version": "1.17.1", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -17,10 +17,10 @@ "@ng-web-apis/resize-observer": "2.0.0", "@ng-web-apis/intersection-observer": "2.0.0", "@ng-web-apis/mutation-observer": "2.0.0", - "@prizm-ui/helpers": "^1.17.0", - "@prizm-ui/core": "^1.17.0", - "@prizm-ui/i18n": "^1.17.0", - "@prizm-ui/theme": "^1.17.0" + "@prizm-ui/helpers": "^1.17.1", + "@prizm-ui/core": "^1.17.1", + "@prizm-ui/i18n": "^1.17.1", + "@prizm-ui/theme": "^1.17.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json.ng14 b/libs/core/package.json.ng14 index 4a60f6a10c..78c25b17f5 100644 --- a/libs/core/package.json.ng14 +++ b/libs/core/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "1.17.0", + "version": "1.17.1", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json.ng14 b/libs/helpers/package.json.ng14 index 146c247f82..134ed0ee5d 100644 --- a/libs/helpers/package.json.ng14 +++ b/libs/helpers/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "1.17.0", + "version": "1.17.1", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json.ng14 b/libs/i18n/package.json.ng14 index b6e9caa2c3..6f54763272 100644 --- a/libs/i18n/package.json.ng14 +++ b/libs/i18n/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "1.17.0", + "version": "1.17.1", "peerDependencies": { "@angular/core": "^14.2.0" }, diff --git a/libs/icons/base/package.json.ng14 b/libs/icons/base/package.json.ng14 index d8e8313c7a..180d6fb11f 100644 --- a/libs/icons/base/package.json.ng14 +++ b/libs/icons/base/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "1.17.0", + "version": "1.17.1", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/core": "^1.17.0" + "@prizm-ui/core": "^1.17.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json.ng14 b/libs/icons/flags/package.json.ng14 index 59d81e978d..cf704be57c 100644 --- a/libs/icons/flags/package.json.ng14 +++ b/libs/icons/flags/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "1.17.0", + "version": "1.17.1", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/core": "^1.17.0" + "@prizm-ui/core": "^1.17.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json.ng14 b/libs/nxmv/package.json.ng14 index 42c1adc08f..a1a4eec76d 100644 --- a/libs/nxmv/package.json.ng14 +++ b/libs/nxmv/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "1.17.0", + "version": "1.17.1", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json.ng14 b/libs/plugin/package.json.ng14 index 21cd4858f2..6c751b67d6 100644 --- a/libs/plugin/package.json.ng14 +++ b/libs/plugin/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "1.17.0", + "version": "1.17.1", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^1.17.0" + "@prizm-ui/ast": "^1.17.1" } } diff --git a/libs/schematics/package.json.ng14 b/libs/schematics/package.json.ng14 index 8ecb0b6faa..1e7eb95cdc 100644 --- a/libs/schematics/package.json.ng14 +++ b/libs/schematics/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "1.17.0", + "version": "1.17.1", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json.ng14 b/libs/theme/package.json.ng14 index 1cdf56e8ef..4973efa484 100644 --- a/libs/theme/package.json.ng14 +++ b/libs/theme/package.json.ng14 @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "1.17.0", + "version": "1.17.1", "peerDependencies": { "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/core": "^1.17.0", - "@prizm-ui/helpers": "^1.17.0" + "@prizm-ui/core": "^1.17.1", + "@prizm-ui/helpers": "^1.17.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json.ng14 b/package.json.ng14 index feca95a191..c38b7c627b 100644 --- a/package.json.ng14 +++ b/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "1.17.0", + "version": "1.17.1", "license": "MIT", "husky": { "hooks": { From 57bc27212e3211afae06a9fdfc8ec68e39969f3a Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 17 May 2024 16:27:07 +0300 Subject: [PATCH 200/291] feat(chore/release): 2.14.0 up to 2.14.1 #000 --- .github/workflows/beta-publish-ng15.yml | 2 +- .github/workflows/main-publish-ng15.yml | 2 +- .github/workflows/pre-release-publish-ng15.yml | 2 +- .../src/app/version-manager/current.const.ts.ng15 | 2 +- .../src/app/version-manager/versions.constants.ts | 12 ++++++------ libs/ast/package.json.ng15 | 2 +- libs/charts/base/package.json.ng15 | 6 +++--- libs/components/package.json.ng15 | 10 +++++----- libs/core/package.json.ng15 | 2 +- libs/helpers/package.json.ng15 | 2 +- libs/i18n/package.json.ng15 | 2 +- libs/icons/base/package.json.ng15 | 4 ++-- libs/icons/flags/package.json.ng15 | 4 ++-- libs/nxmv/package.json.ng15 | 2 +- libs/plugin/package.json.ng15 | 4 ++-- libs/schematics/package.json.ng15 | 2 +- libs/theme/package.json.ng15 | 6 +++--- package.json.ng15 | 2 +- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/beta-publish-ng15.yml b/.github/workflows/beta-publish-ng15.yml index a9ec9ce8f3..0aa4fcbd15 100644 --- a/.github/workflows/beta-publish-ng15.yml +++ b/.github/workflows/beta-publish-ng15.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng15beta --json 2>/dev/null || echo '2.14.0-ng15beta.0') | jq '([.[] | select(startswith("2.14.0-ng15beta"))] | last // "2.14.0-ng15beta.0")' 2>/dev/null || echo '2.14.0-ng15beta.0' + (npm view @prizm-ui/components versions --tag ng15beta --json 2>/dev/null || echo '2.14.1-ng15beta.0') | jq '([.[] | select(startswith("2.14.1-ng15beta"))] | last // "2.14.1-ng15beta.0")' 2>/dev/null || echo '2.14.1-ng15beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng15.yml b/.github/workflows/main-publish-ng15.yml index f86389d22a..c5847eb120 100644 --- a/.github/workflows/main-publish-ng15.yml +++ b/.github/workflows/main-publish-ng15.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_v2_version=$( - echo '2.14.0' + echo '2.14.1' ) echo "LAST_V2_VERSION=${last_v2_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng15.yml b/.github/workflows/pre-release-publish-ng15.yml index 0d29aadefe..2a6842c554 100644 --- a/.github/workflows/pre-release-publish-ng15.yml +++ b/.github/workflows/pre-release-publish-ng15.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng15next --json 2>/dev/null || echo '2.14.0-ng15next.0') | jq '([.[] | select(startswith("2.14.0-ng15next"))] | last // "2.14.0-ng15next.0")' 2>/dev/null || echo '2.14.0-ng15next.0' + (npm view @prizm-ui/components versions --tag ng15next --json 2>/dev/null || echo '2.14.1-ng15next.0') | jq '([.[] | select(startswith("2.14.1-ng15next"))] | last // "2.14.1-ng15next.0")' 2>/dev/null || echo '2.14.1-ng15next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/apps/doc/src/app/version-manager/current.const.ts.ng15 b/apps/doc/src/app/version-manager/current.const.ts.ng15 index ee84901a89..22329e3cb5 100644 --- a/apps/doc/src/app/version-manager/current.const.ts.ng15 +++ b/apps/doc/src/app/version-manager/current.const.ts.ng15 @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '2.14.0'; +export const PRIZM_CURRENT_VERSION = '2.14.1'; diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index d5b6e3f54f..3d1baf19f9 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -20,8 +20,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ }, }, { - label: '2.14.0 (ng15)', - version: '2.14.0', + label: '2.14.1 (ng15)', + version: '2.14.1', stackblitz: 'https://stackblitz.com/edit/prizm-v2-demo', link: new URL('https://prizm-v2.web.app'), otherLinks: [], @@ -47,9 +47,9 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '2.14.0-next (ng15)', + label: '2.14.1-next (ng15)', stackblitz: 'https://stackblitz.com/edit/prizm-v2-next-demo', - version: '2.14.0-next', + version: '2.14.1-next', link: new URL('https://prizm-v2-next.web.app'), otherLinks: [], }, @@ -68,8 +68,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '2.14.0-beta (ng15)', - version: '2.14.0-beta', + label: '2.14.1-beta (ng15)', + version: '2.14.1-beta', stackblitz: 'https://stackblitz.com/edit/prizm-v2-beta-demo', link: new URL('https://prizm-v2-beta.web.app'), otherLinks: [], diff --git a/libs/ast/package.json.ng15 b/libs/ast/package.json.ng15 index c97b416972..4a103ce573 100644 --- a/libs/ast/package.json.ng15 +++ b/libs/ast/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "2.14.0", + "version": "2.14.1", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json.ng15 b/libs/charts/base/package.json.ng15 index 81b336e160..b6b2fae4a6 100644 --- a/libs/charts/base/package.json.ng15 +++ b/libs/charts/base/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "2.14.0", + "version": "2.14.1", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/theme": "^2.14.0", - "@prizm-ui/helpers": "^2.14.0", + "@prizm-ui/theme": "^2.14.1", + "@prizm-ui/helpers": "^2.14.1", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/package.json.ng15 b/libs/components/package.json.ng15 index 9984e48b52..4f12a1a2b7 100644 --- a/libs/components/package.json.ng15 +++ b/libs/components/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "2.14.0", + "version": "2.14.1", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -18,10 +18,10 @@ "@ng-web-apis/resize-observer": "2.0.0", "@ng-web-apis/intersection-observer": "2.0.0", "@ng-web-apis/mutation-observer": "2.0.0", - "@prizm-ui/helpers": "^2.14.0", - "@prizm-ui/core": "^2.14.0", - "@prizm-ui/i18n": "^2.14.0", - "@prizm-ui/theme": "^2.14.0" + "@prizm-ui/helpers": "^2.14.1", + "@prizm-ui/core": "^2.14.1", + "@prizm-ui/i18n": "^2.14.1", + "@prizm-ui/theme": "^2.14.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json.ng15 b/libs/core/package.json.ng15 index 06fa7f2c89..6d3e980781 100644 --- a/libs/core/package.json.ng15 +++ b/libs/core/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "2.14.0", + "version": "2.14.1", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json.ng15 b/libs/helpers/package.json.ng15 index 7ddbc09244..896d20ac8a 100644 --- a/libs/helpers/package.json.ng15 +++ b/libs/helpers/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "2.14.0", + "version": "2.14.1", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json.ng15 b/libs/i18n/package.json.ng15 index 75cd858ff6..b450ea1134 100644 --- a/libs/i18n/package.json.ng15 +++ b/libs/i18n/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "2.14.0", + "version": "2.14.1", "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0" diff --git a/libs/icons/base/package.json.ng15 b/libs/icons/base/package.json.ng15 index 8c960841e2..5cc0f8eda1 100644 --- a/libs/icons/base/package.json.ng15 +++ b/libs/icons/base/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "2.14.0", + "version": "2.14.1", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/core": "^2.14.0" + "@prizm-ui/core": "^2.14.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json.ng15 b/libs/icons/flags/package.json.ng15 index 7f33cd261a..8afe95a49c 100644 --- a/libs/icons/flags/package.json.ng15 +++ b/libs/icons/flags/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "2.14.0", + "version": "2.14.1", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/core": "^2.14.0" + "@prizm-ui/core": "^2.14.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json.ng15 b/libs/nxmv/package.json.ng15 index b1e9651afe..9e1c5dccf7 100644 --- a/libs/nxmv/package.json.ng15 +++ b/libs/nxmv/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "2.14.0", + "version": "2.14.1", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json.ng15 b/libs/plugin/package.json.ng15 index c0c634d7aa..ad8703f458 100644 --- a/libs/plugin/package.json.ng15 +++ b/libs/plugin/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "2.14.0", + "version": "2.14.1", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^2.14.0" + "@prizm-ui/ast": "^2.14.1" } } diff --git a/libs/schematics/package.json.ng15 b/libs/schematics/package.json.ng15 index c83980bd15..8a18eaefb6 100644 --- a/libs/schematics/package.json.ng15 +++ b/libs/schematics/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "2.14.0", + "version": "2.14.1", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json.ng15 b/libs/theme/package.json.ng15 index aff548521b..9bb805473e 100644 --- a/libs/theme/package.json.ng15 +++ b/libs/theme/package.json.ng15 @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "2.14.0", + "version": "2.14.1", "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/core": "^2.14.0", - "@prizm-ui/helpers": "^2.14.0" + "@prizm-ui/core": "^2.14.1", + "@prizm-ui/helpers": "^2.14.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json.ng15 b/package.json.ng15 index 2d9ae63d0c..bddd47d114 100644 --- a/package.json.ng15 +++ b/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "2.14.0", + "version": "2.14.1", "license": "MIT", "husky": { "hooks": { From 7ca5f95a858e163ed952579a5344a3fbef9c6bac Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 17 May 2024 17:36:33 +0300 Subject: [PATCH 201/291] feat(chore/release): version 3.13.0 up to 3.13.1 #000 --- .github/workflows/beta-publish-ng16.yml | 2 +- .github/workflows/main-publish-ng16.yml | 2 +- .github/workflows/pre-release-publish-ng16.yml | 2 +- .../src/app/version-manager/current.const.ts.ng16 | 2 +- .../src/app/version-manager/versions.constants.ts | 12 ++++++------ libs/ast/package.json.ng16 | 2 +- libs/charts/base/package.json | 6 +++--- libs/charts/base/package.json.ng16 | 6 +++--- libs/components/package.json.ng16 | 10 +++++----- libs/core/package.json.ng16 | 2 +- libs/helpers/package.json.ng16 | 2 +- libs/i18n/package.json.ng16 | 2 +- libs/icons/base/package.json.ng16 | 4 ++-- libs/icons/flags/package.json.ng16 | 4 ++-- libs/nxmv/package.json.ng16 | 2 +- libs/plugin/package.json.ng16 | 4 ++-- libs/schematics/package.json.ng16 | 2 +- libs/theme/package.json.ng16 | 6 +++--- package.json.ng16 | 2 +- 19 files changed, 37 insertions(+), 37 deletions(-) diff --git a/.github/workflows/beta-publish-ng16.yml b/.github/workflows/beta-publish-ng16.yml index 6d0dadfb24..7fbb9c27c7 100644 --- a/.github/workflows/beta-publish-ng16.yml +++ b/.github/workflows/beta-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng16beta --json 2>/dev/null || echo '3.13.0-beta.0') | jq '([.[] | select(startswith("3.13.0-beta"))] | last // "3.13.0-beta.0")' 2>/dev/null || echo '3.13.0-beta.0' + (npm view @prizm-ui/components versions --tag ng16beta --json 2>/dev/null || echo '3.13.1-beta.0') | jq '([.[] | select(startswith("3.13.1-beta"))] | last // "3.13.1-beta.0")' 2>/dev/null || echo '3.13.1-beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng16.yml b/.github/workflows/main-publish-ng16.yml index 548c84c8cb..fa80da8bc6 100644 --- a/.github/workflows/main-publish-ng16.yml +++ b/.github/workflows/main-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_v3_version=$( - echo '3.13.0' + echo '3.13.1' ) echo "LAST_V3_VERSION=${last_v3_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng16.yml b/.github/workflows/pre-release-publish-ng16.yml index 94efb00c51..bd545afcbd 100644 --- a/.github/workflows/pre-release-publish-ng16.yml +++ b/.github/workflows/pre-release-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng16next --json 2>/dev/null || echo '3.13.0-next.0') | jq '([.[] | select(startswith("3.13.0-next"))] | last // "3.13.0-next.0")' 2>/dev/null || echo '3.13.0-next.0' + (npm view @prizm-ui/components versions --tag ng16next --json 2>/dev/null || echo '3.13.1-next.0') | jq '([.[] | select(startswith("3.13.1-next"))] | last // "3.13.1-next.0")' 2>/dev/null || echo '3.13.1-next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/apps/doc/src/app/version-manager/current.const.ts.ng16 b/apps/doc/src/app/version-manager/current.const.ts.ng16 index eca4105a4e..ae5cf23e67 100644 --- a/apps/doc/src/app/version-manager/current.const.ts.ng16 +++ b/apps/doc/src/app/version-manager/current.const.ts.ng16 @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '3.13.0'; +export const PRIZM_CURRENT_VERSION = '3.13.1'; diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index 3d1baf19f9..c70a115f24 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -10,8 +10,8 @@ export interface PrizmVersionMeta { export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ { - label: '3.13.0 (ng16)', - version: '3.13.0', + label: '3.13.1 (ng16)', + version: '3.13.1', stackblitz: 'https://stackblitz.com/edit/prizm-v3-demo', link: new URL('http://prizm.site'), otherLinks: [new URL('https://prizm-v3.web.app')], @@ -40,8 +40,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ }, }, { - label: '3.13.0-next (ng16)', - version: '3.13.0-next', + label: '3.13.1-next (ng16)', + version: '3.13.1-next', stackblitz: 'https://stackblitz.com/edit/prizm-v3-next-demo', link: new URL('https://prizm-v3-next.web.app'), otherLinks: [], @@ -61,8 +61,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '3.13.0-beta (ng16)', - version: '3.13.0-beta', + label: '3.13.1-beta (ng16)', + version: '3.13.1-beta', stackblitz: 'https://stackblitz.com/edit/prizm-v3-beta-demo', link: new URL('https://prizm-v3-beta.web.app'), otherLinks: [], diff --git a/libs/ast/package.json.ng16 b/libs/ast/package.json.ng16 index d7d4c62b1c..7de67f8275 100644 --- a/libs/ast/package.json.ng16 +++ b/libs/ast/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "3.13.0", + "version": "3.13.1", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json b/libs/charts/base/package.json index d97deb49cd..de651b0c6a 100644 --- a/libs/charts/base/package.json +++ b/libs/charts/base/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "3.13.0", + "version": "3.13.1", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/theme": "^3.13.0", - "@prizm-ui/helpers": "^3.13.0", + "@prizm-ui/theme": "^3.13.1", + "@prizm-ui/helpers": "^3.13.1", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/charts/base/package.json.ng16 b/libs/charts/base/package.json.ng16 index d97deb49cd..de651b0c6a 100644 --- a/libs/charts/base/package.json.ng16 +++ b/libs/charts/base/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "3.13.0", + "version": "3.13.1", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/theme": "^3.13.0", - "@prizm-ui/helpers": "^3.13.0", + "@prizm-ui/theme": "^3.13.1", + "@prizm-ui/helpers": "^3.13.1", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/package.json.ng16 b/libs/components/package.json.ng16 index 4f7f69c582..c17f5c285b 100644 --- a/libs/components/package.json.ng16 +++ b/libs/components/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "3.13.0", + "version": "3.13.1", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -18,10 +18,10 @@ "@ng-web-apis/resize-observer": "^3.0.0", "@ng-web-apis/intersection-observer": "^3.0.0", "@ng-web-apis/mutation-observer": "^3.0.0", - "@prizm-ui/helpers": "^3.13.0", - "@prizm-ui/core": "^3.13.0", - "@prizm-ui/i18n": "^3.13.0", - "@prizm-ui/theme": "^3.13.0" + "@prizm-ui/helpers": "^3.13.1", + "@prizm-ui/core": "^3.13.1", + "@prizm-ui/i18n": "^3.13.1", + "@prizm-ui/theme": "^3.13.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json.ng16 b/libs/core/package.json.ng16 index 5b4560f7e0..a5a4d10f18 100644 --- a/libs/core/package.json.ng16 +++ b/libs/core/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "3.13.0", + "version": "3.13.1", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json.ng16 b/libs/helpers/package.json.ng16 index 88bc9b6160..fe37f0c50b 100644 --- a/libs/helpers/package.json.ng16 +++ b/libs/helpers/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "3.13.0", + "version": "3.13.1", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json.ng16 b/libs/i18n/package.json.ng16 index 83c0de4ce1..bf9e24db3f 100644 --- a/libs/i18n/package.json.ng16 +++ b/libs/i18n/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "3.13.0", + "version": "3.13.1", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0" diff --git a/libs/icons/base/package.json.ng16 b/libs/icons/base/package.json.ng16 index 8bddede1af..404b1508b6 100644 --- a/libs/icons/base/package.json.ng16 +++ b/libs/icons/base/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "3.13.0", + "version": "3.13.1", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.13.0" + "@prizm-ui/core": "^3.13.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json.ng16 b/libs/icons/flags/package.json.ng16 index eafc7c544f..8a2c6f127e 100644 --- a/libs/icons/flags/package.json.ng16 +++ b/libs/icons/flags/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "3.13.0", + "version": "3.13.1", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.13.0" + "@prizm-ui/core": "^3.13.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json.ng16 b/libs/nxmv/package.json.ng16 index db7f54bccc..f4a5aca7d0 100644 --- a/libs/nxmv/package.json.ng16 +++ b/libs/nxmv/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "3.13.0", + "version": "3.13.1", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json.ng16 b/libs/plugin/package.json.ng16 index 5a35182261..01e39dcf43 100644 --- a/libs/plugin/package.json.ng16 +++ b/libs/plugin/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "3.13.0", + "version": "3.13.1", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^3.13.0" + "@prizm-ui/ast": "^3.13.1" } } diff --git a/libs/schematics/package.json.ng16 b/libs/schematics/package.json.ng16 index 0bd7ba36a8..b715763692 100644 --- a/libs/schematics/package.json.ng16 +++ b/libs/schematics/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "3.13.0", + "version": "3.13.1", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json.ng16 b/libs/theme/package.json.ng16 index 85a0369877..de80dc7cc9 100644 --- a/libs/theme/package.json.ng16 +++ b/libs/theme/package.json.ng16 @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "3.13.0", + "version": "3.13.1", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.13.0", - "@prizm-ui/helpers": "^3.13.0" + "@prizm-ui/core": "^3.13.1", + "@prizm-ui/helpers": "^3.13.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json.ng16 b/package.json.ng16 index e674f7da91..3d17a74ee9 100644 --- a/package.json.ng16 +++ b/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "3.13.0", + "version": "3.13.1", "license": "MIT", "husky": { "hooks": { From afc3afe6db9194cfbb828a47a39da2c68e43c771 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 20 May 2024 09:47:32 +0300 Subject: [PATCH 202/291] feat(chore/release): up ast version in package.json main file #000 --- libs/ast/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/ast/package.json b/libs/ast/package.json index dd52cd82fc..7de67f8275 100644 --- a/libs/ast/package.json +++ b/libs/ast/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "3.12.0", + "version": "3.13.1", "private": false, "publishConfig": { "access": "public", From 7e4a512e3cc35fe02baf7864d0ddc717fd2cc300 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 20 May 2024 10:51:53 +0300 Subject: [PATCH 203/291] fix(chore/release): remove unnesessary versions changes #000 --- libs/ast/package.json | 2 +- libs/charts/base/package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/ast/package.json b/libs/ast/package.json index 7de67f8275..dd52cd82fc 100644 --- a/libs/ast/package.json +++ b/libs/ast/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "3.13.1", + "version": "3.12.0", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json b/libs/charts/base/package.json index de651b0c6a..8a2f396fea 100644 --- a/libs/charts/base/package.json +++ b/libs/charts/base/package.json @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "3.13.1", + "version": "3.13.0", "license": "MIT", "private": false, "publishConfig": { From 224215216fac2fbd51390f37a422aa371812d1c9 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 20 May 2024 11:24:16 +0300 Subject: [PATCH 204/291] feat(doc/changelog): changelog update #000 --- .../src/app/about-prizm/changelog/CHANGELOG.md | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index 1a88991b70..9b9c391efe 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -2,6 +2,22 @@ All notable changes to this project will be documented in this file. +## [1.17.1, 2.14.1, 3.13.1](https://github.com/zyfra/Prizm) (20-05-2023) + +### Bug fixes + +- fix(components/table): add five lines support for table head +- fix(component/table): sort icon replaced with button. #1486 +- fix(component/table): header width doesn't change when sorted #1561 +- fix(documentation/table): filter and edit action buttons in examples replaced with buttons. #1486 +- fix(documentation/table): table track by and sort-pagination examples improvement #1655 +- fix(components/toast): changed content width in toast #1433 +- fix(component/navigation-menu): added scroll to navigation menu #1585 +- fix(components/scrollbar): theme switching in scrollbar works incorrect #1657 +- fix(component/cron): cron selected working incorrect #1494 +- fix(components/cron): cron months blinks on hover #1642 +- fix(doc/dialog): add dismissable prop to live demo #1551 + ## [1.17.0, 2.14.0, 3.13.0](https://github.com/zyfra/Prizm) (22-04-2023) ### Features From 1ecdd4facd9cb15e7e8ae536b0ad683bad6667cc Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 21 May 2024 16:47:31 +0300 Subject: [PATCH 205/291] fix(chore): remove extra version changes #000 --- libs/charts/base/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/charts/base/package.json b/libs/charts/base/package.json index 8a2f396fea..d97deb49cd 100644 --- a/libs/charts/base/package.json +++ b/libs/charts/base/package.json @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/theme": "^3.13.1", - "@prizm-ui/helpers": "^3.13.1", + "@prizm-ui/theme": "^3.13.0", + "@prizm-ui/helpers": "^3.13.0", "@antv/g2plot": "^2.4.22" }, "dependencies": { From c1ca88b80a36bada4c1050238cd60e585c715d0a Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 21 May 2024 16:17:14 +0300 Subject: [PATCH 206/291] fix(components/input-layout): add margin bottom for label in outer inputs #1659 --- .../input/common/input-layout/input-layout.component.less | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less b/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less index 2791135d0e..7e14bcf254 100644 --- a/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less +++ b/libs/components/src/lib/components/input/common/input-layout/input-layout.component.less @@ -46,6 +46,7 @@ width: 100%; display: flex; gap: 4px; + margin-bottom: 4px; &-required { color: var(--prizm-v3-status-alarm-primary-default); From 825c11b8a3374cf62f48e93b4ebcf482efb1fd5b Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 21 May 2024 16:47:31 +0300 Subject: [PATCH 207/291] fix(components/cron): slowly switcher in cron #000 --- libs/charts/base/package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/charts/base/package.json b/libs/charts/base/package.json index 8a2f396fea..d97deb49cd 100644 --- a/libs/charts/base/package.json +++ b/libs/charts/base/package.json @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/theme": "^3.13.1", - "@prizm-ui/helpers": "^3.13.1", + "@prizm-ui/theme": "^3.13.0", + "@prizm-ui/helpers": "^3.13.0", "@antv/g2plot": "^2.4.22" }, "dependencies": { From 0d30d3d0b0fa763db2e75f737574d982c14ca32d Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Fri, 24 May 2024 12:15:31 +0300 Subject: [PATCH 208/291] fix(components/cron): slowly switcher in cron #000 --- libs/charts/base/package.json | 4 +- .../src/lib/components/cron/cron.component.ts | 56 ++++++++++++------- 2 files changed, 38 insertions(+), 22 deletions(-) diff --git a/libs/charts/base/package.json b/libs/charts/base/package.json index d97deb49cd..8a2f396fea 100644 --- a/libs/charts/base/package.json +++ b/libs/charts/base/package.json @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/theme": "^3.13.0", - "@prizm-ui/helpers": "^3.13.0", + "@prizm-ui/theme": "^3.13.1", + "@prizm-ui/helpers": "^3.13.1", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/src/lib/components/cron/cron.component.ts b/libs/components/src/lib/components/cron/cron.component.ts index 195748b0e5..4e0eed6fb1 100644 --- a/libs/components/src/lib/components/cron/cron.component.ts +++ b/libs/components/src/lib/components/cron/cron.component.ts @@ -1,7 +1,9 @@ import { ChangeDetectionStrategy, + ChangeDetectorRef, Component, EventEmitter, + inject, Inject, Input, OnInit, @@ -123,6 +125,7 @@ export class PrizmCronComponent extends PrizmAbstractTestId implements OnInit { }; } + private readonly cdRef = inject(ChangeDetectorRef); readonly cronLanguage$ = this.language$.pipe( map(lang => { return lang.shortName; @@ -153,7 +156,6 @@ export class PrizmCronComponent extends PrizmAbstractTestId implements OnInit { private tabs$: BehaviorSubject = new BehaviorSubject([]); private selected$: BehaviorSubject = new BehaviorSubject('second'); - public switchers: PrizmSwitcherItem[] = [ { title: 'Секунды', @@ -218,25 +220,39 @@ export class PrizmCronComponent extends PrizmAbstractTestId implements OnInit { this.initEndDateStateChanger(); this.saveInitialValue(); - this.tabs$.pipe(takeUntil(this.destroy$), observeOn(asapScheduler)).subscribe(tabs => { - if (tabs.length) { - this.switchers = this.switchers.map(i => { - i.hide = !tabs.includes(i.id as any); - return i; - }); - } - }); - - this.selected$.pipe(takeUntil(this.destroy$), observeOn(asapScheduler)).subscribe(selected => { - this.selectedSwitcherIdx = this.switchers.findIndex(i => i.id === selected); - - const tabs = this.tabs$.getValue(); - if (tabs.length && !tabs.includes(selected)) { - this.selectedChange.emit(tabs[0]); - } else { - this.selectedChange.emit(selected); - } - }); + this.tabs$ + .pipe( + observeOn(asapScheduler), + tap(tabs => { + if (tabs.length) { + this.switchers = this.switchers.map(i => { + i.hide = !tabs.includes(i.id as any); + return i; + }); + } + }), + tap(() => this.cdRef.markForCheck()), + takeUntil(this.destroy$) + ) + .subscribe(); + + this.selected$ + .pipe( + observeOn(asapScheduler), + tap(selected => { + this.selectedSwitcherIdx = this.switchers.findIndex(i => i.id === selected); + + const tabs = this.tabs$.getValue(); + if (tabs.length && !tabs.includes(selected)) { + this.selectedChange.emit(tabs[0]); + } else { + this.selectedChange.emit(selected); + } + }), + tap(() => this.cdRef.markForCheck()), + takeUntil(this.destroy$) + ) + .subscribe(); } private endDateStateCorrector(): void { From 7c4be04ef7e6e0a4bc7255575d0d25b73693148a Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 21 May 2024 16:17:14 +0300 Subject: [PATCH 209/291] fix(components/input-layout): add margin bottom for label in outer inputs #1659 --- .../input-layout/input-layout-hidden-control.component.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/components/src/lib/components/input/common/input-layout/input-layout-hidden-control.component.less b/libs/components/src/lib/components/input/common/input-layout/input-layout-hidden-control.component.less index f9f6c62b75..ff01ec5e6d 100644 --- a/libs/components/src/lib/components/input/common/input-layout/input-layout-hidden-control.component.less +++ b/libs/components/src/lib/components/input/common/input-layout/input-layout-hidden-control.component.less @@ -1,5 +1,5 @@ :host.has-hidden-control { - .label-container { + .label-container:not(.label-container-outer) { height: 16px; margin-bottom: 2px; From 08ca93b63a7ae33725d67b34982443178bdec7a9 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 28 May 2024 14:11:46 +0300 Subject: [PATCH 210/291] fix(components/chips): dots overflows chip list container #1713 --- .../examples/base/multi-select-base-example.component.ts | 1 + .../src/lib/components/chips/chips.component.less | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/apps/doc/src/app/components/input/input-multi-select/examples/base/multi-select-base-example.component.ts b/apps/doc/src/app/components/input/input-multi-select/examples/base/multi-select-base-example.component.ts index 21d3a39cc3..777c71ed28 100644 --- a/apps/doc/src/app/components/input/input-multi-select/examples/base/multi-select-base-example.component.ts +++ b/apps/doc/src/app/components/input/input-multi-select/examples/base/multi-select-base-example.component.ts @@ -17,6 +17,7 @@ export class PrizmInputMultiSelectBaseExampleComponent implements OnInit { value = true; readonly valueControl = new UntypedFormControl([]); readonly items = [ + 'Very long text with a lot of characters and spaces', 'One', 'Two', 'Three', diff --git a/libs/components/src/lib/components/chips/chips.component.less b/libs/components/src/lib/components/chips/chips.component.less index fe68cffa6c..7094621e44 100644 --- a/libs/components/src/lib/components/chips/chips.component.less +++ b/libs/components/src/lib/components/chips/chips.component.less @@ -31,5 +31,11 @@ height: 18px; width: 100%; } + + &:has(.more-item) { + prizm-chips-item.single-line { + max-width: calc(100% - 20px); + } + } } } From 5ec98bd94a3053687476e634c50577c126982553 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Wed, 29 May 2024 13:49:47 +0300 Subject: [PATCH 211/291] refactor(components/chips): move multiply subscriptions to prizmLet #000 --- .../lib/components/chips/chips.component.html | 68 ++++++++++--------- 1 file changed, 35 insertions(+), 33 deletions(-) diff --git a/libs/components/src/lib/components/chips/chips.component.html b/libs/components/src/lib/components/chips/chips.component.html index 46bc467897..c88971f526 100644 --- a/libs/components/src/lib/components/chips/chips.component.html +++ b/libs/components/src/lib/components/chips/chips.component.html @@ -1,38 +1,40 @@ -
    - - - - - -
    +
    + + - ... -
    + + + +
    + ... +
    +     - -
    +
    + Date: Thu, 23 May 2024 14:17:52 +0300 Subject: [PATCH 212/291] fix(components/calendar): change calendar resrtictions ux #1674 --- .../primitive-month-picker.component.ts | 3 +- ...itive-year-month-pagination.component.html | 86 ++++++++----------- .../primitive-year-picker.component.ts | 4 +- libs/components/src/styles/mixins/mixins.less | 2 +- 4 files changed, 43 insertions(+), 52 deletions(-) diff --git a/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.ts b/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.ts index f033ed5e43..e1db3772f0 100644 --- a/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.ts +++ b/libs/components/src/lib/components/internal/primitive-month-picker/primitive-month-picker.component.ts @@ -114,10 +114,11 @@ export class PrizmPrimitiveMonthPickerComponent extends PrizmAbstractTestId { } public getItemState(item: number): PrizmInteractiveState | null { - const { disabledItemHandler, max, pressedItem, hoveredItem } = this; + const { disabledItemHandler, max, min, pressedItem, hoveredItem } = this; if ( (max.month < item && max.year <= this.currentYear) || + (min.month > item && min.year >= this.currentYear) || (disabledItemHandler !== PRIZM_ALWAYS_FALSE_HANDLER && disabledItemHandler(item)) ) { return PrizmInteractiveState.Disabled; diff --git a/libs/components/src/lib/components/internal/primitive-year-month-pagination/primitive-year-month-pagination.component.html b/libs/components/src/lib/components/internal/primitive-year-month-pagination/primitive-year-month-pagination.component.html index 5c84a18cb7..37584f3e39 100644 --- a/libs/components/src/lib/components/internal/primitive-year-month-pagination/primitive-year-month-pagination.component.html +++ b/libs/components/src/lib/components/internal/primitive-year-month-pagination/primitive-year-month-pagination.component.html @@ -1,56 +1,44 @@
    -
    - {{ value | prizmMonth | async }} -
    +
    +
    -
    -
    - - -
    -
    - -
    - -
    -     +
    + +
    - -
    - +
    + + +
    -     + diff --git a/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.ts b/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.ts index b2c563baaf..27680b90ef 100644 --- a/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.ts +++ b/libs/components/src/lib/components/internal/primitive-year-picker/primitive-year-picker.component.ts @@ -19,6 +19,7 @@ import { PrizmLetDirective } from '@prizm-ui/helpers'; import { BooleanInput, coerceBooleanProperty } from '@angular/cdk/coercion'; const LIMIT = 100; +const MIN_ROW_COUNT = 5; const ITEMS_IN_ROW = 3; @Component({ @@ -84,7 +85,8 @@ export class PrizmPrimitiveYearPickerComponent extends PrizmAbstractTestId { override readonly testId_ = 'ui_primitive_year_picker'; get rows(): number { - return Math.ceil((this.calculatedMax - this.calculatedMin) / ITEMS_IN_ROW); + const calculatedRows = Math.ceil((this.calculatedMax - this.calculatedMin) / ITEMS_IN_ROW); + return calculatedRows < MIN_ROW_COUNT ? MIN_ROW_COUNT : calculatedRows; } get calculatedMin(): number { diff --git a/libs/components/src/styles/mixins/mixins.less b/libs/components/src/styles/mixins/mixins.less index 94ec307954..7009d4a993 100644 --- a/libs/components/src/styles/mixins/mixins.less +++ b/libs/components/src/styles/mixins/mixins.less @@ -138,7 +138,7 @@ color: var(--prizm-v3-text-icon-secondary); - &:hover:not(.active):not(:active) { + &:hover:not(.active):not(:active):not(:disabled) { background-color: var(--prizm-v3-button-ghost-hover); border-radius: 2px; } From 8b2843d88e64843354d1a43b5e773eaf1f8d74a8 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 28 May 2024 12:03:54 +0300 Subject: [PATCH 213/291] fix(components/calendar): calendar in inputs display ux change #1674 --- ...ayout-date-range-base-example.component.ts | 2 +- .../components/calendar/calendar.component.ts | 23 +++++++++++++++++-- 2 files changed, 22 insertions(+), 3 deletions(-) diff --git a/apps/doc/src/app/components/input/input-layout-date-range/examples/base/input-layout-date-range-base-example.component.ts b/apps/doc/src/app/components/input/input-layout-date-range/examples/base/input-layout-date-range-base-example.component.ts index dd4931b8a2..6f5c38f2c0 100644 --- a/apps/doc/src/app/components/input/input-layout-date-range/examples/base/input-layout-date-range-base-example.component.ts +++ b/apps/doc/src/app/components/input/input-layout-date-range/examples/base/input-layout-date-range-base-example.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; import { UntypedFormControl } from '@angular/forms'; import { PrizmDay, PrizmDayRange } from '@prizm-ui/components'; diff --git a/libs/components/src/lib/components/calendar/calendar.component.ts b/libs/components/src/lib/components/calendar/calendar.component.ts index e49f07375a..953ee79b31 100644 --- a/libs/components/src/lib/components/calendar/calendar.component.ts +++ b/libs/components/src/lib/components/calendar/calendar.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectionStrategy, Component, EventEmitter, Input, Output } from '@angular/core'; +import { ChangeDetectionStrategy, Component, EventEmitter, Input, OnInit, Output } from '@angular/core'; import { PrizmDay } from '../../@core/date-time/day'; import { PrizmDayRange } from '../../@core/date-time/day-range'; import { PRIZM_FIRST_DAY, PRIZM_LAST_DAY } from '../../@core/date-time/days.const'; @@ -21,6 +21,7 @@ import { PrizmMapperPipeModule } from '../../pipes'; import { PrizmPrimitiveYearMonthPaginationComponent } from '../internal/primitive-year-month-pagination/primitive-year-month-pagination.component'; import { PrizmPrimitiveMonthPickerComponent } from '../internal/primitive-month-picker/primitive-month-picker.component'; import { PrizmPrimitiveYearPickerComponent } from '../internal/primitive-year-picker/primitive-year-picker.component'; +import { prizmInRange } from '../../util/math/in-range'; @Component({ selector: `prizm-calendar`, @@ -38,7 +39,10 @@ import { PrizmPrimitiveYearPickerComponent } from '../internal/primitive-year-pi PrizmMapperPipeModule, ], }) -export class PrizmCalendarComponent extends PrizmAbstractTestId implements PrizmWithOptionalMinMax { +export class PrizmCalendarComponent + extends PrizmAbstractTestId + implements PrizmWithOptionalMinMax, OnInit +{ @Input() @prizmDefaultProp() month: PrizmMonth = PrizmMonth.currentLocal(); @@ -117,6 +121,10 @@ export class PrizmCalendarComponent extends PrizmAbstractTestId implements Prizm return this.maxViewedMonth.monthSameOrBefore(this.max) ? this.maxViewedMonth : this.max; } + ngOnInit(): void { + this.doMonthCorrection(); + } + public onPaginationYearClick(year: PrizmYear): void { this.year = year; this.clickedMonth = null; @@ -166,4 +174,15 @@ export class PrizmCalendarComponent extends PrizmAbstractTestId implements Prizm this.hoveredItem = day; this.hoveredItemChange.emit(day); } + + private doMonthCorrection(): void { + if ((this.min || this.max) && !this.isMonthInRange(this.month, this.min, this.max)) { + const monthToDisplay = this.min ?? this.max; + this.month = new PrizmMonth(monthToDisplay.year, monthToDisplay.month); + } + } + + private isMonthInRange(month: PrizmMonth, min: PrizmMonth | PrizmDay, max: PrizmMonth | PrizmDay): boolean { + return prizmInRange(month.year, min.year, max.year) && prizmInRange(month.month, min.month, max.month); + } } From 220737927d62a27ab9fda54eb2700d1f5bde3d38 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 30 May 2024 11:39:37 +0300 Subject: [PATCH 214/291] fix(components/calnedar): fix merge error #000 --- ...itive-year-month-pagination.component.html | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/libs/components/src/lib/components/internal/primitive-year-month-pagination/primitive-year-month-pagination.component.html b/libs/components/src/lib/components/internal/primitive-year-month-pagination/primitive-year-month-pagination.component.html index 37584f3e39..a9915c2b12 100644 --- a/libs/components/src/lib/components/internal/primitive-year-month-pagination/primitive-year-month-pagination.component.html +++ b/libs/components/src/lib/components/internal/primitive-year-month-pagination/primitive-year-month-pagination.component.html @@ -28,17 +28,16 @@ - -
    - - -
    + +
    + +
    From b676cdf13f31fded912535c8211eeab5ae3a6e6e Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Thu, 30 May 2024 11:55:51 +0300 Subject: [PATCH 215/291] fix(components/input-number): fix sync state with input-layout #1645 #1644 --- .../input/input-number/input-number.component.ts | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/libs/components/src/lib/components/input/input-number/input-number.component.ts b/libs/components/src/lib/components/input/input-number/input-number.component.ts index f7ae875a2c..4f9f9652ca 100644 --- a/libs/components/src/lib/components/input/input-number/input-number.component.ts +++ b/libs/components/src/lib/components/input/input-number/input-number.component.ts @@ -32,7 +32,7 @@ import { PrizmHintDirective } from '../../../directives'; export class PrizmInputNumberComponent extends PrizmInputControl implements OnInit { private hasSymbol = false; - destroy$ = inject(PrizmDestroyService); + readonly destroy$ = inject(PrizmDestroyService); public get empty() { return this.el.nativeElement.value == '' && !this.hasSymbol; } @@ -198,6 +198,7 @@ export class PrizmInputNumberComponent extends PrizmInputControl impleme // this.overrideSetValueMethod(); this.prizmHint_.ngOnInit(); this.inputHint?.updateHint(); + this.initUpdateParentOnChangeStatus(); this.input$$ .pipe( @@ -215,6 +216,17 @@ export class PrizmInputNumberComponent extends PrizmInputControl impleme this.prizmHint_.ngOnDestroy(); } + private initUpdateParentOnChangeStatus() { + this.ngControl?.statusChanges + ?.pipe( + tap(() => { + this.stateChanges.next(); + }), + takeUntil(this.destroy$) + ) + .subscribe(); + } + // TODO change overriding later // private overrideSetValueMethod(): void { // if (this.ngControl.control) { From fb32320330faae643d0842f6241ec71c846a43cf Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Thu, 30 May 2024 12:06:17 +0300 Subject: [PATCH 216/291] fix(components/input-date-range): default time is set only after focus is removed #1565 --- .../input-layout-date-time-range.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/components/src/lib/components/input/input-date-time-range/input-layout-date-time-range.component.ts b/libs/components/src/lib/components/input/input-date-time-range/input-layout-date-time-range.component.ts index 2e4bf239e5..3de0bd1a94 100644 --- a/libs/components/src/lib/components/input/input-date-time-range/input-layout-date-time-range.component.ts +++ b/libs/components/src/lib/components/input/input-date-time-range/input-layout-date-time-range.component.ts @@ -303,6 +303,7 @@ export class PrizmInputLayoutDateTimeRangeComponent public onOpenChange(open: boolean): void { this.open = open; this.changeDetectorRef.markForCheck(); + if (!open) this.completeDateIfAreNotPending(); } private completeDateIfAreNotPending() { From 48fa0efe5a563c32bb4a6ed3c4f61654fd72db92 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 30 May 2024 17:14:17 +0300 Subject: [PATCH 217/291] fix(components/calendar): in-range error fix #000 --- .../src/lib/components/calendar/calendar.component.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libs/components/src/lib/components/calendar/calendar.component.ts b/libs/components/src/lib/components/calendar/calendar.component.ts index 953ee79b31..d928185285 100644 --- a/libs/components/src/lib/components/calendar/calendar.component.ts +++ b/libs/components/src/lib/components/calendar/calendar.component.ts @@ -183,6 +183,8 @@ export class PrizmCalendarComponent } private isMonthInRange(month: PrizmMonth, min: PrizmMonth | PrizmDay, max: PrizmMonth | PrizmDay): boolean { - return prizmInRange(month.year, min.year, max.year) && prizmInRange(month.month, min.month, max.month); + return prizmInRange(month.year, min.year, max.year) && min.year === max.year + ? prizmInRange(month.month, min.month, max.month) + : true; } } From 6a470954d3cd74c7012efcf1012b12f8c415381d Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 31 May 2024 09:33:14 +0300 Subject: [PATCH 218/291] fix(components/calendar): year-month pagination disabled state fix #000 --- .../primitive-year-month-pagination.component.html | 6 ++++-- libs/components/src/styles/mixins/mixins.less | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/libs/components/src/lib/components/internal/primitive-year-month-pagination/primitive-year-month-pagination.component.html b/libs/components/src/lib/components/internal/primitive-year-month-pagination/primitive-year-month-pagination.component.html index a9915c2b12..251642493c 100644 --- a/libs/components/src/lib/components/internal/primitive-year-month-pagination/primitive-year-month-pagination.component.html +++ b/libs/components/src/lib/components/internal/primitive-year-month-pagination/primitive-year-month-pagination.component.html @@ -1,12 +1,13 @@
    -
    +
    -
    +
    diff --git a/apps/doc/src/app/components/file-upload/examples/basic/basic.component.ts b/apps/doc/src/app/components/file-upload/examples/basic/basic.component.ts index e9d9502caf..e10f0ee37a 100644 --- a/apps/doc/src/app/components/file-upload/examples/basic/basic.component.ts +++ b/apps/doc/src/app/components/file-upload/examples/basic/basic.component.ts @@ -13,6 +13,8 @@ export class PrizmFileUploadBasicExampleComponent implements OnDestroy { progress$$ = new BehaviorSubject({}); files: Array = []; disabled = false; + acceptedTypes = 'image/*'; + maxFiles = 3; public onFilesChange(files: Array): void { console.log('fileschange'); diff --git a/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.html b/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.html index 409f1eae68..a9ebc7621c 100644 --- a/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.html +++ b/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.html @@ -1,8 +1,8 @@ - Maximum of three images up to 1MB in size + Uploaded {{ files.length }}/{{ maxFiles }}. {{ acceptedTypes }} up to 1MB in size diff --git a/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.ts b/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.ts index 6d595b7883..23bbd2f0ee 100644 --- a/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.ts +++ b/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.ts @@ -33,6 +33,8 @@ export class PrizmFileUploadI18nExampleComponent { progress$$ = new BehaviorSubject({}); files: Array = []; disabled = false; + acceptedTypes = 'image/*'; + maxFiles = 3; public onFilesChange(files: Array): void { this.files = files; From 5cd32d3585a18a1827c051e10a556f2e1f9ea119 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 6 Jun 2024 10:07:11 +0300 Subject: [PATCH 228/291] fix(components/file-upload): multiply false paramenter works incorrect with uploading by drop #1770 --- .../file-upload-example.component.ts | 4 +-- .../file-upload/file-upload.component.html | 2 +- .../file-upload/file-upload.component.ts | 32 +++++++++++++++---- 3 files changed, 29 insertions(+), 9 deletions(-) diff --git a/apps/doc/src/app/components/file-upload/file-upload-example.component.ts b/apps/doc/src/app/components/file-upload/file-upload-example.component.ts index 6a509b46cd..5fe5a07d33 100644 --- a/apps/doc/src/app/components/file-upload/file-upload-example.component.ts +++ b/apps/doc/src/app/components/file-upload/file-upload-example.component.ts @@ -46,6 +46,8 @@ export class PrizmFileUploadExampleComponent implements OnDestroy { files: Array = []; disabled = false; + constructor(private readonly toastService: PrizmToastService, private http: HttpClient) {} + public onFilesChange(files: Array): void { this.files = files; } @@ -179,8 +181,6 @@ export class PrizmFileUploadExampleComponent implements OnDestroy { ); } - constructor(private readonly toastService: PrizmToastService, private http: HttpClient) {} - public ngOnDestroy(): void { this.progress$$.complete(); } diff --git a/libs/components/src/lib/components/file-upload/file-upload.component.html b/libs/components/src/lib/components/file-upload/file-upload.component.html index 0dbd511a62..8fc09fe158 100644 --- a/libs/components/src/lib/components/file-upload/file-upload.component.html +++ b/libs/components/src/lib/components/file-upload/file-upload.component.html @@ -21,7 +21,7 @@ From c4926c502c3ed4a4418b18beee113033be4785e3 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Thu, 6 Jun 2024 12:41:18 +0300 Subject: [PATCH 231/291] fix(components/panel): rename panelcomponent to name with prefix #1665 --- .../app/components/panel/examples/setup-module.md | 4 ++-- .../app/components/panel/panel-example.module.ts | 4 ++-- .../src/lib/components/panel/panel.component.ts | 7 +++++++ .../src/lib/components/panel/panel.module.ts | 14 +++++++------- 4 files changed, 18 insertions(+), 11 deletions(-) diff --git a/apps/doc/src/app/components/panel/examples/setup-module.md b/apps/doc/src/app/components/panel/examples/setup-module.md index 22b32d7560..7fbf7a11be 100644 --- a/apps/doc/src/app/components/panel/examples/setup-module.md +++ b/apps/doc/src/app/components/panel/examples/setup-module.md @@ -1,13 +1,13 @@ ```ts import { NgModule } from '@angular/core'; -import { PrizmPanelModule } from '@prizm-ui/components'; +import { PrizmPanelComponent } from '@prizm-ui/components'; // ... @NgModule({ imports: [ // ... - PrizmPanelModule, + PrizmPanelComponent, ], }) export class MyModule {} diff --git a/apps/doc/src/app/components/panel/panel-example.module.ts b/apps/doc/src/app/components/panel/panel-example.module.ts index 9034a3957c..3e0a2feb88 100644 --- a/apps/doc/src/app/components/panel/panel-example.module.ts +++ b/apps/doc/src/app/components/panel/panel-example.module.ts @@ -8,7 +8,7 @@ import { PrizmBreadcrumbsModule, PrizmButtonModule, PrizmIconModule, - PrizmPanelModule, + PrizmPanelComponent, PrizmTabsModule, PrizmToggleModule, } from '@prizm-ui/components'; @@ -35,7 +35,7 @@ import { FormsModule } from '@angular/forms'; CommonModule, PrizmAddonDocModule, RouterModule.forChild(prizmDocGenerateRoutes(PanelExampleComponent)), - PrizmPanelModule, + PrizmPanelComponent, PrizmButtonModule, PrizmIconModule, FormsModule, diff --git a/libs/components/src/lib/components/panel/panel.component.ts b/libs/components/src/lib/components/panel/panel.component.ts index daf67ba40c..4cd2f5e6ec 100644 --- a/libs/components/src/lib/components/panel/panel.component.ts +++ b/libs/components/src/lib/components/panel/panel.component.ts @@ -8,11 +8,16 @@ import { ElementRef, } from '@angular/core'; import { PrizmAbstractTestId } from '../../abstract/interactive'; +import { CommonModule } from '@angular/common'; +import { PrizmIconModule } from '../icon'; +import { PrizmButtonModule } from '../button'; @Component({ selector: 'prizm-panel', templateUrl: './panel.component.html', styleUrls: ['./panel.component.less'], + standalone: true, + imports: [CommonModule, PrizmIconModule, PrizmButtonModule], changeDetection: ChangeDetectionStrategy.OnPush, }) export class PanelComponent extends PrizmAbstractTestId { @@ -29,3 +34,5 @@ export class PanelComponent extends PrizmAbstractTestId { this.backClick.emit(); } } + +export const PrizmPanelComponent = PanelComponent; diff --git a/libs/components/src/lib/components/panel/panel.module.ts b/libs/components/src/lib/components/panel/panel.module.ts index e23e27ddfc..5f75a8d8e2 100644 --- a/libs/components/src/lib/components/panel/panel.module.ts +++ b/libs/components/src/lib/components/panel/panel.module.ts @@ -1,12 +1,12 @@ import { NgModule } from '@angular/core'; -import { CommonModule } from '@angular/common'; -import { PanelComponent } from './panel.component'; -import { PrizmIconModule } from '../icon'; -import { PrizmButtonModule } from '../button'; +import { PrizmPanelComponent } from './panel.component'; +/** + * @deprecated + * use standalone + * */ @NgModule({ - declarations: [PanelComponent], - imports: [CommonModule, PrizmIconModule, PrizmButtonModule], - exports: [PanelComponent], + imports: [PrizmPanelComponent], + exports: [PrizmPanelComponent], }) export class PrizmPanelModule {} From 740c4f1d1e0cba1fa2edc48d3c7b4f2cbb9f5dc6 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 6 Jun 2024 13:57:14 +0300 Subject: [PATCH 232/291] fix(components/file-upload): singular mode change for browse button #000 --- .../src/lib/components/file-upload/file-upload.component.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/components/src/lib/components/file-upload/file-upload.component.html b/libs/components/src/lib/components/file-upload/file-upload.component.html index 50cb7a4917..7d9e7b488a 100644 --- a/libs/components/src/lib/components/file-upload/file-upload.component.html +++ b/libs/components/src/lib/components/file-upload/file-upload.component.html @@ -21,9 +21,9 @@
    - {{ item.value.file.size | prizmFileSize }} + + {{ fileSize.value + ' ' }} {{ translations | prizmPluck : [fileSize.key] }} +
    diff --git a/libs/components/src/lib/components/file-upload/pipes/file-size.pipe.ts b/libs/components/src/lib/components/file-upload/pipes/file-size.pipe.ts index 4565df8ed5..2f0122ced4 100644 --- a/libs/components/src/lib/components/file-upload/pipes/file-size.pipe.ts +++ b/libs/components/src/lib/components/file-upload/pipes/file-size.pipe.ts @@ -2,15 +2,30 @@ import { Pipe, PipeTransform } from '@angular/core'; @Pipe({ name: 'prizmFileSize', standalone: true }) export class PrizmFileSizePipe implements PipeTransform { - public transform(size: number): string { + public transform(size: number): { + value: number | string; + key: 'file_size__byte' | 'file_size__kb' | 'file_size__mb' | null; + } { if (size < 1024) { - return size + ' byte/bytes'; + return { + value: size, + key: 'file_size__byte', + }; } else if (size > 1024 && size < 1048576) { - return (size / 1024).toFixed(1) + ' KB'; + return { + value: (size / 1024).toFixed(1), + key: 'file_size__kb', + }; } else if (size > 1048576) { - return (size / 1048576).toFixed(1) + ' MB'; + return { + value: (size / 1048576).toFixed(1), + key: 'file_size__mb', + }; } - return ''; + return { + value: size, + key: null, + }; } } diff --git a/libs/i18n/src/lib/interfaces/language.ts b/libs/i18n/src/lib/interfaces/language.ts index 61ce78da63..1f5c24a0d5 100644 --- a/libs/i18n/src/lib/interfaces/language.ts +++ b/libs/i18n/src/lib/interfaces/language.ts @@ -11,6 +11,9 @@ export interface PrizmLanguageFileUpload { dropzone__description: string; btn__select: string; btn__select_hint_error: string; + file_size__byte: string; + file_size__kb: string; + file_size__mb: string; idle?: string; progress?: string; warning?: string; diff --git a/libs/i18n/src/lib/languages/russian/file-upload.ts b/libs/i18n/src/lib/languages/russian/file-upload.ts index dc27761959..b567d04bba 100644 --- a/libs/i18n/src/lib/languages/russian/file-upload.ts +++ b/libs/i18n/src/lib/languages/russian/file-upload.ts @@ -6,6 +6,9 @@ export const PRIZM_RUSSIAN_FILE_UPLOAD: PrizmLanguageFileUpload = { dropzone__title: 'Загрузка файлов', btn__select: 'Выбрать', btn__select_hint_error: 'Достигнут максимум количества загруженных файлов', + file_size__byte: 'Б', + file_size__kb: 'Кбайт', + file_size__mb: 'Мбайт', idle: 'Ожидание загрузки', progress: 'Загрузка', warning: 'Ошибка', @@ -19,6 +22,9 @@ export const PRIZM_ENGLISH_FILE_UPLOAD: PrizmLanguageFileUpload = { dropzone__title: 'File upload', btn__select: 'Browse', btn__select_hint_error: 'The maximum number of uploaded files has been reached', + file_size__byte: 'byte/bytes', + file_size__kb: 'KB', + file_size__mb: 'MB', idle: 'Waiting to upload', progress: 'Uploading', warning: 'Error', From 3e7d41133c581789d51a0cf2298c04c8a20db2a4 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 7 Jun 2024 13:46:40 +0300 Subject: [PATCH 242/291] fix(compoinents/file-upload): replace in prizmFileSize pipe #000 --- .../src/lib/components/file-upload/pipes/file-size.pipe.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/components/src/lib/components/file-upload/pipes/file-size.pipe.ts b/libs/components/src/lib/components/file-upload/pipes/file-size.pipe.ts index 2f0122ced4..f8d97e6b94 100644 --- a/libs/components/src/lib/components/file-upload/pipes/file-size.pipe.ts +++ b/libs/components/src/lib/components/file-upload/pipes/file-size.pipe.ts @@ -11,12 +11,12 @@ export class PrizmFileSizePipe implements PipeTransform { value: size, key: 'file_size__byte', }; - } else if (size > 1024 && size < 1048576) { + } else if (size >= 1024 && size < 1048576) { return { value: (size / 1024).toFixed(1), key: 'file_size__kb', }; - } else if (size > 1048576) { + } else if (size >= 1048576) { return { value: (size / 1048576).toFixed(1), key: 'file_size__mb', From 807ff21e75c7b0c447dcbdfacfef48a228853d2f Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 7 Jun 2024 13:53:41 +0300 Subject: [PATCH 243/291] fix(components/panel): set default border radius as 0px to panel #1767 --- libs/components/src/lib/components/panel/panel.component.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/components/src/lib/components/panel/panel.component.less b/libs/components/src/lib/components/panel/panel.component.less index 9131e7c217..257eb9b9e0 100644 --- a/libs/components/src/lib/components/panel/panel.component.less +++ b/libs/components/src/lib/components/panel/panel.component.less @@ -11,7 +11,7 @@ height: var(--prizm-panel-height, 48px); display: flex; border-bottom: 1px solid var(--prizm-panel-border-bottom, var(--prizm-v3-background-stroke)); - border-radius: var(--prizm-panel-border-radius, 2px); + border-radius: var(--prizm-panel-border-radius, 0px); background: var(--prizm-panel-background, var(--prizm-v3-background-fill-panel)); .back-btn-wrapper { From 9b59b646e6cc17d88966ac4a4d9c7f61919bab08 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Fri, 7 Jun 2024 14:57:16 +0300 Subject: [PATCH 244/291] Update apps/doc/src/app/version-manager/versions.constants.ts Co-authored-by: ickisIckis --- apps/doc/src/app/version-manager/versions.constants.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index d7ad07c75c..a1a975d3f4 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -25,7 +25,7 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ label: '3.13.2 (ng16)', version: '3.13.2', stackblitz: 'https://stackblitz.com/edit/prizm-v3-demo', - link: getDocSite.bind(null, 'http://3.12.0.doc.prizm.site', 'https://prizm-v3.web.app'), + link: getDocSite.bind(null, 'http://3.13.2.doc.prizm.site', 'https://prizm-v3.web.app'), otherLinks: [new URL('https://prizm-v3.web.app')], cb: (hostName: string, current: PrizmVersionMeta) => { return hostName.startsWith('prizm-v3--'); From 5f9d2c16f7b6ca3184c2c3d47d44e30ee648814f Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 7 Jun 2024 16:10:32 +0300 Subject: [PATCH 245/291] fix(components/input-date-relative): active items not updated when value set by formControl #1685 --- ...ut-date-relative-base-example.component.html | 5 +++++ ...yout-date-relative-base-example.component.ts | 6 +++++- .../input-layout-date-relative.module.ts | 7 ++++++- .../input-layout-date-relative.component.ts | 17 ++++++++--------- 4 files changed, 24 insertions(+), 11 deletions(-) diff --git a/apps/doc/src/app/components/input/input-layout-date-relative/examples/base/input-layout-date-relative-base-example.component.html b/apps/doc/src/app/components/input/input-layout-date-relative/examples/base/input-layout-date-relative-base-example.component.html index dfb5572d73..a5d11382e1 100644 --- a/apps/doc/src/app/components/input/input-layout-date-relative/examples/base/input-layout-date-relative-base-example.component.html +++ b/apps/doc/src/app/components/input/input-layout-date-relative/examples/base/input-layout-date-relative-base-example.component.html @@ -1,3 +1,8 @@ + +
    +
    + + diff --git a/apps/doc/src/app/components/input/input-layout-date-relative/examples/base/input-layout-date-relative-base-example.component.ts b/apps/doc/src/app/components/input/input-layout-date-relative/examples/base/input-layout-date-relative-base-example.component.ts index 5228f028fa..43562296c6 100644 --- a/apps/doc/src/app/components/input/input-layout-date-relative/examples/base/input-layout-date-relative-base-example.component.ts +++ b/apps/doc/src/app/components/input/input-layout-date-relative/examples/base/input-layout-date-relative-base-example.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component } from '@angular/core'; import { UntypedFormControl } from '@angular/forms'; @Component({ @@ -15,4 +15,8 @@ import { UntypedFormControl } from '@angular/forms'; }) export class PrizmInputLayoutDateRelativeBaseExampleComponent { public readonly valueControl = new UntypedFormControl(); + + public changeDate(): void { + this.valueControl.setValue('T-5M'); + } } diff --git a/apps/doc/src/app/components/input/input-layout-date-relative/input-layout-date-relative.module.ts b/apps/doc/src/app/components/input/input-layout-date-relative/input-layout-date-relative.module.ts index ae0cf3e7e3..29d6c404cb 100644 --- a/apps/doc/src/app/components/input/input-layout-date-relative/input-layout-date-relative.module.ts +++ b/apps/doc/src/app/components/input/input-layout-date-relative/input-layout-date-relative.module.ts @@ -3,7 +3,11 @@ import { CommonModule } from '@angular/common'; import { prizmDocGenerateRoutes, PrizmAddonDocModule } from '@prizm-ui/doc'; import { RouterModule } from '@angular/router'; import { InputLayoutDateRelativeRelativeComponent } from './input-layout-date-relative.component'; -import { PolymorphModule, PrizmInputLayoutDateRelativeModule } from '@prizm-ui/components'; +import { + PolymorphModule, + PrizmButtonComponent, + PrizmInputLayoutDateRelativeModule, +} from '@prizm-ui/components'; import { FormsModule, ReactiveFormsModule } from '@angular/forms'; import { PrizmInputLayoutDateRelativeBaseExampleComponent } from './examples/base/input-layout-date-relative-base-example.component'; @@ -15,6 +19,7 @@ import { PrizmInputLayoutDateRelativeBaseExampleComponent } from './examples/bas ReactiveFormsModule, PolymorphModule, PrizmInputLayoutDateRelativeModule, + PrizmButtonComponent, RouterModule.forChild(prizmDocGenerateRoutes(InputLayoutDateRelativeRelativeComponent)), ], declarations: [PrizmInputLayoutDateRelativeBaseExampleComponent, InputLayoutDateRelativeRelativeComponent], diff --git a/libs/components/src/lib/components/input/input-date-relative/input-layout-date-relative.component.ts b/libs/components/src/lib/components/input/input-date-relative/input-layout-date-relative.component.ts index c57fac95bb..7f53fd958b 100644 --- a/libs/components/src/lib/components/input/input-date-relative/input-layout-date-relative.component.ts +++ b/libs/components/src/lib/components/input/input-date-relative/input-layout-date-relative.component.ts @@ -6,7 +6,6 @@ import { Inject, Injector, Input, - OnDestroy, OnInit, ViewChild, } from '@angular/core'; @@ -14,7 +13,7 @@ import { FormsModule, NG_VALUE_ACCESSOR, ReactiveFormsModule } from '@angular/fo import { prizmDefaultProp } from '@prizm-ui/core'; import { PrizmDestroyService, PrizmPluckPipe } from '@prizm-ui/helpers'; import { PrizmLanguageInputLayoutDateRelative } from '@prizm-ui/i18n'; -import { BehaviorSubject, Observable, Subscription } from 'rxjs'; +import { BehaviorSubject, Observable, takeUntil, tap } from 'rxjs'; import { getDefaultRelativeDateMenuItems, @@ -75,7 +74,7 @@ const MenuItems: RelativeDateMenuItems = getDefaultRelativeDateMenuItems(); }) export class PrizmInputLayoutDateRelativeComponent extends PrizmInputNgControl - implements OnInit, OnDestroy + implements OnInit { readonly nativeElementType = 'input-layout-date-relative'; readonly hasClearButton = true; @@ -113,8 +112,6 @@ export class PrizmInputLayoutDateRelativeComponent private activeNumber = ''; private activeWrongFormat = false; - private readonly subscriptions = new Subscription(); - public rightButtons$!: BehaviorSubject; constructor( @@ -131,6 +128,12 @@ export class PrizmInputLayoutDateRelativeComponent public override ngOnInit(): void { super.ngOnInit(); this.rightButtons$ = this.extraButtonInjector.get(PRIZM_DATE_RIGHT_BUTTONS); + this.ngControl.valueChanges + ?.pipe( + tap((value: string) => this.valueChange(value)), + takeUntil(this.destroy$) + ) + .subscribe(); } public valueChange(value: string) { @@ -146,10 +149,6 @@ export class PrizmInputLayoutDateRelativeComponent this.updateTouchedAndValue(value); } - public ngOnDestroy(): void { - this.subscriptions.unsubscribe(); - } - public onMenuItemClick(event: MouseEvent, item: RelativeDateMenuItem): void { event.stopImmediatePropagation(); switch (item.groupId) { From aa5bc63581b23b2da242dbbf8473a79f5cc891ec Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Mon, 10 Jun 2024 08:02:00 +0300 Subject: [PATCH 246/291] fix(components/input-date-time): default time is set only after focus is removed #1762 --- .../input/input-date-time/input-layout-date-time.component.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.ts b/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.ts index dddb9a33ed..e48a73869b 100644 --- a/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.ts +++ b/libs/components/src/lib/components/input/input-date-time/input-layout-date-time.component.ts @@ -429,6 +429,7 @@ export class PrizmInputLayoutDateTimeComponent public onOpenChange(open: boolean): void { this.open = open; this.changeDetectorRef.markForCheck(); + if (!open) this.completeDateIfAreNotPending(); } public override writeValue(value: [PrizmDay | null, PrizmTime | null] | null): void { From 996c164973edf27ad8398597f9d3da6911be45c2 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Mon, 10 Jun 2024 08:47:17 +0300 Subject: [PATCH 247/291] fix(components/chips): update chips on async changes #1754 --- libs/components/src/lib/components/chips/chips.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libs/components/src/lib/components/chips/chips.component.ts b/libs/components/src/lib/components/chips/chips.component.ts index a01a9d8255..a419dda1a3 100644 --- a/libs/components/src/lib/components/chips/chips.component.ts +++ b/libs/components/src/lib/components/chips/chips.component.ts @@ -170,7 +170,7 @@ export class PrizmChipsComponent if (result) this.overflowedChipsList$.value.add(idx); else this.overflowedChipsList$.value.delete(idx); - this.overflowedChipsList$.next(this.overflowedChipsList$.value); + this.overflowedChipsList$.next(new Set([...this.overflowedChipsList$.value])); return result; }), From 930cd675e6e183d8d96b51bfcb7232ff5c6c30d7 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 10 Jun 2024 11:08:46 +0300 Subject: [PATCH 248/291] fix(doc/file-upload): i18n example fix #000 --- .../examples/auto-upload/auto-upload.component.ts | 2 +- .../i18n/file-upload-i18n-example.component.ts | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/doc/src/app/components/file-upload/examples/auto-upload/auto-upload.component.ts b/apps/doc/src/app/components/file-upload/examples/auto-upload/auto-upload.component.ts index 472e5ffcad..b669d7ff91 100644 --- a/apps/doc/src/app/components/file-upload/examples/auto-upload/auto-upload.component.ts +++ b/apps/doc/src/app/components/file-upload/examples/auto-upload/auto-upload.component.ts @@ -45,7 +45,7 @@ export class PrizmFileAutoUploadExampleComponent implements OnDestroy { public send(files: File[]): void { this.disabled = true; const formData = new FormData(); - for (const file of this.files) { + for (const file of files) { formData.append(file.name, file); } diff --git a/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.ts b/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.ts index 98d9d4d16b..1a0a1d2c21 100644 --- a/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.ts +++ b/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.ts @@ -43,7 +43,7 @@ export class PrizmFileUploadI18nExampleComponent { public onFilesChange(files: Array): void { this.files = files; if (this.files.length > 0) { - this.send(); + this.send(files.slice(this.files.length)); } } @@ -65,10 +65,10 @@ export class PrizmFileUploadI18nExampleComponent { }); } - public send(): void { + public send(files: File[]): void { this.disabled = true; const formData = new FormData(); - for (const file of this.files) { + for (const file of files) { formData.append(file.name, file); } @@ -86,14 +86,14 @@ export class PrizmFileUploadI18nExampleComponent { this.disabled = false; if (event.status >= 200 && event.status < 300) { - for (const file of this.files) { + for (const file of files) { this.progress$$.next({ ...this.progress$$.value, [file.name]: { progress: 100, error: false }, }); } } else { - for (const file of this.files) { + for (const file of files) { this.progress$$.next({ ...this.progress$$.value, [file.name]: { error: true }, @@ -104,7 +104,7 @@ export class PrizmFileUploadI18nExampleComponent { break; } case HttpEventType.UploadProgress: { - for (const file of this.files) { + for (const file of files) { this.progress$$.next({ ...this.progress$$.value, [file.name]: { From d57c34df5799b9a43c099d182c64f71c825f4f68 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 10 Jun 2024 11:59:49 +0300 Subject: [PATCH 249/291] fix(components/file-upload): fix styles for size #000 --- .../src/lib/components/file-upload/file-upload.component.less | 1 + 1 file changed, 1 insertion(+) diff --git a/libs/components/src/lib/components/file-upload/file-upload.component.less b/libs/components/src/lib/components/file-upload/file-upload.component.less index 9fdd2b040a..55aeff7a60 100644 --- a/libs/components/src/lib/components/file-upload/file-upload.component.less +++ b/libs/components/src/lib/components/file-upload/file-upload.component.less @@ -119,6 +119,7 @@ font-size: 10px; line-height: 12px; color: var(--prizm-v3-text-icon-tertiary); + white-space: nowrap; } &__stage { From b3fecfcb70822d0ffa0e17476de785c2ebdbc64e Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 10 Jun 2024 12:15:57 +0300 Subject: [PATCH 250/291] fix(components/file-upload): do not throw max count error while multiply true #000 --- .../examples/i18n/file-upload-i18n-example.component.ts | 4 ++-- .../src/lib/components/file-upload/file-upload.component.ts | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.ts b/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.ts index 1a0a1d2c21..312844544d 100644 --- a/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.ts +++ b/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.ts @@ -42,8 +42,8 @@ export class PrizmFileUploadI18nExampleComponent { public onFilesChange(files: Array): void { this.files = files; - if (this.files.length > 0) { - this.send(files.slice(this.files.length)); + if (files.length > 0) { + this.send(files.slice(files.length)); } } diff --git a/libs/components/src/lib/components/file-upload/file-upload.component.ts b/libs/components/src/lib/components/file-upload/file-upload.component.ts index 97655c829e..eaa7188a4b 100644 --- a/libs/components/src/lib/components/file-upload/file-upload.component.ts +++ b/libs/components/src/lib/components/file-upload/file-upload.component.ts @@ -135,7 +135,7 @@ export class PrizmFileUploadComponent this.calculatedMaxFilesCount = this.multiple ? this._maxFilesCount : 1; } - if (this.files.length > this.calculatedMaxFilesCount) { + if (this.files.length > this.calculatedMaxFilesCount && this.multiple) { this.filesCountError.next(this.files.slice(this.calculatedMaxFilesCount).map(file => file.name)); } } @@ -256,7 +256,7 @@ export class PrizmFileUploadComponent this.beforeFilesChange.next(); const filesCountDelta = this.calculatedMaxFilesCount - this.files.length; - if (filteredFiles.length + this.files.length > this.calculatedMaxFilesCount) { + if (filteredFiles.length + this.files.length > this.calculatedMaxFilesCount && this.multiple) { this.filesCountError.next(filteredFiles.slice(filesCountDelta).map(file => file.name)); filteredFiles.length = filesCountDelta; } From 4e6134128a5d97f04cc59a23a039d919004c4c76 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 10 Jun 2024 15:33:09 +0300 Subject: [PATCH 251/291] fix(doc/file-upload): update examples #000 --- .../examples/auto-upload/auto-upload.component.ts | 6 ++++-- .../examples/i18n/file-upload-i18n-example.component.ts | 9 ++++++--- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/apps/doc/src/app/components/file-upload/examples/auto-upload/auto-upload.component.ts b/apps/doc/src/app/components/file-upload/examples/auto-upload/auto-upload.component.ts index b669d7ff91..7949d9c367 100644 --- a/apps/doc/src/app/components/file-upload/examples/auto-upload/auto-upload.component.ts +++ b/apps/doc/src/app/components/file-upload/examples/auto-upload/auto-upload.component.ts @@ -17,8 +17,10 @@ export class PrizmFileAutoUploadExampleComponent implements OnDestroy { maxFiles = 3; public onFilesChange(files: Array): void { - if (files.length > 0) { - this.send(files.slice(this.files.length)); + const filesToUpload = files.filter(file => !this.files.some(el => el === file)); + + if (filesToUpload.length > 0) { + this.send(filesToUpload); } this.files = files; diff --git a/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.ts b/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.ts index 312844544d..06f70b85e7 100644 --- a/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.ts +++ b/apps/doc/src/app/components/file-upload/examples/i18n/file-upload-i18n-example.component.ts @@ -41,10 +41,13 @@ export class PrizmFileUploadI18nExampleComponent { maxFiles = 3; public onFilesChange(files: Array): void { - this.files = files; - if (files.length > 0) { - this.send(files.slice(files.length)); + const filesToUpload = files.filter(file => !this.files.some(el => el === file)); + + if (filesToUpload.length > 0) { + this.send(filesToUpload); } + + this.files = files; } public onfilesValidationErrors(errors: { [key: string]: PrizmFileValidationErrors }): void { From e36948de22653aa0d3e680f5bd62ebc5bb0c0429 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 11 Jun 2024 09:26:14 +0300 Subject: [PATCH 252/291] feat(chore): update mr checklist template #000 --- .gitlab/merge_request_templates/mr_template.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.gitlab/merge_request_templates/mr_template.md b/.gitlab/merge_request_templates/mr_template.md index b05ff22cbf..2c504a8374 100644 --- a/.gitlab/merge_request_templates/mr_template.md +++ b/.gitlab/merge_request_templates/mr_template.md @@ -4,6 +4,7 @@ - [ ] `@prizm-ui/install` - [ ] `@prizm-ui/icons` - [ ] `@prizm-ui/theme` +- [ ] `documentation` ### Компонент @@ -29,3 +30,7 @@ Checklist: ### Следует обратить внимание на ревью _На что нужно обратить внимание_ + +### Release notes + +_Описание на русском для release notes_ From f1366ba040d5290e13a699e2d2b1c64f2dbc0989 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 11 Jun 2024 09:14:52 +0300 Subject: [PATCH 253/291] fix(doc/textarea): missing border property added for textarea livedemo #1803 --- .../components/input/textarea/textarea-example.component.html | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/doc/src/app/components/input/textarea/textarea-example.component.html b/apps/doc/src/app/components/input/textarea/textarea-example.component.html index d58ff58d71..fa0460c870 100644 --- a/apps/doc/src/app/components/input/textarea/textarea-example.component.html +++ b/apps/doc/src/app/components/input/textarea/textarea-example.component.html @@ -22,6 +22,7 @@ [label]="label" [size]="size" [outer]="outer" + [border]="border" [ngStyle]="{ width }" [status]="status" [position]="inputPosition" From 328aedeb8a5f82a5970a369b2852febf2e184094 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 10 Jun 2024 23:10:01 +0300 Subject: [PATCH 254/291] fix(components/file-upload): validation logig update #000 --- .../file-upload/file-upload.component.ts | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/libs/components/src/lib/components/file-upload/file-upload.component.ts b/libs/components/src/lib/components/file-upload/file-upload.component.ts index eaa7188a4b..acf827eb38 100644 --- a/libs/components/src/lib/components/file-upload/file-upload.component.ts +++ b/libs/components/src/lib/components/file-upload/file-upload.component.ts @@ -135,7 +135,7 @@ export class PrizmFileUploadComponent this.calculatedMaxFilesCount = this.multiple ? this._maxFilesCount : 1; } - if (this.files.length > this.calculatedMaxFilesCount && this.multiple) { + if (this.files.length > this.calculatedMaxFilesCount) { this.filesCountError.next(this.files.slice(this.calculatedMaxFilesCount).map(file => file.name)); } } @@ -255,18 +255,26 @@ export class PrizmFileUploadComponent this.beforeFilesChange.next(); - const filesCountDelta = this.calculatedMaxFilesCount - this.files.length; - if (filteredFiles.length + this.files.length > this.calculatedMaxFilesCount && this.multiple) { - this.filesCountError.next(filteredFiles.slice(filesCountDelta).map(file => file.name)); - filteredFiles.length = filesCountDelta; - } + if (this.multiple) { + const filesCountDelta = this.calculatedMaxFilesCount - this.files.length; - this.emitValidationErrors(); + if (filteredFiles.length + this.files.length > this.calculatedMaxFilesCount) { + this.filesCountError.next(filteredFiles.slice(filesCountDelta).map(file => file.name)); + filteredFiles.length = filesCountDelta; + } + } if (!this.multiple) { + if (filteredFiles.length > 1) { + this.filesCountError.next(filteredFiles.slice(1).map(file => file.name)); + filteredFiles.length = 1; + } + this.clearFiles({ emitEvent: false }); } + this.emitValidationErrors(); + for (const file of filteredFiles) { this.filesMap.set(file.name, { file, From ecd77b2b73d6ed9266b79daed2ec33e37cc0dac4 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 11 Jun 2024 10:32:10 +0300 Subject: [PATCH 255/291] feat(chore/release): 1.17.2 up to 1.18.0 #000 --- .github/workflows/beta-publish-ng14.yml | 2 +- .github/workflows/main-publish-ng14.yml | 2 +- .github/workflows/pre-release-publish-ng14.yml | 2 +- .../src/app/version-manager/current.const.ts.ng14 | 2 +- .../src/app/version-manager/versions.constants.ts | 12 ++++++------ libs/ast/package.json.ng14 | 2 +- libs/charts/base/package.json.ng14 | 6 +++--- libs/components/package.json.ng14 | 10 +++++----- libs/core/package.json.ng14 | 2 +- libs/helpers/package.json.ng14 | 2 +- libs/i18n/package.json.ng14 | 2 +- libs/icons/base/package.json.ng14 | 4 ++-- libs/icons/flags/package.json.ng14 | 4 ++-- libs/nxmv/package.json.ng14 | 2 +- libs/plugin/package.json.ng14 | 4 ++-- libs/schematics/package.json.ng14 | 2 +- libs/theme/package.json.ng14 | 6 +++--- package.json.ng14 | 2 +- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/beta-publish-ng14.yml b/.github/workflows/beta-publish-ng14.yml index bb828e8747..8436e3bc86 100644 --- a/.github/workflows/beta-publish-ng14.yml +++ b/.github/workflows/beta-publish-ng14.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng14beta --json 2>/dev/null || echo '1.17.2-ng14beta.0') | jq '([.[] | select(startswith("1.17.2-ng14beta"))] | last // "1.17.2-ng14beta.0")' 2>/dev/null || echo '1.17.2-ng14beta.0' + (npm view @prizm-ui/components versions --tag ng14beta --json 2>/dev/null || echo '1.18.0-ng14beta.0') | jq '([.[] | select(startswith("1.18.0-ng14beta"))] | last // "1.18.0-ng14beta.0")' 2>/dev/null || echo '1.18.0-ng14beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng14.yml b/.github/workflows/main-publish-ng14.yml index 37fdc5c5c8..2cf5ca318d 100644 --- a/.github/workflows/main-publish-ng14.yml +++ b/.github/workflows/main-publish-ng14.yml @@ -58,7 +58,7 @@ jobs: - name: Set up environment variables run: | last_v1_version=$( - echo '1.17.2' + echo '1.18.0' ) echo "LAST_V1_VERSION=${last_v1_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng14.yml b/.github/workflows/pre-release-publish-ng14.yml index 2a823e8283..880838d427 100644 --- a/.github/workflows/pre-release-publish-ng14.yml +++ b/.github/workflows/pre-release-publish-ng14.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng14next --json 2>/dev/null || echo '1.17.2-ng14next.0') | jq '([.[] | select(startswith("1.17.2-ng14next"))] | last // "1.17.2-ng14next.0")' 2>/dev/null || echo '1.17.2-ng14next.0' + (npm view @prizm-ui/components versions --tag ng14next --json 2>/dev/null || echo '1.18.0-ng14next.0') | jq '([.[] | select(startswith("1.18.0-ng14next"))] | last // "1.18.0-ng14next.0")' 2>/dev/null || echo '1.18.0-ng14next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/apps/doc/src/app/version-manager/current.const.ts.ng14 b/apps/doc/src/app/version-manager/current.const.ts.ng14 index b920fa2a3e..5af3aea907 100644 --- a/apps/doc/src/app/version-manager/current.const.ts.ng14 +++ b/apps/doc/src/app/version-manager/current.const.ts.ng14 @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '1.17.2'; +export const PRIZM_CURRENT_VERSION = '1.18.0'; diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index d7c7b365c8..dfbf3e6ad0 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -30,8 +30,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ }, }, { - label: '1.17.2 (ng14)', - version: '1.17.2', + label: '1.18.0 (ng14)', + version: '1.18.0', stackblitz: 'https://stackblitz.com/edit/prizm-v1-demo', link: new URL('https://prizm-v1.web.app'), otherLinks: [], @@ -54,8 +54,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '1.17.2-next (ng14)', - version: '1.17.2-next', + label: '1.18.0-next (ng14)', + version: '1.18.0-next', stackblitz: 'https://stackblitz.com/edit/prizm-v1-next-demo', link: new URL('https://prizm-v1-next.web.app'), otherLinks: [], @@ -75,8 +75,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '1.17.2-beta (ng14)', - version: '1.17.2-beta', + label: '1.18.0-beta (ng14)', + version: '1.18.0-beta', stackblitz: 'https://stackblitz.com/edit/prizm-v1-beta-demo', link: new URL('https://prizm-v1-beta.web.app'), otherLinks: [], diff --git a/libs/ast/package.json.ng14 b/libs/ast/package.json.ng14 index 21965aa9e1..81dac4c5f5 100644 --- a/libs/ast/package.json.ng14 +++ b/libs/ast/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "1.17.2", + "version": "1.18.0", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json.ng14 b/libs/charts/base/package.json.ng14 index f9ee456acd..2a8b665c27 100644 --- a/libs/charts/base/package.json.ng14 +++ b/libs/charts/base/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "1.17.2", + "version": "1.18.0", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/theme": "^1.17.2", - "@prizm-ui/helpers": "^1.17.2", + "@prizm-ui/theme": "^1.18.0", + "@prizm-ui/helpers": "^1.18.0", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/package.json.ng14 b/libs/components/package.json.ng14 index 1e84e6e6ba..3500457c16 100644 --- a/libs/components/package.json.ng14 +++ b/libs/components/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "1.17.2", + "version": "1.18.0", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -17,10 +17,10 @@ "@ng-web-apis/resize-observer": "2.0.0", "@ng-web-apis/intersection-observer": "2.0.0", "@ng-web-apis/mutation-observer": "2.0.0", - "@prizm-ui/helpers": "^1.17.2", - "@prizm-ui/core": "^1.17.2", - "@prizm-ui/i18n": "^1.17.2", - "@prizm-ui/theme": "^1.17.2" + "@prizm-ui/helpers": "^1.18.0", + "@prizm-ui/core": "^1.18.0", + "@prizm-ui/i18n": "^1.18.0", + "@prizm-ui/theme": "^1.18.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json.ng14 b/libs/core/package.json.ng14 index 80cd69f16e..a1ef0ac512 100644 --- a/libs/core/package.json.ng14 +++ b/libs/core/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "1.17.2", + "version": "1.18.0", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json.ng14 b/libs/helpers/package.json.ng14 index 7856b4727a..bbea33e8d2 100644 --- a/libs/helpers/package.json.ng14 +++ b/libs/helpers/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "1.17.2", + "version": "1.18.0", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json.ng14 b/libs/i18n/package.json.ng14 index b94a7368b7..51ea320e8a 100644 --- a/libs/i18n/package.json.ng14 +++ b/libs/i18n/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "1.17.2", + "version": "1.18.0", "peerDependencies": { "@angular/core": "^14.2.0" }, diff --git a/libs/icons/base/package.json.ng14 b/libs/icons/base/package.json.ng14 index a4ec7f73e5..bdc405a28c 100644 --- a/libs/icons/base/package.json.ng14 +++ b/libs/icons/base/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "1.17.2", + "version": "1.18.0", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/core": "^1.17.2" + "@prizm-ui/core": "^1.18.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json.ng14 b/libs/icons/flags/package.json.ng14 index 454e656e2a..a720f76fd6 100644 --- a/libs/icons/flags/package.json.ng14 +++ b/libs/icons/flags/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "1.17.2", + "version": "1.18.0", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/core": "^1.17.2" + "@prizm-ui/core": "^1.18.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json.ng14 b/libs/nxmv/package.json.ng14 index aa5e0abe66..26bec5eb67 100644 --- a/libs/nxmv/package.json.ng14 +++ b/libs/nxmv/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "1.17.2", + "version": "1.18.0", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json.ng14 b/libs/plugin/package.json.ng14 index d4a564ef15..b8cd8a0d93 100644 --- a/libs/plugin/package.json.ng14 +++ b/libs/plugin/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "1.17.2", + "version": "1.18.0", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^1.17.2" + "@prizm-ui/ast": "^1.18.0" } } diff --git a/libs/schematics/package.json.ng14 b/libs/schematics/package.json.ng14 index 97e97f4be6..3a6519987f 100644 --- a/libs/schematics/package.json.ng14 +++ b/libs/schematics/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "1.17.2", + "version": "1.18.0", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json.ng14 b/libs/theme/package.json.ng14 index 5bf6f2d9fb..fdedf39578 100644 --- a/libs/theme/package.json.ng14 +++ b/libs/theme/package.json.ng14 @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "1.17.2", + "version": "1.18.0", "peerDependencies": { "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/core": "^1.17.2", - "@prizm-ui/helpers": "^1.17.2" + "@prizm-ui/core": "^1.18.0", + "@prizm-ui/helpers": "^1.18.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json.ng14 b/package.json.ng14 index 56c47d8baf..f19135ee60 100644 --- a/package.json.ng14 +++ b/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "1.17.2", + "version": "1.18.0", "license": "MIT", "husky": { "hooks": { From 3b8e5e185b71f749f9fa656fee339dd4e28bb042 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 11 Jun 2024 10:45:39 +0300 Subject: [PATCH 256/291] feat(chore/release): 2.14.2 up to 2.15.0 #000 --- .github/workflows/beta-publish-ng15.yml | 2 +- .github/workflows/main-publish-ng15.yml | 2 +- .github/workflows/pre-release-publish-ng15.yml | 2 +- .../src/app/version-manager/current.const.ts.ng15 | 2 +- .../src/app/version-manager/versions.constants.ts | 12 ++++++------ libs/ast/package.json.ng15 | 2 +- libs/charts/base/package.json.ng15 | 6 +++--- libs/components/package.json.ng15 | 10 +++++----- libs/core/package.json.ng15 | 2 +- libs/helpers/package.json.ng15 | 2 +- libs/i18n/package.json.ng15 | 2 +- libs/icons/base/package.json.ng15 | 4 ++-- libs/icons/flags/package.json.ng15 | 4 ++-- libs/nxmv/package.json.ng15 | 2 +- libs/plugin/package.json.ng15 | 4 ++-- libs/schematics/package.json.ng15 | 2 +- libs/theme/package.json.ng15 | 6 +++--- package.json.ng15 | 2 +- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/beta-publish-ng15.yml b/.github/workflows/beta-publish-ng15.yml index 5df6de6750..da631b7812 100644 --- a/.github/workflows/beta-publish-ng15.yml +++ b/.github/workflows/beta-publish-ng15.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng15beta --json 2>/dev/null || echo '2.14.2-ng15beta.0') | jq '([.[] | select(startswith("2.14.2-ng15beta"))] | last // "2.14.2-ng15beta.0")' 2>/dev/null || echo '2.14.2-ng15beta.0' + (npm view @prizm-ui/components versions --tag ng15beta --json 2>/dev/null || echo '2.15.0-ng15beta.0') | jq '([.[] | select(startswith("2.15.0-ng15beta"))] | last // "2.15.0-ng15beta.0")' 2>/dev/null || echo '2.15.0-ng15beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng15.yml b/.github/workflows/main-publish-ng15.yml index 52c41ec77c..3cb8d1c8cd 100644 --- a/.github/workflows/main-publish-ng15.yml +++ b/.github/workflows/main-publish-ng15.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_v2_version=$( - echo '2.14.2' + echo '2.15.0' ) echo "LAST_V2_VERSION=${last_v2_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng15.yml b/.github/workflows/pre-release-publish-ng15.yml index 853f5a34b1..4e9c833eda 100644 --- a/.github/workflows/pre-release-publish-ng15.yml +++ b/.github/workflows/pre-release-publish-ng15.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng15next --json 2>/dev/null || echo '2.14.2-ng15next.0') | jq '([.[] | select(startswith("2.14.2-ng15next"))] | last // "2.14.2-ng15next.0")' 2>/dev/null || echo '2.14.2-ng15next.0' + (npm view @prizm-ui/components versions --tag ng15next --json 2>/dev/null || echo '2.15.0-ng15next.0') | jq '([.[] | select(startswith("2.15.0-ng15next"))] | last // "2.15.0-ng15next.0")' 2>/dev/null || echo '2.15.0-ng15next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/apps/doc/src/app/version-manager/current.const.ts.ng15 b/apps/doc/src/app/version-manager/current.const.ts.ng15 index 7ce88d363d..50846c9f6d 100644 --- a/apps/doc/src/app/version-manager/current.const.ts.ng15 +++ b/apps/doc/src/app/version-manager/current.const.ts.ng15 @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '2.14.2'; +export const PRIZM_CURRENT_VERSION = '2.15.0'; diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index dfbf3e6ad0..ac27e70e71 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -20,8 +20,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ }, }, { - label: '2.14.2 (ng15)', - version: '2.14.2', + label: '2.15.0 (ng15)', + version: '2.15.0', stackblitz: 'https://stackblitz.com/edit/prizm-v2-demo', link: new URL('https://prizm-v2.web.app'), otherLinks: [], @@ -47,9 +47,9 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '2.14.2-next (ng15)', + label: '2.15.0-next (ng15)', stackblitz: 'https://stackblitz.com/edit/prizm-v2-next-demo', - version: '2.14.2-next', + version: '2.15.0-next', link: new URL('https://prizm-v2-next.web.app'), otherLinks: [], }, @@ -68,8 +68,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '2.14.2-beta (ng15)', - version: '2.14.2-beta', + label: '2.15.0-beta (ng15)', + version: '2.15.0-beta', stackblitz: 'https://stackblitz.com/edit/prizm-v2-beta-demo', link: new URL('https://prizm-v2-beta.web.app'), otherLinks: [], diff --git a/libs/ast/package.json.ng15 b/libs/ast/package.json.ng15 index 2d6031afa0..102324f34b 100644 --- a/libs/ast/package.json.ng15 +++ b/libs/ast/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "2.14.2", + "version": "2.15.0", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json.ng15 b/libs/charts/base/package.json.ng15 index 650f966a1b..3aa4fc7fbd 100644 --- a/libs/charts/base/package.json.ng15 +++ b/libs/charts/base/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "2.14.2", + "version": "2.15.0", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/theme": "^2.14.2", - "@prizm-ui/helpers": "^2.14.2", + "@prizm-ui/theme": "^2.15.0", + "@prizm-ui/helpers": "^2.15.0", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/package.json.ng15 b/libs/components/package.json.ng15 index d56aa545b2..76d17bca9b 100644 --- a/libs/components/package.json.ng15 +++ b/libs/components/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "2.14.2", + "version": "2.15.0", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -18,10 +18,10 @@ "@ng-web-apis/resize-observer": "2.0.0", "@ng-web-apis/intersection-observer": "2.0.0", "@ng-web-apis/mutation-observer": "2.0.0", - "@prizm-ui/helpers": "^2.14.2", - "@prizm-ui/core": "^2.14.2", - "@prizm-ui/i18n": "^2.14.2", - "@prizm-ui/theme": "^2.14.2" + "@prizm-ui/helpers": "^2.15.0", + "@prizm-ui/core": "^2.15.0", + "@prizm-ui/i18n": "^2.15.0", + "@prizm-ui/theme": "^2.15.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json.ng15 b/libs/core/package.json.ng15 index e9b1d5f4d3..64f5fe0851 100644 --- a/libs/core/package.json.ng15 +++ b/libs/core/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "2.14.2", + "version": "2.15.0", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json.ng15 b/libs/helpers/package.json.ng15 index a4e940692b..6b09626a26 100644 --- a/libs/helpers/package.json.ng15 +++ b/libs/helpers/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "2.14.2", + "version": "2.15.0", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json.ng15 b/libs/i18n/package.json.ng15 index 59fa0f9a14..b2e2fe6260 100644 --- a/libs/i18n/package.json.ng15 +++ b/libs/i18n/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "2.14.2", + "version": "2.15.0", "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0" diff --git a/libs/icons/base/package.json.ng15 b/libs/icons/base/package.json.ng15 index 9c4381868d..d2c5dbac9a 100644 --- a/libs/icons/base/package.json.ng15 +++ b/libs/icons/base/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "2.14.2", + "version": "2.15.0", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/core": "^2.14.2" + "@prizm-ui/core": "^2.15.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json.ng15 b/libs/icons/flags/package.json.ng15 index 99be2a3f90..9aa9b70135 100644 --- a/libs/icons/flags/package.json.ng15 +++ b/libs/icons/flags/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "2.14.2", + "version": "2.15.0", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/core": "^2.14.2" + "@prizm-ui/core": "^2.15.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json.ng15 b/libs/nxmv/package.json.ng15 index 5a35b39fbd..28809a7fbe 100644 --- a/libs/nxmv/package.json.ng15 +++ b/libs/nxmv/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "2.14.2", + "version": "2.15.0", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json.ng15 b/libs/plugin/package.json.ng15 index 76391d8953..ebf631eb26 100644 --- a/libs/plugin/package.json.ng15 +++ b/libs/plugin/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "2.14.2", + "version": "2.15.0", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^2.14.2" + "@prizm-ui/ast": "^2.15.0" } } diff --git a/libs/schematics/package.json.ng15 b/libs/schematics/package.json.ng15 index 08d77c092e..a196767d59 100644 --- a/libs/schematics/package.json.ng15 +++ b/libs/schematics/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "2.14.2", + "version": "2.15.0", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json.ng15 b/libs/theme/package.json.ng15 index ab14d44d70..c136c6fdc5 100644 --- a/libs/theme/package.json.ng15 +++ b/libs/theme/package.json.ng15 @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "2.14.2", + "version": "2.15.0", "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/core": "^2.14.2", - "@prizm-ui/helpers": "^2.14.2" + "@prizm-ui/core": "^2.15.0", + "@prizm-ui/helpers": "^2.15.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json.ng15 b/package.json.ng15 index 933de8ec47..bf039c3ac0 100644 --- a/package.json.ng15 +++ b/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "2.14.2", + "version": "2.15.0", "license": "MIT", "husky": { "hooks": { From a642426ac49ef1a0db82349cadf28ca49fd04d65 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 11 Jun 2024 11:09:34 +0300 Subject: [PATCH 257/291] feat(chore/release): 3.13.2 up to 3.14.0 #000 --- .github/workflows/beta-publish-ng16.yml | 2 +- .github/workflows/main-publish-ng16.yml | 2 +- .github/workflows/pre-release-publish-ng16.yml | 2 +- .../src/app/version-manager/current.const.ts.ng16 | 2 +- .../src/app/version-manager/versions.constants.ts | 12 ++++++------ libs/ast/package.json.ng16 | 2 +- libs/charts/base/package.json.ng16 | 6 +++--- libs/components/package.json.ng16 | 10 +++++----- libs/core/package.json.ng16 | 2 +- libs/helpers/package.json.ng16 | 2 +- libs/i18n/package.json.ng16 | 2 +- libs/icons/base/package.json.ng16 | 4 ++-- libs/icons/flags/package.json.ng16 | 4 ++-- libs/nxmv/package.json.ng16 | 2 +- libs/plugin/package.json.ng16 | 4 ++-- libs/schematics/package.json.ng16 | 2 +- libs/theme/package.json.ng16 | 6 +++--- package.json.ng16 | 2 +- 18 files changed, 34 insertions(+), 34 deletions(-) diff --git a/.github/workflows/beta-publish-ng16.yml b/.github/workflows/beta-publish-ng16.yml index c3e735a1b6..9cfb95d323 100644 --- a/.github/workflows/beta-publish-ng16.yml +++ b/.github/workflows/beta-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng16beta --json 2>/dev/null || echo '3.13.2-beta.0') | jq '([.[] | select(startswith("3.13.2-beta"))] | last // "3.13.2-beta.0")' 2>/dev/null || echo '3.13.2-beta.0' + (npm view @prizm-ui/components versions --tag ng16beta --json 2>/dev/null || echo '3.14.0-beta.0') | jq '([.[] | select(startswith("3.14.0-beta"))] | last // "3.14.0-beta.0")' 2>/dev/null || echo '3.14.0-beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng16.yml b/.github/workflows/main-publish-ng16.yml index 359d8bacf0..3361d6c6bc 100644 --- a/.github/workflows/main-publish-ng16.yml +++ b/.github/workflows/main-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_v3_version=$( - echo '3.13.2' + echo '3.14.0' ) echo "LAST_V3_VERSION=${last_v3_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng16.yml b/.github/workflows/pre-release-publish-ng16.yml index 7434ecc6bb..f5bdce0b25 100644 --- a/.github/workflows/pre-release-publish-ng16.yml +++ b/.github/workflows/pre-release-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng16next --json 2>/dev/null || echo '3.13.2-next.0') | jq '([.[] | select(startswith("3.13.2-next"))] | last // "3.13.2-next.0")' 2>/dev/null || echo '3.13.2-next.0' + (npm view @prizm-ui/components versions --tag ng16next --json 2>/dev/null || echo '3.14.0-next.0') | jq '([.[] | select(startswith("3.14.0-next"))] | last // "3.14.0-next.0")' 2>/dev/null || echo '3.14.0-next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/apps/doc/src/app/version-manager/current.const.ts.ng16 b/apps/doc/src/app/version-manager/current.const.ts.ng16 index bf4dfc276c..fbd364f027 100644 --- a/apps/doc/src/app/version-manager/current.const.ts.ng16 +++ b/apps/doc/src/app/version-manager/current.const.ts.ng16 @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '3.13.2'; +export const PRIZM_CURRENT_VERSION = '3.14.0'; diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index ac27e70e71..0bcdd6083e 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -10,8 +10,8 @@ export interface PrizmVersionMeta { export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ { - label: '3.13.2 (ng16)', - version: '3.13.2', + label: '3.14.0 (ng16)', + version: '3.14.0', stackblitz: 'https://stackblitz.com/edit/prizm-v3-demo', link: new URL('http://prizm.site'), otherLinks: [new URL('https://prizm-v3.web.app')], @@ -40,8 +40,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ }, }, { - label: '3.13.2-next (ng16)', - version: '3.13.2-next', + label: '3.14.0-next (ng16)', + version: '3.14.0-next', stackblitz: 'https://stackblitz.com/edit/prizm-v3-next-demo', link: new URL('https://prizm-v3-next.web.app'), otherLinks: [], @@ -61,8 +61,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ otherLinks: [], }, { - label: '3.13.2-beta (ng16)', - version: '3.13.2-beta', + label: '3.14.0-beta (ng16)', + version: '3.14.0-beta', stackblitz: 'https://stackblitz.com/edit/prizm-v3-beta-demo', link: new URL('https://prizm-v3-beta.web.app'), otherLinks: [], diff --git a/libs/ast/package.json.ng16 b/libs/ast/package.json.ng16 index 45f60955e5..69e975ef42 100644 --- a/libs/ast/package.json.ng16 +++ b/libs/ast/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "3.13.2", + "version": "3.14.0", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json.ng16 b/libs/charts/base/package.json.ng16 index 551b671d8d..075cbc99b0 100644 --- a/libs/charts/base/package.json.ng16 +++ b/libs/charts/base/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "3.13.2", + "version": "3.14.0", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/theme": "^3.13.2", - "@prizm-ui/helpers": "^3.13.2", + "@prizm-ui/theme": "^3.14.0", + "@prizm-ui/helpers": "^3.14.0", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/package.json.ng16 b/libs/components/package.json.ng16 index 0b6da57b9e..86d83930bf 100644 --- a/libs/components/package.json.ng16 +++ b/libs/components/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "3.13.2", + "version": "3.14.0", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -18,10 +18,10 @@ "@ng-web-apis/resize-observer": "^3.0.0", "@ng-web-apis/intersection-observer": "^3.0.0", "@ng-web-apis/mutation-observer": "^3.0.0", - "@prizm-ui/helpers": "^3.13.2", - "@prizm-ui/core": "^3.13.2", - "@prizm-ui/i18n": "^3.13.2", - "@prizm-ui/theme": "^3.13.2" + "@prizm-ui/helpers": "^3.14.0", + "@prizm-ui/core": "^3.14.0", + "@prizm-ui/i18n": "^3.14.0", + "@prizm-ui/theme": "^3.14.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json.ng16 b/libs/core/package.json.ng16 index a5b4a9f1af..b32701cad7 100644 --- a/libs/core/package.json.ng16 +++ b/libs/core/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "3.13.2", + "version": "3.14.0", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json.ng16 b/libs/helpers/package.json.ng16 index 03c5f68776..80e3ae829d 100644 --- a/libs/helpers/package.json.ng16 +++ b/libs/helpers/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "3.13.2", + "version": "3.14.0", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json.ng16 b/libs/i18n/package.json.ng16 index 52f2a7e203..68b33de825 100644 --- a/libs/i18n/package.json.ng16 +++ b/libs/i18n/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "3.13.2", + "version": "3.14.0", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0" diff --git a/libs/icons/base/package.json.ng16 b/libs/icons/base/package.json.ng16 index e67d6aeedd..d70eef9d2a 100644 --- a/libs/icons/base/package.json.ng16 +++ b/libs/icons/base/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "3.13.2", + "version": "3.14.0", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.13.2" + "@prizm-ui/core": "^3.14.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json.ng16 b/libs/icons/flags/package.json.ng16 index 62ae4487ae..f41b780e22 100644 --- a/libs/icons/flags/package.json.ng16 +++ b/libs/icons/flags/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "3.13.2", + "version": "3.14.0", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.13.2" + "@prizm-ui/core": "^3.14.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json.ng16 b/libs/nxmv/package.json.ng16 index b41df9d145..6012c3bb38 100644 --- a/libs/nxmv/package.json.ng16 +++ b/libs/nxmv/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "3.13.2", + "version": "3.14.0", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json.ng16 b/libs/plugin/package.json.ng16 index 363ba72aab..b2c84639c2 100644 --- a/libs/plugin/package.json.ng16 +++ b/libs/plugin/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "3.13.2", + "version": "3.14.0", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^3.13.2" + "@prizm-ui/ast": "^3.14.0" } } diff --git a/libs/schematics/package.json.ng16 b/libs/schematics/package.json.ng16 index 1d4cb32801..c8ebb981c4 100644 --- a/libs/schematics/package.json.ng16 +++ b/libs/schematics/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "3.13.2", + "version": "3.14.0", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json.ng16 b/libs/theme/package.json.ng16 index 9a95b3630b..bb24819762 100644 --- a/libs/theme/package.json.ng16 +++ b/libs/theme/package.json.ng16 @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "3.13.2", + "version": "3.14.0", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.13.2", - "@prizm-ui/helpers": "^3.13.2" + "@prizm-ui/core": "^3.14.0", + "@prizm-ui/helpers": "^3.14.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json.ng16 b/package.json.ng16 index c945b8dba8..5c8764eede 100644 --- a/package.json.ng16 +++ b/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "3.13.2", + "version": "3.14.0", "license": "MIT", "husky": { "hooks": { From fd9da8873a653dae9588946fc32585f1afb25bc4 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 13 Jun 2024 11:40:48 +0300 Subject: [PATCH 258/291] feat(doc/changelog): changelog update #000 --- .../app/about-prizm/changelog/CHANGELOG.md | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index ec85df1d71..986221c7ff 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -2,6 +2,34 @@ All notable changes to this project will be documented in this file. +## [1.18.0, 2.15.0, 3.14.0](https://github.com/zyfra/Prizm) (13-06-2024) + +### Features + +- feat(helpers): added prizmHasChanged helper +- feat: update mr checklist template + +### Bug Fixes + +- fix(components/chips): update chips on async changes #1754 +- fix(components/input-date-range): default time is set only after focus is removed #1762 +- fix(components/input-date-relative): active items not updated when value set by formControl #1685 +- fix(components/panel): set default border radius as 0px to panel #1767 +- fix(components/input-date-time): display time 00:00 when a date is selected #1575 +- fix(components/hint): safe update overlay only when changes dependencies and moved method prizmHasChanges #1719, #716 +- fix(docs/tab): remove $any from basic example #841 +- fix(components/input-date-range): added corrector if from is more than to #1628 +- fix(components/panel): add prefix prizm to panel component #1665 +- fix(components/panel): converted panelcomponent to standalone #1665 +- fix(components/file-upload): newly uploaded files should not overwrte existing files array #1662 +- fix(components/file-upload): multiply false paramenter works incorrect with uploading by drop #1770 +- fix(chore): remove cloud nx token + +### Breacking Changes + +- feat(components/file-upload): add hint for browse button when its disable due max files count reached #1769 - BREAKING CHANGE in dictionaries, why we do this read [here](https://github.com/zyfra/Prizm/discussions/1617) +- feat(components/file-upload): add translations for file size unit #1789 - BREAKING CHANGE in dictionaries, why we do this read [here](https://github.com/zyfra/Prizm/discussions/1617) + ## [1.17.2, 2.14.2, 3.13.2](https://github.com/zyfra/Prizm) (03-06-2024) ### Bug fixes From 7b87976fc39b8d06ac80e0fb990964f917b12134 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Thu, 13 Jun 2024 12:30:32 +0300 Subject: [PATCH 259/291] fix(chore): update detector for multiple domains #1133 --- .github/PULL_REQUEST_TEMPLATE/prepare_release_for_3.md | 5 +++++ apps/doc/src/app/version-manager/util.ts | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_3.md b/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_3.md index 2a388a8eb9..4d6365f52b 100644 --- a/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_3.md +++ b/.github/PULL_REQUEST_TEMPLATE/prepare_release_for_3.md @@ -24,6 +24,8 @@ ### Checklist: +- [ ] Изменить версии в соответствующем массиве на ветке MAIN + - apps/doc/src/app/version-manager/versions.constants.ts - [ ] Замените NEW_VERSION на новую версию в этом PR - [ ] Замените CURRENT_DATE на текущую дату в этом PR - [ ] Добавить в каждый тип ваши изменения в этом PR @@ -87,3 +89,6 @@ - [ ] libs/theme/package.json.ng15 - [ ] libs/theme/package.json.ng16 - [ ] Составить readMe файл с описанием изменений на русском +- [ ] Выпуск тега для v1 +- [ ] Выпуск тега для v2 +- [ ] Выпуск тега для v3 diff --git a/apps/doc/src/app/version-manager/util.ts b/apps/doc/src/app/version-manager/util.ts index 003ded1d46..77e42a902e 100644 --- a/apps/doc/src/app/version-manager/util.ts +++ b/apps/doc/src/app/version-manager/util.ts @@ -1,5 +1,7 @@ export function isInnerDoc() { - return window.location.host.includes('doc.prizm.site'); + return ( + window.location.host.includes('doc.prizm.site') || window.location.host.includes('doc.prizm.zyfra.com') + ); } export function getDocSite(innerSite: string, tempSite: string) { From c617cebc52ce86281ceaf06aeb636cf8db2ba5b2 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 13 Jun 2024 12:57:02 +0300 Subject: [PATCH 260/291] feat(doc/changelog): update changelog #000 --- apps/doc/src/app/about-prizm/changelog/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index 986221c7ff..c6e27a0fa1 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -24,6 +24,7 @@ All notable changes to this project will be documented in this file. - fix(components/file-upload): newly uploaded files should not overwrte existing files array #1662 - fix(components/file-upload): multiply false paramenter works incorrect with uploading by drop #1770 - fix(chore): remove cloud nx token +- fix(doc): version detection on doc.zyfra or prizm.site #1133 ### Breacking Changes From 482d2813cbb384b3dcc67ff06e97e8cc2bbc8a46 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Thu, 13 Jun 2024 13:46:11 +0300 Subject: [PATCH 261/291] feat(doc): add v4 to doc --- .../src/app/version-manager/versions.constants.ts | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index 2bfe45731e..568f23a0ce 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -12,20 +12,21 @@ export interface PrizmVersionMeta { export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ { - label: '3.14.0 (ng16)', - version: '3.14.0', + label: '4.3.2 (ng17)', + version: '4.3.2', stackblitz: 'https://stackblitz.com/edit/prizm-v4-demo', - link: getDocSite.bind(null, 'http://doc.prizm.site', 'http://prizm.site'), - otherLinks: [new URL('https://prizm-v3.web.app')], + link: getDocSite.bind(null, 'https://doc.prizm.zyfra.com', 'http://prizm.site'), + + otherLinks: [new URL('https://prizm-v4.web.app')], cb: (hostName: string, current: PrizmVersionMeta) => { return hostName.startsWith('prizm-v4--'); }, }, { - label: '3.13.2 (ng16)', - version: '3.13.2', + label: '3.14.0 (ng16)', + version: '3.14.0', stackblitz: 'https://stackblitz.com/edit/prizm-v3-demo', - link: getDocSite.bind(null, 'http://3.13.2.doc.prizm.site', 'https://prizm-v3.web.app'), + link: getDocSite.bind(null, 'http://3.14.0.doc.prizm.site', 'https://prizm-v3.web.app'), otherLinks: [new URL('https://prizm-v3.web.app')], cb: (hostName: string, current: PrizmVersionMeta) => { return hostName.startsWith('prizm-v3--'); From caf2318b31625a6e41b6b4e45b68598d961bb58a Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 13 Jun 2024 15:13:22 +0300 Subject: [PATCH 262/291] fix(charts/line): add missing seriesFiled input to Line chart #1811 --- ...-charts-line-series-example.component.html | 9 ++ ...zm-charts-line-series-example.component.ts | 71 +++++++++++++ .../src/app/charts/line/line.component.html | 18 +++- .../doc/src/app/charts/line/line.component.ts | 99 ++++++++++++++++++- apps/doc/src/app/charts/line/line.module.ts | 8 +- .../line/prizm-charts-line.component.ts | 8 ++ 6 files changed, 209 insertions(+), 4 deletions(-) create mode 100644 apps/doc/src/app/charts/line/examples/series/prizm-charts-line-series-example.component.html create mode 100644 apps/doc/src/app/charts/line/examples/series/prizm-charts-line-series-example.component.ts diff --git a/apps/doc/src/app/charts/line/examples/series/prizm-charts-line-series-example.component.html b/apps/doc/src/app/charts/line/examples/series/prizm-charts-line-series-example.component.html new file mode 100644 index 0000000000..8e6fce6e1f --- /dev/null +++ b/apps/doc/src/app/charts/line/examples/series/prizm-charts-line-series-example.component.html @@ -0,0 +1,9 @@ + diff --git a/apps/doc/src/app/charts/line/examples/series/prizm-charts-line-series-example.component.ts b/apps/doc/src/app/charts/line/examples/series/prizm-charts-line-series-example.component.ts new file mode 100644 index 0000000000..ec8ca8d0a9 --- /dev/null +++ b/apps/doc/src/app/charts/line/examples/series/prizm-charts-line-series-example.component.ts @@ -0,0 +1,71 @@ +import { Component } from '@angular/core'; +import { PrizmThemeService } from '@prizm-ui/theme'; + +@Component({ + selector: 'prizm-charts-line-series-example', + templateUrl: './prizm-charts-line-series-example.component.html', + styles: [ + ` + .block { + width: 100%; + height: 300px; + } + `, + ], +}) +export class PrizmChartsLinesSeriesExampleComponent { + data = [ + { + time: '00:10', + city: 'Москва', + value: 30, + }, + { + time: '00:20', + city: 'Москва', + value: 10, + }, + { + time: '00:30', + city: 'Москва', + value: 20, + }, + { + time: '00:40', + city: 'Москва', + value: 25, + }, + { + time: '00:50', + city: 'Москва', + value: 5, + }, + { + time: '00:10', + city: 'Санкт-Петербург', + value: 40, + }, + { + time: '00:20', + city: 'Санкт-Петербург', + value: 50, + }, + { + time: '00:30', + city: 'Санкт-Петербург', + value: 1, + }, + { + time: '00:40', + city: 'Санкт-Петербург', + value: 10, + }, + { + time: '00:50', + city: 'Санкт-Петербург', + value: 20, + }, + ]; + + constructor(public readonly prizmTheme: PrizmThemeService) {} +} diff --git a/apps/doc/src/app/charts/line/line.component.html b/apps/doc/src/app/charts/line/line.component.html index ad65ac1e66..597e389759 100644 --- a/apps/doc/src/app/charts/line/line.component.html +++ b/apps/doc/src/app/charts/line/line.component.html @@ -4,13 +4,17 @@ short-term. We can also use line graphs to compare changes over the same period for more than one group.
    - + - + + + + + @@ -22,6 +26,7 @@ [data]="data" [xField]="xField" [yField]="yField" + [seriesField]="$any(seriesField)" [theme]="$any(prizmTheme.changesTheme$ | async)" [height]="height" > @@ -54,6 +59,15 @@ Y Field Name + + Series Field Name (use 'key' for example data) + + extends PrizmChartsAbstractCo return this.options.yField as string; } + @Input() + public set seriesField(value: string) { + this.updateOptions({ seriesField: value }); + } + public get seriesField(): string { + return this.options.seriesField as string; + } + @Input() set data(value: PrizmChartsLineItem[]) { this.updateOptions({ From 059d09505178091a33bc3f41b96d8d7afcadbf19 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 13 Jun 2024 16:34:18 +0300 Subject: [PATCH 263/291] feat(doc/changelog): update changelog #000 --- apps/doc/src/app/about-prizm/changelog/CHANGELOG.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index c6e27a0fa1..d7db044170 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -25,6 +25,8 @@ All notable changes to this project will be documented in this file. - fix(components/file-upload): multiply false paramenter works incorrect with uploading by drop #1770 - fix(chore): remove cloud nx token - fix(doc): version detection on doc.zyfra or prizm.site #1133 +- fix(charts/line): add missing seriesField input to Line chart #1811 +- fix(doc/line): smoof line exaple source code link fix ### Breacking Changes From 6e9a30c18e5bc52682c41dc7c763d6af5a97497c Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 13 Jun 2024 17:15:07 +0300 Subject: [PATCH 264/291] fix(doc/tab): improve live demo example #000 --- apps/doc/src/app/about-prizm/changelog/CHANGELOG.md | 3 ++- apps/doc/src/app/components/tabs/tabs-example.component.ts | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index d7db044170..4c56ce2084 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -26,7 +26,8 @@ All notable changes to this project will be documented in this file. - fix(chore): remove cloud nx token - fix(doc): version detection on doc.zyfra or prizm.site #1133 - fix(charts/line): add missing seriesField input to Line chart #1811 -- fix(doc/line): smoof line exaple source code link fix +- fix(doc/line): smooth line exaple source code link fix +- fix(doc/tab): improve live demo example for counter options ### Breacking Changes diff --git a/apps/doc/src/app/components/tabs/tabs-example.component.ts b/apps/doc/src/app/components/tabs/tabs-example.component.ts index 7d7bc4f7b3..68d1885024 100644 --- a/apps/doc/src/app/components/tabs/tabs-example.component.ts +++ b/apps/doc/src/app/components/tabs/tabs-example.component.ts @@ -59,6 +59,7 @@ export class TabsExampleComponent { }, { status: 'success', + disabled: false, }, { status: 'warning', From 4cd42c6a0368ccaf23089c0a8724a7ca983313c7 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Fri, 14 Jun 2024 09:10:18 +0300 Subject: [PATCH 265/291] fix(components/chips): hihint appears in multiselect after deletion #1815 --- .../lib/components/chips/chips-item/chips-item.component.html | 2 +- .../lib/components/chips/chips-item/chips-item.component.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/libs/components/src/lib/components/chips/chips-item/chips-item.component.html b/libs/components/src/lib/components/chips/chips-item/chips-item.component.html index 629fea78bc..c98fc0c54d 100644 --- a/libs/components/src/lib/components/chips/chips-item/chips-item.component.html +++ b/libs/components/src/lib/components/chips/chips-item/chips-item.component.html @@ -6,7 +6,7 @@ [prizmHintHost]="el.nativeElement" [prizmHintDirection]="hintDirection" [prizmHintCanShow]=" - $any(!!hintText && (div | prizmCallFunc : prizmIsTextOverflow$ : hintCanShow : null | async)) + (!!hintText && (div | prizmCallFunc : prizmIsTextOverflow$ : hintCanShow : false : hintText | async))! " > diff --git a/libs/components/src/lib/components/chips/chips-item/chips-item.component.ts b/libs/components/src/lib/components/chips/chips-item/chips-item.component.ts index 009ab6a5c0..49e46f279c 100644 --- a/libs/components/src/lib/components/chips/chips-item/chips-item.component.ts +++ b/libs/components/src/lib/components/chips/chips-item/chips-item.component.ts @@ -55,7 +55,9 @@ export class PrizmChipsItemComponent extends PrizmAbstractTestId { readonly prizmIsTextOverflow$ = ( elem: HTMLElement, hintCanShow: boolean, - forceShowHint: boolean + forceShowHint: boolean, + // for clear memory + ..._: unknown[] ): Observable => { return of(forceShowHint).pipe( switchMap(val => { From 3b90159bd6a546b1d3992907de1a0c1ec31d4f52 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 14 Jun 2024 11:11:44 +0300 Subject: [PATCH 266/291] feat(doc/changelog): update changelog #000 --- apps/doc/src/app/about-prizm/changelog/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index 4c56ce2084..1208aed284 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -28,6 +28,7 @@ All notable changes to this project will be documented in this file. - fix(charts/line): add missing seriesField input to Line chart #1811 - fix(doc/line): smooth line exaple source code link fix - fix(doc/tab): improve live demo example for counter options +- fix(components/chips): hint appears in multiselect after deletion #1815 ### Breacking Changes From 9332488292e1bced24d753c7536464a1c3552ff7 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 14 Jun 2024 17:35:46 +0300 Subject: [PATCH 267/291] fix(components/hint): draw hint in wrappers fix #000 --- .../input/common/input-hint/input-hint.directive.ts | 6 +++--- .../switcher/directives/switcher-hint.directive.ts | 4 ++-- libs/components/src/lib/directives/hint/hint.directive.ts | 8 +++++++- 3 files changed, 12 insertions(+), 6 deletions(-) diff --git a/libs/components/src/lib/components/input/common/input-hint/input-hint.directive.ts b/libs/components/src/lib/components/input/common/input-hint/input-hint.directive.ts index ce8cdac6c2..acd82c712c 100644 --- a/libs/components/src/lib/components/input/common/input-hint/input-hint.directive.ts +++ b/libs/components/src/lib/components/input/common/input-hint/input-hint.directive.ts @@ -1,4 +1,4 @@ -import { Directive, ElementRef, HostBinding, inject, Input, Optional } from '@angular/core'; +import { Directive, ElementRef, HostBinding, inject, Input } from '@angular/core'; import { PrizmHintDirective } from '../../../../directives/hint'; import { PrizmOverlayOutsidePlacement } from '../../../../modules/overlay/models'; import { prizmIsTextOverflow } from '../../../../util/dom/is-textoverflow'; @@ -44,11 +44,11 @@ export class PrizmInputHintDirective { } public ngOnChanges(): void { - this.prizmHint_.ngOnChanges(); + this.hintSyncChanges(); } private hintSyncChanges(): void { - this.prizmHint_.ngOnChanges(); + this.prizmHint_.drawHint(); } public updateHint(): void { diff --git a/libs/components/src/lib/components/switcher/directives/switcher-hint.directive.ts b/libs/components/src/lib/components/switcher/directives/switcher-hint.directive.ts index 196a6c989e..bcaaa1c3fa 100644 --- a/libs/components/src/lib/components/switcher/directives/switcher-hint.directive.ts +++ b/libs/components/src/lib/components/switcher/directives/switcher-hint.directive.ts @@ -29,7 +29,7 @@ export class PrizmSwitcherHintDirective implements OnInit, OnChanges, OnDestroy } public ngOnChanges(): void { - this.prizmHint_.ngOnChanges(); + this.hintSyncChanges(); } public ngOnDestroy(): void { @@ -47,6 +47,6 @@ export class PrizmSwitcherHintDirective implements OnInit, OnChanges, OnDestroy } private hintSyncChanges(): void { - this.prizmHint_.ngOnChanges(); + this.prizmHint_.drawHint(); } } diff --git a/libs/components/src/lib/directives/hint/hint.directive.ts b/libs/components/src/lib/directives/hint/hint.directive.ts index 9ecc3c92cf..596c525e87 100644 --- a/libs/components/src/lib/directives/hint/hint.directive.ts +++ b/libs/components/src/lib/directives/hint/hint.directive.ts @@ -136,7 +136,7 @@ export class PrizmHintDirective< if ( prizmHasChanges(changes, ['prizmHintHost', 'prizmHint', 'prizmHintCanShow', 'prizmHintContext'], false) ) { - this.initOverlayController(); + this.drawHint(); } } @@ -169,6 +169,12 @@ export class PrizmHintDirective< } } + // public api for support hint wrappers + public drawHint(): void { + this.show_ = false; + this.initOverlayController(); + } + protected open(): void { if (!this.prizmHintCanShow || this.content === '') return; this.show_ = true; From e93b0ca04686d14b9aabab0006537745762e4d51 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Wed, 19 Jun 2024 15:19:32 +0300 Subject: [PATCH 268/291] fix(components/input-icon-button): disabled button should not fire events #1823 --- .../input-icon-buttons-example.component.html | 39 +++++++++++++++---- .../input-icon-buttons-example.component.ts | 8 +++- .../input/input-text/input-example.module.ts | 3 +- .../input-icon-button.component.ts | 9 ++++- 4 files changed, 48 insertions(+), 11 deletions(-) diff --git a/apps/doc/src/app/components/input/input-text/examples/input-icon-buttons-example/input-icon-buttons-example.component.html b/apps/doc/src/app/components/input/input-text/examples/input-icon-buttons-example/input-icon-buttons-example.component.html index 6051570747..997010389d 100644 --- a/apps/doc/src/app/components/input/input-text/examples/input-icon-buttons-example/input-icon-buttons-example.component.html +++ b/apps/doc/src/app/components/input/input-text/examples/input-icon-buttons-example/input-icon-buttons-example.component.html @@ -4,7 +4,7 @@

    Right template

    - + @@ -12,7 +12,11 @@

    Left template

    - + @@ -22,14 +26,18 @@

    Left and right template

    - - + + - + @@ -37,7 +45,11 @@

    With status message

    - + @@ -45,7 +57,7 @@

    With status message

    Warning text - +     @@ -58,3 +70,16 @@

    Only icon

     + +
    +
    + +
    + Disable + +
    diff --git a/apps/doc/src/app/components/input/input-text/examples/input-icon-buttons-example/input-icon-buttons-example.component.ts b/apps/doc/src/app/components/input/input-text/examples/input-icon-buttons-example/input-icon-buttons-example.component.ts index d39c7610fd..910537e9c5 100644 --- a/apps/doc/src/app/components/input/input-text/examples/input-icon-buttons-example/input-icon-buttons-example.component.ts +++ b/apps/doc/src/app/components/input/input-text/examples/input-icon-buttons-example/input-icon-buttons-example.component.ts @@ -6,4 +6,10 @@ import { Component, ChangeDetectionStrategy } from '@angular/core'; styleUrls: ['./input-icon-buttons-example.component.less'], changeDetection: ChangeDetectionStrategy.OnPush, }) -export class InputIconButtonsExampleComponent {} +export class InputIconButtonsExampleComponent { + public disabled = false; + + public handleButtonClick() { + console.log('Button clicked!'); + } +} diff --git a/apps/doc/src/app/components/input/input-text/input-example.module.ts b/apps/doc/src/app/components/input/input-text/input-example.module.ts index 376cece390..645c4b207b 100644 --- a/apps/doc/src/app/components/input/input-text/input-example.module.ts +++ b/apps/doc/src/app/components/input/input-text/input-example.module.ts @@ -6,12 +6,12 @@ import { PrizmHintDirective, PrizmIconComponent, PrizmInputTextModule, + PrizmToggleComponent, } from '@prizm-ui/components'; import { PrizmAddonDocModule, prizmDocGenerateRoutes } from '@prizm-ui/doc'; import { InputIconButtonsExampleComponent } from './examples/input-icon-buttons-example/input-icon-buttons-example.component'; import { InputComponent } from './input.component'; import { InputLabelPositionExampleComponent } from './examples/input-label-position-example/input-label-position-example.component'; - import { InputSizesExampleComponent } from './examples/input-sizes-example/input-sizes-example.component'; import { InputStatusesExampleComponent } from './examples/input-statuses-example/input-statuses-example.component'; import { InputSubtextExampleComponent } from './examples/input-subtext-example/input-subtext-example.component'; @@ -34,6 +34,7 @@ import { InputCustomClearButtonExampleComponent } from './examples/input-custom- PrizmButtonModule, ReactiveFormsModule, FormsModule, + PrizmToggleComponent, ], declarations: [ InputComponent, diff --git a/libs/components/src/lib/components/input/common/input-icon-button/input-icon-button.component.ts b/libs/components/src/lib/components/input/common/input-icon-button/input-icon-button.component.ts index a9880eaf64..8903813715 100644 --- a/libs/components/src/lib/components/input/common/input-icon-button/input-icon-button.component.ts +++ b/libs/components/src/lib/components/input/common/input-icon-button/input-icon-button.component.ts @@ -19,14 +19,19 @@ export class PrizmInputIconButtonComponent extends PrizmAbstractTestId { @Input() prizmInputIconButton!: string; @Input() interactive = false; - @HostBinding('class.disabled') + @HostBinding('attr.disabled') @Input() get disabled() { - return this._disabled; + return this._disabled || null; } set disabled(value: BooleanInput) { this._disabled = coerceBooleanProperty(value); } + + @HostBinding('class.disabled') + get classDisabled() { + return this._disabled; + } private _disabled = false; @Input() @HostBinding('attr.type') From 55834fdf7cd516a43263146086109b6dfe7aea7b Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 20 Jun 2024 14:22:20 +0300 Subject: [PATCH 269/291] feat(chore): up version 3.14.0 to 3.14.1 #000 --- .github/workflows/beta-publish-ng16.yml | 2 +- .github/workflows/main-publish-ng16.yml | 2 +- .github/workflows/pre-release-publish-ng16.yml | 2 +- apps/doc/src/app/version-manager/current.const.ts.ng16 | 2 +- apps/doc/src/app/version-manager/versions.constants.ts | 10 +++++----- libs/ast/package.json.ng16 | 2 +- libs/charts/base/package.json.ng16 | 6 +++--- libs/components/package.json.ng16 | 10 +++++----- libs/core/package.json.ng16 | 2 +- libs/helpers/package.json.ng16 | 2 +- libs/i18n/package.json.ng16 | 2 +- libs/icons/base/package.json.ng16 | 4 ++-- libs/icons/flags/package.json.ng16 | 4 ++-- libs/nxmv/package.json.ng16 | 2 +- libs/plugin/package.json.ng16 | 4 ++-- libs/schematics/package.json.ng16 | 2 +- libs/theme/package.json.ng16 | 6 +++--- package.json.ng16 | 2 +- 18 files changed, 33 insertions(+), 33 deletions(-) diff --git a/.github/workflows/beta-publish-ng16.yml b/.github/workflows/beta-publish-ng16.yml index 9cfb95d323..990a06a0ea 100644 --- a/.github/workflows/beta-publish-ng16.yml +++ b/.github/workflows/beta-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng16beta --json 2>/dev/null || echo '3.14.0-beta.0') | jq '([.[] | select(startswith("3.14.0-beta"))] | last // "3.14.0-beta.0")' 2>/dev/null || echo '3.14.0-beta.0' + (npm view @prizm-ui/components versions --tag ng16beta --json 2>/dev/null || echo '3.14.1-beta.0') | jq '([.[] | select(startswith("3.14.1-beta"))] | last // "3.14.1-beta.0")' 2>/dev/null || echo '3.14.1-beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng16.yml b/.github/workflows/main-publish-ng16.yml index 3361d6c6bc..3e6f3d8879 100644 --- a/.github/workflows/main-publish-ng16.yml +++ b/.github/workflows/main-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_v3_version=$( - echo '3.14.0' + echo '3.14.1' ) echo "LAST_V3_VERSION=${last_v3_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng16.yml b/.github/workflows/pre-release-publish-ng16.yml index f5bdce0b25..6fd7855d05 100644 --- a/.github/workflows/pre-release-publish-ng16.yml +++ b/.github/workflows/pre-release-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng16next --json 2>/dev/null || echo '3.14.0-next.0') | jq '([.[] | select(startswith("3.14.0-next"))] | last // "3.14.0-next.0")' 2>/dev/null || echo '3.14.0-next.0' + (npm view @prizm-ui/components versions --tag ng16next --json 2>/dev/null || echo '3.14.1-next.0') | jq '([.[] | select(startswith("3.14.1-next"))] | last // "3.14.1-next.0")' 2>/dev/null || echo '3.14.1-next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/apps/doc/src/app/version-manager/current.const.ts.ng16 b/apps/doc/src/app/version-manager/current.const.ts.ng16 index fbd364f027..e8d8931ec3 100644 --- a/apps/doc/src/app/version-manager/current.const.ts.ng16 +++ b/apps/doc/src/app/version-manager/current.const.ts.ng16 @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '3.14.0'; +export const PRIZM_CURRENT_VERSION = '3.14.1'; diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index 568f23a0ce..c50342bde0 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -12,8 +12,8 @@ export interface PrizmVersionMeta { export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ { - label: '4.3.2 (ng17)', - version: '4.3.2', + label: '4.3.4 (ng17)', + version: '4.3.4', stackblitz: 'https://stackblitz.com/edit/prizm-v4-demo', link: getDocSite.bind(null, 'https://doc.prizm.zyfra.com', 'http://prizm.site'), @@ -23,10 +23,10 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ }, }, { - label: '3.14.0 (ng16)', - version: '3.14.0', + label: '3.14.1 (ng16)', + version: '3.14.1', stackblitz: 'https://stackblitz.com/edit/prizm-v3-demo', - link: getDocSite.bind(null, 'http://3.14.0.doc.prizm.site', 'https://prizm-v3.web.app'), + link: getDocSite.bind(null, 'http://3.14.1.doc.prizm.site', 'https://prizm-v3.web.app'), otherLinks: [new URL('https://prizm-v3.web.app')], cb: (hostName: string, current: PrizmVersionMeta) => { return hostName.startsWith('prizm-v3--'); diff --git a/libs/ast/package.json.ng16 b/libs/ast/package.json.ng16 index 69e975ef42..80d06cad94 100644 --- a/libs/ast/package.json.ng16 +++ b/libs/ast/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "3.14.0", + "version": "3.14.1", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json.ng16 b/libs/charts/base/package.json.ng16 index 075cbc99b0..fa2aa54444 100644 --- a/libs/charts/base/package.json.ng16 +++ b/libs/charts/base/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "3.14.0", + "version": "3.14.1", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/theme": "^3.14.0", - "@prizm-ui/helpers": "^3.14.0", + "@prizm-ui/theme": "^3.14.1", + "@prizm-ui/helpers": "^3.14.1", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/package.json.ng16 b/libs/components/package.json.ng16 index 86d83930bf..6212a5589f 100644 --- a/libs/components/package.json.ng16 +++ b/libs/components/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "3.14.0", + "version": "3.14.1", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -18,10 +18,10 @@ "@ng-web-apis/resize-observer": "^3.0.0", "@ng-web-apis/intersection-observer": "^3.0.0", "@ng-web-apis/mutation-observer": "^3.0.0", - "@prizm-ui/helpers": "^3.14.0", - "@prizm-ui/core": "^3.14.0", - "@prizm-ui/i18n": "^3.14.0", - "@prizm-ui/theme": "^3.14.0" + "@prizm-ui/helpers": "^3.14.1", + "@prizm-ui/core": "^3.14.1", + "@prizm-ui/i18n": "^3.14.1", + "@prizm-ui/theme": "^3.14.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json.ng16 b/libs/core/package.json.ng16 index b32701cad7..4927ae4e55 100644 --- a/libs/core/package.json.ng16 +++ b/libs/core/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "3.14.0", + "version": "3.14.1", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json.ng16 b/libs/helpers/package.json.ng16 index 80e3ae829d..cdf1eec1a5 100644 --- a/libs/helpers/package.json.ng16 +++ b/libs/helpers/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "3.14.0", + "version": "3.14.1", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json.ng16 b/libs/i18n/package.json.ng16 index 68b33de825..7afdbbc84f 100644 --- a/libs/i18n/package.json.ng16 +++ b/libs/i18n/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "3.14.0", + "version": "3.14.1", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0" diff --git a/libs/icons/base/package.json.ng16 b/libs/icons/base/package.json.ng16 index d70eef9d2a..07e58bbd5d 100644 --- a/libs/icons/base/package.json.ng16 +++ b/libs/icons/base/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "3.14.0", + "version": "3.14.1", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.14.0" + "@prizm-ui/core": "^3.14.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json.ng16 b/libs/icons/flags/package.json.ng16 index f41b780e22..12ede225db 100644 --- a/libs/icons/flags/package.json.ng16 +++ b/libs/icons/flags/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "3.14.0", + "version": "3.14.1", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.14.0" + "@prizm-ui/core": "^3.14.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json.ng16 b/libs/nxmv/package.json.ng16 index 6012c3bb38..9aecce1b29 100644 --- a/libs/nxmv/package.json.ng16 +++ b/libs/nxmv/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "3.14.0", + "version": "3.14.1", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json.ng16 b/libs/plugin/package.json.ng16 index b2c84639c2..2cc26984f2 100644 --- a/libs/plugin/package.json.ng16 +++ b/libs/plugin/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "3.14.0", + "version": "3.14.1", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^3.14.0" + "@prizm-ui/ast": "^3.14.1" } } diff --git a/libs/schematics/package.json.ng16 b/libs/schematics/package.json.ng16 index c8ebb981c4..bab785b73a 100644 --- a/libs/schematics/package.json.ng16 +++ b/libs/schematics/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "3.14.0", + "version": "3.14.1", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json.ng16 b/libs/theme/package.json.ng16 index bb24819762..b469758042 100644 --- a/libs/theme/package.json.ng16 +++ b/libs/theme/package.json.ng16 @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "3.14.0", + "version": "3.14.1", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.14.0", - "@prizm-ui/helpers": "^3.14.0" + "@prizm-ui/core": "^3.14.1", + "@prizm-ui/helpers": "^3.14.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json.ng16 b/package.json.ng16 index 5c8764eede..da5e55913c 100644 --- a/package.json.ng16 +++ b/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "3.14.0", + "version": "3.14.1", "license": "MIT", "husky": { "hooks": { From 1205697c873cea41a70deab3ec7cc2fb708f1d02 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 20 Jun 2024 15:33:35 +0300 Subject: [PATCH 270/291] feat(chore): up version 2.15.0 to 2.15.1 #000 --- .github/workflows/beta-publish-ng15.yml | 2 +- .github/workflows/main-publish-ng15.yml | 2 +- .github/workflows/pre-release-publish-ng15.yml | 2 +- apps/doc/src/app/version-manager/current.const.ts.ng15 | 2 +- apps/doc/src/app/version-manager/versions.constants.ts | 4 ++-- libs/ast/package.json.ng15 | 2 +- libs/charts/base/package.json.ng15 | 6 +++--- libs/components/package.json.ng15 | 10 +++++----- libs/core/package.json.ng15 | 2 +- libs/helpers/package.json.ng15 | 2 +- libs/i18n/package.json.ng15 | 2 +- libs/icons/base/package.json.ng15 | 4 ++-- libs/icons/flags/package.json.ng15 | 4 ++-- libs/nxmv/package.json.ng15 | 2 +- libs/plugin/package.json.ng15 | 4 ++-- libs/schematics/package.json.ng15 | 2 +- libs/theme/package.json.ng15 | 6 +++--- package.json.ng15 | 2 +- 18 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/beta-publish-ng15.yml b/.github/workflows/beta-publish-ng15.yml index da631b7812..986dd0ee17 100644 --- a/.github/workflows/beta-publish-ng15.yml +++ b/.github/workflows/beta-publish-ng15.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng15beta --json 2>/dev/null || echo '2.15.0-ng15beta.0') | jq '([.[] | select(startswith("2.15.0-ng15beta"))] | last // "2.15.0-ng15beta.0")' 2>/dev/null || echo '2.15.0-ng15beta.0' + (npm view @prizm-ui/components versions --tag ng15beta --json 2>/dev/null || echo '2.15.1-ng15beta.0') | jq '([.[] | select(startswith("2.15.1-ng15beta"))] | last // "2.15.1-ng15beta.0")' 2>/dev/null || echo '2.15.1-ng15beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng15.yml b/.github/workflows/main-publish-ng15.yml index 3cb8d1c8cd..9c1cb16ff7 100644 --- a/.github/workflows/main-publish-ng15.yml +++ b/.github/workflows/main-publish-ng15.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_v2_version=$( - echo '2.15.0' + echo '2.15.1' ) echo "LAST_V2_VERSION=${last_v2_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng15.yml b/.github/workflows/pre-release-publish-ng15.yml index 4e9c833eda..43bee27a9f 100644 --- a/.github/workflows/pre-release-publish-ng15.yml +++ b/.github/workflows/pre-release-publish-ng15.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng15next --json 2>/dev/null || echo '2.15.0-ng15next.0') | jq '([.[] | select(startswith("2.15.0-ng15next"))] | last // "2.15.0-ng15next.0")' 2>/dev/null || echo '2.15.0-ng15next.0' + (npm view @prizm-ui/components versions --tag ng15next --json 2>/dev/null || echo '2.15.1-ng15next.0') | jq '([.[] | select(startswith("2.15.1-ng15next"))] | last // "2.15.1-ng15next.0")' 2>/dev/null || echo '2.15.1-ng15next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/apps/doc/src/app/version-manager/current.const.ts.ng15 b/apps/doc/src/app/version-manager/current.const.ts.ng15 index 50846c9f6d..9c1825ac33 100644 --- a/apps/doc/src/app/version-manager/current.const.ts.ng15 +++ b/apps/doc/src/app/version-manager/current.const.ts.ng15 @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '2.15.0'; +export const PRIZM_CURRENT_VERSION = '2.15.1'; diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index c50342bde0..fc3ffdf176 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -33,8 +33,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ }, }, { - label: '2.15.0 (ng15)', - version: '2.15.0', + label: '2.15.1 (ng15)', + version: '2.15.1', stackblitz: 'https://stackblitz.com/edit/prizm-v2-demo', link: getDocSite.bind(null, 'http://2.14.2.doc.prizm.site', 'https://prizm-v2.web.app'), otherLinks: [], diff --git a/libs/ast/package.json.ng15 b/libs/ast/package.json.ng15 index 102324f34b..113b5ce008 100644 --- a/libs/ast/package.json.ng15 +++ b/libs/ast/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "2.15.0", + "version": "2.15.1", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json.ng15 b/libs/charts/base/package.json.ng15 index 3aa4fc7fbd..5885f75bcc 100644 --- a/libs/charts/base/package.json.ng15 +++ b/libs/charts/base/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "2.15.0", + "version": "2.15.1", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/theme": "^2.15.0", - "@prizm-ui/helpers": "^2.15.0", + "@prizm-ui/theme": "^2.15.1", + "@prizm-ui/helpers": "^2.15.1", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/package.json.ng15 b/libs/components/package.json.ng15 index 76d17bca9b..bbd4ba0da1 100644 --- a/libs/components/package.json.ng15 +++ b/libs/components/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "2.15.0", + "version": "2.15.1", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -18,10 +18,10 @@ "@ng-web-apis/resize-observer": "2.0.0", "@ng-web-apis/intersection-observer": "2.0.0", "@ng-web-apis/mutation-observer": "2.0.0", - "@prizm-ui/helpers": "^2.15.0", - "@prizm-ui/core": "^2.15.0", - "@prizm-ui/i18n": "^2.15.0", - "@prizm-ui/theme": "^2.15.0" + "@prizm-ui/helpers": "^2.15.1", + "@prizm-ui/core": "^2.15.1", + "@prizm-ui/i18n": "^2.15.1", + "@prizm-ui/theme": "^2.15.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json.ng15 b/libs/core/package.json.ng15 index 64f5fe0851..cf2e87358c 100644 --- a/libs/core/package.json.ng15 +++ b/libs/core/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "2.15.0", + "version": "2.15.1", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json.ng15 b/libs/helpers/package.json.ng15 index 6b09626a26..515750a5bb 100644 --- a/libs/helpers/package.json.ng15 +++ b/libs/helpers/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "2.15.0", + "version": "2.15.1", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json.ng15 b/libs/i18n/package.json.ng15 index b2e2fe6260..db4a337614 100644 --- a/libs/i18n/package.json.ng15 +++ b/libs/i18n/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "2.15.0", + "version": "2.15.1", "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0" diff --git a/libs/icons/base/package.json.ng15 b/libs/icons/base/package.json.ng15 index d2c5dbac9a..70f8dc225e 100644 --- a/libs/icons/base/package.json.ng15 +++ b/libs/icons/base/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "2.15.0", + "version": "2.15.1", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/core": "^2.15.0" + "@prizm-ui/core": "^2.15.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json.ng15 b/libs/icons/flags/package.json.ng15 index 9aa9b70135..c5a0fa833c 100644 --- a/libs/icons/flags/package.json.ng15 +++ b/libs/icons/flags/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "2.15.0", + "version": "2.15.1", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/core": "^2.15.0" + "@prizm-ui/core": "^2.15.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json.ng15 b/libs/nxmv/package.json.ng15 index 28809a7fbe..e2b944411a 100644 --- a/libs/nxmv/package.json.ng15 +++ b/libs/nxmv/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "2.15.0", + "version": "2.15.1", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json.ng15 b/libs/plugin/package.json.ng15 index ebf631eb26..1e0dc5ea0b 100644 --- a/libs/plugin/package.json.ng15 +++ b/libs/plugin/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "2.15.0", + "version": "2.15.1", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^2.15.0" + "@prizm-ui/ast": "^2.15.1" } } diff --git a/libs/schematics/package.json.ng15 b/libs/schematics/package.json.ng15 index a196767d59..533b12baa4 100644 --- a/libs/schematics/package.json.ng15 +++ b/libs/schematics/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "2.15.0", + "version": "2.15.1", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json.ng15 b/libs/theme/package.json.ng15 index c136c6fdc5..d141d39971 100644 --- a/libs/theme/package.json.ng15 +++ b/libs/theme/package.json.ng15 @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "2.15.0", + "version": "2.15.1", "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/core": "^2.15.0", - "@prizm-ui/helpers": "^2.15.0" + "@prizm-ui/core": "^2.15.1", + "@prizm-ui/helpers": "^2.15.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json.ng15 b/package.json.ng15 index bf039c3ac0..7f0cbab369 100644 --- a/package.json.ng15 +++ b/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "2.15.0", + "version": "2.15.1", "license": "MIT", "husky": { "hooks": { From 984ca6f2fcd2f20ee9f4245aaadd2c6473415eac Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 20 Jun 2024 15:39:01 +0300 Subject: [PATCH 271/291] feat(chore): up version 1.18.0 to 1.18.1 #000 --- .github/workflows/beta-publish-ng14.yml | 2 +- .github/workflows/main-publish-ng14.yml | 2 +- .github/workflows/pre-release-publish-ng14.yml | 2 +- apps/doc/src/app/version-manager/current.const.ts.ng14 | 2 +- apps/doc/src/app/version-manager/versions.constants.ts | 4 ++-- libs/ast/package.json.ng14 | 2 +- libs/charts/base/package.json.ng14 | 6 +++--- libs/components/package.json.ng14 | 10 +++++----- libs/core/package.json.ng14 | 2 +- libs/helpers/package.json.ng14 | 2 +- libs/i18n/package.json.ng14 | 2 +- libs/icons/base/package.json.ng14 | 4 ++-- libs/icons/flags/package.json.ng14 | 4 ++-- libs/nxmv/package.json.ng14 | 2 +- libs/plugin/package.json.ng14 | 4 ++-- libs/schematics/package.json.ng14 | 2 +- libs/theme/package.json.ng14 | 6 +++--- package.json.ng14 | 2 +- 18 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/beta-publish-ng14.yml b/.github/workflows/beta-publish-ng14.yml index 8436e3bc86..bfb6ac3f37 100644 --- a/.github/workflows/beta-publish-ng14.yml +++ b/.github/workflows/beta-publish-ng14.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng14beta --json 2>/dev/null || echo '1.18.0-ng14beta.0') | jq '([.[] | select(startswith("1.18.0-ng14beta"))] | last // "1.18.0-ng14beta.0")' 2>/dev/null || echo '1.18.0-ng14beta.0' + (npm view @prizm-ui/components versions --tag ng14beta --json 2>/dev/null || echo '1.18.1-ng14beta.0') | jq '([.[] | select(startswith("1.18.1-ng14beta"))] | last // "1.18.1-ng14beta.0")' 2>/dev/null || echo '1.18.1-ng14beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng14.yml b/.github/workflows/main-publish-ng14.yml index 2cf5ca318d..65491c8496 100644 --- a/.github/workflows/main-publish-ng14.yml +++ b/.github/workflows/main-publish-ng14.yml @@ -58,7 +58,7 @@ jobs: - name: Set up environment variables run: | last_v1_version=$( - echo '1.18.0' + echo '1.18.1' ) echo "LAST_V1_VERSION=${last_v1_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng14.yml b/.github/workflows/pre-release-publish-ng14.yml index 880838d427..ea59c1385d 100644 --- a/.github/workflows/pre-release-publish-ng14.yml +++ b/.github/workflows/pre-release-publish-ng14.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng14next --json 2>/dev/null || echo '1.18.0-ng14next.0') | jq '([.[] | select(startswith("1.18.0-ng14next"))] | last // "1.18.0-ng14next.0")' 2>/dev/null || echo '1.18.0-ng14next.0' + (npm view @prizm-ui/components versions --tag ng14next --json 2>/dev/null || echo '1.18.1-ng14next.0') | jq '([.[] | select(startswith("1.18.1-ng14next"))] | last // "1.18.1-ng14next.0")' 2>/dev/null || echo '1.18.1-ng14next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/apps/doc/src/app/version-manager/current.const.ts.ng14 b/apps/doc/src/app/version-manager/current.const.ts.ng14 index 5af3aea907..e31d9fccbe 100644 --- a/apps/doc/src/app/version-manager/current.const.ts.ng14 +++ b/apps/doc/src/app/version-manager/current.const.ts.ng14 @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '1.18.0'; +export const PRIZM_CURRENT_VERSION = '1.18.1'; diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index fc3ffdf176..72ac389592 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -43,8 +43,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ }, }, { - label: '1.18.0 (ng14)', - version: '1.18.0', + label: '1.18.1 (ng14)', + version: '1.18.1', stackblitz: 'https://stackblitz.com/edit/prizm-v1-demo', link: getDocSite.bind(null, 'http://1.17.2.doc.prizm.site', 'https://prizm-v1.web.app'), otherLinks: [], diff --git a/libs/ast/package.json.ng14 b/libs/ast/package.json.ng14 index 81dac4c5f5..05843876d2 100644 --- a/libs/ast/package.json.ng14 +++ b/libs/ast/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "1.18.0", + "version": "1.18.1", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json.ng14 b/libs/charts/base/package.json.ng14 index 2a8b665c27..0642b41384 100644 --- a/libs/charts/base/package.json.ng14 +++ b/libs/charts/base/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "1.18.0", + "version": "1.18.1", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/theme": "^1.18.0", - "@prizm-ui/helpers": "^1.18.0", + "@prizm-ui/theme": "^1.18.1", + "@prizm-ui/helpers": "^1.18.1", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/package.json.ng14 b/libs/components/package.json.ng14 index 3500457c16..16505fcca4 100644 --- a/libs/components/package.json.ng14 +++ b/libs/components/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "1.18.0", + "version": "1.18.1", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -17,10 +17,10 @@ "@ng-web-apis/resize-observer": "2.0.0", "@ng-web-apis/intersection-observer": "2.0.0", "@ng-web-apis/mutation-observer": "2.0.0", - "@prizm-ui/helpers": "^1.18.0", - "@prizm-ui/core": "^1.18.0", - "@prizm-ui/i18n": "^1.18.0", - "@prizm-ui/theme": "^1.18.0" + "@prizm-ui/helpers": "^1.18.1", + "@prizm-ui/core": "^1.18.1", + "@prizm-ui/i18n": "^1.18.1", + "@prizm-ui/theme": "^1.18.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json.ng14 b/libs/core/package.json.ng14 index a1ef0ac512..b47f24b3f9 100644 --- a/libs/core/package.json.ng14 +++ b/libs/core/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "1.18.0", + "version": "1.18.1", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json.ng14 b/libs/helpers/package.json.ng14 index bbea33e8d2..8b9ace64f3 100644 --- a/libs/helpers/package.json.ng14 +++ b/libs/helpers/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "1.18.0", + "version": "1.18.1", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json.ng14 b/libs/i18n/package.json.ng14 index 51ea320e8a..6fdd1f831c 100644 --- a/libs/i18n/package.json.ng14 +++ b/libs/i18n/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "1.18.0", + "version": "1.18.1", "peerDependencies": { "@angular/core": "^14.2.0" }, diff --git a/libs/icons/base/package.json.ng14 b/libs/icons/base/package.json.ng14 index bdc405a28c..c48ec9cd13 100644 --- a/libs/icons/base/package.json.ng14 +++ b/libs/icons/base/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "1.18.0", + "version": "1.18.1", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/core": "^1.18.0" + "@prizm-ui/core": "^1.18.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json.ng14 b/libs/icons/flags/package.json.ng14 index a720f76fd6..9f4c7d5501 100644 --- a/libs/icons/flags/package.json.ng14 +++ b/libs/icons/flags/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "1.18.0", + "version": "1.18.1", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/core": "^1.18.0" + "@prizm-ui/core": "^1.18.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json.ng14 b/libs/nxmv/package.json.ng14 index 26bec5eb67..39557a7acc 100644 --- a/libs/nxmv/package.json.ng14 +++ b/libs/nxmv/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "1.18.0", + "version": "1.18.1", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json.ng14 b/libs/plugin/package.json.ng14 index b8cd8a0d93..0473ee619d 100644 --- a/libs/plugin/package.json.ng14 +++ b/libs/plugin/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "1.18.0", + "version": "1.18.1", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^1.18.0" + "@prizm-ui/ast": "^1.18.1" } } diff --git a/libs/schematics/package.json.ng14 b/libs/schematics/package.json.ng14 index 3a6519987f..e55cf7ecfc 100644 --- a/libs/schematics/package.json.ng14 +++ b/libs/schematics/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "1.18.0", + "version": "1.18.1", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json.ng14 b/libs/theme/package.json.ng14 index fdedf39578..7e9249c2ec 100644 --- a/libs/theme/package.json.ng14 +++ b/libs/theme/package.json.ng14 @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "1.18.0", + "version": "1.18.1", "peerDependencies": { "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/core": "^1.18.0", - "@prizm-ui/helpers": "^1.18.0" + "@prizm-ui/core": "^1.18.1", + "@prizm-ui/helpers": "^1.18.1" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json.ng14 b/package.json.ng14 index f19135ee60..5b23f15980 100644 --- a/package.json.ng14 +++ b/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "1.18.0", + "version": "1.18.1", "license": "MIT", "husky": { "hooks": { From cf350c7a07f1442a56ae93fd7ca900f3a79d4ca0 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 20 Jun 2024 15:42:22 +0300 Subject: [PATCH 272/291] feat(doc): changelog update #000 --- apps/doc/src/app/about-prizm/changelog/CHANGELOG.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index 1208aed284..09193ffa95 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -2,6 +2,13 @@ All notable changes to this project will be documented in this file. +## [1.18.1, 2.15.1, 3.14.1](https://github.com/zyfra/Prizm) (20-06-2024) + +### Bug Fixes + +- fix(doc/textarea): missing border property added for textarea livedemo #1803 +- fix(components/input-icon-button): disabled button should not fire events #1823 + ## [1.18.0, 2.15.0, 3.14.0](https://github.com/zyfra/Prizm) (13-06-2024) ### Features From b979d7f8600786cdac6fe3529fd077387fa9c06b Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Fri, 28 Jun 2024 12:48:11 +0300 Subject: [PATCH 273/291] feat(components/paginator): update paginator dictionary #1840 --- .../paginator/prizm-paginator.component.html | 25 +++++++++++++------ .../paginator/prizm-paginator.component.ts | 9 +++---- libs/i18n/src/lib/interfaces/language.ts | 2 ++ .../src/lib/languages/english/paginator.ts | 10 ++++++++ .../src/lib/languages/russian/paginator.ts | 2 ++ 5 files changed, 36 insertions(+), 12 deletions(-) create mode 100644 libs/i18n/src/lib/languages/english/paginator.ts diff --git a/libs/components/src/lib/components/paginator/prizm-paginator.component.html b/libs/components/src/lib/components/paginator/prizm-paginator.component.html index 4052b13327..44f3cda2ee 100644 --- a/libs/components/src/lib/components/paginator/prizm-paginator.component.html +++ b/libs/components/src/lib/components/paginator/prizm-paginator.component.html @@ -1,10 +1,12 @@ -
    +
    - + {{ title }} @@ -24,10 +26,19 @@
    - {{ paginator$ | async | prizmPluck : ['linesShown'] }} {{ (currentPage - 1) * rows + 1 }}-{{ - currentPage * rows > $any(totalRecords) ? totalRecords : currentPage * rows - }} - {{ paginator$ | async | prizmPluck : ['fromText'] }} {{ realTotalRecord }} + + {{ language | prizmPluck : ['linesShown'] }} + + {{ (currentPage - 1) * rows + 1 }} - + + {{ currentPage * rows > $any(totalRecords) ? totalRecords : currentPage * rows }} + + + {{ language | prizmPluck : ['fromText'] }} + + + {{ realTotalRecord }} +
    - {{ moreButtonLabel }} + {{ moreButtonLabel ? moreButtonLabel : (language | prizmPluck : ['moreButtonLabel']) }}
    diff --git a/libs/components/src/lib/components/paginator/prizm-paginator.component.ts b/libs/components/src/lib/components/paginator/prizm-paginator.component.ts index a4024fa54e..25452af26e 100644 --- a/libs/components/src/lib/components/paginator/prizm-paginator.component.ts +++ b/libs/components/src/lib/components/paginator/prizm-paginator.component.ts @@ -50,7 +50,10 @@ import { PrizmButtonModule } from '../button'; }) export class PrizmPaginatorComponent extends PrizmAbstractTestId implements OnInit { @Input() public paginatorType: PrizmPaginatorType = 'finite'; - @Input() textOnPage: PolymorphContent = 'Строк на странице'; + @Input() textOnPage: PolymorphContent; + @Input() public leftButtonLabel = ''; + @Input() public rightButtonLabel = ''; + @Input() public moreButtonLabel = ''; /** The length of the total number of items that are being paginated. Defaulted to 0. */ @Input() get totalRecords(): number | null { @@ -100,10 +103,6 @@ export class PrizmPaginatorComponent extends PrizmAbstractTestId implements OnIn noPages: false, }; - @Input() public leftButtonLabel = ''; - @Input() public rightButtonLabel = ''; - @Input() moreButtonLabel = 'Показать еще'; - @Input() public rowsCountOptions: number[] = []; @Output() public paginatorChange: EventEmitter = new EventEmitter(); diff --git a/libs/i18n/src/lib/interfaces/language.ts b/libs/i18n/src/lib/interfaces/language.ts index 1f5c24a0d5..f1bf1c3668 100644 --- a/libs/i18n/src/lib/interfaces/language.ts +++ b/libs/i18n/src/lib/interfaces/language.ts @@ -65,6 +65,8 @@ export interface PrizmLanguagePaginator { paginator: { linesShown: string; fromText: string; + linesOnPage: string; + moreButtonLabel: string; }; } diff --git a/libs/i18n/src/lib/languages/english/paginator.ts b/libs/i18n/src/lib/languages/english/paginator.ts new file mode 100644 index 0000000000..71a3cd4d2a --- /dev/null +++ b/libs/i18n/src/lib/languages/english/paginator.ts @@ -0,0 +1,10 @@ +import { PrizmLanguagePaginator } from '../../interfaces'; + +export const PRIZM_ENGLISH_PAGINATOR: PrizmLanguagePaginator = { + paginator: { + linesShown: 'Lines shown:', + fromText: 'out of', + linesOnPage: 'Lines per page', + moreButtonLabel: 'Show more', + }, +}; diff --git a/libs/i18n/src/lib/languages/russian/paginator.ts b/libs/i18n/src/lib/languages/russian/paginator.ts index 7cbfb9e1ce..6bee8f71a1 100644 --- a/libs/i18n/src/lib/languages/russian/paginator.ts +++ b/libs/i18n/src/lib/languages/russian/paginator.ts @@ -4,5 +4,7 @@ export const PRIZM_RUSSIAN_PAGINATOR: PrizmLanguagePaginator = { paginator: { linesShown: 'Показано строк:', fromText: 'из', + linesOnPage: 'Строк на странице', + moreButtonLabel: 'Показать ещё', }, }; From 65ba3aa77a11d4a16b5023a90f95f55b8cfb3c9e Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Mon, 8 Jul 2024 11:46:56 +0300 Subject: [PATCH 274/291] feat(chore): up version to 4.3.5 --- apps/doc/src/app/version-manager/versions.constants.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index 72ac389592..811e0d63b3 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -12,8 +12,8 @@ export interface PrizmVersionMeta { export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ { - label: '4.3.4 (ng17)', - version: '4.3.4', + label: '4.3.5 (ng17)', + version: '4.3.5', stackblitz: 'https://stackblitz.com/edit/prizm-v4-demo', link: getDocSite.bind(null, 'https://doc.prizm.zyfra.com', 'http://prizm.site'), From 719808cbbff64ebfc63c4763165a35b00d1bdde6 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Mon, 15 Jul 2024 09:35:48 +0300 Subject: [PATCH 275/291] feat: up version of v4 to 4.3.6 #000 --- apps/doc/src/app/version-manager/versions.constants.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index 811e0d63b3..e523ed51b9 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -12,8 +12,8 @@ export interface PrizmVersionMeta { export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ { - label: '4.3.5 (ng17)', - version: '4.3.5', + label: '4.3.6 (ng17)', + version: '4.3.6', stackblitz: 'https://stackblitz.com/edit/prizm-v4-demo', link: getDocSite.bind(null, 'https://doc.prizm.zyfra.com', 'http://prizm.site'), From 06ea0bcd095f78d35a46feed023269b23b561917 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Thu, 27 Jun 2024 11:47:12 +0300 Subject: [PATCH 276/291] fix(components/switcher): add async example for issue #1476 --- .../switcher-async-example.component.html | 13 +++++++ .../switcher-async-example.component.less | 0 .../switcher-async-example.component.ts | 34 +++++++++++++++++++ .../switcher/switcher-example.component.html | 4 +++ .../switcher/switcher-example.component.ts | 5 +++ .../switcher/switcher-example.module.ts | 2 ++ 6 files changed, 58 insertions(+) create mode 100644 apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.html create mode 100644 apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.less create mode 100644 apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.ts diff --git a/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.html b/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.html new file mode 100644 index 0000000000..83bb6db85c --- /dev/null +++ b/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.html @@ -0,0 +1,13 @@ + + +
    +
    + + + +
    +
    + + + + diff --git a/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.less b/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.less new file mode 100644 index 0000000000..e69de29bb2 diff --git a/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.ts b/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.ts new file mode 100644 index 0000000000..e16c378078 --- /dev/null +++ b/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.ts @@ -0,0 +1,34 @@ +import { Component, ChangeDetectionStrategy } from '@angular/core'; +import { PrizmSwitcherItem } from '@prizm-ui/components'; +import { PrizmDestroyService } from '@prizm-ui/helpers'; +import { map, takeUntil, timer } from 'rxjs'; + +@Component({ + selector: 'prizm-switcher-async-example', + templateUrl: './switcher-async-example.component.html', + styleUrls: ['./switcher-async-example.component.less'], + changeDetection: ChangeDetectionStrategy.OnPush, + providers: [PrizmDestroyService], +}) +export class SwitcherAsyncExampleComponent { + public readonly switchers: PrizmSwitcherItem[] = [ + { + title: 'Таблицы', + }, + { + title: 'Графики', + }, + { + title: 'Мнемосхемы', + }, + { + title: 'Дашборды', + }, + ]; + + public readonly switchers$ = timer(100).pipe( + map(() => this.switchers), + takeUntil(this.destroy$) + ); + constructor(private readonly destroy$: PrizmDestroyService) {} +} diff --git a/apps/doc/src/app/components/switcher/switcher-example.component.html b/apps/doc/src/app/components/switcher/switcher-example.component.html index 2143af03b4..e647dda883 100644 --- a/apps/doc/src/app/components/switcher/switcher-example.component.html +++ b/apps/doc/src/app/components/switcher/switcher-example.component.html @@ -7,6 +7,10 @@ + + + + diff --git a/apps/doc/src/app/components/switcher/switcher-example.component.ts b/apps/doc/src/app/components/switcher/switcher-example.component.ts index 68a94c9f1b..b759d2a6b9 100644 --- a/apps/doc/src/app/components/switcher/switcher-example.component.ts +++ b/apps/doc/src/app/components/switcher/switcher-example.component.ts @@ -37,6 +37,11 @@ export class SwitcherExampleComponent { HTML: import('./examples/switcher-basic-example/switcher-basic-example.component.html?raw'), }; + public readonly exampleAsyncSwitcher: TuiDocExample = { + TypeScript: import('./examples/switcher-async-example/switcher-async-example.component?raw'), + HTML: import('./examples/switcher-async-example/switcher-async-example.component.html?raw'), + }; + public readonly exampleInnerLSwitcher: TuiDocExample = { TypeScript: import('./examples/switcher-inner-l-example/switcher-inner-l-example.component?raw'), HTML: import('./examples/switcher-inner-l-example/switcher-inner-l-example.component.html?raw'), diff --git a/apps/doc/src/app/components/switcher/switcher-example.module.ts b/apps/doc/src/app/components/switcher/switcher-example.module.ts index 059f4f2b7c..7762379f87 100644 --- a/apps/doc/src/app/components/switcher/switcher-example.module.ts +++ b/apps/doc/src/app/components/switcher/switcher-example.module.ts @@ -13,6 +13,7 @@ import { SwitcherOuterSExampleComponent } from './examples/switcher-outer-s-exam import { SwitcherWithIconExampleComponent } from './examples/switcher-with-icon-example/switcher-with-icon-example.component'; import { SwitcherOnlyIconExampleComponent } from './examples/switcher-only-icon-example/switcher-only-icon-example.component'; import { ReactiveFormsModule } from '@angular/forms'; +import { SwitcherAsyncExampleComponent } from './examples/switcher-async-example/switcher-async-example.component'; @NgModule({ declarations: [ @@ -25,6 +26,7 @@ import { ReactiveFormsModule } from '@angular/forms'; SwitcherOuterSExampleComponent, SwitcherWithIconExampleComponent, SwitcherOnlyIconExampleComponent, + SwitcherAsyncExampleComponent, ], imports: [ CommonModule, From 8dd1ab04b0751e90e0174c2adecc3c2d01013990 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Wed, 3 Jul 2024 12:20:28 +0300 Subject: [PATCH 277/291] fix(components/switcher): selected switcher logic moved from setter to ngOnChanges #1476 --- .../switcher-async-example.component.html | 20 ++++++++--- .../switcher-async-example.component.less | 3 ++ .../switcher-async-example.component.ts | 35 +++++++++++++++++-- .../switcher/switcher-example.module.ts | 3 +- .../components/switcher/switcher.component.ts | 31 +++++++++------- .../lib/components/switcher/swithcer.const.ts | 1 + 6 files changed, 72 insertions(+), 21 deletions(-) create mode 100644 libs/components/src/lib/components/switcher/swithcer.const.ts diff --git a/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.html b/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.html index 83bb6db85c..59f46f1f4d 100644 --- a/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.html +++ b/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.html @@ -1,13 +1,25 @@ - +

    Static

    + + + +
    +
    + +

    Async

    +

    - +

    Inverse attribute ordering

    + +

    - + - + diff --git a/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.less b/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.less index e69de29bb2..80f9c2e115 100644 --- a/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.less +++ b/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.less @@ -0,0 +1,3 @@ +.margin-right { + margin-right: 24px; +} diff --git a/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.ts b/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.ts index e16c378078..76dd331333 100644 --- a/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.ts +++ b/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.ts @@ -1,7 +1,7 @@ import { Component, ChangeDetectionStrategy } from '@angular/core'; import { PrizmSwitcherItem } from '@prizm-ui/components'; import { PrizmDestroyService } from '@prizm-ui/helpers'; -import { map, takeUntil, timer } from 'rxjs'; +import { BehaviorSubject, switchMap, takeUntil, tap, timer } from 'rxjs'; @Component({ selector: 'prizm-switcher-async-example', @@ -11,7 +11,8 @@ import { map, takeUntil, timer } from 'rxjs'; providers: [PrizmDestroyService], }) export class SwitcherAsyncExampleComponent { - public readonly switchers: PrizmSwitcherItem[] = [ + public selectedIndex = 1; + public readonly switchersSetA: PrizmSwitcherItem[] = [ { title: 'Таблицы', }, @@ -20,15 +21,43 @@ export class SwitcherAsyncExampleComponent { }, { title: 'Мнемосхемы', + disabled: true, }, { title: 'Дашборды', }, ]; + public readonly switchersSetB: PrizmSwitcherItem[] = [ + { + title: 'Москва', + }, + { + title: 'Санкт-Петербург', + }, + ]; + + public switchers: PrizmSwitcherItem[] = this.switchersSetA; + public readonly switchers$ = timer(100).pipe( - map(() => this.switchers), + switchMap(() => this.switchers$$), + tap(value => (this.switchers = value)), takeUntil(this.destroy$) ); + + private readonly switchers$$: BehaviorSubject = new BehaviorSubject< + PrizmSwitcherItem[] + >(this.switchersSetA); + constructor(private readonly destroy$: PrizmDestroyService) {} + + public toggleIndex(): void { + this.selectedIndex === 1 ? (this.selectedIndex = 2) : (this.selectedIndex = 1); + } + + public toggleSwitchers(): void { + this.switchers === this.switchersSetA + ? this.switchers$$.next(this.switchersSetB) + : this.switchers$$.next(this.switchersSetA); + } } diff --git a/apps/doc/src/app/components/switcher/switcher-example.module.ts b/apps/doc/src/app/components/switcher/switcher-example.module.ts index 7762379f87..6274b0e957 100644 --- a/apps/doc/src/app/components/switcher/switcher-example.module.ts +++ b/apps/doc/src/app/components/switcher/switcher-example.module.ts @@ -4,7 +4,7 @@ import { SwitcherExampleComponent } from './switcher-example.component'; import { prizmDocGenerateRoutes, PrizmAddonDocModule } from '@prizm-ui/doc'; import { RouterModule } from '@angular/router'; import { SwitcherBasicExampleComponent } from './examples/switcher-basic-example/switcher-basic-example.component'; -import { PrizmSwitcherModule } from '@prizm-ui/components'; +import { PrizmButtonComponent, PrizmSwitcherModule } from '@prizm-ui/components'; import { SwitcherInnerLExampleComponent } from './examples/switcher-inner-l-example/switcher-inner-l-example.component'; import { SwitcherInnerMExampleComponent } from './examples/switcher-inner-m-example/switcher-inner-m-example.component'; import { SwitcherOuterMExampleComponent } from './examples/switcher-outer-m-example/switcher-outer-m-example.component'; @@ -34,6 +34,7 @@ import { SwitcherAsyncExampleComponent } from './examples/switcher-async-example RouterModule.forChild(prizmDocGenerateRoutes(SwitcherExampleComponent)), PrizmSwitcherModule, ReactiveFormsModule, + PrizmButtonComponent, ], }) export class SwitcherExampleModule {} diff --git a/libs/components/src/lib/components/switcher/switcher.component.ts b/libs/components/src/lib/components/switcher/switcher.component.ts index 8f27b30245..7d663b1c64 100644 --- a/libs/components/src/lib/components/switcher/switcher.component.ts +++ b/libs/components/src/lib/components/switcher/switcher.component.ts @@ -5,9 +5,11 @@ import { EventEmitter, HostBinding, Input, + OnChanges, Optional, Output, Self, + SimpleChanges, } from '@angular/core'; import { PrizmSwitcherItem, PrizmSwitcherSize, PrizmSwitcherType } from './switcher.interface'; import { prizmDefaultProp } from '@prizm-ui/core'; @@ -17,6 +19,8 @@ import { noop } from 'rxjs'; import { CommonModule } from '@angular/common'; import { PrizmSwitcherItemComponent } from './components/switcher-item/switcher-item.component'; import { PrizmSwitcherHintDirective } from './directives/switcher-hint.directive'; +import { prizmHasChanges } from '@prizm-ui/helpers'; +import { INITIAL_SWITHCER_INDEX } from './swithcer.const'; @Component({ selector: 'prizm-switcher', @@ -26,11 +30,7 @@ import { PrizmSwitcherHintDirective } from './directives/switcher-hint.directive standalone: true, imports: [CommonModule, PrizmSwitcherHintDirective, PrizmSwitcherItemComponent], }) -export class PrizmSwitcherComponent extends PrizmAbstractTestId implements ControlValueAccessor { - onChange: (v: number) => void = noop; - onTouched: () => void = noop; - private selectedSwitcherIdx_ = 0; - +export class PrizmSwitcherComponent extends PrizmAbstractTestId implements ControlValueAccessor, OnChanges { @Input() @prizmDefaultProp() public size: PrizmSwitcherSize = 'l'; @@ -45,13 +45,7 @@ export class PrizmSwitcherComponent extends PrizmAbstractTestId implements Contr @Input() @prizmDefaultProp() - public set selectedSwitcherIdx(idx: number) { - const item = this.switchers[idx]; - if (item) this.selectSwitcher(item, idx); - } - get selectedSwitcherIdx() { - return this.selectedSwitcherIdx_; - } + public selectedSwitcherIdx: number = INITIAL_SWITHCER_INDEX; @Input() @HostBinding('class.full-width') @@ -62,6 +56,9 @@ export class PrizmSwitcherComponent extends PrizmAbstractTestId implements Contr override readonly testId_ = 'ui_switcher'; + onChange: (v: number) => void = noop; + onTouched: () => void = noop; + constructor( public readonly cdRef: ChangeDetectorRef, @Optional() @Self() public readonly ngControl: NgControl @@ -71,11 +68,19 @@ export class PrizmSwitcherComponent extends PrizmAbstractTestId implements Contr this.ngControl.valueAccessor = this; } } + ngOnChanges(changes: SimpleChanges): void { + if (prizmHasChanges(changes, 'selectedSwitcherIdx') && prizmHasChanges(changes, 'switchers')) { + const idx = + this.selectedSwitcherIdx <= this.switchers.length ? this.selectedSwitcherIdx : INITIAL_SWITHCER_INDEX; + const item = this.switchers[idx]; + if (item) this.selectSwitcher(item, idx); + } + } public selectSwitcher(item: PrizmSwitcherItem, idx: number): void { if (this.ngControl?.disabled) return; if (item.disabled) return; if (this.selectedSwitcherIdx === idx) return; - this.selectedSwitcherIdxChange.emit((this.selectedSwitcherIdx_ = idx)); + this.selectedSwitcherIdxChange.emit((this.selectedSwitcherIdx = idx)); this.onChange(this.selectedSwitcherIdx); } diff --git a/libs/components/src/lib/components/switcher/swithcer.const.ts b/libs/components/src/lib/components/switcher/swithcer.const.ts new file mode 100644 index 0000000000..aa7c41daad --- /dev/null +++ b/libs/components/src/lib/components/switcher/swithcer.const.ts @@ -0,0 +1 @@ +export const INITIAL_SWITHCER_INDEX = 0; From abf8324390c1c0707c88534328b62c2686f0c0bc Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 8 Jul 2024 08:59:24 +0300 Subject: [PATCH 278/291] feat(components/switcher): move logic from ngonchanges to function #1476 --- .../lib/components/switcher/switcher.component.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/libs/components/src/lib/components/switcher/switcher.component.ts b/libs/components/src/lib/components/switcher/switcher.component.ts index 7d663b1c64..0dc078b87d 100644 --- a/libs/components/src/lib/components/switcher/switcher.component.ts +++ b/libs/components/src/lib/components/switcher/switcher.component.ts @@ -70,10 +70,7 @@ export class PrizmSwitcherComponent extends PrizmAbstractTestId implements Contr } ngOnChanges(changes: SimpleChanges): void { if (prizmHasChanges(changes, 'selectedSwitcherIdx') && prizmHasChanges(changes, 'switchers')) { - const idx = - this.selectedSwitcherIdx <= this.switchers.length ? this.selectedSwitcherIdx : INITIAL_SWITHCER_INDEX; - const item = this.switchers[idx]; - if (item) this.selectSwitcher(item, idx); + this.setActiveSwitcherOnChange(); } } public selectSwitcher(item: PrizmSwitcherItem, idx: number): void { @@ -97,4 +94,11 @@ export class PrizmSwitcherComponent extends PrizmAbstractTestId implements Contr public setDisabledState(isDisabled: boolean): void { this.cdRef.markForCheck(); } + + private setActiveSwitcherOnChange(): void { + const idx = + this.selectedSwitcherIdx <= this.switchers.length ? this.selectedSwitcherIdx : INITIAL_SWITHCER_INDEX; + const item = this.switchers[idx]; + if (item) this.selectSwitcher(item, idx); + } } From 6230c7e9c72c083db63bf07c332e35e01178c40e Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Tue, 9 Jul 2024 16:04:14 +0300 Subject: [PATCH 279/291] fix(components/swithcer): switcher stters fix #1315 --- .../components/switcher/switcher.component.ts | 73 ++++++++++++++----- 1 file changed, 56 insertions(+), 17 deletions(-) diff --git a/libs/components/src/lib/components/switcher/switcher.component.ts b/libs/components/src/lib/components/switcher/switcher.component.ts index 0dc078b87d..dbf49b1c7a 100644 --- a/libs/components/src/lib/components/switcher/switcher.component.ts +++ b/libs/components/src/lib/components/switcher/switcher.component.ts @@ -5,22 +5,21 @@ import { EventEmitter, HostBinding, Input, - OnChanges, + OnInit, Optional, Output, Self, - SimpleChanges, } from '@angular/core'; import { PrizmSwitcherItem, PrizmSwitcherSize, PrizmSwitcherType } from './switcher.interface'; import { prizmDefaultProp } from '@prizm-ui/core'; import { PrizmAbstractTestId } from '../../abstract/interactive'; import { ControlValueAccessor, NgControl } from '@angular/forms'; -import { noop } from 'rxjs'; +import { BehaviorSubject, combineLatestWith, noop, takeUntil, tap } from 'rxjs'; import { CommonModule } from '@angular/common'; import { PrizmSwitcherItemComponent } from './components/switcher-item/switcher-item.component'; import { PrizmSwitcherHintDirective } from './directives/switcher-hint.directive'; -import { prizmHasChanges } from '@prizm-ui/helpers'; import { INITIAL_SWITHCER_INDEX } from './swithcer.const'; +import { PrizmDestroyService } from '@prizm-ui/helpers'; @Component({ selector: 'prizm-switcher', @@ -29,8 +28,9 @@ import { INITIAL_SWITHCER_INDEX } from './swithcer.const'; changeDetection: ChangeDetectionStrategy.OnPush, standalone: true, imports: [CommonModule, PrizmSwitcherHintDirective, PrizmSwitcherItemComponent], + providers: [PrizmDestroyService], }) -export class PrizmSwitcherComponent extends PrizmAbstractTestId implements ControlValueAccessor, OnChanges { +export class PrizmSwitcherComponent extends PrizmAbstractTestId implements ControlValueAccessor, OnInit { @Input() @prizmDefaultProp() public size: PrizmSwitcherSize = 'l'; @@ -39,13 +39,28 @@ export class PrizmSwitcherComponent extends PrizmAbstractTestId implements Contr @prizmDefaultProp() public type: PrizmSwitcherType = 'inner'; + private swithcers$: BehaviorSubject = new BehaviorSubject([]); + @Input() @prizmDefaultProp() - public switchers: PrizmSwitcherItem[] = []; + public set switchers(value: PrizmSwitcherItem[]) { + if (value) this.swithcers$.next(value); + } + get switchers(): PrizmSwitcherItem[] { + return this.swithcers$.value; + } + + private selectedSwitcherIdx$: BehaviorSubject = new BehaviorSubject(INITIAL_SWITHCER_INDEX); + public selectedSwitcherIdx_ = INITIAL_SWITHCER_INDEX; @Input() @prizmDefaultProp() - public selectedSwitcherIdx: number = INITIAL_SWITHCER_INDEX; + public set selectedSwitcherIdx(value: number) { + this.selectedSwitcherIdx$.next(value); + } + get selectedSwitcherIdx(): number { + return this.selectedSwitcherIdx_; + } @Input() @HostBinding('class.full-width') @@ -61,18 +76,19 @@ export class PrizmSwitcherComponent extends PrizmAbstractTestId implements Contr constructor( public readonly cdRef: ChangeDetectorRef, - @Optional() @Self() public readonly ngControl: NgControl + @Optional() @Self() public readonly ngControl: NgControl, + private readonly destroy$: PrizmDestroyService ) { super(); if (this.ngControl != null) { this.ngControl.valueAccessor = this; } } - ngOnChanges(changes: SimpleChanges): void { - if (prizmHasChanges(changes, 'selectedSwitcherIdx') && prizmHasChanges(changes, 'switchers')) { - this.setActiveSwitcherOnChange(); - } + + ngOnInit(): void { + this.handleSwitchersUpdate(); } + public selectSwitcher(item: PrizmSwitcherItem, idx: number): void { if (this.ngControl?.disabled) return; if (item.disabled) return; @@ -95,10 +111,33 @@ export class PrizmSwitcherComponent extends PrizmAbstractTestId implements Contr this.cdRef.markForCheck(); } - private setActiveSwitcherOnChange(): void { - const idx = - this.selectedSwitcherIdx <= this.switchers.length ? this.selectedSwitcherIdx : INITIAL_SWITHCER_INDEX; - const item = this.switchers[idx]; - if (item) this.selectSwitcher(item, idx); + private handleSwitchersUpdate() { + this.swithcers$ + .pipe( + tap(switchers => { + if (!this.isIndexValid(this.selectedSwitcherIdx_, switchers)) { + this.selectedSwitcherIdx_ = INITIAL_SWITHCER_INDEX; + } + }), + combineLatestWith(this.selectedSwitcherIdx$), + tap(([switchers, selectedSwitcherIdx]) => { + if (!switchers.length) return; + + if (!this.isIndexValid(selectedSwitcherIdx, switchers)) { + console.warn('selectedSwitcherIdx out of bound'); + return; + } + + this.selectedSwitcherIdx_ = selectedSwitcherIdx; + + this.selectSwitcher(switchers[selectedSwitcherIdx], selectedSwitcherIdx); + }), + takeUntil(this.destroy$) + ) + .subscribe(); + } + + private isIndexValid(idx: number, switchers: PrizmSwitcherItem[]): boolean { + return !!switchers[idx]; } } From d03631a8d5ee11f776a088354435dcab0b6e40ae Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Wed, 10 Jul 2024 13:41:20 +0300 Subject: [PATCH 280/291] fix(components/switcher): filter empty switcher array #1476 --- .../switcher-async-example.component.html | 18 +++++++++++--- .../switcher-async-example.component.ts | 5 ++++ .../components/switcher/switcher.component.ts | 24 ++++++++++++------- 3 files changed, 35 insertions(+), 12 deletions(-) diff --git a/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.html b/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.html index 59f46f1f4d..5f97828202 100644 --- a/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.html +++ b/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.html @@ -1,19 +1,31 @@

    Static

    - +

    Async

    - +

    Inverse attribute ordering

    - +

    diff --git a/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.ts b/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.ts index 76dd331333..5d5d10c399 100644 --- a/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.ts +++ b/apps/doc/src/app/components/switcher/examples/switcher-async-example/switcher-async-example.component.ts @@ -12,6 +12,7 @@ import { BehaviorSubject, switchMap, takeUntil, tap, timer } from 'rxjs'; }) export class SwitcherAsyncExampleComponent { public selectedIndex = 1; + public testIndex = this.selectedIndex; public readonly switchersSetA: PrizmSwitcherItem[] = [ { title: 'Таблицы', @@ -60,4 +61,8 @@ export class SwitcherAsyncExampleComponent { ? this.switchers$$.next(this.switchersSetB) : this.switchers$$.next(this.switchersSetA); } + + public updateIdx(idx: number) { + this.selectedIndex = idx; + } } diff --git a/libs/components/src/lib/components/switcher/switcher.component.ts b/libs/components/src/lib/components/switcher/switcher.component.ts index dbf49b1c7a..5274d71f88 100644 --- a/libs/components/src/lib/components/switcher/switcher.component.ts +++ b/libs/components/src/lib/components/switcher/switcher.component.ts @@ -14,7 +14,7 @@ import { PrizmSwitcherItem, PrizmSwitcherSize, PrizmSwitcherType } from './switc import { prizmDefaultProp } from '@prizm-ui/core'; import { PrizmAbstractTestId } from '../../abstract/interactive'; import { ControlValueAccessor, NgControl } from '@angular/forms'; -import { BehaviorSubject, combineLatestWith, noop, takeUntil, tap } from 'rxjs'; +import { BehaviorSubject, combineLatestWith, filter, noop, takeUntil, tap } from 'rxjs'; import { CommonModule } from '@angular/common'; import { PrizmSwitcherItemComponent } from './components/switcher-item/switcher-item.component'; import { PrizmSwitcherHintDirective } from './directives/switcher-hint.directive'; @@ -39,15 +39,15 @@ export class PrizmSwitcherComponent extends PrizmAbstractTestId implements Contr @prizmDefaultProp() public type: PrizmSwitcherType = 'inner'; - private swithcers$: BehaviorSubject = new BehaviorSubject([]); + private switchers$: BehaviorSubject = new BehaviorSubject([]); @Input() @prizmDefaultProp() public set switchers(value: PrizmSwitcherItem[]) { - if (value) this.swithcers$.next(value); + if (value) this.switchers$.next(value); } get switchers(): PrizmSwitcherItem[] { - return this.swithcers$.value; + return this.switchers$.value; } private selectedSwitcherIdx$: BehaviorSubject = new BehaviorSubject(INITIAL_SWITHCER_INDEX); @@ -112,19 +112,21 @@ export class PrizmSwitcherComponent extends PrizmAbstractTestId implements Contr } private handleSwitchersUpdate() { - this.swithcers$ + this.switchers$ .pipe( + filter((switchers: PrizmSwitcherItem[]) => !!switchers.length), tap(switchers => { if (!this.isIndexValid(this.selectedSwitcherIdx_, switchers)) { - this.selectedSwitcherIdx_ = INITIAL_SWITHCER_INDEX; + this.selectSwitcher(switchers[INITIAL_SWITHCER_INDEX], INITIAL_SWITHCER_INDEX); + this.logIndexValidationError( + `selectedSwitcherIdx out of bound. Index has been reset to ${INITIAL_SWITHCER_INDEX}` + ); } }), combineLatestWith(this.selectedSwitcherIdx$), tap(([switchers, selectedSwitcherIdx]) => { - if (!switchers.length) return; - if (!this.isIndexValid(selectedSwitcherIdx, switchers)) { - console.warn('selectedSwitcherIdx out of bound'); + this.logIndexValidationError('selectedSwitcherIdx out of bound'); return; } @@ -140,4 +142,8 @@ export class PrizmSwitcherComponent extends PrizmAbstractTestId implements Contr private isIndexValid(idx: number, switchers: PrizmSwitcherItem[]): boolean { return !!switchers[idx]; } + + private logIndexValidationError(errorMsg: string) { + console.warn(errorMsg); + } } From 43782ddd5495b91b4d70f06ca1750120ebb2c967 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Wed, 10 Jul 2024 15:36:20 +0300 Subject: [PATCH 281/291] fix(components/tree): incorrect markup fix #1742 --- .../components/tree/examples/component/folder.component.less | 2 +- .../tree-item-content/tree-item-content.component.less | 3 +++ .../tree/components/tree-item/tree-item.component.less | 4 ---- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/apps/doc/src/app/components/tree/examples/component/folder.component.less b/apps/doc/src/app/components/tree/examples/component/folder.component.less index 64c6d75db7..dd30f40f28 100644 --- a/apps/doc/src/app/components/tree/examples/component/folder.component.less +++ b/apps/doc/src/app/components/tree/examples/component/folder.component.less @@ -23,7 +23,7 @@ } &:after { - top: -1rem; + top: -0.5rem; bottom: 1rem; border-left: 1px solid var(--prizm-v3-background-stroke); } diff --git a/libs/components/src/lib/components/tree/components/tree-item-content/tree-item-content.component.less b/libs/components/src/lib/components/tree/components/tree-item-content/tree-item-content.component.less index 8f02629ffe..b3c1717864 100644 --- a/libs/components/src/lib/components/tree/components/tree-item-content/tree-item-content.component.less +++ b/libs/components/src/lib/components/tree/components/tree-item-content/tree-item-content.component.less @@ -3,6 +3,9 @@ :host { display: flex; align-items: center; + &:not(:empty) { + height: 32px; + } :host-context(prizm-tree-item._expandable):not(._expandable) { padding-left: 28px; diff --git a/libs/components/src/lib/components/tree/components/tree-item/tree-item.component.less b/libs/components/src/lib/components/tree/components/tree-item/tree-item.component.less index 23d8639f99..15a38ce549 100644 --- a/libs/components/src/lib/components/tree/components/tree-item/tree-item.component.less +++ b/libs/components/src/lib/components/tree/components/tree-item/tree-item.component.less @@ -16,7 +16,3 @@ position: relative; margin-left: var(--prizm-tree-item-indent, 24px); } - -.prizm-tree-item__dynamic-content { - margin: 4px 0; -} From 1f6dad251cd753c91aedf5cac0face170183ae63 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Wed, 17 Jul 2024 12:36:01 +0300 Subject: [PATCH 282/291] feat(chore): up version to 1.19.0 #000 --- .github/workflows/beta-publish-ng14.yml | 2 +- .github/workflows/main-publish-ng14.yml | 2 +- .github/workflows/pre-release-publish-ng14.yml | 2 +- apps/doc/src/app/version-manager/current.const.ts.ng14 | 2 +- apps/doc/src/app/version-manager/versions.constants.ts | 4 ++-- libs/ast/package.json.ng14 | 2 +- libs/charts/base/package.json.ng14 | 6 +++--- libs/components/package.json.ng14 | 10 +++++----- libs/core/package.json.ng14 | 2 +- libs/helpers/package.json.ng14 | 2 +- libs/i18n/package.json.ng14 | 2 +- libs/icons/base/package.json.ng14 | 4 ++-- libs/icons/flags/package.json.ng14 | 4 ++-- libs/nxmv/package.json.ng14 | 2 +- libs/plugin/package.json.ng14 | 4 ++-- libs/schematics/package.json.ng14 | 2 +- libs/theme/package.json.ng14 | 6 +++--- package.json.ng14 | 2 +- 18 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/beta-publish-ng14.yml b/.github/workflows/beta-publish-ng14.yml index bfb6ac3f37..aa2d16734b 100644 --- a/.github/workflows/beta-publish-ng14.yml +++ b/.github/workflows/beta-publish-ng14.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng14beta --json 2>/dev/null || echo '1.18.1-ng14beta.0') | jq '([.[] | select(startswith("1.18.1-ng14beta"))] | last // "1.18.1-ng14beta.0")' 2>/dev/null || echo '1.18.1-ng14beta.0' + (npm view @prizm-ui/components versions --tag ng14beta --json 2>/dev/null || echo '1.19.0-ng14beta.0') | jq '([.[] | select(startswith("1.19.0-ng14beta"))] | last // "1.19.0-ng14beta.0")' 2>/dev/null || echo '1.19.0-ng14beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng14.yml b/.github/workflows/main-publish-ng14.yml index 65491c8496..a1477fc2d7 100644 --- a/.github/workflows/main-publish-ng14.yml +++ b/.github/workflows/main-publish-ng14.yml @@ -58,7 +58,7 @@ jobs: - name: Set up environment variables run: | last_v1_version=$( - echo '1.18.1' + echo '1.19.0' ) echo "LAST_V1_VERSION=${last_v1_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng14.yml b/.github/workflows/pre-release-publish-ng14.yml index ea59c1385d..979d923298 100644 --- a/.github/workflows/pre-release-publish-ng14.yml +++ b/.github/workflows/pre-release-publish-ng14.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng14next --json 2>/dev/null || echo '1.18.1-ng14next.0') | jq '([.[] | select(startswith("1.18.1-ng14next"))] | last // "1.18.1-ng14next.0")' 2>/dev/null || echo '1.18.1-ng14next.0' + (npm view @prizm-ui/components versions --tag ng14next --json 2>/dev/null || echo '1.19.0-ng14next.0') | jq '([.[] | select(startswith("1.19.0-ng14next"))] | last // "1.19.0-ng14next.0")' 2>/dev/null || echo '1.19.0-ng14next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/apps/doc/src/app/version-manager/current.const.ts.ng14 b/apps/doc/src/app/version-manager/current.const.ts.ng14 index e31d9fccbe..0e43d64c4b 100644 --- a/apps/doc/src/app/version-manager/current.const.ts.ng14 +++ b/apps/doc/src/app/version-manager/current.const.ts.ng14 @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '1.18.1'; +export const PRIZM_CURRENT_VERSION = '1.19.0'; diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index e523ed51b9..9a7d2989e2 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -43,8 +43,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ }, }, { - label: '1.18.1 (ng14)', - version: '1.18.1', + label: '1.19.0 (ng14)', + version: '1.19.0', stackblitz: 'https://stackblitz.com/edit/prizm-v1-demo', link: getDocSite.bind(null, 'http://1.17.2.doc.prizm.site', 'https://prizm-v1.web.app'), otherLinks: [], diff --git a/libs/ast/package.json.ng14 b/libs/ast/package.json.ng14 index 05843876d2..ff0ab7f4cd 100644 --- a/libs/ast/package.json.ng14 +++ b/libs/ast/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "1.18.1", + "version": "1.19.0", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json.ng14 b/libs/charts/base/package.json.ng14 index 0642b41384..373b392452 100644 --- a/libs/charts/base/package.json.ng14 +++ b/libs/charts/base/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "1.18.1", + "version": "1.19.0", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/theme": "^1.18.1", - "@prizm-ui/helpers": "^1.18.1", + "@prizm-ui/theme": "^1.19.0", + "@prizm-ui/helpers": "^1.19.0", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/package.json.ng14 b/libs/components/package.json.ng14 index 16505fcca4..f44bd15b98 100644 --- a/libs/components/package.json.ng14 +++ b/libs/components/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "1.18.1", + "version": "1.19.0", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -17,10 +17,10 @@ "@ng-web-apis/resize-observer": "2.0.0", "@ng-web-apis/intersection-observer": "2.0.0", "@ng-web-apis/mutation-observer": "2.0.0", - "@prizm-ui/helpers": "^1.18.1", - "@prizm-ui/core": "^1.18.1", - "@prizm-ui/i18n": "^1.18.1", - "@prizm-ui/theme": "^1.18.1" + "@prizm-ui/helpers": "^1.19.0", + "@prizm-ui/core": "^1.19.0", + "@prizm-ui/i18n": "^1.19.0", + "@prizm-ui/theme": "^1.19.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json.ng14 b/libs/core/package.json.ng14 index b47f24b3f9..a010a59867 100644 --- a/libs/core/package.json.ng14 +++ b/libs/core/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "1.18.1", + "version": "1.19.0", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json.ng14 b/libs/helpers/package.json.ng14 index 8b9ace64f3..0400dd2ad4 100644 --- a/libs/helpers/package.json.ng14 +++ b/libs/helpers/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "1.18.1", + "version": "1.19.0", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json.ng14 b/libs/i18n/package.json.ng14 index 6fdd1f831c..1a17a5bd66 100644 --- a/libs/i18n/package.json.ng14 +++ b/libs/i18n/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "1.18.1", + "version": "1.19.0", "peerDependencies": { "@angular/core": "^14.2.0" }, diff --git a/libs/icons/base/package.json.ng14 b/libs/icons/base/package.json.ng14 index c48ec9cd13..3498b7abbb 100644 --- a/libs/icons/base/package.json.ng14 +++ b/libs/icons/base/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "1.18.1", + "version": "1.19.0", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/core": "^1.18.1" + "@prizm-ui/core": "^1.19.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json.ng14 b/libs/icons/flags/package.json.ng14 index 9f4c7d5501..cd7d7f86d5 100644 --- a/libs/icons/flags/package.json.ng14 +++ b/libs/icons/flags/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "1.18.1", + "version": "1.19.0", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/core": "^1.18.1" + "@prizm-ui/core": "^1.19.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json.ng14 b/libs/nxmv/package.json.ng14 index 39557a7acc..1b875d263e 100644 --- a/libs/nxmv/package.json.ng14 +++ b/libs/nxmv/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "1.18.1", + "version": "1.19.0", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json.ng14 b/libs/plugin/package.json.ng14 index 0473ee619d..b1facdd172 100644 --- a/libs/plugin/package.json.ng14 +++ b/libs/plugin/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "1.18.1", + "version": "1.19.0", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^1.18.1" + "@prizm-ui/ast": "^1.19.0" } } diff --git a/libs/schematics/package.json.ng14 b/libs/schematics/package.json.ng14 index e55cf7ecfc..15f30a37e0 100644 --- a/libs/schematics/package.json.ng14 +++ b/libs/schematics/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "1.18.1", + "version": "1.19.0", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json.ng14 b/libs/theme/package.json.ng14 index 7e9249c2ec..8bb94070ef 100644 --- a/libs/theme/package.json.ng14 +++ b/libs/theme/package.json.ng14 @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "1.18.1", + "version": "1.19.0", "peerDependencies": { "@angular/common": "^14.2.0", "@angular/core": "^14.2.0", - "@prizm-ui/core": "^1.18.1", - "@prizm-ui/helpers": "^1.18.1" + "@prizm-ui/core": "^1.19.0", + "@prizm-ui/helpers": "^1.19.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json.ng14 b/package.json.ng14 index 5b23f15980..7f17883963 100644 --- a/package.json.ng14 +++ b/package.json.ng14 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "1.18.1", + "version": "1.19.0", "license": "MIT", "husky": { "hooks": { From 79de52d9fd62eed0d7c0d9624dd1c1281265dce0 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Wed, 17 Jul 2024 12:49:59 +0300 Subject: [PATCH 283/291] feat(chore): up version to 2.16.0 #000 --- .github/workflows/beta-publish-ng15.yml | 2 +- .github/workflows/main-publish-ng15.yml | 2 +- .github/workflows/pre-release-publish-ng15.yml | 2 +- apps/doc/src/app/version-manager/current.const.ts.ng15 | 2 +- apps/doc/src/app/version-manager/versions.constants.ts | 4 ++-- libs/ast/package.json.ng15 | 2 +- libs/charts/base/package.json.ng15 | 6 +++--- libs/components/package.json.ng15 | 10 +++++----- libs/core/package.json.ng15 | 2 +- libs/helpers/package.json.ng15 | 2 +- libs/i18n/package.json.ng15 | 2 +- libs/icons/base/package.json.ng15 | 4 ++-- libs/icons/flags/package.json.ng15 | 4 ++-- libs/nxmv/package.json.ng15 | 2 +- libs/plugin/package.json.ng15 | 4 ++-- libs/schematics/package.json.ng15 | 2 +- libs/theme/package.json.ng15 | 6 +++--- package.json.ng15 | 2 +- 18 files changed, 30 insertions(+), 30 deletions(-) diff --git a/.github/workflows/beta-publish-ng15.yml b/.github/workflows/beta-publish-ng15.yml index 986dd0ee17..f81b7abf18 100644 --- a/.github/workflows/beta-publish-ng15.yml +++ b/.github/workflows/beta-publish-ng15.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng15beta --json 2>/dev/null || echo '2.15.1-ng15beta.0') | jq '([.[] | select(startswith("2.15.1-ng15beta"))] | last // "2.15.1-ng15beta.0")' 2>/dev/null || echo '2.15.1-ng15beta.0' + (npm view @prizm-ui/components versions --tag ng15beta --json 2>/dev/null || echo '2.16.0-ng15beta.0') | jq '([.[] | select(startswith("2.16.0-ng15beta"))] | last // "2.16.0-ng15beta.0")' 2>/dev/null || echo '2.16.0-ng15beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng15.yml b/.github/workflows/main-publish-ng15.yml index 9c1cb16ff7..d216289de8 100644 --- a/.github/workflows/main-publish-ng15.yml +++ b/.github/workflows/main-publish-ng15.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_v2_version=$( - echo '2.15.1' + echo '2.16.0' ) echo "LAST_V2_VERSION=${last_v2_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng15.yml b/.github/workflows/pre-release-publish-ng15.yml index 43bee27a9f..afb7608423 100644 --- a/.github/workflows/pre-release-publish-ng15.yml +++ b/.github/workflows/pre-release-publish-ng15.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng15next --json 2>/dev/null || echo '2.15.1-ng15next.0') | jq '([.[] | select(startswith("2.15.1-ng15next"))] | last // "2.15.1-ng15next.0")' 2>/dev/null || echo '2.15.1-ng15next.0' + (npm view @prizm-ui/components versions --tag ng15next --json 2>/dev/null || echo '2.16.0-ng15next.0') | jq '([.[] | select(startswith("2.16.0-ng15next"))] | last // "2.16.0-ng15next.0")' 2>/dev/null || echo '2.16.0-ng15next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/apps/doc/src/app/version-manager/current.const.ts.ng15 b/apps/doc/src/app/version-manager/current.const.ts.ng15 index 9c1825ac33..d918baf8fc 100644 --- a/apps/doc/src/app/version-manager/current.const.ts.ng15 +++ b/apps/doc/src/app/version-manager/current.const.ts.ng15 @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '2.15.1'; +export const PRIZM_CURRENT_VERSION = '2.16.0'; diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index 9a7d2989e2..adaefbbb16 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -33,8 +33,8 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ }, }, { - label: '2.15.1 (ng15)', - version: '2.15.1', + label: '2.16.0 (ng15)', + version: '2.16.0', stackblitz: 'https://stackblitz.com/edit/prizm-v2-demo', link: getDocSite.bind(null, 'http://2.14.2.doc.prizm.site', 'https://prizm-v2.web.app'), otherLinks: [], diff --git a/libs/ast/package.json.ng15 b/libs/ast/package.json.ng15 index 113b5ce008..e73b0a01e1 100644 --- a/libs/ast/package.json.ng15 +++ b/libs/ast/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "2.15.1", + "version": "2.16.0", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json.ng15 b/libs/charts/base/package.json.ng15 index 5885f75bcc..d291e9f678 100644 --- a/libs/charts/base/package.json.ng15 +++ b/libs/charts/base/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "2.15.1", + "version": "2.16.0", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/theme": "^2.15.1", - "@prizm-ui/helpers": "^2.15.1", + "@prizm-ui/theme": "^2.16.0", + "@prizm-ui/helpers": "^2.16.0", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/package.json.ng15 b/libs/components/package.json.ng15 index bbd4ba0da1..8d25fc9b38 100644 --- a/libs/components/package.json.ng15 +++ b/libs/components/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "2.15.1", + "version": "2.16.0", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -18,10 +18,10 @@ "@ng-web-apis/resize-observer": "2.0.0", "@ng-web-apis/intersection-observer": "2.0.0", "@ng-web-apis/mutation-observer": "2.0.0", - "@prizm-ui/helpers": "^2.15.1", - "@prizm-ui/core": "^2.15.1", - "@prizm-ui/i18n": "^2.15.1", - "@prizm-ui/theme": "^2.15.1" + "@prizm-ui/helpers": "^2.16.0", + "@prizm-ui/core": "^2.16.0", + "@prizm-ui/i18n": "^2.16.0", + "@prizm-ui/theme": "^2.16.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json.ng15 b/libs/core/package.json.ng15 index cf2e87358c..29be5fcc08 100644 --- a/libs/core/package.json.ng15 +++ b/libs/core/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "2.15.1", + "version": "2.16.0", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json.ng15 b/libs/helpers/package.json.ng15 index 515750a5bb..d24cfe26db 100644 --- a/libs/helpers/package.json.ng15 +++ b/libs/helpers/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "2.15.1", + "version": "2.16.0", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json.ng15 b/libs/i18n/package.json.ng15 index db4a337614..45e4975619 100644 --- a/libs/i18n/package.json.ng15 +++ b/libs/i18n/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "2.15.1", + "version": "2.16.0", "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0" diff --git a/libs/icons/base/package.json.ng15 b/libs/icons/base/package.json.ng15 index 70f8dc225e..00056c0a28 100644 --- a/libs/icons/base/package.json.ng15 +++ b/libs/icons/base/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "2.15.1", + "version": "2.16.0", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/core": "^2.15.1" + "@prizm-ui/core": "^2.16.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json.ng15 b/libs/icons/flags/package.json.ng15 index c5a0fa833c..b1cc8ec8f2 100644 --- a/libs/icons/flags/package.json.ng15 +++ b/libs/icons/flags/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "2.15.1", + "version": "2.16.0", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/core": "^2.15.1" + "@prizm-ui/core": "^2.16.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json.ng15 b/libs/nxmv/package.json.ng15 index e2b944411a..bd40152af8 100644 --- a/libs/nxmv/package.json.ng15 +++ b/libs/nxmv/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "2.15.1", + "version": "2.16.0", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json.ng15 b/libs/plugin/package.json.ng15 index 1e0dc5ea0b..591321ca95 100644 --- a/libs/plugin/package.json.ng15 +++ b/libs/plugin/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "2.15.1", + "version": "2.16.0", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^2.15.1" + "@prizm-ui/ast": "^2.16.0" } } diff --git a/libs/schematics/package.json.ng15 b/libs/schematics/package.json.ng15 index 533b12baa4..e6565e4b16 100644 --- a/libs/schematics/package.json.ng15 +++ b/libs/schematics/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "2.15.1", + "version": "2.16.0", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json.ng15 b/libs/theme/package.json.ng15 index d141d39971..9fba86aaf1 100644 --- a/libs/theme/package.json.ng15 +++ b/libs/theme/package.json.ng15 @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "2.15.1", + "version": "2.16.0", "peerDependencies": { "@angular/common": "^15.2.0", "@angular/core": "^15.2.0", - "@prizm-ui/core": "^2.15.1", - "@prizm-ui/helpers": "^2.15.1" + "@prizm-ui/core": "^2.16.0", + "@prizm-ui/helpers": "^2.16.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json.ng15 b/package.json.ng15 index 7f0cbab369..4f35e6ccca 100644 --- a/package.json.ng15 +++ b/package.json.ng15 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "2.15.1", + "version": "2.16.0", "license": "MIT", "husky": { "hooks": { From 848ef361444a3af6f9bd2c402b287d9f1ba86004 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Wed, 17 Jul 2024 13:13:23 +0300 Subject: [PATCH 284/291] feat(chore): up version to 3.15.0 #000 --- .github/workflows/beta-publish-ng16.yml | 2 +- .github/workflows/main-publish-ng16.yml | 2 +- .github/workflows/pre-release-publish-ng16.yml | 2 +- apps/doc/src/app/version-manager/current.const.ts.ng16 | 2 +- apps/doc/src/app/version-manager/versions.constants.ts | 6 +++--- libs/ast/package.json.ng16 | 2 +- libs/charts/base/package.json.ng16 | 6 +++--- libs/components/package.json.ng16 | 10 +++++----- libs/core/package.json.ng16 | 2 +- libs/helpers/package.json.ng16 | 2 +- libs/i18n/package.json.ng16 | 2 +- libs/icons/base/package.json.ng16 | 4 ++-- libs/icons/flags/package.json.ng16 | 4 ++-- libs/nxmv/package.json.ng16 | 2 +- libs/plugin/package.json.ng16 | 4 ++-- libs/schematics/package.json.ng16 | 2 +- libs/theme/package.json.ng16 | 6 +++--- package.json.ng16 | 2 +- 18 files changed, 31 insertions(+), 31 deletions(-) diff --git a/.github/workflows/beta-publish-ng16.yml b/.github/workflows/beta-publish-ng16.yml index 990a06a0ea..589b7afaa2 100644 --- a/.github/workflows/beta-publish-ng16.yml +++ b/.github/workflows/beta-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_draft_version=$( - (npm view @prizm-ui/components versions --tag ng16beta --json 2>/dev/null || echo '3.14.1-beta.0') | jq '([.[] | select(startswith("3.14.1-beta"))] | last // "3.14.1-beta.0")' 2>/dev/null || echo '3.14.1-beta.0' + (npm view @prizm-ui/components versions --tag ng16beta --json 2>/dev/null || echo '3.15.0-beta.0') | jq '([.[] | select(startswith("3.15.0-beta"))] | last // "3.15.0-beta.0")' 2>/dev/null || echo '3.15.0-beta.0' ) echo "LAST_DRAFT_VERSION=${last_draft_version}" >> $GITHUB_ENV diff --git a/.github/workflows/main-publish-ng16.yml b/.github/workflows/main-publish-ng16.yml index 3e6f3d8879..79cf95f5f2 100644 --- a/.github/workflows/main-publish-ng16.yml +++ b/.github/workflows/main-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_v3_version=$( - echo '3.14.1' + echo '3.15.0' ) echo "LAST_V3_VERSION=${last_v3_version}" >> $GITHUB_ENV diff --git a/.github/workflows/pre-release-publish-ng16.yml b/.github/workflows/pre-release-publish-ng16.yml index 6fd7855d05..7884f96413 100644 --- a/.github/workflows/pre-release-publish-ng16.yml +++ b/.github/workflows/pre-release-publish-ng16.yml @@ -57,7 +57,7 @@ jobs: - name: Set up environment variables run: | last_next_version=$( - (npm view @prizm-ui/components versions --tag ng16next --json 2>/dev/null || echo '3.14.1-next.0') | jq '([.[] | select(startswith("3.14.1-next"))] | last // "3.14.1-next.0")' 2>/dev/null || echo '3.14.1-next.0' + (npm view @prizm-ui/components versions --tag ng16next --json 2>/dev/null || echo '3.15.0-next.0') | jq '([.[] | select(startswith("3.15.0-next"))] | last // "3.15.0-next.0")' 2>/dev/null || echo '3.15.0-next.0' ) echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV diff --git a/apps/doc/src/app/version-manager/current.const.ts.ng16 b/apps/doc/src/app/version-manager/current.const.ts.ng16 index e8d8931ec3..9ebcd2fa69 100644 --- a/apps/doc/src/app/version-manager/current.const.ts.ng16 +++ b/apps/doc/src/app/version-manager/current.const.ts.ng16 @@ -1 +1 @@ -export const PRIZM_CURRENT_VERSION = '3.14.1'; +export const PRIZM_CURRENT_VERSION = '3.15.0'; diff --git a/apps/doc/src/app/version-manager/versions.constants.ts b/apps/doc/src/app/version-manager/versions.constants.ts index adaefbbb16..3976e768de 100644 --- a/apps/doc/src/app/version-manager/versions.constants.ts +++ b/apps/doc/src/app/version-manager/versions.constants.ts @@ -23,10 +23,10 @@ export const PRIZM_VERSIONS_META: readonly PrizmVersionMeta[] = [ }, }, { - label: '3.14.1 (ng16)', - version: '3.14.1', + label: '3.15.0 (ng16)', + version: '3.15.0', stackblitz: 'https://stackblitz.com/edit/prizm-v3-demo', - link: getDocSite.bind(null, 'http://3.14.1.doc.prizm.site', 'https://prizm-v3.web.app'), + link: getDocSite.bind(null, 'http://3.15.0.doc.prizm.site', 'https://prizm-v3.web.app'), otherLinks: [new URL('https://prizm-v3.web.app')], cb: (hostName: string, current: PrizmVersionMeta) => { return hostName.startsWith('prizm-v3--'); diff --git a/libs/ast/package.json.ng16 b/libs/ast/package.json.ng16 index 80d06cad94..4b5bd23bb2 100644 --- a/libs/ast/package.json.ng16 +++ b/libs/ast/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/ast", - "version": "3.14.1", + "version": "3.15.0", "private": false, "publishConfig": { "access": "public", diff --git a/libs/charts/base/package.json.ng16 b/libs/charts/base/package.json.ng16 index fa2aa54444..1a4186debd 100644 --- a/libs/charts/base/package.json.ng16 +++ b/libs/charts/base/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/charts", - "version": "3.14.1", + "version": "3.15.0", "license": "MIT", "private": false, "publishConfig": { @@ -11,8 +11,8 @@ "lodash-es": "^4.17.21", "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/theme": "^3.14.1", - "@prizm-ui/helpers": "^3.14.1", + "@prizm-ui/theme": "^3.15.0", + "@prizm-ui/helpers": "^3.15.0", "@antv/g2plot": "^2.4.22" }, "dependencies": { diff --git a/libs/components/package.json.ng16 b/libs/components/package.json.ng16 index 6212a5589f..38587db8b6 100644 --- a/libs/components/package.json.ng16 +++ b/libs/components/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/components", - "version": "3.14.1", + "version": "3.15.0", "description": "Prizm UI system design components library http://prizm.zyfra.com", "license": "MIT", "private": false, @@ -18,10 +18,10 @@ "@ng-web-apis/resize-observer": "^3.0.0", "@ng-web-apis/intersection-observer": "^3.0.0", "@ng-web-apis/mutation-observer": "^3.0.0", - "@prizm-ui/helpers": "^3.14.1", - "@prizm-ui/core": "^3.14.1", - "@prizm-ui/i18n": "^3.14.1", - "@prizm-ui/theme": "^3.14.1" + "@prizm-ui/helpers": "^3.15.0", + "@prizm-ui/core": "^3.15.0", + "@prizm-ui/i18n": "^3.15.0", + "@prizm-ui/theme": "^3.15.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/core/package.json.ng16 b/libs/core/package.json.ng16 index 4927ae4e55..a783266d02 100644 --- a/libs/core/package.json.ng16 +++ b/libs/core/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/core", - "version": "3.14.1", + "version": "3.15.0", "license": "MIT", "description": "The main library for creating Angular components and elements using Prizm.", "private": false, diff --git a/libs/helpers/package.json.ng16 b/libs/helpers/package.json.ng16 index cdf1eec1a5..af79af6e55 100644 --- a/libs/helpers/package.json.ng16 +++ b/libs/helpers/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/helpers", - "version": "3.14.1", + "version": "3.15.0", "license": "MIT", "description": "Library to make it easy to create Angular applications. Contains Injectables Service, RxJS utilities, directives, and standard pipes.", "private": false, diff --git a/libs/i18n/package.json.ng16 b/libs/i18n/package.json.ng16 index 7afdbbc84f..4a67d21533 100644 --- a/libs/i18n/package.json.ng16 +++ b/libs/i18n/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/i18n", - "version": "3.14.1", + "version": "3.15.0", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0" diff --git a/libs/icons/base/package.json.ng16 b/libs/icons/base/package.json.ng16 index 07e58bbd5d..ba189c82e1 100644 --- a/libs/icons/base/package.json.ng16 +++ b/libs/icons/base/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/icons", - "version": "3.14.1", + "version": "3.15.0", "description": "Prizm UI base icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.14.1" + "@prizm-ui/core": "^3.15.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/icons/flags/package.json.ng16 b/libs/icons/flags/package.json.ng16 index 12ede225db..67d6b2879f 100644 --- a/libs/icons/flags/package.json.ng16 +++ b/libs/icons/flags/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/flag-icons", - "version": "3.14.1", + "version": "3.15.0", "description": "Prizm UI flags icon pack library http://prizm.zyfra.com", "private": false, "publishConfig": { @@ -10,7 +10,7 @@ "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.14.1" + "@prizm-ui/core": "^3.15.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/libs/nxmv/package.json.ng16 b/libs/nxmv/package.json.ng16 index 9aecce1b29..3d3f00ce8b 100644 --- a/libs/nxmv/package.json.ng16 +++ b/libs/nxmv/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-mv", - "version": "3.14.1", + "version": "3.15.0", "main": "src/index.js", "private": false, "publishConfig": { diff --git a/libs/plugin/package.json.ng16 b/libs/plugin/package.json.ng16 index 2cc26984f2..bd8d79cc61 100644 --- a/libs/plugin/package.json.ng16 +++ b/libs/plugin/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/nx-plugin", - "version": "3.14.1", + "version": "3.15.0", "main": "src/index.js", "private": false, "publishConfig": { @@ -10,6 +10,6 @@ "generators": "./generators.json", "executors": "./executors.json", "peerDependencies": { - "@prizm-ui/ast": "^3.14.1" + "@prizm-ui/ast": "^3.15.0" } } diff --git a/libs/schematics/package.json.ng16 b/libs/schematics/package.json.ng16 index bab785b73a..f793071a61 100644 --- a/libs/schematics/package.json.ng16 +++ b/libs/schematics/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/install", - "version": "3.14.1", + "version": "3.15.0", "description": "Package installer @prizm-ui/* , Angular schematic ng-add", "schematics": "./src/collection.json", "private": false, diff --git a/libs/theme/package.json.ng16 b/libs/theme/package.json.ng16 index b469758042..9778a1584e 100644 --- a/libs/theme/package.json.ng16 +++ b/libs/theme/package.json.ng16 @@ -1,11 +1,11 @@ { "name": "@prizm-ui/theme", - "version": "3.14.1", + "version": "3.15.0", "peerDependencies": { "@angular/common": "^16.1.0 || ^16.2.0", "@angular/core": "^16.1.0 || ^16.2.0", - "@prizm-ui/core": "^3.14.1", - "@prizm-ui/helpers": "^3.14.1" + "@prizm-ui/core": "^3.15.0", + "@prizm-ui/helpers": "^3.15.0" }, "dependencies": { "tslib": "^2.3.0" diff --git a/package.json.ng16 b/package.json.ng16 index da5e55913c..3d5c376180 100644 --- a/package.json.ng16 +++ b/package.json.ng16 @@ -1,6 +1,6 @@ { "name": "@prizm-ui/sdk", - "version": "3.14.1", + "version": "3.15.0", "license": "MIT", "husky": { "hooks": { From 966e03eef558af4315be8e7157a665f6f9d7d513 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Wed, 17 Jul 2024 13:18:21 +0300 Subject: [PATCH 285/291] feat(doc/changelog): update changelog #000 --- apps/doc/src/app/about-prizm/changelog/CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index 09193ffa95..9b6628de98 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -2,6 +2,17 @@ All notable changes to this project will be documented in this file. +## [1.19.0, 2.15.0, 3.15.0](https://github.com/zyfra/Prizm) (18-07-2024) + +### Features + +- feat(components/paginator): update paginator dictionary #1840 BREAKING CHANGE in dictionary -[here](https://github.com/zyfra/Prizm/discussions/1617) + +### Bug Fixes + +- fix(components/switcher): add async example for issue #1476 +- fix(components/tree): incorrect markup fix #1742 Note: markup is update can affect tree component in project + ## [1.18.1, 2.15.1, 3.14.1](https://github.com/zyfra/Prizm) (20-06-2024) ### Bug Fixes From e834f56c0d8736b759a6ba4b37be7c0076334a87 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Fri, 19 Jul 2024 14:35:40 +0300 Subject: [PATCH 286/291] fix(components/input-text): incorrect behavior occurring in PrizmInputComponent when NgxMaskDirective is applied and the value changes from an empty state. #1190 --- .../input/input-text/input-block.component.ts | 7 ++- .../input/input-text/input-text.component.ts | 41 +++++++------- .../input-text/input-text.component.ts.ng14 | 56 ++++++++++--------- .../input-text/input-text.component.ts.ng15 | 53 +++++++++--------- .../input-text/input-text.component.ts.ng16 | 41 +++++++------- 5 files changed, 99 insertions(+), 99 deletions(-) diff --git a/libs/components/src/lib/components/input/input-text/input-block.component.ts b/libs/components/src/lib/components/input/input-text/input-block.component.ts index 60eb85f986..017c509c75 100644 --- a/libs/components/src/lib/components/input/input-text/input-block.component.ts +++ b/libs/components/src/lib/components/input/input-text/input-block.component.ts @@ -1,4 +1,4 @@ -import { ChangeDetectorRef, Component, ElementRef, Optional, Self } from '@angular/core'; +import { ChangeDetectorRef, Component, ElementRef, Optional, Renderer2, Self } from '@angular/core'; import { ControlValueAccessor, NgControl } from '@angular/forms'; import { PrizmDestroyService } from '@prizm-ui/helpers'; import { PrizmInputControl } from '../common/base/input-control.class'; @@ -43,9 +43,10 @@ export class PrizmInputBlockComponent extends PrizmInputTextComponent implements @Optional() @Self() public readonly ngControl_: NgControl, public readonly elementRef_: ElementRef, private readonly destroy_: PrizmDestroyService, - private readonly cdr_: ChangeDetectorRef + private readonly cdr_: ChangeDetectorRef, + private readonly renderer_: Renderer2 ) { - super(ngControl_, elementRef_, destroy_, cdr_); + super(ngControl_, elementRef_, destroy_, cdr_, renderer_); if (this.ngControl != null) { this.ngControl.valueAccessor = this; diff --git a/libs/components/src/lib/components/input/input-text/input-text.component.ts b/libs/components/src/lib/components/input/input-text/input-text.component.ts index eddd77a411..b39486f1c7 100644 --- a/libs/components/src/lib/components/input/input-text/input-text.component.ts +++ b/libs/components/src/lib/components/input/input-text/input-text.component.ts @@ -12,6 +12,7 @@ import { OnInit, Optional, Output, + Renderer2, Self, } from '@angular/core'; import { NgControl, NgModel, UntypedFormControl, Validators } from '@angular/forms'; @@ -113,7 +114,7 @@ export class PrizmInputTextComponent, private readonly destroy: PrizmDestroyService, - private readonly cdr: ChangeDetectorRef + private readonly cdr: ChangeDetectorRef, + private readonly renderer2_: Renderer2 ) { super(); this.nativeElementType = elementRef.nativeElement.type; @@ -205,14 +207,6 @@ export class PrizmInputTextComponent, private readonly destroy: PrizmDestroyService, - private readonly cdr: ChangeDetectorRef + private readonly cdr: ChangeDetectorRef, + private readonly renderer2_: Renderer2, ) { super(); this.nativeElementType = elementRef.nativeElement.type; @@ -183,7 +190,7 @@ export class PrizmInputTextComponent { - this.maybeMask, this.maybeMask?.writeValue(null as any); + this.maybeMask?.writeValue(null as any); }), takeUntil(this.destroy) ) @@ -200,14 +207,6 @@ export class PrizmInputTextComponent, private readonly destroy: PrizmDestroyService, - private readonly cdr: ChangeDetectorRef + private readonly cdr: ChangeDetectorRef, + private readonly renderer2_: Renderer2, ) { super(); this.nativeElementType = elementRef.nativeElement.type; @@ -182,7 +190,7 @@ export class PrizmInputTextComponent { - this.maybeMask, this.maybeMask?.writeValue(null as any); + this.maybeMask?.writeValue(null as any); }), takeUntil(this.destroy) ) @@ -199,14 +207,6 @@ export class PrizmInputTextComponent, private readonly destroy: PrizmDestroyService, - private readonly cdr: ChangeDetectorRef + private readonly cdr: ChangeDetectorRef, + private readonly renderer2_: Renderer2, ) { super(); this.nativeElementType = elementRef.nativeElement.type; @@ -205,14 +207,6 @@ export class PrizmInputTextComponent Date: Fri, 19 Jul 2024 14:39:22 +0300 Subject: [PATCH 287/291] fix(components/input-text): for ng14 #000\ --- .../input/input-text/input-text.component.ts.ng14 | 10 +++++----- .../input/input-text/input-text.component.ts.ng15 | 3 +-- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/libs/components/src/lib/components/input/input-text/input-text.component.ts.ng14 b/libs/components/src/lib/components/input/input-text/input-text.component.ts.ng14 index f215f14610..deabe5fb13 100644 --- a/libs/components/src/lib/components/input/input-text/input-text.component.ts.ng14 +++ b/libs/components/src/lib/components/input/input-text/input-text.component.ts.ng14 @@ -15,13 +15,12 @@ import { Renderer2, Self, } from '@angular/core'; -import { NgControl, NgModel, UntypedFormControl, Validators } from '@angular/forms'; +import { NgControl, Validators } from '@angular/forms'; import { PrizmDestroyService } from '@prizm-ui/helpers'; import { takeUntil, tap } from 'rxjs/operators'; import { PrizmInputControl } from '../common/base/input-control.class'; import { PrizmInputHintDirective, PrizmInputLayoutComponent } from '../common'; -import { NgxMaskDirective } from 'ngx-mask'; -import { timer } from 'rxjs'; +import { MaskDirective } from 'ngx-mask'; @Component({ selector: @@ -75,6 +74,7 @@ export class PrizmInputTextComponent Date: Mon, 22 Jul 2024 11:51:17 +0300 Subject: [PATCH 288/291] feat(doc): changelog update #000 --- apps/doc/src/app/about-prizm/changelog/CHANGELOG.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index 9b6628de98..912d2e294d 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -2,7 +2,7 @@ All notable changes to this project will be documented in this file. -## [1.19.0, 2.15.0, 3.15.0](https://github.com/zyfra/Prizm) (18-07-2024) +## [1.19.0, 2.15.0, 3.15.0](https://github.com/zyfra/Prizm) (22-07-2024) ### Features @@ -10,8 +10,10 @@ All notable changes to this project will be documented in this file. ### Bug Fixes -- fix(components/switcher): add async example for issue #1476 +- fix(components/switcher): fix async support for selected switcher #1476 - fix(components/tree): incorrect markup fix #1742 Note: markup is update can affect tree component in project +- fix(components/input-text): incorrect behavior occurring in PrizmInputComponent when NgxMaskDirective is applied and the value changes from an empty state. #1190 +- fix(components/multiselect): checkboxes are blinking on elements click #1718 ## [1.18.1, 2.15.1, 3.14.1](https://github.com/zyfra/Prizm) (20-06-2024) From 46677e962f1beda1331c931c3b1662fd64b8b923 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 22 Jul 2024 16:07:21 +0300 Subject: [PATCH 289/291] fix(components/switcher): write value error fixed #000 --- .../switcher-basic-example.component.html | 4 ++++ .../switcher-basic-example.component.ts | 4 ++++ .../src/lib/components/switcher/switcher.component.ts | 9 ++++++++- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/apps/doc/src/app/components/switcher/examples/switcher-basic-example/switcher-basic-example.component.html b/apps/doc/src/app/components/switcher/examples/switcher-basic-example/switcher-basic-example.component.html index 5d451f2ff0..e05a7715ae 100644 --- a/apps/doc/src/app/components/switcher/examples/switcher-basic-example/switcher-basic-example.component.html +++ b/apps/doc/src/app/components/switcher/examples/switcher-basic-example/switcher-basic-example.component.html @@ -3,3 +3,7 @@
    Value: {{ control.value }}
    + +
    + + diff --git a/apps/doc/src/app/components/switcher/examples/switcher-basic-example/switcher-basic-example.component.ts b/apps/doc/src/app/components/switcher/examples/switcher-basic-example/switcher-basic-example.component.ts index 83ecc7ad7b..6e88a6201f 100644 --- a/apps/doc/src/app/components/switcher/examples/switcher-basic-example/switcher-basic-example.component.ts +++ b/apps/doc/src/app/components/switcher/examples/switcher-basic-example/switcher-basic-example.component.ts @@ -27,4 +27,8 @@ export class SwitcherBasicExampleComponent { }, ]; public readonly control = new FormControl(1); + + public updateValue() { + this.control.setValue(3); + } } diff --git a/libs/components/src/lib/components/switcher/switcher.component.ts b/libs/components/src/lib/components/switcher/switcher.component.ts index 5274d71f88..8306bdf97d 100644 --- a/libs/components/src/lib/components/switcher/switcher.component.ts +++ b/libs/components/src/lib/components/switcher/switcher.component.ts @@ -98,7 +98,14 @@ export class PrizmSwitcherComponent extends PrizmAbstractTestId implements Contr } public writeValue(idx: string): void { - this.selectedSwitcherIdx = parseInt(idx); + const selectedSwitcherIdx = parseInt(idx); + if (!this.isIndexValid(selectedSwitcherIdx, this.switchers)) { + this.logIndexValidationError("value is out of bound and can't be set"); + return; + } + + this.selectedSwitcherIdx_ = selectedSwitcherIdx; + this.cdRef.markForCheck(); } public registerOnChange(fn: (value: number) => void): void { this.onChange = fn; From 852d4994b79292886bdb54eaf54186b580a40e63 Mon Sep 17 00:00:00 2001 From: "darina.reynish@idp.zyfra.com" Date: Mon, 22 Jul 2024 17:00:06 +0300 Subject: [PATCH 290/291] feat(doc): changelog update #000 --- apps/doc/src/app/about-prizm/changelog/CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md index 912d2e294d..40428b3afa 100644 --- a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md +++ b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md @@ -14,6 +14,7 @@ All notable changes to this project will be documented in this file. - fix(components/tree): incorrect markup fix #1742 Note: markup is update can affect tree component in project - fix(components/input-text): incorrect behavior occurring in PrizmInputComponent when NgxMaskDirective is applied and the value changes from an empty state. #1190 - fix(components/multiselect): checkboxes are blinking on elements click #1718 +- fix(components/switcher): write value error fixed #1890 ## [1.18.1, 2.15.1, 3.14.1](https://github.com/zyfra/Prizm) (20-06-2024) From 148ce50d607f0b8fa22f574d7a3afdbfc7ac7d84 Mon Sep 17 00:00:00 2001 From: Zurab Developer <75216044+ZurabDev@users.noreply.github.com> Date: Mon, 9 Dec 2024 09:28:51 +0300 Subject: [PATCH 291/291] fix: check input-number #1142 --- .../input-number-basic-example.component.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/doc/src/app/components/input/input-number/examples/input-number-basic-example/input-number-basic-example.component.ts b/apps/doc/src/app/components/input/input-number/examples/input-number-basic-example/input-number-basic-example.component.ts index 4ec5ffecbd..aa31a3538e 100644 --- a/apps/doc/src/app/components/input/input-number/examples/input-number-basic-example/input-number-basic-example.component.ts +++ b/apps/doc/src/app/components/input/input-number/examples/input-number-basic-example/input-number-basic-example.component.ts @@ -8,5 +8,5 @@ import { UntypedFormControl, Validators } from '@angular/forms'; changeDetection: ChangeDetectionStrategy.OnPush, }) export class InputNumberBasicExampleComponent { - public requiredInputControl = new UntypedFormControl(2, Validators.required); + public requiredInputControl = new UntypedFormControl(2); }
    КодКод НаименованиеКатегорияКоличествоКатегорияКоличество
    @@ -20,6 +20,16 @@ >
    + + +