Skip to content

Feature/rma 98688 Multiline labels #154

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 25, 2023
Merged

Feature/rma 98688 Multiline labels #154

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3dbad06
multi line label issues with select component
assureclaims Jan 20, 2023
fa2bcf0
multi line label issue for select control fixed
assureclaims Jan 20, 2023
8f48934
Disable Control issues
assureclaims Jan 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions projects/dxc-ngx-cdk/src/lib/dxc-select/select.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand All @@ -32,21 +33,27 @@ $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 {
@include mat-truncate-line();
}

.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%.
Expand Down
17 changes: 10 additions & 7 deletions projects/dxc-ngx-cdk/src/lib/dxc-select/select.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1305,16 +1305,19 @@ export abstract class _MatSelectBase<C>
${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;
}
}
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 {
color: var(--select-disabledColor) !important;
Expand Down Expand Up @@ -1349,11 +1352,11 @@ export abstract class _MatSelectBase<C>
}

.mat-select-trigger {
border-top-width: 0.84375em;
border-top-style: solid;
border-top-color: transparent;
border-bottom: 1px solid var(--select-color);
:focus{
// 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);
}
Expand Down
4 changes: 0 additions & 4 deletions projects/dxc-ngx-cdk/src/lib/dxc-text-input/dxc-input-text.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
Expand Down Expand Up @@ -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;
}
Expand Down