@dereekb/dbx-web 9.23.11 → 9.23.13

package/fesm2020/dereekb-dbx-web.mjs

@@ -15,7 +15,7 @@ import * as i3 from '@angular/material/progress-spinner';
 import { MatProgressSpinnerModule } from '@angular/material/progress-spinner';
 import * as i2$1 from '@angular/material/icon';
 import { MatIconModule } from '@angular/material/icon';
-import { getValueFromGetter, mergeObjects, splitCommaSeparatedStringToSet, objectHasNoKeys, modifier, combineMaps, addModifiers, removeModifiers, applyBestFit, isMaybeNot, isNotNullOrEmptyString, filterMaybeValues, mapIterable, toReadableError, isDefaultReadableError, build, ServerErrorResponse, UnauthorizedServerErrorResponse, maybeModifierMapToFunction, ModelRelationUtility, encodeModelKeyTypePair, useIterableOrValue } from '@dereekb/util';
+import { getValueFromGetter, mergeObjects, splitCommaSeparatedStringToSet, asPromise, objectHasNoKeys, modifier, combineMaps, addModifiers, removeModifiers, applyBestFit, isMaybeNot, isNotNullOrEmptyString, filterMaybeValues, mapIterable, toReadableError, isDefaultReadableError, build, ServerErrorResponse, UnauthorizedServerErrorResponse, maybeModifierMapToFunction, ModelRelationUtility, encodeModelKeyTypePair, useIterableOrValue } from '@dereekb/util';
 import * as i3$1 from '@angular/material/progress-bar';
 import { MatProgressBarModule } from '@angular/material/progress-bar';
 import * as i5 from '@angular/material/core';
@@ -1539,6 +1539,20 @@ class DbxPopoverComponent extends AbstractTransitionWatcherDirective {
                 originalClose.call(this.popoverRef, x);
             }
         };
+        // Also intercept the _close function to capture backdropClose, etc.
+        const original_close = this.popoverRef._close;
+        this.popoverRef._close = (closeType, inputValue) => {
+            const closeWithValue = (value) => {
+                original_close.call(this.popoverRef, closeType, value);
+            };
+            if (closeType === 'close' || inputValue != null) {
+                closeWithValue(inputValue);
+            }
+            else {
+                // expected to be a backdrop close. Get the closing value then close.
+                this._useClosingValue(closeType, (x) => closeWithValue(x));
+            }
+        };
         // eslint-disable-next-line
         const overlay = popoverRef._overlay; // overlay is not publically accessible
         const elementRef = this.config.origin;
@@ -1578,12 +1592,8 @@ class DbxPopoverComponent extends AbstractTransitionWatcherDirective {
     }
     // Popover Controls
     close() {
-        if (!this._startedClosing && this.getClosingValueFn) {
-            this.getClosingValueFn().then((x) => {
-                this.return(x);
-            }, () => {
-                this.return();
-            });
+        if (!this._startedClosing && this.getClosingValueFn != null) {
+            this._useClosingValue('close', (x) => this.return(x));
         }
         else {
             this.return();
@@ -1593,6 +1603,18 @@ class DbxPopoverComponent extends AbstractTransitionWatcherDirective {
         this._closing.next();
         this.popoverRef.close(value);
     }
+    _useClosingValue(closeType, useValue) {
+        if (this.getClosingValueFn != null) {
+            asPromise(this.getClosingValueFn(this.data, closeType)).then((x) => {
+                useValue(x);
+            }, () => {
+                useValue();
+            });
+        }
+        else {
+            useValue();
+        }
+    }
     // Keypresses
     handleKeydown() {
         this.close();