From eae868672f3ef28dc797ce4671cad8bce80afeaa Mon Sep 17 00:00:00 2001 From: VeraRibeiro Date: Thu, 18 Aug 2022 14:34:34 +0100 Subject: [PATCH 1/2] Props - Removed onColumnCollapseChange, onRowCollapseChange & displayCollapseIcon --- src/ApolloSpreadsheet.tsx | 6 +++--- src/ApolloSpreadsheetProps.tsx | 6 ------ src/gridWrapper/GridWrapper.tsx | 5 ++--- src/gridWrapper/gridWrapperProps.ts | 2 +- stories/components/Budget/P&L.tsx | 8 ++++---- 5 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/ApolloSpreadsheet.tsx b/src/ApolloSpreadsheet.tsx index db4053f..fb4432c 100755 --- a/src/ApolloSpreadsheet.tsx +++ b/src/ApolloSpreadsheet.tsx @@ -281,7 +281,7 @@ export const ApolloSpreadSheet: React.FC = forwardRef( minRowHeight={props.minColumnHeight ?? 50} scrollLeft={scrollLeft} onScrollHeader={props?.id ? onScrollHeader : () => null} - onColumnCollapse={props?.onColumnCollapseChange} + //onColumnCollapse={props?.onColumnCollapseChange} apiRef={apiRef} sort={sort} nestedRowsEnabled={nestedRowsEnabled} @@ -308,8 +308,8 @@ export const ApolloSpreadSheet: React.FC = forwardRef( mergeCells={mergedCells} mergedPositions={mergedPositions} isMerged={isMerged} - onRowCollapse={props?.onRowCollapseChange} - displayCollapseIcon={props?.displayCollapseIcon} + // onRowCollapse={props?.onRowCollapseChange} + // displayCollapseIcon={props?.displayCollapseIcon} nestedRowsProps={nestedRowsProps} theme={theme} coreId={`core-${props?.id}`} diff --git a/src/ApolloSpreadsheetProps.tsx b/src/ApolloSpreadsheetProps.tsx index 18e7881..4c7b9a3 100755 --- a/src/ApolloSpreadsheetProps.tsx +++ b/src/ApolloSpreadsheetProps.tsx @@ -14,8 +14,6 @@ import { NestedColumnsProps } from './nestedColumns/nestedColumnsProps' export interface ApolloCrudProps { onCreateRow?: (coords: NavigationCoords) => void onCellChange?: ICellChangeEvent - onColumnCollapseChange?: (column: string) => void - onRowCollapseChange?: (row: string) => void } export interface ApolloColumnRowSizeProps { @@ -96,10 +94,6 @@ export interface ApolloLayoutProps { * Optional renderer to be used in place of rows when either :rowCount or :columnCount is 0. */ noContentOverlay?: () => ReactNode - /** - * Toggle icon display in Collapses - */ - displayCollapseIcon?: boolean } export interface ApolloCoreProps { diff --git a/src/gridWrapper/GridWrapper.tsx b/src/gridWrapper/GridWrapper.tsx index 0618368..03e6c9e 100755 --- a/src/gridWrapper/GridWrapper.tsx +++ b/src/gridWrapper/GridWrapper.tsx @@ -70,7 +70,7 @@ const GridWrapper: React.FC = React.memo( rowHeight, noContentOverlay, onRowCollapse, - displayCollapseIcon = true, + //displayCollapseIcon = true, coreId, }) => { const logger = useLogger('GridWrapper') @@ -309,7 +309,7 @@ const GridWrapper: React.FC = React.memo( const component = (
1 ? { marginLeft: nestedMargin } : {}}> {cell.value} - {displayCollapseIcon ? renderExpandOrCollapseIcon() : null} + {/* {displayCollapseIcon ? renderExpandOrCollapseIcon() : null} */}
) return wrapper(component) @@ -336,7 +336,6 @@ const GridWrapper: React.FC = React.memo( nestedRowsProps, highlightBorderColor, apiRef, - displayCollapseIcon, onRowCollapse, logger, ], diff --git a/src/gridWrapper/gridWrapperProps.ts b/src/gridWrapper/gridWrapperProps.ts index 6bd8df4..e13430a 100755 --- a/src/gridWrapper/gridWrapperProps.ts +++ b/src/gridWrapper/gridWrapperProps.ts @@ -47,5 +47,5 @@ export interface GridWrapperProps theme?: GridTheme coreId?: string onRowCollapse?: (params: string) => any - displayCollapseIcon?: boolean + // displayCollapseIcon?: boolean } diff --git a/stories/components/Budget/P&L.tsx b/stories/components/Budget/P&L.tsx index ef36760..02265b0 100644 --- a/stories/components/Budget/P&L.tsx +++ b/stories/components/Budget/P&L.tsx @@ -488,7 +488,7 @@ export function Financial() { connectToIds={['grid1', 'grid4']} containerClassName={useTheme.containerClass} theme={useTheme.theme} - onColumnCollapseChange={getExpandedColumnsTwo} + //onColumnCollapseChange={getExpandedColumnsTwo} getSelectedCoords={getSelectedCoords2} suppressNavigation defaultCoords={{ rowIndex: -1, colIndex: -1 }} @@ -511,7 +511,7 @@ export function Financial() { connectToIds={['grid4']} containerClassName={useTheme.containerClass} theme={useTheme.theme} - onRowCollapseChange={getExpandedRows} + // onRowCollapseChange={getExpandedRows} getSelectedCoords={getSelectedCoords3} suppressNavigation defaultCoords={{ rowIndex: -1, colIndex: -1 }} @@ -534,8 +534,8 @@ export function Financial() { connectToIds={['grid3', 'grid2']} containerClassName={useTheme.containerClass} theme={useTheme.theme} - onColumnCollapseChange={getExpandedColumns} - displayCollapseIcon={false} + //onColumnCollapseChange={getExpandedColumns} + // displayCollapseIcon={false} getSelectedCoords={getSelectedCoords4} suppressNavigation defaultCoords={{ rowIndex: -1, colIndex: -1 }} From 834988407b58ef620eb3f41cc1d472041cd91067 Mon Sep 17 00:00:00 2001 From: VeraRibeiro Date: Thu, 18 Aug 2022 15:23:17 +0100 Subject: [PATCH 2/2] v1.0.53 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fba4539..aa2eb03 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "apollo-spreadsheet", - "version": "1.0.52", + "version": "1.0.53", "main": "dist/index.js", "types": "dist/index.d.ts", "description": "React excel like fast grid plugin",