Merge pull request #644 from revolist/filter-hooks

filter updates
revolist · Nov 28, 2024 · 78d14b7 · 78d14b7
2 parents 10e2104 + bbd2289
commit 78d14b7
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 16 deletions.
diff --git a/src/plugins/filter/filter.panel.tsx b/src/plugins/filter/filter.panel.tsx
@@ -459,18 +459,23 @@ export class FilterPanel {
       >
         <slot slot="header" />
         { this.changes.extraContent?.(this.changes) || '' }
-        <label>{capts.title}</label>
-        <div class="filter-holder">{this.getFilterItemsList()}</div>
-
-        <div class="add-filter">
-          <select
-            id={FILTER_ID}
-            class="select-css"
-            onChange={e => this.onAddNewFilter(e)}
-          >
-            {this.renderSelectOptions(this.currentFilterType)}
-          </select>
-        </div>
+
+        { this.changes?.hideDefaultFilters !== true && (
+          [
+            <label>{capts.title}</label>,
+            <div class="filter-holder">{this.getFilterItemsList()}</div>,
+            <div class="add-filter">
+              <select
+                id={FILTER_ID}
+                class="select-css"
+                onChange={e => this.onAddNewFilter(e)}
+              >
+                {this.renderSelectOptions(this.currentFilterType)}
+              </select>
+            </div>
+          ]
+        )}
+
         <slot />
         <div class="filter-actions">
           {this.disableDynamicFiltering && [

diff --git a/src/plugins/filter/filter.plugin.tsx b/src/plugins/filter/filter.plugin.tsx
@@ -155,6 +155,10 @@ export class FilterPlugin extends BasePlugin {
     );
   }
 
+  beforeshow(_: ShowData) {
+    // used as hook for filter panel
+  }
+
   extraContent(): any {
     return null;
   }
@@ -254,11 +258,10 @@ export class FilterPlugin extends BasePlugin {
       autoCorrect: true,
       filterTypes: this.getColumnFilter(e.detail.filter),
       filterItems: this.multiFilterItems,
-    };
-    this.pop.show({
-      ...data,
       extraContent: this.extraHyperContent,
-    });
+    };
+    this.beforeshow?.(data);
+    this.pop.show(data);
   }
 
   getColumnFilter(

diff --git a/src/plugins/filter/filter.types.ts b/src/plugins/filter/filter.types.ts
@@ -151,6 +151,8 @@ export type ShowData = {
   autoCorrect?: boolean;
   filterTypes?: Record<string, string[]>;
   filterItems?: MultiFilterItem;
+  // hide default filters
+  hideDefaultFilters?: boolean;
   // pass vnodes from plugins
   extraContent?: (data: ShowData) => any;
 } & FilterItem & Omit<ColumnRegular, 'filter'>;