fix: Pass optional expandDescendants arg to setColumnExpanded (#2540)

- Pass optional `expandDescendants` arg to `setColumnExpanded`
- Pass mouse handlers and renderer from `IrisGridPanel` to `IrisGrid`

Author: vbabich

packages/dashboard-core-plugins/src/panels/IrisGridPanel.tsx

@@ -45,6 +45,8 @@ import {
   type ColumnHeaderGroup,
   type IrisGridContextMenuData,
   type PartitionConfig,
+  type IrisGridRenderer,
+  type MouseHandlersProp,
 } from '@deephaven/iris-grid';
 import {
   type RowDataMap,
@@ -153,7 +155,10 @@ export interface OwnProps extends DashboardPanelProps {
   /** Load a plugin defined by the table */
   loadPlugin: (pluginName: string) => TablePluginComponent;
 
-  theme?: IrisGridThemeType;
+  theme?: Partial<IrisGridThemeType> & Record<string, unknown>;
+
+  mouseHandlers?: MouseHandlersProp;
+  renderer?: IrisGridRenderer;
 }
 
 interface StateProps {
@@ -1135,8 +1140,10 @@ export class IrisGridPanel extends PureComponent<
       inputFilters,
       links,
       metadata,
+      mouseHandlers,
       panelState,
       user,
+      renderer,
       settings,
       theme,
     } = this.props;
@@ -1239,11 +1246,13 @@ export class IrisGridPanel extends PureComponent<
             isSelectingPartition={isSelectingPartition}
             isStuckToBottom={isStuckToBottom}
             isStuckToRight={isStuckToRight}
+            mouseHandlers={mouseHandlers}
             movedColumns={movedColumns}
             movedRows={movedRows}
             partitions={partitions}
             partitionConfig={partitionConfig}
             quickFilters={quickFilters}
+            renderer={renderer}
             reverse={reverse}
             rollupConfig={rollupConfig}
             settings={settings}

packages/iris-grid/src/IrisGrid.tsx

@@ -278,6 +278,11 @@ export interface IrisGridContextMenuData {
   modelColumn: GridRangeIndex;
 }
 
+export type MouseHandlersProp = readonly (
+  | GridMouseHandler
+  | ((irisGrid: IrisGrid) => GridMouseHandler)
+)[];
+
 export interface IrisGridProps {
   children: React.ReactNode;
   advancedFilters: ReadonlyAdvancedFilterMap;
@@ -361,7 +366,7 @@ export interface IrisGridProps {
 
   // Optional key and mouse handlers
   keyHandlers: readonly KeyHandler[];
-  mouseHandlers: readonly GridMouseHandler[];
+  mouseHandlers: MouseHandlersProp;
 
   // Pass in a custom renderer to the grid for advanced use cases
   renderer?: IrisGridRenderer;
@@ -751,13 +756,15 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> {
       columnHeaderGroups,
     } = props;
 
+    const { mouseHandlers: mouseHandlersProp } = props;
+
     const { dh } = model;
     const keyHandlers: KeyHandler[] = [
       new CopyCellKeyHandler(this),
       new ReverseKeyHandler(this),
       new ClearFilterKeyHandler(this),
     ];
-    const mouseHandlers: GridMouseHandler[] = [
+    const mouseHandlers: MouseHandlersProp = [
       new IrisGridCellOverflowMouseHandler(this),
       new IrisGridRowTreeMouseHandler(this),
       new IrisGridTokenMouseHandler(this),
@@ -769,10 +776,11 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> {
       new IrisGridDataSelectMouseHandler(this),
       new PendingMouseHandler(this),
       new IrisGridPartitionedTableMouseHandler(this),
+      ...mouseHandlersProp,
+      ...(canCopy ? [new IrisGridCopyCellMouseHandler(this)] : []),
     ];
     if (canCopy) {
       keyHandlers.push(new CopyKeyHandler(this));
-      mouseHandlers.push(new IrisGridCopyCellMouseHandler(this));
     }
     const movedColumns =
       movedColumnsProp.length > 0
@@ -1095,7 +1103,7 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> {
 
   keyHandlers: readonly KeyHandler[];
 
-  mouseHandlers: readonly GridMouseHandler[];
+  mouseHandlers: MouseHandlersProp;
 
   get gridWrapper(): HTMLDivElement | null {
     return this.grid?.canvasWrapper.current ?? null;
@@ -1538,9 +1546,10 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> {
   }
 
   getCachedMouseHandlers = memoize(
-    (
-      mouseHandlers: readonly GridMouseHandler[]
-    ): readonly GridMouseHandler[] => [...mouseHandlers, ...this.mouseHandlers],
+    (mouseHandlers: MouseHandlersProp): readonly GridMouseHandler[] =>
+      [...mouseHandlers, ...this.mouseHandlers].map(handler =>
+        typeof handler === 'function' ? handler(this) : handler
+      ),
     { max: 1 }
   );
 
@@ -2586,11 +2595,18 @@ class IrisGrid extends Component<IrisGridProps, IrisGridState> {
     });
   }
 
-  toggleExpandColumn(modelIndex: ModelIndex): void {
+  toggleExpandColumn(
+    modelIndex: ModelIndex,
+    expandDescendants?: boolean
+  ): void {
     log.debug2('Toggle expand column', modelIndex);
     const { model } = this.props;
     if (isExpandableColumnGridModel(model) && model.hasExpandableColumns) {
-      model.setColumnExpanded(modelIndex, !model.isColumnExpanded(modelIndex));
+      model.setColumnExpanded(
+        modelIndex,
+        !model.isColumnExpanded(modelIndex),
+        expandDescendants
+      );
     }
   }