@dereekb/dbx-web 9.24.8 → 9.24.10

package/fesm2020/dereekb-dbx-web.mjs

@@ -5,7 +5,7 @@ import { BehaviorSubject, map, combineLatest, distinctUntilChanged, shareReplay,
 import * as i1$1 from '@angular/material/snack-bar';
 import { MAT_SNACK_BAR_DATA, MatSnackBarModule } from '@angular/material/snack-bar';
 import * as i1$2 from '@dereekb/dbx-core';
-import { AbstractSubscriptionDirective, safeMarkForCheck, AbstractDbxButtonDirective, provideDbxButton, DbxCoreButtonModule, AbstractTransitionWatcherDirective, AbstractDbxActionValueOnTriggerDirective, safeDetectChanges, DbxInjectionComponentModule, AbstractDbxActionHandlerDirective, provideActionStoreSource, AbstractDbxAnchorDirective, expandClickableAnchorLinkTrees, AbstractTransitionDirective, tapDetectChanges, AbstractIfDirective, DbxCoreFilterModule, asSegueRef, isSegueRefActive, DBX_INJECTION_COMPONENT_DATA, checkNgContentWrapperHasContent, anchorTypeForAnchor, AnchorType, DbxCoreActionModule, isIdleActionState, canTriggerAction, onDbxAppAuth, SimpleStorageAccessorFactory } from '@dereekb/dbx-core';
+import { AbstractSubscriptionDirective, safeMarkForCheck, AbstractDbxButtonDirective, provideDbxButton, DbxCoreButtonModule, AbstractTransitionWatcherDirective, AbstractDbxActionValueOnTriggerDirective, safeDetectChanges, DbxInjectionComponentModule, AbstractDbxActionHandlerDirective, provideActionStoreSource, isClickableFilterPreset, AbstractDbxAnchorDirective, expandClickableAnchorLinkTrees, AbstractTransitionDirective, tapDetectChanges, AbstractIfDirective, DbxCoreFilterModule, asSegueRef, isSegueRefActive, DBX_INJECTION_COMPONENT_DATA, checkNgContentWrapperHasContent, anchorTypeForAnchor, AnchorType, DbxCoreActionModule, isIdleActionState, canTriggerAction, onDbxAppAuth, SimpleStorageAccessorFactory } from '@dereekb/dbx-core';
 import ms from 'ms';
 import * as i1 from '@angular/common';
 import { CommonModule } from '@angular/common';
@@ -2281,18 +2281,41 @@ class AbstractDbxPresetFilterMenuComponent {
         //TODO: Rename to AbstractDbxPresetFilterMenuDirective with next breaking changes
         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))));
         this.selectedPresetString$ = this.selected$.pipe(map((selectedFilter) => (selectedFilter ? selectedFilter.preset : undefined)), distinctUntilChanged());
-        this.presetAnchors$ = combineLatest([this._presets, this.selectedPresetString$]).pipe(map(([presets, selectedPresetString]) => {
-            return presets.map((x) => ({
-                ...x,
-                selected: x.preset === selectedPresetString,
-                onClick: () => {
-                    this.selectPreset(x);
+        this.presetAnchorsPairs$ = combineLatest([this._presets, this.selected$, this.selectedPresetString$]).pipe(map(([presets, currentFilterValue, selectedPresetString]) => {
+            return presets.map((x) => {
+                let selected;
+                let type;
+                if (isClickableFilterPreset(x)) {
+                    selected = x.preset === selectedPresetString;
+                    type = 'preset';
                 }
-            }));
+                else {
+                    selected = x.isActive(currentFilterValue);
+                    type = 'partialPreset';
+                }
+                return [
+                    type,
+                    x,
+                    {
+                        ...x,
+                        selected,
+                        onClick: () => {
+                            this.selectPreset(x);
+                        }
+                    }
+                ];
+            });
+        }), shareReplay(1));
+        this.presetAnchors$ = this.presetAnchorsPairs$.pipe(map((x) => x.map((x) => x[2])), shareReplay(1));
+        this.firstSelectedAnchorPair$ = this.presetAnchorsPairs$.pipe(map((presets) => {
+            const firstSelected = presets.find((x) => x[2].selected);
+            return firstSelected ? firstSelected : undefined;
         }), shareReplay(1));
-        this.selectedPreset$ = combineLatest([this._presets, this.selectedPresetString$]).pipe(map(([presets, selectedPresetString]) => {
-            return selectedPresetString != null ? presets.find((x) => x.preset === selectedPresetString) : undefined;
+        this.selectedPreset$ = this.presetAnchorsPairs$.pipe(map((presets) => {
+            const firstSelected = presets.filter((x) => x[0] === 'preset').find((x) => x[2].selected);
+            return firstSelected ? firstSelected[1] : undefined;
         }), shareReplay(1));
     }
     get presets() {
@@ -2302,18 +2325,19 @@ class AbstractDbxPresetFilterMenuComponent {
         this._presets.next(presets);
     }
     selectPreset(preset) {
-        const presetValue = preset.presetValue;
+        const presetString = preset.preset;
+        const presetValue = preset.presetValue || preset.partialPresetValue;
         if (presetValue == null || (typeof presetValue !== 'function' && objectHasNoKeys(presetValue))) {
             // set and then reset if the value is null or empty
             this.filterSourceDirective.setFilter((presetValue ?? {}));
             this.filterSourceDirective.resetFilter();
         }
         else {
-            let filter = getValueFromGetter(preset.presetValue);
-            if (filter.preset !== preset.preset) {
+            let filter = getValueFromGetter(presetValue);
+            if (filter.preset !== presetString) {
                 filter = {
                     ...filter,
-                    preset: preset.preset
+                    preset: presetString
                 };
             }
             this.filterSourceDirective.setFilter(filter);