diff --git a/projects/ng-components/lib/datepicker/datepicker.component.spec.ts b/projects/ng-components/lib/datepicker/datepicker.component.spec.ts index a855650e..816afef7 100644 --- a/projects/ng-components/lib/datepicker/datepicker.component.spec.ts +++ b/projects/ng-components/lib/datepicker/datepicker.component.spec.ts @@ -29,8 +29,8 @@ class CustomTestClass { constructor() { const today: Date = new Date(); this.dateValue = today; - this.startDate = new Date(today.getFullYear(), 0, today.getDate()); - this.endDate = new Date(today.getFullYear(), 11, today.getDate()); + this.startDate = new Date(today.getFullYear(), -1, today.getDate()); + this.endDate = new Date(today.getFullYear(), 12, today.getDate()); this.id = "my-datepicker"; this.className = "my-class"; diff --git a/projects/ng-components/lib/dropdown/dropdown.component.ts b/projects/ng-components/lib/dropdown/dropdown.component.ts index d02ab797..a7decc32 100644 --- a/projects/ng-components/lib/dropdown/dropdown.component.ts +++ b/projects/ng-components/lib/dropdown/dropdown.component.ts @@ -400,6 +400,9 @@ export class DropdownComponent implements ControlValueAccessor, OnChanges, OnDes this.nativeOnChange && this.nativeOnChange(event); this.selectedValue = items; } + + this.onChangeCallback && this.onChangeCallback(this.selectedValue); + this.onTouchedCallback && this.onTouchedCallback(); } /** Function which handles the logic of setting the non-native onChange prop (and sets the internal selected value as well) */ diff --git a/projects/ng-components/lib/toggle-selector/toggle-selector.component.ts b/projects/ng-components/lib/toggle-selector/toggle-selector.component.ts index 48f8b375..dd8f8392 100644 --- a/projects/ng-components/lib/toggle-selector/toggle-selector.component.ts +++ b/projects/ng-components/lib/toggle-selector/toggle-selector.component.ts @@ -126,7 +126,12 @@ export class ToggleSelectorComponent implements ControlValueAccessor, OnInit { this.list && this.list.map(e => { if (this.multi) { - let selected: boolean = !!(this.value as Array)?.find((element: any) => element.value === e.value); + let selected: boolean = false; + + if (Array.isArray(this.value) && this.value.length > 0) { + selected = !!this.value.find((element: IToggleSelector) => element.value === e.value); + } + return { optionItem: e, selected } as IDisplayToggleSelector; } else { let selected: boolean = (this.value as IToggleSelector)?.value === e.value;