Merge branch '6.0.0' into jason/cell-activation-behavior

glideapps · Dec 24, 2023 · 803ed67 · 803ed67
2 parents 50c69c7 + 48ef0c9
commit 803ed67
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/packages/core/src/data-editor/data-editor.tsx b/packages/core/src/data-editor/data-editor.tsx
@@ -1042,7 +1042,8 @@ const DataEditorImpl: React.ForwardRefRenderFunction<DataEditorRef, DataEditorPr
         [additionalRenderers, rendererMap]
     );
 
-    const { sizedColumns: columns, nonGrowWidth } = useColumnSizer(
+    // eslint-disable-next-line prefer-const
+    let { sizedColumns: columns, nonGrowWidth } = useColumnSizer(
         columnsIn,
         rows,
         getCellsForSeletionDirect,
@@ -1053,6 +1054,7 @@ const DataEditorImpl: React.ForwardRefRenderFunction<DataEditorRef, DataEditorPr
         getCellRenderer,
         abortControllerRef.current
     );
+    if (rowMarkers !== "none") nonGrowWidth += rowMarkerWidth;
 
     const enableGroups = React.useMemo(() => {
         return columns.some(c => c.group !== undefined);