@dereekb/dbx-web 9.24.17 → 9.24.18

package/fesm2020/dereekb-dbx-web.mjs

@@ -1895,15 +1895,19 @@ class DbxFilterPopoverComponent extends AbstractPopoverDirective {
         this._showPreset = new BehaviorSubject(false);
         this.showPreset$ = this._showPreset.asObservable();
         this.config$ = this._showPreset.pipe(map((showPreset) => {
-            const { closeOnFilterChange = true, connector, initialFilterObs, customFilterComponentClass, presetFilterComponentClass } = this.config;
+            const { closeOnFilterChange = true, connector, initialFilterObs, customFilterComponentClass, presetFilterComponentClass, customFilterComponentConfig, presetFilterComponentConfig } = this.config;
             let componentClass;
+            let baseConfig;
             if (showPreset) {
-                componentClass = presetFilterComponentClass;
+                componentClass = (presetFilterComponentConfig?.componentClass ?? presetFilterComponentClass);
+                baseConfig = presetFilterComponentConfig;
             }
             else {
-                componentClass = customFilterComponentClass;
+                componentClass = (customFilterComponentConfig?.componentClass ?? customFilterComponentClass);
+                baseConfig = customFilterComponentConfig;
             }
             const config = {
+                ...baseConfig,
                 componentClass,
                 init: (filterSource) => {
                     connector.connectWithSource(filterSource);
@@ -1915,12 +1919,14 @@ class DbxFilterPopoverComponent extends AbstractPopoverDirective {
                             this.close();
                         });
                     }
+                    // run the next init if provided
+                    baseConfig?.init?.(filterSource);
                 }
             };
             return config;
         }));
     }
-    static openPopover(popupService, { width, height, isResizable, origin, header, icon, customFilterComponentClass, presetFilterComponentClass, connector, initialFilterObs, closeOnFilterChange, customizeButtonText, showCloseButton, closeButtonText }, popoverKey) {
+    static openPopover(popupService, { width, height, isResizable, origin, header, icon, customFilterComponentClass, presetFilterComponentClass, customFilterComponentConfig, presetFilterComponentConfig, connector, initialFilterObs, closeOnFilterChange, customizeButtonText, showCloseButton, closeButtonText }, popoverKey) {
         return popupService.open({
             key: popoverKey ?? DEFAULT_FILTER_POPOVER_KEY,
             origin,
@@ -1936,6 +1942,8 @@ class DbxFilterPopoverComponent extends AbstractPopoverDirective {
                 closeButtonText,
                 customFilterComponentClass,
                 presetFilterComponentClass,
+                customFilterComponentConfig,
+                presetFilterComponentConfig,
                 connector,
                 initialFilterObs,
                 closeOnFilterChange
@@ -1953,14 +1961,14 @@ class DbxFilterPopoverComponent extends AbstractPopoverDirective {
     }
     ngOnInit() {
         let showPreset = false;
-        const { customFilterComponentClass, presetFilterComponentClass } = this.config;
-        if (customFilterComponentClass) {
+        const { customFilterComponentClass, presetFilterComponentClass, customFilterComponentConfig, presetFilterComponentConfig } = this.config;
+        if (customFilterComponentClass || customFilterComponentConfig) {
             showPreset = false;
         }
-        if (presetFilterComponentClass) {
+        if (presetFilterComponentClass || presetFilterComponentConfig) {
             showPreset = true;
         }
-        if (!customFilterComponentClass && !presetFilterComponentClass) {
+        if (!(customFilterComponentClass || customFilterComponentConfig) && !(presetFilterComponentClass || presetFilterComponentConfig)) {
             throw new Error('Requires a preset or custom class provided for DbxFilterPopover.');
         }
         this._showPreset.next(showPreset);
@@ -2273,6 +2281,7 @@ class AbstractDbxPresetFilterMenuComponent {
     constructor(filterSourceDirective) {
         this.filterSourceDirective = filterSourceDirective;
         //TODO: Rename to AbstractDbxPresetFilterMenuDirective with next breaking changes
+        this.presetSelected = new EventEmitter();
         this._presets = new BehaviorSubject([]);
         this.selected$ = this.filterSourceDirective.filter$.pipe(startWith(undefined), distinctUntilChanged(), shareReplay(1));
         this.presetsWithPresetStringOnly$ = this._presets.pipe(map((x) => x.filter((y) => Boolean(y.preset))));
@@ -2336,16 +2345,20 @@ class AbstractDbxPresetFilterMenuComponent {
             }
             this.filterSourceDirective.setFilter(filter);
         }
+        this.presetSelected.next(preset);
     }
     ngOnDestroy() {
         this._presets.complete();
+        this.presetSelected.complete();
     }
 }
 AbstractDbxPresetFilterMenuComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: AbstractDbxPresetFilterMenuComponent, deps: [{ token: i1$2.FilterSourceDirective }], target: i0.ɵɵFactoryTarget.Directive });
-AbstractDbxPresetFilterMenuComponent.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.12", type: AbstractDbxPresetFilterMenuComponent, inputs: { presets: "presets" }, ngImport: i0 });
+AbstractDbxPresetFilterMenuComponent.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.12", type: AbstractDbxPresetFilterMenuComponent, inputs: { presets: "presets" }, outputs: { presetSelected: "presetSelected" }, ngImport: i0 });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.12", ngImport: i0, type: AbstractDbxPresetFilterMenuComponent, decorators: [{
             type: Directive
-        }], ctorParameters: function () { return [{ type: i1$2.FilterSourceDirective }]; }, propDecorators: { presets: [{
+        }], ctorParameters: function () { return [{ type: i1$2.FilterSourceDirective }]; }, propDecorators: { presetSelected: [{
+                type: Output
+            }], presets: [{
                 type: Input
             }] } });