From 71fc54c66fd791b187ec5bd9d79e6b0c4c027b71 Mon Sep 17 00:00:00 2001 From: govindrgraj Date: Wed, 18 Jan 2023 22:07:42 +0530 Subject: [PATCH 01/20] Update package.json 216 build server not supported the NPM and Node and NVM versions. Hence not able to continue our build process... --- projects/dxc-ngx-cdk/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/dxc-ngx-cdk/package.json b/projects/dxc-ngx-cdk/package.json index 20f80cc00..1332cbbe2 100644 --- a/projects/dxc-ngx-cdk/package.json +++ b/projects/dxc-ngx-cdk/package.json @@ -1,6 +1,6 @@ { "name": "@dxc-technology/halstack-angular", - "version": "4.1.0", + "version": "3.2.0", "description": "DXC Angular CDK (Component Development Kit) based on Graphen Design System", "scripts": { "build-lib": "ng build dxc-ngx-cdk", From 87446c090950cf53a5f9c31dde9f7495146c848e Mon Sep 17 00:00:00 2001 From: Deb Date: Wed, 18 Jan 2023 22:11:44 +0530 Subject: [PATCH 02/20] version changes after build --- projects/dxc-ngx-cdk/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/dxc-ngx-cdk/package.json b/projects/dxc-ngx-cdk/package.json index 1332cbbe2..2a73495c5 100644 --- a/projects/dxc-ngx-cdk/package.json +++ b/projects/dxc-ngx-cdk/package.json @@ -1,6 +1,6 @@ { "name": "@dxc-technology/halstack-angular", - "version": "3.2.0", + "version": "3.3.0", "description": "DXC Angular CDK (Component Development Kit) based on Graphen Design System", "scripts": { "build-lib": "ng build dxc-ngx-cdk", From 205d8b14e28b1a36a24d4b75bd3ae72dd4402980 Mon Sep 17 00:00:00 2001 From: govindrgraj Date: Thu, 19 Jan 2023 12:11:42 +0530 Subject: [PATCH 03/20] Update package.json --- projects/dxc-ngx-cdk/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/dxc-ngx-cdk/package.json b/projects/dxc-ngx-cdk/package.json index 2a73495c5..4ca6b86a1 100644 --- a/projects/dxc-ngx-cdk/package.json +++ b/projects/dxc-ngx-cdk/package.json @@ -1,6 +1,6 @@ { "name": "@dxc-technology/halstack-angular", - "version": "3.3.0", + "version": "4.0.0", "description": "DXC Angular CDK (Component Development Kit) based on Graphen Design System", "scripts": { "build-lib": "ng build dxc-ngx-cdk", From 31c3be4ace823e3265c2b918f768fc800a768872 Mon Sep 17 00:00:00 2001 From: Deb Date: Thu, 19 Jan 2023 12:15:07 +0530 Subject: [PATCH 04/20] version changes after build --- projects/dxc-ngx-cdk/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/dxc-ngx-cdk/package.json b/projects/dxc-ngx-cdk/package.json index 4ca6b86a1..20f80cc00 100644 --- a/projects/dxc-ngx-cdk/package.json +++ b/projects/dxc-ngx-cdk/package.json @@ -1,6 +1,6 @@ { "name": "@dxc-technology/halstack-angular", - "version": "4.0.0", + "version": "4.1.0", "description": "DXC Angular CDK (Component Development Kit) based on Graphen Design System", "scripts": { "build-lib": "ng build dxc-ngx-cdk", From 3dbad06dd5a2874a5aaac751b2c526d1441dd8d3 Mon Sep 17 00:00:00 2001 From: assureclaims <84139537+assureclaims@users.noreply.github.com> Date: Fri, 20 Jan 2023 16:49:31 +0530 Subject: [PATCH 05/20] multi line label issues with select component --- .../src/lib/dxc-select/select.scss | 19 +++++++++++++------ .../dxc-ngx-cdk/src/lib/dxc-select/select.ts | 10 ++++------ 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/projects/dxc-ngx-cdk/src/lib/dxc-select/select.scss b/projects/dxc-ngx-cdk/src/lib/dxc-select/select.scss index 2b579d94a..4a0cb9794 100644 --- a/projects/dxc-ngx-cdk/src/lib/dxc-select/select.scss +++ b/projects/dxc-ngx-cdk/src/lib/dxc-select/select.scss @@ -13,9 +13,10 @@ $mat-select-placeholder-arrow-space: 2 * ($mat-select-arrow-size + $mat-select-arrow-margin); .mat-select { - display: inline-block; + // display: inline-block; width: 100%; outline: none; + border-bottom: 1px solid var(--select-color); } .mat-select-trigger { @@ -32,13 +33,18 @@ $mat-select-placeholder-arrow-space: 2 * } .mat-select-value { - display: table-cell; - max-width: 0; - width: 100%; + // display: table-cell; + // max-width: 0; + // width: 100%; + // overflow: hidden; + // text-overflow: ellipsis; + // white-space: nowrap; + // vertical-align: middle; + display:inline-block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; - vertical-align: middle; + min-width: calc(100% - 1rem); } .mat-select-value-text { @@ -46,7 +52,8 @@ $mat-select-placeholder-arrow-space: 2 * } .mat-select-arrow-wrapper { - display: table-cell; + // display: table-cell; + width: 1rem; vertical-align: middle; // When used in a box appearance form-field the arrow should be shifted up 50%. diff --git a/projects/dxc-ngx-cdk/src/lib/dxc-select/select.ts b/projects/dxc-ngx-cdk/src/lib/dxc-select/select.ts index 4184ca481..cb2a00a2b 100644 --- a/projects/dxc-ngx-cdk/src/lib/dxc-select/select.ts +++ b/projects/dxc-ngx-cdk/src/lib/dxc-select/select.ts @@ -1306,14 +1306,12 @@ export abstract class _MatSelectBase &.mat-select { ${this.utils.calculateWidth(this.sizes, this)} } - height: 66.5px; position: relative; &.mat-select-disabled { cursor: not-allowed; .mat-select-trigger { cursor: not-allowed; - border-bottom: 1px solid var(--select-disabledColor) !important; outline: none !important; } .assistiveText { @@ -1349,10 +1347,10 @@ export abstract class _MatSelectBase } .mat-select-trigger { - border-top-width: 0.84375em; - border-top-style: solid; - border-top-color: transparent; - border-bottom: 1px solid var(--select-color); + // border-top-width: 0.84375em; + // border-top-style: solid; + // border-top-color: transparent; + //border-bottom: 1px solid var(--select-color); :focus{ outline: -webkit-focus-ring-color auto 1px; outline-color: var(--select-focusColor); From fa2bcf0c2ad352d6848e8772c7de8fd1628b2fbc Mon Sep 17 00:00:00 2001 From: assureclaims <84139537+assureclaims@users.noreply.github.com> Date: Fri, 20 Jan 2023 17:56:09 +0530 Subject: [PATCH 06/20] multi line label issue for select control fixed --- projects/dxc-ngx-cdk/src/lib/dxc-select/select.ts | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/projects/dxc-ngx-cdk/src/lib/dxc-select/select.ts b/projects/dxc-ngx-cdk/src/lib/dxc-select/select.ts index cb2a00a2b..df4632e4f 100644 --- a/projects/dxc-ngx-cdk/src/lib/dxc-select/select.ts +++ b/projects/dxc-ngx-cdk/src/lib/dxc-select/select.ts @@ -1305,14 +1305,20 @@ export abstract class _MatSelectBase ${this.utils.getMargins(this.margin)} &.mat-select { ${this.utils.calculateWidth(this.sizes, this)} + .mat-select-trigger { + .mat-select-arrow { + margin: 0.9rem 0 0 0!important; + } } position: relative; &.mat-select-disabled { cursor: not-allowed; + border-bottom: 1px solid var(--select-disabledColor) !important; .mat-select-trigger { cursor: not-allowed; outline: none !important; + } .assistiveText { color: var(--select-disabledColor) !important; @@ -1351,7 +1357,7 @@ export abstract class _MatSelectBase // border-top-style: solid; // border-top-color: transparent; //border-bottom: 1px solid var(--select-color); - :focus{ + :focus { outline: -webkit-focus-ring-color auto 1px; outline-color: var(--select-focusColor); } From 8f4893464ea586fecb5158af86f06d27db6cb833 Mon Sep 17 00:00:00 2001 From: assureclaims <84139537+assureclaims@users.noreply.github.com> Date: Mon, 23 Jan 2023 11:43:04 +0530 Subject: [PATCH 07/20] Disable Control issues --- projects/dxc-ngx-cdk/src/lib/dxc-select/select.ts | 1 - .../src/lib/dxc-text-input/dxc-input-text.component.ts | 4 ---- 2 files changed, 5 deletions(-) diff --git a/projects/dxc-ngx-cdk/src/lib/dxc-select/select.ts b/projects/dxc-ngx-cdk/src/lib/dxc-select/select.ts index df4632e4f..3e980c67a 100644 --- a/projects/dxc-ngx-cdk/src/lib/dxc-select/select.ts +++ b/projects/dxc-ngx-cdk/src/lib/dxc-select/select.ts @@ -1314,7 +1314,6 @@ export abstract class _MatSelectBase &.mat-select-disabled { cursor: not-allowed; - border-bottom: 1px solid var(--select-disabledColor) !important; .mat-select-trigger { cursor: not-allowed; outline: none !important; diff --git a/projects/dxc-ngx-cdk/src/lib/dxc-text-input/dxc-input-text.component.ts b/projects/dxc-ngx-cdk/src/lib/dxc-text-input/dxc-input-text.component.ts index b30ad6208..bf59487ee 100644 --- a/projects/dxc-ngx-cdk/src/lib/dxc-text-input/dxc-input-text.component.ts +++ b/projects/dxc-ngx-cdk/src/lib/dxc-text-input/dxc-input-text.component.ts @@ -481,9 +481,6 @@ export class DxcTextInputComponent .mat-hint { color: var(--inputText-disabledFontColor); } - .mat-form-field-underline { - background-color: var(--inputText-disabledFontColor) !important; - } .mat-form-field-empty mat-label { color: var(--inputText-disabledFontColor); } @@ -516,7 +513,6 @@ export class DxcTextInputComponent color: var(--inputText-fontColor); } .mat-form-field-underline { - background-color: var(--inputText-fontColor) !important; .mat-form-field-ripple { background-color: var(--inputText-fontColor) !important; } From ce63e97be1374cb90d411d7f610956fbe5020ce0 Mon Sep 17 00:00:00 2001 From: Deb Date: Wed, 25 Jan 2023 14:03:49 +0530 Subject: [PATCH 08/20] version changes after build --- projects/dxc-ngx-cdk/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/dxc-ngx-cdk/package.json b/projects/dxc-ngx-cdk/package.json index 20f80cc00..2480c421d 100644 --- a/projects/dxc-ngx-cdk/package.json +++ b/projects/dxc-ngx-cdk/package.json @@ -1,6 +1,6 @@ { "name": "@dxc-technology/halstack-angular", - "version": "4.1.0", + "version": "4.2.0", "description": "DXC Angular CDK (Component Development Kit) based on Graphen Design System", "scripts": { "build-lib": "ng build dxc-ngx-cdk", From 5495b66e8917045d4806de02480c15b81e9aa4a0 Mon Sep 17 00:00:00 2001 From: assureclaims <84139537+assureclaims@users.noreply.github.com> Date: Fri, 27 Jan 2023 21:43:39 +0530 Subject: [PATCH 09/20] multiline label issue --- projects/dxc-ngx-cdk/src/lib/dxc-select/select.html | 2 +- projects/dxc-ngx-cdk/src/lib/dxc-select/select.scss | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/dxc-ngx-cdk/src/lib/dxc-select/select.html b/projects/dxc-ngx-cdk/src/lib/dxc-select/select.html index 0c412d2cf..88d5832f7 100644 --- a/projects/dxc-ngx-cdk/src/lib/dxc-select/select.html +++ b/projects/dxc-ngx-cdk/src/lib/dxc-select/select.html @@ -8,7 +8,7 @@ See https://github.com/angular/components/issues/20694 --> {{assistiveText}} -