From bb76fcead39f171171df836271f32a4baa07dc6e Mon Sep 17 00:00:00 2001 From: Matthew Russell Date: Mon, 7 Aug 2023 13:40:51 +0100 Subject: [PATCH] chore: make all datagrids resizable by default --- apps/trading/client-pages/markets/closed.tsx | 1 - libs/accounts/src/lib/accounts-table.tsx | 1 - libs/accounts/src/lib/breakdown-table.tsx | 1 - .../src/lib/ag-grid/ag-grid-lazy-themed.tsx | 31 +++++++++++++------ .../src/lib/use-datagrid-events.spec.tsx | 1 - libs/fills/src/lib/fills-table.tsx | 1 - libs/ledger/src/lib/ledger-table.tsx | 1 - libs/liquidity/src/lib/liquidity-table.tsx | 1 - .../markets-container/market-list-table.tsx | 1 - .../lib/components/order-list/order-list.tsx | 1 - .../stop-orders-table/stop-orders-table.tsx | 1 - libs/positions/src/lib/positions-table.tsx | 1 - .../proposals-list/use-column-defs.tsx | 1 - 13 files changed, 22 insertions(+), 21 deletions(-) diff --git a/apps/trading/client-pages/markets/closed.tsx b/apps/trading/client-pages/markets/closed.tsx index 2b0603dea..7b67a6351 100644 --- a/apps/trading/client-pages/markets/closed.tsx +++ b/apps/trading/client-pages/markets/closed.tsx @@ -281,7 +281,6 @@ const ClosedMarketsDataGrid = ({ columnDefs={colDefs} getRowId={({ data }) => data.id} defaultColDef={{ - resizable: true, minWidth: 100, flex: 1, }} diff --git a/libs/accounts/src/lib/accounts-table.tsx b/libs/accounts/src/lib/accounts-table.tsx index 5d616bed6..7ba85bd0f 100644 --- a/libs/accounts/src/lib/accounts-table.tsx +++ b/libs/accounts/src/lib/accounts-table.tsx @@ -311,7 +311,6 @@ export const AccountTable = ({ tooltipShowDelay={500} rowData={data} defaultColDef={{ - resizable: true, tooltipComponent: TooltipCellComponent, sortable: true, comparator: accountValuesComparator, diff --git a/libs/accounts/src/lib/breakdown-table.tsx b/libs/accounts/src/lib/breakdown-table.tsx index 1eb0e9f19..dff23ac80 100644 --- a/libs/accounts/src/lib/breakdown-table.tsx +++ b/libs/accounts/src/lib/breakdown-table.tsx @@ -130,7 +130,6 @@ const BreakdownTable = forwardRef( tooltipShowDelay={500} defaultColDef={{ flex: 1, - resizable: true, sortable: true, }} columnDefs={coldefs} diff --git a/libs/datagrid/src/lib/ag-grid/ag-grid-lazy-themed.tsx b/libs/datagrid/src/lib/ag-grid/ag-grid-lazy-themed.tsx index 641e20fcf..16dafd9b3 100644 --- a/libs/datagrid/src/lib/ag-grid/ag-grid-lazy-themed.tsx +++ b/libs/datagrid/src/lib/ag-grid/ag-grid-lazy-themed.tsx @@ -4,6 +4,19 @@ import { useThemeSwitcher } from '@vegaprotocol/react-helpers'; import { t } from '@vegaprotocol/i18n'; import classNames from 'classnames'; +const defaultProps: AgGridReactProps = { + rowHeight: 22, + headerHeight: 22, + enableCellTextSelection: true, + overlayLoadingTemplate: t('Loading...'), + overlayNoRowsTemplate: t('No data'), + suppressCellFocus: true, +}; + +const defaultColDef = { + resizable: true, +}; + export const AgGridThemed = ({ style, gridRef, @@ -13,14 +26,6 @@ export const AgGridThemed = ({ gridRef?: React.ForwardedRef; }) => { const { theme } = useThemeSwitcher(); - const defaultProps = { - rowHeight: 22, - headerHeight: 22, - enableCellTextSelection: true, - overlayLoadingTemplate: t('Loading...'), - overlayNoRowsTemplate: t('No data'), - suppressCellFocus: true, - }; const wrapperClasses = classNames('vega-ag-grid', { 'ag-theme-balham': theme === 'light', @@ -29,7 +34,15 @@ export const AgGridThemed = ({ return (
- +
); }; diff --git a/libs/datagrid/src/lib/use-datagrid-events.spec.tsx b/libs/datagrid/src/lib/use-datagrid-events.spec.tsx index 073fc00f6..c4d40c935 100644 --- a/libs/datagrid/src/lib/use-datagrid-events.spec.tsx +++ b/libs/datagrid/src/lib/use-datagrid-events.spec.tsx @@ -14,7 +14,6 @@ const gridProps = { { field: 'id', width: 100, - resizable: true, filter: 'agNumberColumnFilter', }, ], diff --git a/libs/fills/src/lib/fills-table.tsx b/libs/fills/src/lib/fills-table.tsx index 9e48a1f51..81c73f333 100644 --- a/libs/fills/src/lib/fills-table.tsx +++ b/libs/fills/src/lib/fills-table.tsx @@ -124,7 +124,6 @@ export const FillsTable = forwardRef( ref={ref} columnDefs={columnDefs} overlayNoRowsTemplate={t('No fills')} - defaultColDef={{ resizable: true }} style={{ width: '100%', height: '100%' }} getRowId={({ data }) => data?.id} tooltipShowDelay={0} diff --git a/libs/ledger/src/lib/ledger-table.tsx b/libs/ledger/src/lib/ledger-table.tsx index 8628256e1..007b4cd5a 100644 --- a/libs/ledger/src/lib/ledger-table.tsx +++ b/libs/ledger/src/lib/ledger-table.tsx @@ -187,7 +187,6 @@ export const LedgerTable = (props: LedgerEntryProps) => { style={{ width: '100%', height: '100%' }} tooltipShowDelay={500} defaultColDef={{ - resizable: true, sortable: true, tooltipComponent: TransferTooltipCellComponent, filterParams: { diff --git a/libs/liquidity/src/lib/liquidity-table.tsx b/libs/liquidity/src/lib/liquidity-table.tsx index 1fa870d39..5e3f0b49e 100644 --- a/libs/liquidity/src/lib/liquidity-table.tsx +++ b/libs/liquidity/src/lib/liquidity-table.tsx @@ -188,7 +188,6 @@ export const LiquidityTable = ({ getRowId={({ data }: { data: LiquidityProvisionData }) => data.id || ''} tooltipShowDelay={500} defaultColDef={{ - resizable: true, minWidth: 100, tooltipComponent: TooltipCellComponent, sortable: true, diff --git a/libs/markets/src/lib/components/markets-container/market-list-table.tsx b/libs/markets/src/lib/components/markets-container/market-list-table.tsx index 51d24e2bd..988277b48 100644 --- a/libs/markets/src/lib/components/markets-container/market-list-table.tsx +++ b/libs/markets/src/lib/components/markets-container/market-list-table.tsx @@ -35,7 +35,6 @@ const MarketName = (props: MarketNameCellProps) => ( ); const defaultColDef = { - resizable: true, sortable: true, filter: true, filterParams: { buttons: ['reset'] }, diff --git a/libs/orders/src/lib/components/order-list/order-list.tsx b/libs/orders/src/lib/components/order-list/order-list.tsx index bc4bc4b8a..b7d06e640 100644 --- a/libs/orders/src/lib/components/order-list/order-list.tsx +++ b/libs/orders/src/lib/components/order-list/order-list.tsx @@ -337,7 +337,6 @@ export const OrderListTable = memo< { const defaultColDef: ColDef = useMemo(() => { return { sortable: true, - resizable: true, filter: true, filterParams: { buttons: ['reset'] }, minWidth: 100,