Merge pull request #625 from revolist/grouping-plugin

feat: Preserver grouping, improved plugin types
revolist · Nov 7, 2024 · d396742 · d396742
2 parents b38e7e2 + e8c360f
commit d396742
Show file tree

Hide file tree

Showing 15 changed files with 232 additions and 152 deletions.
diff --git a/docs b/docs
diff --git a/packages/angular b/packages/angular
diff --git a/packages/react b/packages/react
diff --git a/packages/svelte b/packages/svelte
diff --git a/packages/vue3 b/packages/vue3
diff --git a/src/components/revoGrid/revo-grid.tsx b/src/components/revoGrid/revo-grid.tsx
@@ -1267,8 +1267,7 @@ export class RevoGridComponent {
    * Grouping
    */
   @Watch('grouping') groupingChanged(newVal: GroupingOptions = {}) {
-    const grPlugin = this.pluginService.getByClass(GroupingRowPlugin);
-    grPlugin?.setGrouping(newVal || {});
+    this.pluginService.getByClass(GroupingRowPlugin)?.setGrouping(newVal || {});
   }
   /**
    * Stretch Plugin Apply

diff --git a/src/plugins/base.plugin.ts b/src/plugins/base.plugin.ts
@@ -1,7 +1,8 @@
 import { h } from '@stencil/core';
-import { PluginProviders, PluginBaseComponent } from '..';
+import type { PluginProviders, PluginBaseComponent, RevoGridCustomEvent } from '..';
 
-type WatchConfig = { immediate: boolean };
+
+export type WatchConfig = { immediate: boolean };
 
 /**
  * Base layer for plugins
@@ -17,12 +18,12 @@ export class BasePlugin implements PluginBaseComponent {
    * @param eventName - event name to subscribe to in revo-grid component (e.g. 'beforeheaderclick')
    * @param callback - callback function for event
    */
-  addEventListener<T = any>(
-    eventName: string,
-    callback: (e: CustomEvent<T>) => void,
+  addEventListener<K extends keyof HTMLRevoGridElementEventMap>(
+    eventName: K,
+    callback: (this: BasePlugin, e: RevoGridCustomEvent<HTMLRevoGridElementEventMap[K]>) => void,
   ) {
-    this.revogrid.addEventListener(eventName, callback);
-    this.subscriptions[eventName] = callback;
+    this.revogrid.addEventListener(eventName as string, callback);
+    this.subscriptions[eventName as string] = callback;
   }
 
   /**

diff --git a/src/plugins/groupingRow/grouping.const.ts b/src/plugins/groupingRow/grouping.const.ts
@@ -1,3 +1,4 @@
+import { DimensionRows } from '@type';
 import { GRID_INTERNALS } from '../../utils/consts';
 
 export const GROUP_DEPTH = `${GRID_INTERNALS}-depth`;
@@ -6,7 +7,8 @@ export const PSEUDO_GROUP_ITEM_ID = `${GRID_INTERNALS}-id`;
 export const PSEUDO_GROUP_ITEM_VALUE = `${GRID_INTERNALS}-value`;
 export const PSEUDO_GROUP_COLUMN = `${GRID_INTERNALS}-column`;
 export const GROUP_EXPANDED = `${GRID_INTERNALS}-expanded`;
+export const GROUP_COLUMN_PROP = `${GRID_INTERNALS}-prop`;
 export const GROUP_ORIGINAL_INDEX = `${GRID_INTERNALS}-original-index`;
 export const GROUP_EXPAND_BTN = `group-expand`;
 export const GROUP_EXPAND_EVENT = `groupexpandclick`;
-export const GROUPING_ROW_TYPE = 'rgRow';
+export const GROUPING_ROW_TYPE: DimensionRows = 'rgRow';
+2 −2		package.json
+2 −2		projects/angular-datagrid/package.json