Merge pull request #1311 from zyfra/feat/release-3.10.0-main

feat: merge changes from 3.10.0
zyfra · Jan 19, 2024 · 939eda6 · 939eda6
2 parents 3437840 + 23a529d
commit 939eda6
Show file tree

Hide file tree

Showing 60 changed files with 125 additions and 122 deletions.
diff --git 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.13.0-ng14beta.0') | jq '([.[] | select(startswith("1.13.0-ng14beta"))] | last // "1.13.0-ng14beta.0")' 2>/dev/null || echo '1.13.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
@@ -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.10.0-ng15beta.0') | jq '([.[] | select(startswith("2.10.0-ng15beta"))] | last // "2.10.0-ng15beta.0")' 2>/dev/null || echo '2.10.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
@@ -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.9.0-beta.0') | jq '([.[] | select(startswith("3.9.0-beta"))] | last // "3.9.0-beta.0")' 2>/dev/null || echo '3.9.0-beta.0'
+ (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'
  )
  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
@@ -58,7 +58,7 @@ jobs:
  - name: Set up environment variables
  run: |
  last_v1_version=$(
- echo '1.13.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
@@ -57,7 +57,7 @@ jobs:
  - name: Set up environment variables
  run: |
  last_v2_version=$(
- echo '2.10.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
@@ -57,7 +57,7 @@ jobs:
  - name: Set up environment variables
  run: |
  last_v3_version=$(
- echo '3.9.0'
+ echo '3.10.0'
  )
  echo "LAST_V3_VERSION=${last_v3_version}" >> $GITHUB_ENV
 

diff --git 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.13.0-ng14next.0') | jq '([.[] | select(startswith("1.13.0-ng14next"))] | last // "1.13.0-ng14next.0")' 2>/dev/null || echo '1.13.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
@@ -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.10.0-ng15next.0') | jq '([.[] | select(startswith("2.10.0-ng15next"))] | last // "2.10.0-ng15next.0")' 2>/dev/null || echo '2.10.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
@@ -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.9.0-next.0') | jq '([.[] | select(startswith("3.9.0-next"))] | last // "3.9.0-next.0")' 2>/dev/null || echo '3.9.0-next.0'
+ (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'
  )
  echo "LAST_NEXT_VERSION=${last_next_version}" >> $GITHUB_ENV
 

diff --git a/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md b/apps/doc/src/app/about-prizm/changelog/CHANGELOG.md
@@ -2,6 +2,18 @@
 
 All notable changes to this project will be documented in this file.
 
+## [1.14.0, 2.11.0, 3.10.0](https:/zyfra/Prizm) (19-01-2023)
+
+## Features
+
+- feat(doc): save current theme in local storage on change
+
+### Bug fixes
+
+- fix(theme/service): recognize current theme #1287 #1292
+- fix(components/tabs): set stacking context to isolate #1291
+- fix(components/input-text): show status on clear required fields #1284
+
 ## [4.0.0-rc.1](https:/zyfra/Prizm) (15-01-2024)
 
 ## Features

diff --git a/apps/doc/src/app/logo/logo.component.ts b/apps/doc/src/app/logo/logo.component.ts
@@ -30,6 +30,7 @@ export class LogoComponent {
  }
 
  public onMode(isNight: boolean): void {
+ this.storage.setItem(`night`, isNight ? 'true' : 'false');
  this.themeSwitcher.update(isNight ? 'dark' : 'light');
  }
 }

diff --git 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.13.0';
+export const PRIZM_CURRENT_VERSION = '1.14.0';
diff --git 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.10.0';
+export const PRIZM_CURRENT_VERSION = '2.11.0';
diff --git 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.9.0';
+export const PRIZM_CURRENT_VERSION = '3.10.0';
diff --git a/libs/ast/package.json.ng14 b/libs/ast/package.json.ng14
@@ -1,6 +1,6 @@
 {
  "name": "@prizm-ui/ast",
- "version": "1.13.0",
+ "version": "1.14.0",
  "private": false,
  "publishConfig": {
  "access": "public",

diff --git a/libs/ast/package.json.ng15 b/libs/ast/package.json.ng15
@@ -1,6 +1,6 @@
 {
  "name": "@prizm-ui/ast",
- "version": "2.10.0",
+ "version": "2.11.0",
  "private": false,
  "publishConfig": {
  "access": "public",

diff --git a/libs/ast/package.json.ng16 b/libs/ast/package.json.ng16
@@ -1,6 +1,6 @@
 {
  "name": "@prizm-ui/ast",
- "version": "3.9.0",
+ "version": "3.10.0",
  "private": false,
  "publishConfig": {
  "access": "public",

diff --git a/libs/charts/base/package.json.ng14 b/libs/charts/base/package.json.ng14
@@ -1,6 +1,6 @@
 {
  "name": "@prizm-ui/charts",
- "version": "1.13.0",
+ "version": "1.14.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.13.0",
- "@prizm-ui/helpers": "^1.13.0",
+ "@prizm-ui/theme": "^1.14.0",
+ "@prizm-ui/helpers": "^1.14.0",
  "@antv/g2plot": "^2.4.22"
  },
  "dependencies": {

diff --git a/libs/charts/base/package.json.ng15 b/libs/charts/base/package.json.ng15
@@ -1,6 +1,6 @@
 {
  "name": "@prizm-ui/charts",
- "version": "2.10.0",
+ "version": "2.11.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.10.0",
- "@prizm-ui/helpers": "^2.10.0",
+ "@prizm-ui/theme": "^2.11.0",
+ "@prizm-ui/helpers": "^2.11.0",
  "@antv/g2plot": "^2.4.22"
  },
  "dependencies": {

diff --git a/libs/charts/base/package.json.ng16 b/libs/charts/base/package.json.ng16
@@ -1,6 +1,6 @@
 {
  "name": "@prizm-ui/charts",
- "version": "3.9.0",
+ "version": "3.10.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.9.0",
- "@prizm-ui/helpers": "^3.9.0",
+ "@prizm-ui/theme": "^3.10.0",
+ "@prizm-ui/helpers": "^3.10.0",
  "@antv/g2plot": "^2.4.22"
  },
  "dependencies": {

diff --git a/libs/components/package.json.ng14 b/libs/components/package.json.ng14
@@ -1,6 +1,6 @@
 {
  "name": "@prizm-ui/components",
- "version": "1.13.0",
+ "version": "1.14.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.13.0",
- "@prizm-ui/core": "^1.13.0",
- "@prizm-ui/i18n": "^1.13.0",
- "@prizm-ui/theme": "^1.13.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"
  },
  "dependencies": {
  "tslib": "^2.3.0"

diff --git a/libs/components/package.json.ng15 b/libs/components/package.json.ng15
@@ -1,6 +1,6 @@
 {
  "name": "@prizm-ui/components",
- "version": "2.10.0",
+ "version": "2.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": "2.0.0",
  "@ng-web-apis/intersection-observer": "2.0.0",
  "@ng-web-apis/mutation-observer": "2.0.0",
- "@prizm-ui/helpers": "^2.10.0",
- "@prizm-ui/core": "^2.10.0",
- "@prizm-ui/i18n": "^2.10.0",
- "@prizm-ui/theme": "^2.10.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"
  },
  "dependencies": {
  "tslib": "^2.3.0"

diff --git a/libs/components/package.json.ng16 b/libs/components/package.json.ng16
@@ -1,6 +1,6 @@
 {
  "name": "@prizm-ui/components",
- "version": "3.9.0",
+ "version": "3.10.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.9.0",
- "@prizm-ui/core": "^3.9.0",
- "@prizm-ui/i18n": "^3.9.0",
- "@prizm-ui/theme": "^3.9.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"
  },
  "dependencies": {
  "tslib": "^2.3.0"

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
@@ -20,6 +20,7 @@ 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';
 
 @Component({
  selector:
@@ -183,7 +184,7 @@ export class PrizmInputTextComponent<VALUE extends string | number | null = stri
  this.parentLayout?.clear
  .pipe(
  tap(() => {
- this.maybeMask, this.maybeMask?.writeValue(null as any);
+ this.maybeMask?.writeValue(null as any);
  }),
  takeUntil(this.destroy)
  )
@@ -279,14 +280,10 @@ export class PrizmInputTextComponent<VALUE extends string | number | null = stri
 
  this.updateValue(null as VALUE);
 
- this.ngControl?.control?.markAsDirty();
-
  this.updateEmptyState();
  this.updateErrorState();
 
- this.focus();
-
- this.stateChanges.next();
+ this.markControl({ touched: true, dirty: true });
  this.onClear.emit(event);
  this.valueChanged.next('' as VALUE);
 
@@ -318,7 +315,6 @@ export class PrizmInputTextComponent<VALUE extends string | number | null = stri
  }
 
  public markAsTouched(): void {
- if (this.ngControl?.control instanceof UntypedFormControl) this.ngControl.control.markAsTouched();
- else this._touched = true;
+ this.markControl({ touched: true });
  }
 }
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
@@ -279,14 +279,10 @@ export class PrizmInputTextComponent<VALUE extends string | number | null = stri
 
  this.updateValue(null as VALUE);
 
- this.ngControl?.control?.markAsDirty();
-
  this.updateEmptyState();
  this.updateErrorState();
 
- this.focus();
-
- this.stateChanges.next();
+ this.markControl({ touched: true, dirty: true });
  this.onClear.emit(event);
  this.valueChanged.next('' as VALUE);
 
@@ -318,7 +314,6 @@ export class PrizmInputTextComponent<VALUE extends string | number | null = stri
  }
 
  public markAsTouched(): void {
- if (this.ngControl?.control instanceof UntypedFormControl) this.ngControl.control.markAsTouched();
- else this._touched = true;
+ this.markControl({ touched: true });
  }
 }
diff --git a/libs/components/src/lib/components/input/input-text/input-text.component.ts.ng15 b/libs/components/src/lib/components/input/input-text/input-text.component.ts.ng15
@@ -278,14 +278,10 @@ export class PrizmInputTextComponent<VALUE extends string | number | null = stri
 
  this.updateValue(null as VALUE);
 
- this.ngControl?.control?.markAsDirty();
-
  this.updateEmptyState();
  this.updateErrorState();
 
- this.focus();
-
- this.stateChanges.next();
+ this.markControl({ touched: true, dirty: true });
  this.onClear.emit(event);
  this.valueChanged.next('' as VALUE);
 
@@ -317,7 +313,6 @@ export class PrizmInputTextComponent<VALUE extends string | number | null = stri
  }
 
  public markAsTouched(): void {
- if (this.ngControl?.control instanceof UntypedFormControl) this.ngControl.control.markAsTouched();
- else this._touched = true;
+ this.markControl({ touched: true });
  }
 }