Skip to content

[Patch] fix #312 Fixing select required #345

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 1 commit into from
May 10, 2021
Merged

[Patch] fix #312 Fixing select required #345

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 4 additions & 1 deletion projects/dxc-ngx-cdk/src/lib/dxc-select/select.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@
See https://github.com/angular/components/issues/20694
-->
<span class="assistiveText">{{assistiveText}}</span>
<label class="selectLabel">{{label}}</label>
<label class="selectLabel">
<span *ngIf="required" class="select-required">*</span>
<span>{{label}}</span>
</label>
<div cdk-overlay-origin
[tabIndex]="disabled ? -1 : tabIndexValue"
[attr.aria-owns]="panelOpen ? id + '-panel' : null"
Expand Down
4 changes: 4 additions & 0 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 @@ -1373,6 +1373,10 @@ export abstract class _MatSelectBase<C>
left 400ms cubic-bezier(0.25, 0.8, 0.25, 1),
top 400ms cubic-bezier(0.25, 0.8, 0.25, 1),
width 400ms cubic-bezier(0.25, 0.8, 0.25, 1);

.select-required {
color: var(--select-required);
}
}

dxc-option.mat-active,
Expand Down
1 change: 1 addition & 0 deletions projects/dxc-ngx-cdk/src/lib/theme/componentTokens.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,7 @@ export const componentTokens = {
"--select-selectedOptionBackgroundColor": globalTokens.lightGrey,
"--select-color": globalTokens.black,
"--select-error": globalTokens.darkRed,
"--select-required": globalTokens.darkRed,
"--select-focusColor": globalTokens.blue,
"--select-disabledColor": globalTokens.lighterBlack,
"--select-scrollBarThumbColor": globalTokens.darkGrey,
Expand Down