@sumaris-net/ngx-components 18.6.19-alpha2 → 18.6.19-alpha4

package/fesm2022/sumaris-net.ngx-components.mjs

@@ -8185,7 +8185,9 @@ class MatAutocompleteField {
         }));
         // Select input content, on focus or press enter
         if (this.selectInputContentOnFocus && !this.mobile && !this.multiple) {
-            this._subscription.add(merge(this.focused.pipe(filter((event) => !event.defaultPrevented), tap$1((event) => event.preventDefault())), this.keyupEnter.pipe(filter(() => isNotNilObject(this.formControl.value))))
+            this._subscription.add(merge(this.focused.pipe(filter((event) => !event.defaultPrevented)
+            //tap((event) => event.preventDefault())
+            ), this.keyupEnter.pipe(filter(() => isNotNilObject(this.formControl.value))))
                 .pipe(debounceTime(this.selectInputContentOnFocusDelay))
                 .subscribe(() => {
                 if (this.debug)
@@ -8299,6 +8301,7 @@ class MatAutocompleteField {
             //if (this.debug) console.debug(this.logPrefix + ' Cancelling focus event');
             return false;
         }
+        this._focused = true;
         // DEBUG
         //if (this.debug) console.debug(this.logPrefix + ' Select input content');
         const hasContent = isNotNilOrBlank(event.target?.value);
@@ -8306,7 +8309,7 @@ class MatAutocompleteField {
         if (!hasContent || this.showPanelOnFocus || this.showAllOnFocus) {
             // DEBUG
             //if (this.debug) console.debug(this.logPrefix + ' Emit focus event');
-            this._focused = true;
+            // Need a delay to prevent early focus event, just after a blur event (see sumaris issue - 2 panels opened)
             setTimeout(() => {
                 if (!this._focused)
                     return; // Skip if blur event received
@@ -8321,21 +8324,23 @@ class MatAutocompleteField {
             return;
         // DEBUG
         //if (this.debug) console.debug(this.logPrefix + ' filterInputTextBlurEvent', event);
-        // Need a timeout to prevent early blur event without triggering formChange event
+        // Ignore event from mat-option
+        if ((event.relatedTarget instanceof HTMLElement && event.relatedTarget.tagName === 'MAT-OPTION') ||
+            // Or autocomplete panel is open because event.relatedTarget is null (cf. https://github.com/angular/components/issues/24182)
+            this.autocomplete?.isOpen) {
+            event.preventDefault();
+            if (event.stopPropagation)
+                event.stopPropagation();
+            event.returnValue = false;
+            // DEBUG
+            //if (this.debug) console.debug(this.logPrefix + " Cancelling blur event");
+            return;
+        }
+        this._focused = false;
+        // Need a delay to prevent early blur event without triggering formChange event
         setTimeout(() => {
-            // Ignore event from mat-option
-            if ((event.relatedTarget instanceof HTMLElement && event.relatedTarget.tagName === 'MAT-OPTION') ||
-                // Or autocomplete panel is open because event.relatedTarget is null (cf. https://github.com/angular/components/issues/24182)
-                this.autocomplete?.isOpen) {
-                event.preventDefault();
-                if (event.stopPropagation)
-                    event.stopPropagation();
-                event.returnValue = false;
-                // DEBUG
-                //if (this.debug) console.debug(this.logPrefix + " Cancelling blur event");
-                return;
-            }
-            this._focused = false;
+            if (this._focused)
+                return; // Skip if focus again
             this.blurred.emit(event);
         }, 100);
     }