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.

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

Bump ag-grid to v32.2.0 #1489

Merged
merged 5 commits into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2,121 changes: 1,114 additions & 1,007 deletions package-lock.json

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "17.1.1",
"version": "18.0.0",
"license": "MIT",
"main": "dist/cjs/index.js",
"module": "dist/esm/index.js",
Expand Down Expand Up @@ -96,17 +96,17 @@
"webpack": "^5.89.0"
},
"dependencies": {
"@ag-grid-community/client-side-row-model": "31.3.2",
"@ag-grid-community/core": "31.3.2",
"@ag-grid-community/csv-export": "31.3.2",
"@ag-grid-community/react": "31.3.2",
"@ag-grid-community/styles": "31.3.2",
"@ag-grid-enterprise/core": "31.3.2",
"@ag-grid-enterprise/excel-export": "31.3.2",
"@ag-grid-enterprise/row-grouping": "31.3.2",
"@ag-grid-enterprise/server-side-row-model": "31.3.2",
"@ag-grid-enterprise/set-filter": "31.3.2",
"@ag-grid-enterprise/status-bar": "31.3.2",
"@ag-grid-community/client-side-row-model": "32.2.0",
"@ag-grid-community/core": "32.2.0",
"@ag-grid-community/csv-export": "32.2.0",
"@ag-grid-community/react": "32.2.0",
"@ag-grid-community/styles": "32.2.0",
"@ag-grid-enterprise/core": "32.2.0",
"@ag-grid-enterprise/excel-export": "32.2.0",
"@ag-grid-enterprise/row-grouping": "32.2.0",
"@ag-grid-enterprise/server-side-row-model": "32.2.0",
"@ag-grid-enterprise/set-filter": "32.2.0",
"@ag-grid-enterprise/status-bar": "32.2.0",
"@phosphor-icons/react": "^2.1.5",
"@timechimp/timechimp-typescript-helpers": "^3.0.4",
"@types/bytes": "^3.1.1",
Expand Down
13 changes: 7 additions & 6 deletions src/components/button/Button.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(
rootOverrides,
color,
backgroundColor,
borderColor,
cursorType,
...rest
}: ButtonProps,
Expand Down Expand Up @@ -97,7 +98,7 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(
...getPadding(),
...border({
...border100,
borderColor: getButtonBackgroundColor(buttonType, customColors, colors),
borderColor: borderColor ?? getButtonBackgroundColor(buttonType, customColors, colors),
}),
fontWeight: 'normal',
height: getButtonHeight(),
Expand All @@ -108,14 +109,14 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(
backgroundColor: backgroundColor ?? getButtonBackgroundHoverColor(buttonType, colors),
...border({
...border100,
borderColor: getButtonBackgroundHoverColor(buttonType, colors),
borderColor: borderColor ?? getButtonBackgroundHoverColor(buttonType, colors),
}),
},
':active': {
backgroundColor: backgroundColor ?? getButtonBackgroundHoverColor(buttonType, colors),
...border({
...border100,
borderColor: getButtonBackgroundHoverColor(buttonType, colors),
borderColor: borderColor ?? getButtonBackgroundHoverColor(buttonType, colors),
}),
},
':disabled': {
Expand Down Expand Up @@ -250,19 +251,19 @@ export const Button = forwardRef<HTMLButtonElement, ButtonProps>(
color: color ?? dark1,
...border({
...border300,
borderColor: light2,
borderColor: borderColor ?? light2,
}),
...borderRadius(radius200),
...getPadding(),
...transitionProperties,
':hover': {
backgroundColor: backgroundColor ?? primaryB,
borderColor: dark4,
borderColor: borderColor ?? dark4,
...transitionProperties,
},
':active': {
backgroundColor: backgroundColor ?? primaryB,
borderColor: dark4,
borderColor: borderColor ?? dark4,
},
':disabled': {
borderColor: light2,
Expand Down
1 change: 1 addition & 0 deletions src/components/button/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,6 @@ export interface ButtonProps extends Omit<BaseButtonProps, 'kind'> {
isLink?: boolean;
rootOverrides?: { [key: string]: number | string };
backgroundColor?: string;
borderColor?: string;
cursorType?: string;
}
1 change: 1 addition & 0 deletions src/components/data-grid/DataGrid.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ export const DataGrid = ({
setIsGrouping,
defaultSearch,
}: DataGridProps) => {
// @ts-expect-error - AgGridReact is not a valid type
const [gridApi, setGridApi] = useState<GridApi>(new GridApi());
const [gridColumns, setGridColumns] = useState<DataGridColumn[]>(columns || []);
const selectedGroupOption = useMemo(
Expand Down
3 changes: 1 addition & 2 deletions src/components/data-grid/export/docDefinition.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Column, ColumnApi, GridApi, ValueFormatterParams } from '@ag-grid-community/core';
import { Column, GridApi, ValueFormatterParams } from '@ag-grid-community/core';
import { DEFAULT_PDF_HEADER_HEIGHT, DEFAULT_PDF_ROW_HEIGHT } from '../../../models';
import { Alignment, Margins, PdfHeaderCell, PdfTableCell, PrintParams, Translations } from '../types';

Expand Down Expand Up @@ -196,7 +196,6 @@ export const getDocDefinition = (gridApi: GridApi, printParams: PrintParams, tra
}
const valueFormatterParams: ValueFormatterParams = {
api: gridApi,
columnApi: gridApi as unknown as ColumnApi,
column: column as unknown as Column,
node: gridApi?.getRowNode(node.id as string) ?? null,
data: node,
Expand Down
1 change: 1 addition & 0 deletions src/components/dropdown/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
export * from './Dropdown';
export * from './dropdown-option';
export * from './types';
export * from './styles';
Loading