Skip to content

[Patch] #704 Fixing reset selected option value in dxc select component #705

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
mawelCaballero merged 1 commit into from
Feb 21, 2022
Merged

[Patch] #704 Fixing reset selected option value in dxc select component #705

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
37 changes: 19 additions & 18 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,23 @@
{
"workbench.colorCustomizations": {
"activityBar.activeBackground": "#073caf",
"activityBar.activeBorder": "#e9eff5",
"activityBar.background": "#ec5fa6",
"activityBar.foreground": "#15202b",
"activityBar.inactiveForeground": "#15202b99",
"activityBarBadge.background": "#e9eff5",
"activityBarBadge.foreground": "#15202b",
"statusBar.background": "#ec5fa6",
"statusBar.foreground": "#15202b",
"statusBarItem.hoverBackground": "#597a38",
"titleBar.activeBackground": "#739d48",
"titleBar.activeForeground": "#15202b",
"titleBar.inactiveBackground": "#739d4899",
"titleBar.inactiveForeground": "#15202b99",
"sash.hoverBorder": "#8cb761",
"statusBarItem.remoteBackground": "#739d48",
"statusBarItem.remoteForeground": "#15202b"
"activityBar.activeBackground": "#fa1b49",
"activityBar.activeBorder": "#155e02",
"activityBar.background": "#fa1b49",
"activityBar.foreground": "#e7e7e7",
"activityBar.inactiveForeground": "#e7e7e799",
"activityBarBadge.background": "#155e02",
"activityBarBadge.foreground": "#e7e7e7",
"statusBar.background": "#dd0531",
"statusBar.foreground": "#e7e7e7",
"statusBarItem.hoverBackground": "#fa1b49",
"titleBar.activeBackground": "#dd0531",
"titleBar.activeForeground": "#e7e7e7",
"titleBar.inactiveBackground": "#dd053199",
"titleBar.inactiveForeground": "#e7e7e799",
"sash.hoverBorder": "#fa1b49",
"statusBarItem.remoteBackground": "#dd0531",
"statusBarItem.remoteForeground": "#e7e7e7"
},
"peacock.color": "#739d48"
"peacock.color": "#dd0531",
"angular.enable-strict-mode-prompt": false
}
118 changes: 30 additions & 88 deletions ...dk-site/src/app/pages/theme-builder/previews/select-preview/select-preview.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,119 +2,61 @@
<dxc-heading text="Light Mode" [level]="5" margin="xsmall"></dxc-heading>
<background-provider color="#FFFFFF">
<tbuilder-component-mode text="Default">
<dxc-select
label="Label"
helperText="HelperText"
margin="xsmall"
[options]="array1"
(onChange)="onChange($event)"
(onBlur)="onBlur($event)"
[optional]="true"
placeholder="Another placeholder"
size="large"
tabIndex="3"
>
<dxc-select label="Label" helperText="HelperText" margin="xsmall" [options]="array1" (onChange)="onChange($event)"
(onBlur)="onBlur($event)" [optional]="true" placeholder="Another placeholder" size="large" tabIndex="3">
</dxc-select>
<dxc-select
label="Label"
helperText="HelperText"
margin="xsmall"
[options]="array2"
[optional]="true"
(onChange)="onChange($event)"
placeholder="Another placeholder"
></dxc-select>
<dxc-select label="Label" helperText="HelperText" margin="xsmall" [options]="array2" [optional]="true"
(onChange)="onChange($event)" placeholder="Another placeholder"></dxc-select>
</tbuilder-component-mode>

<tbuilder-component-mode text="Searchable">
<dxc-select
label="Label"
helperText="HelperText"
searchable="true"
margin="xsmall"
[options]="array1"
[optional]="true"
placeholder="Another placeholder"
>
<dxc-select label="Label" helperText="HelperText" searchable="true" margin="xsmall" [options]="array1"
[optional]="true" placeholder="Another placeholder">
</dxc-select>
<dxc-select
label="Label"
helperText="HelperText"
searchable="true"
margin="xsmall"
[options]="array2"
placeholder="Another placeholder"
>
<dxc-select label="Label" helperText="HelperText" searchable="true" margin="xsmall" [options]="array2"
placeholder="Another placeholder">
</dxc-select>
<dxc-select
label="Label"
helperText="HelperText"
searchable="true"
margin="xsmall"
[options]="array2"
[multiple]="true"
(onChange)="onChange($event)"
(onBlur)="onBlur($event)"
placeholder="Another placeholder"
>
<dxc-select label="Label" helperText="HelperText" searchable="true" margin="xsmall" [options]="array2"
[multiple]="true" (onChange)="onChange($event)" (onBlur)="onBlur($event)" placeholder="Another placeholder">
</dxc-select>
</tbuilder-component-mode>

<tbuilder-component-mode text="Multiple">
<dxc-select
label="Label"
helperText="HelperText"
multiple="true"
(onChange)="onChange($event)"
margin="xsmall"
[options]="array1"
[value]="arrayValue"
>
<dxc-select label="Label" helperText="HelperText" multiple="true" (onChange)="onChange($event)" margin="xsmall"
[options]="array1" [value]="arrayValue">
</dxc-select>
<dxc-select
label="Label"
helperText="HelperText"
multiple="true"
(onChange)="onChange($event)"
margin="xsmall"
[options]="array2"
>
<dxc-select label="Label" helperText="HelperText" multiple="true" (onChange)="onChange($event)" margin="xsmall"
[options]="array2">
</dxc-select>
</tbuilder-component-mode>

<tbuilder-component-mode text="Error">
<dxc-select
label="Label"
helperText="HelperText"
error="There is an error"
margin="xsmall"
>
<dxc-select label="Label" helperText="HelperText" error="There is an error" margin="xsmall">
</dxc-select>
</tbuilder-component-mode>

<tbuilder-component-mode text="Error and multiple">
<dxc-select
label="Label"
helperText="HelperText"
error="There is an error"
margin="xsmall"
[multiple]="true"
>
<dxc-select label="Label" helperText="HelperText" error="There is an error" margin="xsmall" [multiple]="true">
</dxc-select>
</tbuilder-component-mode>

<tbuilder-component-mode text="Disabled">
<dxc-select
label="Label"
helperText="HelperText"
error="There is an error"
margin="xsmall"
[disabled]="true"
>
<dxc-select label="Label" helperText="HelperText" error="There is an error" margin="xsmall" [disabled]="true">
</dxc-select>
</tbuilder-component-mode>
</background-provider>

<dxc-heading text="Dark Mode" [level]="5" margin="xsmall"></dxc-heading>
<background-provider color="#000000"> </background-provider>
<dxc-heading text="Test reset controlled select" [level]="5" margin="xsmall"></dxc-heading>

<tbuilder-component-mode text="Default">
<dxc-select label="Label" helperText="HelperText" margin="xsmall" [value]="selectedValues" [options]="array1"
(onChange)="onChangeTest($event)" (onBlur)="onBlurTest($event)" [optional]="true"
placeholder="Another placeholder" size="large" tabIndex="3">
</dxc-select>

<dxc-button label="Reset values" (onClick)="onResetTest($event)" margin="medium"></dxc-button>
</tbuilder-component-mode>

<!-- <dxc-heading text="Dark Mode" [level]="5" margin="xsmall"></dxc-heading>
<background-provider color="#000000"> </background-provider> -->
</div>
33 changes: 23 additions & 10 deletions ...-cdk-site/src/app/pages/theme-builder/previews/select-preview/select-preview.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
import { Component, OnInit } from '@angular/core';
import { Option } from '@dxc-technology/halstack-angular/lib/dxc-select/interfaces/option.interface';
import { OptionGroup } from '@dxc-technology/halstack-angular/lib/dxc-select/interfaces/optionGroup.interface';
import { Component, OnInit } from "@angular/core";
import { Option } from "@dxc-technology/halstack-angular/lib/dxc-select/interfaces/option.interface";
import { OptionGroup } from "@dxc-technology/halstack-angular/lib/dxc-select/interfaces/optionGroup.interface";

@Component({
selector: 'app-select',
templateUrl: './select-preview.component.html'
selector: "app-select",
templateUrl: "./select-preview.component.html",
})
export class SelectPreviewComponent implements OnInit {
selectedValues: string = "";

array1: Option[] = [
{
Expand Down Expand Up @@ -62,21 +63,33 @@ export class SelectPreviewComponent implements OnInit {
},
];

arrayValue = ['1','2'];
arrayValue = ["1", "2"];

value = "1";

constructor() { }
constructor() {}

ngOnInit(): void {
ngOnInit(): void {}

onChange(event) {
console.log("onchange:", event);
}

onBlur(event) {
console.log("onBlur:", event);
}

onChange(event){
onChangeTest(event) {
this.selectedValues = event.value;
console.log("onchange:", event);
}

onBlur(event){
onBlurTest(event) {
console.log("onBlur:", event);
}

onResetTest(event) {
console.log(event);
this.selectedValues = "";
}
}
32 changes: 15 additions & 17 deletions ...cdk/src/lib/dxc-select/dxc-select-option-selected/dxc-select-option-selected.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ export class DxcSelectOptionSelectedComponent implements OnInit {
} else {
this.selectedOptions[0] = newOptions;
}
} else {
this.selectedOptions = [];
}
});
}
Expand Down Expand Up @@ -91,27 +93,25 @@ export class DxcSelectOptionSelectedComponent implements OnInit {
font-size: var(--select-valueFontSize);
font-style: var(--select-valueFontStyle);
font-weight: var(--select-valueFontWeight);
color: ${
inputs.disabled
? "var(--select-disabledColor)"
: "var(--select-valueFontColor)"
};
.iconLabel{
color: ${inputs.disabled
? "var(--select-disabledColor)"
: "var(--select-valueFontColor)"};
.iconLabel {
width: 24px;
height: 24px;
display: inline-flex;
align-items: center;
}
.comma{
.comma {
margin-right: 4px;
}
.iconLabel{
.iconLabel {
margin-right: 0.25rem;
}
.isOptionalLabel{
color: ${
inputs.disabled ? "var(--select-disabledColor)" : "#000000b3"
};
.isOptionalLabel {
color: ${inputs.disabled
? "var(--select-disabledColor)"
: "#000000b3"};
}
}
.notSelectedLabel {
Expand All @@ -120,11 +120,9 @@ export class DxcSelectOptionSelectedComponent implements OnInit {
font-size: var(--select-placeholderFontSize);
font-style: var(--select-placeholderFontStyle);
font-weight: var(--select-placeholderFontWeight);
color: ${
inputs.disabled
? "var(--select-disabledColor)"
: "var(--select-placeholderFontColor)"
};
color: ${inputs.disabled
? "var(--select-disabledColor)"
: "var(--select-placeholderFontColor)"};
}
}
`;
Expand Down
7 changes: 4 additions & 3 deletions projects/dxc-ngx-cdk/src/lib/dxc-select/dxc-select.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,8 +254,9 @@ export class DxcSelectComponent implements OnInit, ControlValueAccessor {
}
} else {
if (this.optionGroupRef) {
const optionGroupElement =
this.optionGroupRef?.toArray()[value.group];
const optionGroupElement = this.optionGroupRef?.toArray()[
value.group
];
optionGroupElement &&
this.scrollByIndex(optionGroupElement, value.option + 1);
}
Expand Down Expand Up @@ -395,7 +396,7 @@ export class DxcSelectComponent implements OnInit, ControlValueAccessor {
this.focusedOption.group === indexGroup;

setDefaultValues() {
if (this.value) {
if (this.value !== undefined && this.value !== null) {
if (Array.isArray(this.value)) {
const arr = [];
this.value.map((value) => {
Expand Down
13 changes: 7 additions & 6 deletions projects/dxc-ngx-cdk/src/lib/dxc-select/services/select.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,12 @@ export class SelectService {

public selectedValues: BehaviorSubject<any> = new BehaviorSubject(null);
public filteredOptions: BehaviorSubject<any> = new BehaviorSubject(null);
public visualFocused: BehaviorSubject<VisualOptionFocus> =
new BehaviorSubject({
group: -1,
option: -1,
});
public visualFocused: BehaviorSubject<
VisualOptionFocus
> = new BehaviorSubject({
group: -1,
option: -1,
});
public activeOption: BehaviorSubject<VisualOptionFocus> = new BehaviorSubject(
{
group: -1,
Expand All @@ -25,7 +26,7 @@ export class SelectService {
);

public setSelectedValues(newOptions): void {
this.selectedValues.next(newOptions);
this.selectedValues.next(newOptions ?? null);
}

public setVisualFocused(newFocus): void {
Expand Down
2 changes: 1 addition & 1 deletion projects/dxc-ngx-cdk/src/lib/dxc-textarea/dxc-textarea.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ export class DxcTextareaComponent implements OnInit {
private _rows = 4;

@Input()
verticalGrow = "";
verticalGrow = "auto";

@Input()
error = undefined;
Expand Down