fix: fixed ClickableFilterPreset type

dereekb · Feb 27, 2023 · 5bab6db · 5bab6db
1 parent 4fafd70
commit 5bab6db
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/apps/demo/src/app/modules/doc/modules/interaction/component/filter.ts b/apps/demo/src/app/modules/doc/modules/interaction/component/filter.ts
@@ -3,14 +3,14 @@ import { FilterWithPreset } from '@dereekb/rxjs';
 import { Maybe } from '@dereekb/util';
 import { startOfDay, addDays } from 'date-fns';
 
-export type DocInteractionTestFilterPresets = 'today';
+export type DocInteractionTestFilterPresets = 'johndoe' | 'today' | 'tomorrow' | 'noicon' | 'delete';
 
 export interface DocInteractionTestFilter extends FilterWithPreset<DocInteractionTestFilterPresets> {
   name?: Maybe<string>;
   date?: Maybe<Date>;
 }
 
-export const DOC_INTERACTION_TEST_PRESETS: ClickableFilterPreset<DocInteractionTestFilter>[] = [
+export const DOC_INTERACTION_TEST_PRESETS: ClickableFilterPreset<DocInteractionTestFilter, DocInteractionTestFilterPresets>[] = [
   {
     icon: 'person',
     title: 'John Doe',
@@ -23,17 +23,17 @@ export const DOC_INTERACTION_TEST_PRESETS: ClickableFilterPreset<DocInteractionT
     icon: 'calendar_today',
     title: 'Today',
     preset: 'today',
-    presetValue: {
+    presetValue: () => ({
       date: startOfDay(new Date())
-    }
+    })
   },
   {
     icon: 'circle',
     title: 'Tomorrow',
     preset: 'tomorrow',
-    presetValue: {
+    presetValue: () => ({
       date: startOfDay(addDays(new Date(), 1))
-    }
+    })
   },
   {
     title: 'No Icon',

diff --git a/packages/dbx-core/src/lib/filter/filter.preset.ts b/packages/dbx-core/src/lib/filter/filter.preset.ts
@@ -2,7 +2,7 @@ import { FilterPresetStringRef, FilterWithPreset, FilterWithPresetOptional } fro
 import { EmptyObject, GetterOrValue } from '@dereekb/util';
 import { ClickableAnchorLink } from '../router/anchor/anchor';
 
-export interface ClickableFilterPreset<F extends FilterWithPreset<P>, P extends string = string> extends Pick<ClickableAnchorLink, 'title' | 'icon' | 'disabled'>, FilterPresetStringRef {
+export interface ClickableFilterPreset<F extends FilterWithPreset<P>, P extends string = string> extends Pick<ClickableAnchorLink, 'title' | 'icon' | 'disabled'>, FilterPresetStringRef<P> {
   /**
    * GetterOrValue that retrieves the filter for this preset.
    *