From b777c9ac2b0e3cbeec382b653c7fe7cb8800d444 Mon Sep 17 00:00:00 2001
From: matttdawson <89495499+matttdawson@users.noreply.github.com>
Date: Fri, 14 Jun 2024 09:16:55 +1200
Subject: [PATCH] Fix classNames being lost

---
 src/components/gridPopoverEdit/GridPopoutEditMultiSelect.ts   | 3 ++-
 .../gridPopoverEdit/GridPopoutEditMultiSelectGrid.ts          | 3 ++-
 src/components/gridPopoverEdit/GridPopoverEditDropDown.ts     | 4 ++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/components/gridPopoverEdit/GridPopoutEditMultiSelect.ts b/src/components/gridPopoverEdit/GridPopoutEditMultiSelect.ts
index 4aeb8c2e..0b871111 100644
--- a/src/components/gridPopoverEdit/GridPopoutEditMultiSelect.ts
+++ b/src/components/gridPopoverEdit/GridPopoutEditMultiSelect.ts
@@ -1,3 +1,4 @@
+import clsx from "clsx";
 import { GridBaseRow } from "../Grid";
 import { ColDefT, GenericCellEditorProps, GridCell } from "../GridCell";
 import { GridFormMultiSelect, GridFormMultiSelectProps } from "../gridForm/GridFormMultiSelect";
@@ -11,7 +12,7 @@ export const GridPopoutEditMultiSelect = <TData extends GridBaseRow, TValue = an
     editor: GridFormMultiSelect,
     ...props,
     editorParams: {
-      className: "GridMultiSelect-containerMedium",
       ...(props.editorParams as GridFormMultiSelectProps<TData>),
+      className: clsx("GridMultiSelect-containerMedium", props.editorParams?.className),
     },
   });
diff --git a/src/components/gridPopoverEdit/GridPopoutEditMultiSelectGrid.ts b/src/components/gridPopoverEdit/GridPopoutEditMultiSelectGrid.ts
index 2b0de710..23ed0e3a 100644
--- a/src/components/gridPopoverEdit/GridPopoutEditMultiSelectGrid.ts
+++ b/src/components/gridPopoverEdit/GridPopoutEditMultiSelectGrid.ts
@@ -1,3 +1,4 @@
+import clsx from "clsx";
 import { GridBaseRow } from "../Grid";
 import { ColDefT, GenericCellEditorProps, GridCell } from "../GridCell";
 import { GridFormMultiSelectGrid, GridFormMultiSelectGridProps } from "../gridForm/GridFormMultiSelectGrid";
@@ -11,7 +12,7 @@ export const GridPopoutEditMultiSelectGrid = <TData extends GridBaseRow, TValue
     editor: GridFormMultiSelectGrid,
     ...props,
     editorParams: {
-      className: "GridMultiSelect-containerMedium",
       ...(props.editorParams as GridFormMultiSelectGridProps<TData>),
+      className: clsx("GridMultiSelect-containerMedium", props.editorParams?.className),
     },
   });
diff --git a/src/components/gridPopoverEdit/GridPopoverEditDropDown.ts b/src/components/gridPopoverEdit/GridPopoverEditDropDown.ts
index 688437c8..5bd8031c 100644
--- a/src/components/gridPopoverEdit/GridPopoverEditDropDown.ts
+++ b/src/components/gridPopoverEdit/GridPopoverEditDropDown.ts
@@ -1,3 +1,4 @@
+import clsx from "clsx";
 import { GridBaseRow } from "../Grid";
 import { ColDefT, GenericCellEditorProps, GridCell } from "../GridCell";
 import { GridFormDropDown, GridFormDropDownProps } from "../gridForm/GridFormDropDown";
@@ -11,8 +12,7 @@ export const GridPopoverEditDropDown = <TData extends GridBaseRow, TValue = any>
     editor: GridFormDropDown,
     ...props,
     editorParams: {
-      // Defaults to large size container
       ...(props.editorParams as GridFormDropDownProps<TData>),
-      className: `GridPopoverEditDropDown-containerLarge ${props.editorParams?.className ?? ""}`,
+      className: clsx("GridPopoverEditDropDown-containerLarge", props.editorParams?.className),
     },
   });