@linzjs/step-ag-grid 20.0.0 → 21.0.1

package/src/components/gridForm/GridFormEditBearing.tsx

@@ -7,15 +7,15 @@ import { GridBaseRow } from "../Grid";
 import { CellEditorCommon } from "../GridCell";
 import { useGridPopoverHook } from "../GridPopoverHook";
 
-export interface GridFormEditBearingProps<RowType extends GridBaseRow> extends CellEditorCommon {
+export interface GridFormEditBearingProps<TData extends GridBaseRow> extends CellEditorCommon {
   formatValue?: (value: any) => string;
   placeHolder?: string;
   range?: (value: number | null) => string | null;
-  onSave?: (props: { selectedRows: RowType[]; value: number | null }) => Promise<boolean>;
+  onSave?: (props: { selectedRows: TData[]; value: number | null }) => Promise<boolean>;
 }
 
-export const GridFormEditBearing = <RowType extends GridBaseRow>(props: GridFormEditBearingProps<RowType>) => {
-  const { field, value: initialValue } = useGridPopoverContext<RowType>();
+export const GridFormEditBearing = <TData extends GridBaseRow>(props: GridFormEditBearingProps<TData>) => {
+  const { field, value: initialValue } = useGridPopoverContext<TData>();
 
   // This clears out any scientific precision
   const defaultValue = useMemo(
@@ -28,7 +28,7 @@ export const GridFormEditBearing = <RowType extends GridBaseRow>(props: GridForm
   const invalid = useCallback(() => bearingStringValidator(value, props.range), [props.range, value]);
 
   const save = useCallback(
-    async (selectedRows: RowType[]): Promise<boolean> => {
+    async (selectedRows: TData[]): Promise<boolean> => {
       const parsedValue = bearingNumberParser(value);
       // Value didn't change so don't save just cancel
       if (parsedValue === bearingNumberParser(defaultValue)) {

package/src/components/gridForm/GridFormMessage.tsx

@@ -7,12 +7,12 @@ import { GridBaseRow } from "../Grid";
 import { CellEditorCommon } from "../GridCell";
 import { useGridPopoverHook } from "../GridPopoverHook";
 
-export interface GridFormMessageProps<RowType extends GridBaseRow> extends CellEditorCommon {
-  message: (selectedRows: RowType[]) => Promise<string | ReactElement> | string | ReactElement;
+export interface GridFormMessageProps<TData extends GridBaseRow> extends CellEditorCommon {
+  message: (selectedRows: TData[]) => Promise<string | ReactElement> | string | ReactElement;
 }
 
-export const GridFormMessage = <RowType extends GridBaseRow>(props: GridFormMessageProps<RowType>) => {
-  const { selectedRows } = useGridPopoverContext<RowType>();
+export const GridFormMessage = <TData extends GridBaseRow>(props: GridFormMessageProps<TData>): ReactElement => {
+  const { selectedRows } = useGridPopoverContext<TData>();
 
   const [message, setMessage] = useState<string | ReactElement | null>(null);
   const { popoverWrapper } = useGridPopoverHook({ className: props.className });

package/src/components/gridForm/GridFormMultiSelect.tsx

@@ -45,12 +45,12 @@ export interface GridFormMultiSelectGroup {
   filter?: string;
 }
 
-export interface GridFormMultiSelectSaveProps<RowType extends GridBaseRow> {
-  selectedRows: RowType[];
+export interface GridFormMultiSelectSaveProps<TData extends GridBaseRow> {
+  selectedRows: TData[];
   selectedOptions: MultiSelectOption[];
 }
 
-export interface GridFormMultiSelectProps<RowType extends GridBaseRow> extends CellEditorCommon {
+export interface GridFormMultiSelectProps<TData extends GridBaseRow> extends CellEditorCommon {
   className?:
     | "GridMultiSelect-containerSmall"
     | "GridMultiSelect-containerMedium"
@@ -63,14 +63,14 @@ export interface GridFormMultiSelectProps<RowType extends GridBaseRow> extends C
   filterHelpText?: string | ((filter: string, options: MultiSelectOption[]) => string | undefined);
   noOptionsMessage?: string;
   onSelectFilter?: (props: { filter: string; options: MultiSelectOption[] }) => void;
-  onSave?: (props: GridFormMultiSelectSaveProps<RowType>) => Promise<boolean>;
+  onSave?: (props: GridFormMultiSelectSaveProps<TData>) => Promise<boolean>;
   headers?: GridFormMultiSelectGroup[];
-  options: MultiSelectOption[] | ((selectedRows: RowType[]) => Promise<MultiSelectOption[]> | MultiSelectOption[]);
-  invalid?: (selectedRows: RowType[], selectedOptions: MultiSelectOption[]) => boolean;
+  options: MultiSelectOption[] | ((selectedRows: TData[]) => Promise<MultiSelectOption[]> | MultiSelectOption[]);
+  invalid?: (selectedRows: TData[], selectedOptions: MultiSelectOption[]) => boolean;
 }
 
-export const GridFormMultiSelect = <RowType extends GridBaseRow>(props: GridFormMultiSelectProps<RowType>) => {
-  const { selectedRows, data } = useGridPopoverContext<RowType>();
+export const GridFormMultiSelect = <TData extends GridBaseRow>(props: GridFormMultiSelectProps<TData>) => {
+  const { selectedRows, data } = useGridPopoverContext<TData>();
 
   const subComponentIsValidRef = useRef<Record<string, boolean>>({});
   const optionsInitialising = useRef(false);
@@ -95,7 +95,7 @@ export const GridFormMultiSelect = <RowType extends GridBaseRow>(props: GridForm
   }, [options, props, selectedRows]);
 
   const save = useCallback(
-    async (selectedRows: RowType[]): Promise<boolean> => {
+    async (selectedRows: TData[]): Promise<boolean> => {
       if (!options || !props.onSave) return true;
 
       // Any changes to save?

package/src/components/gridForm/GridFormMultiSelectGrid.tsx

@@ -19,34 +19,34 @@ export interface MultiSelectGridOption {
   warning?: string | undefined;
 }
 
-export interface GridFormMultiSelectGridSaveProps<RowType extends GridBaseRow> {
-  selectedRows: RowType[];
+export interface GridFormMultiSelectGridSaveProps<TData extends GridBaseRow> {
+  selectedRows: TData[];
   addValues: any[];
   removeValues: any[];
 }
 
-export interface GridFormMultiSelectGridProps<RowType extends GridBaseRow> extends CellEditorCommon {
+export interface GridFormMultiSelectGridProps<TData extends GridBaseRow> extends CellEditorCommon {
   className?: string | undefined;
   noOptionsMessage?: string;
-  onSave?: (props: GridFormMultiSelectGridSaveProps<RowType>) => Promise<boolean>;
+  onSave?: (props: GridFormMultiSelectGridSaveProps<TData>) => Promise<boolean>;
   options:
     | MultiSelectGridOption[]
-    | ((selectedRows: RowType[]) => Promise<MultiSelectGridOption[]> | MultiSelectGridOption[]);
-  invalid?: (props: GridFormMultiSelectGridSaveProps<RowType>) => boolean;
+    | ((selectedRows: TData[]) => Promise<MultiSelectGridOption[]> | MultiSelectGridOption[]);
+  invalid?: (props: GridFormMultiSelectGridSaveProps<TData>) => boolean;
   maxRowCount?: number;
 }
 
-export const GridFormMultiSelectGrid = <RowType extends GridBaseRow>(
-  props: GridFormMultiSelectGridProps<RowType>,
+export const GridFormMultiSelectGrid = <TData extends GridBaseRow>(
+  props: GridFormMultiSelectGridProps<TData>,
 ): ReactElement => {
-  const { selectedRows } = useGridPopoverContext<RowType>();
+  const { selectedRows } = useGridPopoverContext<TData>();
   const optionsInitialising = useRef(false);
 
   const [initialValues, setInitialValues] = useState<MultiSelectGridOption[]>();
   const [options, setOptions] = useState<MultiSelectGridOption[]>();
 
   const genSave = useCallback(
-    (selectedRows: RowType[]): GridFormMultiSelectGridSaveProps<RowType> => {
+    (selectedRows: TData[]): GridFormMultiSelectGridSaveProps<TData> => {
       if (!options) return { selectedRows, addValues: [], removeValues: [] };
 
       const preChecked = (initialValues ?? []).filter((o) => o.checked).map((o) => o.value);
@@ -63,7 +63,7 @@ export const GridFormMultiSelectGrid = <RowType extends GridBaseRow>(
   );
 
   const save = useCallback(
-    async (selectedRows: RowType[]): Promise<boolean> => {
+    async (selectedRows: TData[]): Promise<boolean> => {
       if (!options || !props.onSave) return true;
       // Any changes to save?
       if (

package/src/components/gridForm/GridFormPopoverMenu.tsx

@@ -10,9 +10,9 @@ import { GridBaseRow } from "../Grid";
 import { CellEditorCommon } from "../GridCell";
 import { useGridPopoverHook } from "../GridPopoverHook";
 
-export interface GridFormPopoverMenuProps<RowType extends GridBaseRow> extends CellEditorCommon {
-  options: (selectedRows: RowType[]) => Promise<MenuOption<RowType>[]>;
-  defaultAction?: (props: { selectedRows: RowType[]; menuOption: SelectedMenuOptionResult<RowType> }) => Promise<void>;
+export interface GridFormPopoverMenuProps<TData extends GridBaseRow> extends CellEditorCommon {
+  options: (selectedRows: TData[]) => Promise<MenuOption<TData>[]>;
+  defaultAction?: (props: { selectedRows: TData[]; menuOption: SelectedMenuOptionResult<TData> }) => Promise<void>;
 }
 
 /** Menu configuration types **/
@@ -23,14 +23,14 @@ interface MenuSeparatorType {
   __isMenuSeparator__: boolean;
 }
 
-export interface SelectedMenuOptionResult<RowType extends GridBaseRow> extends MenuOption<RowType> {
+export interface SelectedMenuOptionResult<TData extends GridBaseRow> extends MenuOption<TData> {
   subValue: any;
 }
 
-export interface MenuOption<RowType extends GridBaseRow> {
+export interface MenuOption<TData extends GridBaseRow> {
   label: ReactElement | string | MenuSeparatorType;
   subMenu?: () => ReactElement;
-  action?: (props: { selectedRows: RowType[]; menuOption: SelectedMenuOptionResult<RowType> }) => Promise<void>;
+  action?: (props: { selectedRows: TData[]; menuOption: SelectedMenuOptionResult<TData> }) => Promise<void>;
   disabled?: string | boolean;
   hidden?: boolean;
   subComponent?: (props: any) => ReactElement;
@@ -40,18 +40,18 @@ export interface MenuOption<RowType extends GridBaseRow> {
  * NOTE: If the popout menu doesn't appear on single click when also selecting row it's because
  * you need a useMemo around your columnDefs
  */
-export const GridFormPopoverMenu = <RowType extends GridBaseRow>(props: GridFormPopoverMenuProps<RowType>) => {
-  const { selectedRows, updateValue, data } = useGridPopoverContext<RowType>();
+export const GridFormPopoverMenu = <TData extends GridBaseRow>(props: GridFormPopoverMenuProps<TData>) => {
+  const { selectedRows, updateValue, data } = useGridPopoverContext<TData>();
 
   const optionsInitialising = useRef(false);
-  const [options, setOptions] = useState<MenuOption<RowType>[]>();
+  const [options, setOptions] = useState<MenuOption<TData>[]>();
 
-  const [subComponentSelected, setSubComponentSelected] = useState<MenuOption<RowType> | null>(null);
+  const [subComponentSelected, setSubComponentSelected] = useState<MenuOption<TData> | null>(null);
   const subComponentIsValid = useRef(false);
   const [subSelectedValue, setSubSelectedValue] = useState<any>();
 
   const defaultAction = useCallback(
-    async (params: { selectedRows: RowType[]; menuOption: SelectedMenuOptionResult<RowType> }) => {
+    async (params: { selectedRows: TData[]; menuOption: SelectedMenuOptionResult<TData> }) => {
       if (props.defaultAction) await props.defaultAction(params);
       else console.error(`No action specified for ${params.menuOption.label} menu options`);
     },
@@ -80,7 +80,7 @@ export const GridFormPopoverMenu = <RowType extends GridBaseRow>(props: GridForm
   }, [options, props.defaultAction, props.options, selectedRows]);
 
   const actionClick = useCallback(
-    async (menuOption: MenuOption<RowType>) => {
+    async (menuOption: MenuOption<TData>) => {
       await (menuOption.action ?? defaultAction)({
         selectedRows,
         menuOption: { ...menuOption, subValue: subSelectedValue },
@@ -91,7 +91,7 @@ export const GridFormPopoverMenu = <RowType extends GridBaseRow>(props: GridForm
   );
 
   const onMenuItemClick = useCallback(
-    async (e: ClickEvent, item: MenuOption<RowType>) => {
+    async (e: ClickEvent, item: MenuOption<TData>) => {
       if (item.subComponent) {
         subComponentIsValid.current = false;
         setSubSelectedValue(null);

package/src/components/gridForm/GridFormSubComponentTextArea.tsx

@@ -7,8 +7,8 @@ import { TextInputValidator, TextInputValidatorProps } from "../../utils/textVal
 import { GridBaseRow } from "../Grid";
 import { CellEditorCommon } from "../GridCell";
 
-export interface GridSubComponentTextAreaProps<RowType extends GridBaseRow>
-  extends TextInputValidatorProps<RowType>,
+export interface GridSubComponentTextAreaProps<TData extends GridBaseRow>
+  extends TextInputValidatorProps<TData>,
     CellEditorCommon {
   placeholder?: string;
   width?: string | number;
@@ -17,8 +17,8 @@ export interface GridSubComponentTextAreaProps<RowType extends GridBaseRow>
   helpText?: string;
 }
 
-export const GridFormSubComponentTextArea = <RowType extends GridBaseRow>(
-  props: GridSubComponentTextAreaProps<RowType>,
+export const GridFormSubComponentTextArea = <TData extends GridBaseRow>(
+  props: GridSubComponentTextAreaProps<TData>,
 ): ReactElement => {
   const { value, data, setValue, setValid, context } = useContext(GridSubComponentContext);
 

package/src/components/gridForm/GridFormSubComponentTextInput.tsx

@@ -6,8 +6,8 @@ import { TextInputValidator, TextInputValidatorProps } from "../../utils/textVal
 import { GridBaseRow } from "../Grid";
 import { CellEditorCommon } from "../GridCell";
 
-export interface GridFormSubComponentTextInputProps<RowType extends GridBaseRow>
-  extends TextInputValidatorProps<RowType>,
+export interface GridFormSubComponentTextInputProps<TData extends GridBaseRow>
+  extends TextInputValidatorProps<TData>,
     CellEditorCommon {
   placeholder?: string;
   width?: string | number;
@@ -15,8 +15,8 @@ export interface GridFormSubComponentTextInputProps<RowType extends GridBaseRow>
   helpText?: string;
 }
 
-export const GridFormSubComponentTextInput = <RowType extends GridBaseRow>(
-  props: GridFormSubComponentTextInputProps<RowType>,
+export const GridFormSubComponentTextInput = <TData extends GridBaseRow>(
+  props: GridFormSubComponentTextInputProps<TData>,
 ): ReactElement => {
   const { value, setValue, setValid, data, context } = useContext(GridSubComponentContext);
 

package/src/components/gridForm/GridFormTextArea.tsx

@@ -7,17 +7,17 @@ import { GridBaseRow } from "../Grid";
 import { CellEditorCommon } from "../GridCell";
 import { useGridPopoverHook } from "../GridPopoverHook";
 
-export interface GridFormTextAreaProps<RowType extends GridBaseRow>
-  extends TextInputValidatorProps<RowType>,
+export interface GridFormTextAreaProps<TData extends GridBaseRow>
+  extends TextInputValidatorProps<TData>,
     CellEditorCommon {
   placeholder?: string;
   width?: string | number;
-  onSave?: (props: { selectedRows: RowType[]; value: string }) => Promise<boolean>;
+  onSave?: (props: { selectedRows: TData[]; value: string }) => Promise<boolean>;
   helpText?: string;
 }
 
-export const GridFormTextArea = <RowType extends GridBaseRow>(props: GridFormTextAreaProps<RowType>): ReactElement => {
-  const { field, value: initialVale, data } = useGridPopoverContext<RowType>();
+export const GridFormTextArea = <TData extends GridBaseRow>(props: GridFormTextAreaProps<TData>): ReactElement => {
+  const { field, value: initialVale, data } = useGridPopoverContext<TData>();
 
   const initValue = useMemo(() => (initialVale == null ? "" : `${initialVale}`), [initialVale]);
   const [value, setValue] = useState(initValue);
@@ -27,7 +27,7 @@ export const GridFormTextArea = <RowType extends GridBaseRow>(props: GridFormTex
   const invalid = useCallback(() => TextInputValidator(props, value, data, {}), [props, value, data]);
 
   const save = useCallback(
-    async (selectedRows: RowType[]): Promise<boolean> => {
+    async (selectedRows: TData[]): Promise<boolean> => {
       if (invalid()) return false;
 
       const trimmedValue = value.trim();

package/src/components/gridForm/GridFormTextInput.tsx

@@ -7,28 +7,28 @@ import { GridBaseRow } from "../Grid";
 import { CellEditorCommon } from "../GridCell";
 import { useGridPopoverHook } from "../GridPopoverHook";
 
-export interface GridFormTextInputProps<RowType extends GridBaseRow>
-  extends TextInputValidatorProps<RowType>,
+export interface GridFormTextInputProps<TData extends GridBaseRow>
+  extends TextInputValidatorProps<TData>,
     CellEditorCommon {
   placeholder?: string;
   units?: string;
   width?: string | number;
-  onSave?: (props: { selectedRows: RowType[]; value: string }) => Promise<boolean>;
+  onSave?: (props: { selectedRows: TData[]; value: string }) => Promise<boolean>;
   helpText?: string;
 }
 
-export const GridFormTextInput = <RowType extends GridBaseRow>(props: GridFormTextInputProps<RowType>) => {
-  const { field, value: initialVale, data } = useGridPopoverContext<RowType>();
+export const GridFormTextInput = <TData extends GridBaseRow>(props: GridFormTextInputProps<TData>) => {
+  const { field, value: initialVale, data } = useGridPopoverContext<TData>();
 
   const helpText = props.helpText ?? "Press enter or tab to save";
 
   const initValue = useMemo(() => (initialVale == null ? "" : `${initialVale}`), [initialVale]);
   const [value, setValue] = useState(initValue);
 
-  const invalid = useCallback(() => TextInputValidator<RowType>(props, value, data, {}), [data, props, value]);
+  const invalid = useCallback(() => TextInputValidator<TData>(props, value, data, {}), [data, props, value]);
 
   const save = useCallback(
-    async (selectedRows: RowType[]): Promise<boolean> => {
+    async (selectedRows: TData[]): Promise<boolean> => {
       if (invalid()) return false;
 
       const trimmedValue = value.trim();

package/src/components/gridHeader/GridHeaderSelect.tsx

@@ -1,6 +1,6 @@
 import { IHeaderParams } from "ag-grid-community";
 import clsx from "clsx";
-import { useCallback, useEffect, useState } from "react";
+import { useEffect, useState } from "react";
 
 /**
  * AgGrid's existing select header doesn't work the way we want.
@@ -12,14 +12,16 @@ export const GridHeaderSelect = ({ api }: IHeaderParams) => {
   const [updateCounter, setUpdateCounter] = useState(0);
   const selectedNodeCount = api.getSelectedRows().length;
 
-  const clickHandler = useCallback(() => {
-    setUpdateCounter(updateCounter + 1);
-  }, [updateCounter]);
-
   useEffect(() => {
+    const clickHandler = () => {
+      setUpdateCounter(updateCounter + 1);
+    };
+
     api.addEventListener("selectionChanged", clickHandler);
-    return () => api.removeEventListener("selectionChanged", clickHandler);
-  }, [api, clickHandler]);
+    return () => {
+      !api.isDestroyed() && api.removeEventListener("selectionChanged", clickHandler);
+    };
+  }, [api, updateCounter]);
 
   const handleMultiSelect = () => {
     if (selectedNodeCount == 0) {
@@ -29,7 +31,7 @@ export const GridHeaderSelect = ({ api }: IHeaderParams) => {
     }
   };
 
-  const totalNodeCount = api.getModel().getRowCount();
+  const totalNodeCount = api.getDisplayedRowCount();
   const partialSelect = selectedNodeCount != 0 && selectedNodeCount != totalNodeCount;
   const allSelected = selectedNodeCount != 0 && selectedNodeCount == totalNodeCount;
 

package/src/components/gridHook/useGridContextMenu.tsx

@@ -1,28 +1,28 @@
 import { ColDef } from "ag-grid-community";
-import { CellContextMenuEvent } from "ag-grid-community/dist/lib/events";
+import { CellContextMenuEvent } from "ag-grid-community";
 import { ReactElement, useCallback, useContext, useRef, useState } from "react";
 
 import { GridContext } from "../../contexts/GridContext";
 import { ControlledMenu } from "../../react-menu3";
 import { GridBaseRow } from "../Grid";
 
-export interface GridContextMenuComponentProps<RowType extends GridBaseRow> {
-  selectedRows: RowType[];
-  clickedRow: RowType;
+export interface GridContextMenuComponentProps<TData extends GridBaseRow> {
+  selectedRows: TData[];
+  clickedRow: TData;
   colDef: ColDef;
   close: () => void;
 }
 
-export type GridContextMenuComponent<RowType extends GridBaseRow> = (
-  props: GridContextMenuComponentProps<RowType>,
+export type GridContextMenuComponent<TData extends GridBaseRow> = (
+  props: GridContextMenuComponentProps<TData>,
 ) => ReactElement | null;
 
-export const useGridContextMenu = <RowType extends GridBaseRow>({
+export const useGridContextMenu = <TData extends GridBaseRow>({
   contextMenuSelectRow,
   contextMenu: ContextMenu,
 }: {
   contextMenuSelectRow: boolean;
-  contextMenu?: GridContextMenuComponent<RowType>;
+  contextMenu?: GridContextMenuComponent<TData>;
 }) => {
   const { redrawRows, prePopupOps, postPopupOps, getSelectedRows } = useContext(GridContext);
 

package/src/components/gridPopoverEdit/GridPopoutEditMultiSelect.ts

@@ -3,15 +3,15 @@ import { ColDefT, GenericCellEditorProps, GridCell } from "../GridCell";
 import { GridFormMultiSelect, GridFormMultiSelectProps } from "../gridForm/GridFormMultiSelect";
 import { GenericCellColDef } from "../gridRender/GridRenderGenericCell";
 
-export const GridPopoutEditMultiSelect = <RowType extends GridBaseRow>(
-  colDef: GenericCellColDef<RowType>,
-  props: GenericCellEditorProps<GridFormMultiSelectProps<RowType>>,
-): ColDefT<RowType> =>
-  GridCell(colDef, {
+export const GridPopoutEditMultiSelect = <TData extends GridBaseRow, TValue = any>(
+  colDef: GenericCellColDef<TData, TValue>,
+  props: GenericCellEditorProps<GridFormMultiSelectProps<TData>>,
+): ColDefT<TData, TValue> =>
+  GridCell<TData, TValue, GridFormMultiSelectProps<TData>>(colDef, {
     editor: GridFormMultiSelect,
     ...props,
     editorParams: {
       className: "GridMultiSelect-containerMedium",
-      ...(props.editorParams as GridFormMultiSelectProps<RowType>),
+      ...(props.editorParams as GridFormMultiSelectProps<TData>),
     },
   });

package/src/components/gridPopoverEdit/GridPopoutEditMultiSelectGrid.ts

@@ -3,15 +3,15 @@ import { ColDefT, GenericCellEditorProps, GridCell } from "../GridCell";
 import { GridFormMultiSelectGrid, GridFormMultiSelectGridProps } from "../gridForm/GridFormMultiSelectGrid";
 import { GenericCellColDef } from "../gridRender/GridRenderGenericCell";
 
-export const GridPopoutEditMultiSelectGrid = <RowType extends GridBaseRow>(
-  colDef: GenericCellColDef<RowType>,
-  props: GenericCellEditorProps<GridFormMultiSelectGridProps<RowType>>,
-): ColDefT<RowType> =>
-  GridCell(colDef, {
+export const GridPopoutEditMultiSelectGrid = <TData extends GridBaseRow, TValue = any>(
+  colDef: GenericCellColDef<TData, TValue>,
+  props: GenericCellEditorProps<GridFormMultiSelectGridProps<TData>>,
+): ColDefT<TData, TValue> =>
+  GridCell<TData, TValue, GridFormMultiSelectGridProps<TData>>(colDef, {
     editor: GridFormMultiSelectGrid,
     ...props,
     editorParams: {
       className: "GridMultiSelect-containerMedium",
-      ...(props.editorParams as GridFormMultiSelectGridProps<RowType>),
+      ...(props.editorParams as GridFormMultiSelectGridProps<TData>),
     },
   });

package/src/components/gridPopoverEdit/GridPopoverEditBearing.ts

@@ -1,4 +1,4 @@
-import { ValueFormatterParams } from "ag-grid-community/dist/lib/entities/colDef";
+import { ValueFormatterParams } from "ag-grid-community";
 
 import {
   bearingCorrectionRangeValidator,
@@ -11,13 +11,13 @@ import { ColDefT, GenericCellEditorProps, GridCell } from "../GridCell";
 import { GridFormEditBearing, GridFormEditBearingProps } from "../gridForm/GridFormEditBearing";
 import { GenericCellColDef } from "../gridRender/GridRenderGenericCell";
 
-const GridPopoverEditBearingLike = <RowType extends GridBaseRow>(
-  colDef: GenericCellColDef<RowType>,
-  props: GenericCellEditorProps<GridFormEditBearingProps<RowType>> & {
+const GridPopoverEditBearingLike = <TData extends GridBaseRow, TValue = any>(
+  colDef: GenericCellColDef<TData, TValue>,
+  props: GenericCellEditorProps<GridFormEditBearingProps<TData>> & {
     editorParams: { formatValue: (value: any) => any };
   },
-): ColDefT<RowType> =>
-  GridCell(
+): ColDefT<TData, TValue> =>
+  GridCell<TData, TValue, GridFormEditBearingProps<TData>>(
     {
       valueFormatter: (params: ValueFormatterParams) => props.editorParams?.formatValue(params.value) ?? "",
       ...colDef,
@@ -34,11 +34,11 @@ export const GridPopoverEditBearingEditorParams = {
   range: bearingRangeValidator,
 };
 
-export const GridPopoverEditBearing = <RowType extends GridBaseRow>(
-  colDef: GenericCellColDef<RowType>,
-  props: GenericCellEditorProps<GridFormEditBearingProps<RowType>>,
-): ColDefT<RowType> =>
-  GridPopoverEditBearingLike(colDef, {
+export const GridPopoverEditBearing = <TData extends GridBaseRow, TValue = any>(
+  colDef: GenericCellColDef<TData, TValue>,
+  props: GenericCellEditorProps<GridFormEditBearingProps<TData>>,
+): ColDefT<TData, TValue> =>
+  GridPopoverEditBearingLike<TData, TValue>(colDef, {
     multiEdit: !!props.multiEdit,
     editorParams: {
       ...GridPopoverEditBearingEditorParams,
@@ -52,11 +52,11 @@ export const GridPopoverEditBearingCorrectionEditorParams = {
   range: bearingCorrectionRangeValidator,
 };
 
-export const GridPopoverEditBearingCorrection = <RowType extends GridBaseRow>(
-  colDef: GenericCellColDef<RowType>,
-  props: GenericCellEditorProps<GridFormEditBearingProps<RowType>>,
-): ColDefT<RowType> =>
-  GridPopoverEditBearingLike(colDef, {
+export const GridPopoverEditBearingCorrection = <TData extends GridBaseRow, TValue = any>(
+  colDef: GenericCellColDef<TData, TValue>,
+  props: GenericCellEditorProps<GridFormEditBearingProps<TData>>,
+): ColDefT<TData, TValue> =>
+  GridPopoverEditBearingLike<TData, TValue>(colDef, {
     multiEdit: !!props.multiEdit,
     editorParams: {
       ...GridPopoverEditBearingCorrectionEditorParams,

package/src/components/gridPopoverEdit/GridPopoverEditDropDown.ts

@@ -3,16 +3,16 @@ import { ColDefT, GenericCellEditorProps, GridCell } from "../GridCell";
 import { GridFormDropDown, GridFormDropDownProps } from "../gridForm/GridFormDropDown";
 import { GenericCellColDef } from "../gridRender/GridRenderGenericCell";
 
-export const GridPopoverEditDropDown = <RowType extends GridBaseRow>(
-  colDef: GenericCellColDef<RowType>,
-  props: GenericCellEditorProps<GridFormDropDownProps<RowType>>,
-): ColDefT<RowType> =>
-  GridCell(colDef, {
+export const GridPopoverEditDropDown = <TData extends GridBaseRow, TValue = any>(
+  colDef: GenericCellColDef<TData, TValue>,
+  props: GenericCellEditorProps<GridFormDropDownProps<TData>>,
+): ColDefT<TData, TValue> =>
+  GridCell<TData, TValue, GridFormDropDownProps<TData>>(colDef, {
     editor: GridFormDropDown,
     ...props,
     editorParams: {
       // Defaults to large size container
       className: "GridPopoverEditDropDown-containerLarge",
-      ...(props.editorParams as GridFormDropDownProps<RowType>),
+      ...(props.editorParams as GridFormDropDownProps<TData>),
     },
   });

package/src/components/gridPopoverEdit/GridPopoverMenu.tsx

@@ -7,11 +7,11 @@ import { GridRenderPopoutMenuCell } from "../gridRender/GridRenderPopoutMenuCell
 /**
  * Popout burger menu
  */
-export const GridPopoverMenu = <RowType extends GridBaseRow>(
-  colDef: GenericCellColDef<RowType>,
-  custom: GenericCellEditorProps<GridFormPopoverMenuProps<RowType>>,
-): ColDefT<RowType> =>
-  GridCell<RowType, GridFormPopoverMenuProps<RowType>>(
+export const GridPopoverMenu = <TData extends GridBaseRow>(
+  colDef: GenericCellColDef<TData>,
+  custom: GenericCellEditorProps<GridFormPopoverMenuProps<TData>>,
+): ColDefT<TData> =>
+  GridCell<TData, any, GridFormPopoverMenuProps<TData>>(
     {
       minWidth: 48,
       maxWidth: 48,

package/src/components/gridPopoverEdit/GridPopoverMessage.ts

@@ -3,11 +3,11 @@ import { ColDefT, GenericCellEditorProps, GridCell } from "../GridCell";
 import { GridFormMessage, GridFormMessageProps } from "../gridForm/GridFormMessage";
 import { GenericCellColDef } from "../gridRender/GridRenderGenericCell";
 
-export const GridPopoverMessage = <RowType extends GridBaseRow>(
-  colDef: GenericCellColDef<RowType>,
-  props: GenericCellEditorProps<GridFormMessageProps<RowType>>,
-): ColDefT<RowType> =>
-  GridCell(
+export const GridPopoverMessage = <TData extends GridBaseRow, TValue = any>(
+  colDef: GenericCellColDef<TData, TValue>,
+  props: GenericCellEditorProps<GridFormMessageProps<TData>>,
+): ColDefT<TData, TValue> =>
+  GridCell<TData, TValue, GridFormMessageProps<TData>>(
     {
       resizable: true,
       ...colDef,

package/src/components/gridPopoverEdit/GridPopoverTextArea.ts

@@ -3,7 +3,8 @@ import { ColDefT, GenericCellEditorProps, GridCell } from "../GridCell";
 import { GridFormTextArea, GridFormTextAreaProps } from "../gridForm/GridFormTextArea";
 import { GenericCellColDef } from "../gridRender/GridRenderGenericCell";
 
-export const GridPopoverTextArea = <RowType extends GridBaseRow>(
-  colDef: GenericCellColDef<RowType>,
-  params: GenericCellEditorProps<GridFormTextAreaProps<RowType>>,
-): ColDefT<RowType> => GridCell(colDef, { editor: GridFormTextArea, ...params });
+export const GridPopoverTextArea = <TData extends GridBaseRow, TValue = any>(
+  colDef: GenericCellColDef<TData, TValue>,
+  params: GenericCellEditorProps<GridFormTextAreaProps<TData>>,
+): ColDefT<TData, TValue> =>
+  GridCell<TData, TValue, GridFormTextAreaProps<TData>>(colDef, { editor: GridFormTextArea, ...params });

package/src/components/gridPopoverEdit/GridPopoverTextInput.ts

@@ -3,11 +3,11 @@ import { ColDefT, GenericCellEditorProps, GridCell } from "../GridCell";
 import { GridFormTextInput, GridFormTextInputProps } from "../gridForm/GridFormTextInput";
 import { GenericCellColDef } from "../gridRender/GridRenderGenericCell";
 
-export const GridPopoverTextInput = <RowType extends GridBaseRow>(
-  colDef: GenericCellColDef<RowType>,
-  params: GenericCellEditorProps<GridFormTextInputProps<RowType>>,
-): ColDefT<RowType> =>
-  GridCell(colDef, {
+export const GridPopoverTextInput = <TData extends GridBaseRow, TValue = any>(
+  colDef: GenericCellColDef<TData, TValue>,
+  params: GenericCellEditorProps<GridFormTextInputProps<TData>>,
+): ColDefT<TData, TValue> =>
+  GridCell<TData, TValue, GridFormTextInputProps<TData>>(colDef, {
     editor: GridFormTextInput,
     ...params,
   });