@elderbyte/ngx-starter 13.9.2 → 13.9.3

package/fesm2020/elderbyte-ngx-starter.mjs

@@ -20782,11 +20782,12 @@ function isElderEntityValueAccessor(object) {
         return false;
     }
     const vac = object;
-    return vac.entity !== undefined
-        && vac.entityId !== undefined
+    return 'entity' in vac // This might be undefined
+        && 'entityId' in vac // This might be undefined
         && vac.entityIdChange !== undefined
         && vac.entityChange !== undefined
-        && vac.updateValueByEntity !== undefined;
+        && vac.updateValueByEntity !== undefined
+        && vac.entityToValue !== undefined;
 }
 
 class ElderSelectOnTabDirective {
@@ -20820,6 +20821,9 @@ class ElderSelectOnTabDirective {
      * Event Listener                                                          *
      *                                                                         *
      **************************************************************************/
+    onOptionSelect() {
+        this.userInput = true;
+    }
     onBlur() {
         if (!this.panelOpen) {
             return;
@@ -20834,21 +20838,9 @@ class ElderSelectOnTabDirective {
         const activeOption = this.autoTrigger.activeOption;
         if (activeOption) {
             const entity = activeOption.value;
-            this.updateValueByEntity(entity);
-            this.autoTrigger.writeValue(entity);
-            this.logger.warn('Wrote option.value to control: ', entity);
-        }
-    }
-    updateValueByEntity(entity) {
-        if (isElderEntityValueAccessor(this.controlValueAccessor)) {
-            // Since elder-select may use the entity id as value (valueAsId),
-            // we can not directly write to the value safely.
-            this.controlValueAccessor.updateValueByEntity(entity);
-        }
-        else {
-            // By default, write the selected option to the control value
-            this.controlValueAccessor.updateValue(entity);
+            this.writeEntity(entity);
         }
+        this.reset();
     }
     /***************************************************************************
      *                                                                         *
@@ -20859,15 +20851,41 @@ class ElderSelectOnTabDirective {
         const autocomplete = this.autoTrigger.autocomplete;
         merge(autocomplete.opened.pipe(map(() => true)), autocomplete.closed.pipe(map(() => false))).pipe(takeUntil(this.destroy$), delay(0)).subscribe(value => this.panelOpen = value);
         this.autoTrigger.optionSelections.pipe(// TODO https://github.com/angular/components/pull/14813
-        takeUntil(this.destroy$), map(opt => opt.isUserInput)).subscribe(isUserInput => this.userInput = isUserInput);
+        takeUntil(this.destroy$), tap(opt => this.logger.debug('[optionSelections] CHANGED ', opt)), map(opt => opt.isUserInput)).subscribe(isUserInput => this.userInput = isUserInput);
     }
     ngOnDestroy() {
         this.destroy$.next();
         this.destroy$.complete();
     }
+    /***************************************************************************
+     *                                                                         *
+     * Private methods                                                         *
+     *                                                                         *
+     **************************************************************************/
+    reset() {
+        this.userInput = false;
+    }
+    writeEntity(entity) {
+        const value = this.entityToValue(entity);
+        this.controlValueAccessor.updateValue(value);
+        this.autoTrigger.writeValue(value);
+        this.logger.warn('Wrote entity to control as value: ', value);
+    }
+    entityToValue(entity) {
+        if (isElderEntityValueAccessor(this.controlValueAccessor)) {
+            // Since elder-select may use the entity id as value (valueAsId),
+            // we can not directly write to the value safely.
+            return this.controlValueAccessor.entityToValue(entity);
+        }
+        else {
+            // By default, write the selected option to the control value
+            this.logger.warn('[controlValueAccessor] is not a ElderEntityValueAccessor!: ', this.controlValueAccessor);
+            return entity;
+        }
+    }
 }
 ElderSelectOnTabDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.10", ngImport: i0, type: ElderSelectOnTabDirective, deps: [{ token: i1$6.MatAutocompleteTrigger }, { token: ELDER_SELECT_BASE, skipSelf: true }], target: i0.ɵɵFactoryTarget.Directive });
-ElderSelectOnTabDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.3.10", type: ElderSelectOnTabDirective, selector: "[elderSelectOnTab]", host: { listeners: { "keydown.tab": "onBlur()" } }, ngImport: i0 });
+ElderSelectOnTabDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "12.0.0", version: "13.3.10", type: ElderSelectOnTabDirective, selector: "[elderSelectOnTab]", host: { listeners: { "keydown.arrowup": "onOptionSelect()", "keydown.arrowdown": "onOptionSelect()", "keydown.tab": "onBlur()" } }, ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.10", ngImport: i0, type: ElderSelectOnTabDirective, decorators: [{
             type: Directive,
             args: [{
@@ -20878,7 +20896,13 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.10", ngImpo
                 }, {
                     type: Inject,
                     args: [ELDER_SELECT_BASE]
-                }] }]; }, propDecorators: { onBlur: [{
+                }] }]; }, propDecorators: { onOptionSelect: [{
+                type: HostListener,
+                args: ['keydown.arrowup']
+            }, {
+                type: HostListener,
+                args: ['keydown.arrowdown']
+            }], onBlur: [{
                 type: HostListener,
                 args: ['keydown.tab']
             }] } });