@coreui/angular-pro 4.2.18 → 4.2.19

package/fesm2020/coreui-angular-pro.mjs

@@ -8349,9 +8349,9 @@ class MultiSelectOptionComponent {
     getLabel() {
         return (this.label ?? this.value);
     }
-    focus(origin) {
+    focus(origin = 'program') {
         if (this.dropdownVisible) {
-            this.focusMonitor.focusVia(this.elementRef, origin ?? 'program', { preventScroll: false });
+            this.focusMonitor.focusVia(this.elementRef, origin, { preventScroll: false });
             this.changeDetectorRef.markForCheck();
         }
     }
@@ -8709,20 +8709,20 @@ class MultiSelectComponent {
         if ($event.key === 'Escape') {
             this.visible = false;
             this.searchValue = '';
-            this.setFocus();
+            this.setFocus('keyboard', 'onKeyUp');
             return;
         }
         if (['Enter', ' ', 'ArrowDown'].includes($event.key) && [this.inputElement?.nativeElement, this.elementRef.nativeElement].includes($event.target)) {
             this.visible = true;
             if (!this.search) {
-                this.setFocus();
+                this.setFocus('keyboard', 'onKeyUp');
             }
             return;
         }
         if ($event.key === 'Tab' && $event.target === this.elementRef.nativeElement) {
             this.visible = true;
             if (!this.search) {
-                this.setFocus();
+                this.setFocus('keyboard', 'onKeyUp');
             }
             return;
         }
@@ -8740,11 +8740,11 @@ class MultiSelectComponent {
             return;
         if (!this.visible) {
             this.visible = true;
-            this.setFocus();
+            this.setFocus('mouse', 'onClick');
         }
         else if ([this.dropdown.nativeElement].includes($event.target)) {
             this.visible = false;
-            this.setFocus();
+            this.setFocus('mouse', 'onClick');
         }
     }
     set searchValue(value) {
@@ -8779,13 +8779,12 @@ class MultiSelectComponent {
     }
     ngOnChanges(changes) {
         if (changes['value']) {
-            if (changes['value'].currentValue.length === 0) {
+            const valueChanges = changes['value'];
+            if (valueChanges.currentValue.length === 0) {
                 this.clearAllOptions();
             }
             else {
-                this.multiSelectOptions?.forEach((option, index) => {
-                    this.selectOption(option, changes['value'].currentValue.includes(option.value));
-                });
+                this.selectOptions();
             }
             this.selectedOptionsUpdate();
         }
@@ -8809,6 +8808,7 @@ class MultiSelectComponent {
     multiselectSubscribe(subscribe = true) {
         if (subscribe) {
             this.multiSelectOptionsSubscription = this.multiSelectOptions.changes.subscribe(change => {
+                // console.log('multiSelectOptions change', change)
                 this.selectOptions();
             });
             this.multiselectVisibleSubscription = this.multiSelectService.multiSelectVisible$.subscribe((visible) => {
@@ -8826,7 +8826,7 @@ class MultiSelectComponent {
                     // close dropdown for single select (!multiple)
                     this.visible = false;
                     this.searchValue = '';
-                    this.setFocus();
+                    this.setFocus('program', 'multiselectSubscribe');
                 }
                 // todo?
                 // if (!!option) {
@@ -8852,7 +8852,10 @@ class MultiSelectComponent {
                 option.selected = false;
         });
         this.selectedOptionsUpdate();
-        this.setFocus();
+        if ($event) {
+            this.searchValue = '';
+            this.setFocus('program', 'clearAllOptions');
+        }
     }
     selectAllOptions() {
         this.multiSelectOptions.forEach((option, index) => {
@@ -8862,12 +8865,15 @@ class MultiSelectComponent {
         this.selectedOptionsUpdate();
     }
     handleTagRemove($event) {
-        this.setFocus();
+        this.setFocus('program', 'handleTagRemove');
     }
-    setFocus() {
+    setFocus(origin = 'program', methodName) {
         if (this.disabled)
             return;
-        this.focusMonitor?.focusVia(this.inputElement ?? this.elementRef, 'program');
+        const element = this.inputElement ?? this.elementRef;
+        const preventScroll = origin === 'program';
+        this.focusMonitor?.focusVia(element, origin, { preventScroll: preventScroll });
+        // console.log('setFocus', origin, methodName, 'preventScroll:', preventScroll );
     }
     filterOptions(value) {
         const searchString = value.toLowerCase() ?? '';
@@ -8920,11 +8926,7 @@ class MultiSelectComponent {
         }
     }
     selectOption(option, selected) {
-        this.multiSelectOptions.forEach(item => {
-            if (item === option) {
-                option.selected = selected;
-            }
-        });
+        option.selected = selected;
         this.selectedOptionsUpdate();
     }
     selectedOptionsUpdate() {
@@ -8938,6 +8940,7 @@ class MultiSelectComponent {
     setFocusMonitor(monitor) {
         if (monitor && !this.disabled) {
             this.focusMonitorSubscription = this.focusMonitor?.monitor(this.elementRef, true).subscribe((origin) => {
+                // console.log('focusMonitorSubscription', this.elementRef, origin);
                 this.ngZone.run(() => {
                     this.subtreeFocused = this.focusOrigin(origin);
                     this.changeDetectorRef?.markForCheck();