FIX: NPE on getColumnState (#458)

linz · May 21, 2024 · e5a1e5e · e5a1e5e
1 parent 4af1efb
commit e5a1e5e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/components/Grid.tsx b/src/components/Grid.tsx
@@ -182,6 +182,10 @@ export const Grid = ({
     const skipHeader = sizeColumns === "auto-skip-headers" && gridRendered === "rows-visible";
     if (sizeColumns === "auto" || skipHeader) {
       const result = autoSizeColumns({ skipHeader, userSizedColIds: userSizedColIds.current, includeFlex: true });
+      if (!result) {
+        needsAutoSize.current = true;
+        return;
+      }
       if (gridRendered === "empty") {
         if (!hasSetContentSizeEmpty.current && result && !hasSetContentSize.current) {
           hasSetContentSizeEmpty.current = true;

diff --git a/src/contexts/GridContextProvider.tsx b/src/contexts/GridContextProvider.tsx
@@ -403,9 +403,9 @@ export const GridContextProvider = <TData extends GridBaseRow>(props: PropsWithC
    */
   const autoSizeColumns = useCallback(
     ({ skipHeader, colIds, userSizedColIds, includeFlex }: AutoSizeColumnsProps = {}): AutoSizeColumnsResult => {
-      if (!gridApi) return null;
+      if (!gridApi || !gridApi.getColumnState()) return null;
       const colIdsSet = colIds instanceof Set ? colIds : new Set(colIds);
-      const colsToResize = gridApi.getColumnState().filter((colState) => {
+      const colsToResize = gridApi.getColumnState()?.filter?.((colState) => {
         const colId = colState.colId;
         return (
           (isEmpty(colIdsSet) || colIdsSet.has(colId)) &&