@wizishop/angular-components 14.4.66 → 14.4.67

package/fesm2020/wizishop-angular-components.mjs

@@ -565,9 +565,13 @@ class ValueChangeService {
         return this.value !== this.getSelectedOptionsValues()[0];
     }
     handleSelectedOptionsEvent() {
-        this.optionSelectedChangeListeners().subscribe(() => {
+        this.optionSelectedChangeListeners().subscribe((option) => {
             const selectedOptionsValues = this.getSelectedOptionsValues();
-            this.value = this.multiple ? selectedOptionsValues : selectedOptionsValues[0];
+            if (this.multiple) {
+                this.value = selectedOptionsValues;
+                return;
+            }
+            this.value = option.selected ? option.value : undefined;
         });
     }
     updateSelectPlaceholder() {
@@ -591,7 +595,7 @@ class ValueChangeService {
     }
     optionSelectedChangeListeners() {
         const selectedChange$ = this.optionChildren.map((option) => {
-            return option.selectedChange.pipe(filter(() => !this.disabled));
+            return option.selectedChange.pipe(filter(() => !this.disabled), map(() => option));
         });
         return merge(...selectedChange$).pipe(takeUntil(this.resetListeners$));
     }
@@ -607,7 +611,7 @@ class ValueChangeService {
       * May not work with objects values
     */
     isSelectedValue(value2) {
-        if (Array.isArray(this.value)) {
+        if (this.multiple && Array.isArray(this.value)) {
             return this.value.includes(value2);
         }
         return this.value === value2;