Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: support customized defined className #465

Merged
merged 3 commits into from
Jun 13, 2024
Merged

fix: support customized defined className #465

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3d3f203
fix: support customized defined classname
Jun 13, 2024
b777c9a
Fix classNames being lost
matttdawson Jun 13, 2024
c089432
upgrade libs
matttdawson Jun 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/components/gridPopoverEdit/GridPopoutEditMultiSelect.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import clsx from "clsx";
import { GridBaseRow } from "../Grid";
import { ColDefT, GenericCellEditorProps, GridCell } from "../GridCell";
import { GridFormMultiSelect, GridFormMultiSelectProps } from "../gridForm/GridFormMultiSelect";
Expand All @@ -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),
},
});
3 changes: 2 additions & 1 deletion src/components/gridPopoverEdit/GridPopoutEditMultiSelectGrid.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import clsx from "clsx";
import { GridBaseRow } from "../Grid";
import { ColDefT, GenericCellEditorProps, GridCell } from "../GridCell";
import { GridFormMultiSelectGrid, GridFormMultiSelectGridProps } from "../gridForm/GridFormMultiSelectGrid";
Expand All @@ -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),
},
});
4 changes: 2 additions & 2 deletions src/components/gridPopoverEdit/GridPopoverEditDropDown.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import clsx from "clsx";
import { GridBaseRow } from "../Grid";
import { ColDefT, GenericCellEditorProps, GridCell } from "../GridCell";
import { GridFormDropDown, GridFormDropDownProps } from "../gridForm/GridFormDropDown";
Expand All @@ -11,8 +12,7 @@ export const GridPopoverEditDropDown = <TData extends GridBaseRow, TValue = any>
editor: GridFormDropDown,
...props,
editorParams: {
// Defaults to large size container
className: "GridPopoverEditDropDown-containerLarge",
...(props.editorParams as GridFormDropDownProps<TData>),
className: clsx("GridPopoverEditDropDown-containerLarge", props.editorParams?.className),
},
});
Loading