Merge pull request #76 from Apollo-Spreadsheet/feat/apollo-build-test

Feat/apollo build test
Apollo-Spreadsheet · Aug 18, 2022 · 18b5cfa · 18b5cfa
2 parents 3601311 + 8349884
commit 18b5cfa
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 18 deletions.
diff --git 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",

diff --git a/src/ApolloSpreadsheet.tsx b/src/ApolloSpreadsheet.tsx
@@ -281,7 +281,7 @@ export const ApolloSpreadSheet: React.FC<ApolloSpreadsheetProps> = 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<ApolloSpreadsheetProps> = 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
@@ -14,8 +14,6 @@ import { NestedColumnsProps } from './nestedColumns/nestedColumnsProps'
 export interface ApolloCrudProps {
   onCreateRow?: (coords: NavigationCoords) => void
   onCellChange?: ICellChangeEvent<any>
-  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
@@ -70,7 +70,7 @@ const GridWrapper: React.FC<GridWrapperProps> = React.memo(
     rowHeight,
     noContentOverlay,
     onRowCollapse,
-    displayCollapseIcon = true,
+    //displayCollapseIcon = true,
     coreId,
   }) => {
     const logger = useLogger('GridWrapper')
@@ -309,7 +309,7 @@ const GridWrapper: React.FC<GridWrapperProps> = React.memo(
             const component = (
               <div style={depth > 1 ? { marginLeft: nestedMargin } : {}}>
                 {cell.value}
-                {displayCollapseIcon ? renderExpandOrCollapseIcon() : null}
+                {/* {displayCollapseIcon ? renderExpandOrCollapseIcon() : null} */}
               </div>
             )
             return wrapper(component)
@@ -336,7 +336,6 @@ const GridWrapper: React.FC<GridWrapperProps> = React.memo(
         nestedRowsProps,
         highlightBorderColor,
         apiRef,
-        displayCollapseIcon,
         onRowCollapse,
         logger,
       ],

diff --git 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
@@ -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 }}