@alexgorbatchev/shadcn 0.0.56 → 0.0.58

package/README.md

@@ -439,9 +439,9 @@ Column `meta.filter` offers a column in `DataGridFilters`, hidden columns includ
 
 Import `DataGridSelectHeader` and `DataGridSelectCell` from `@alexgorbatchev/shadcn/data-grid`. Pass the current `useTable` result as `table` to both controls, and pass `row` and an accessible `label` to each cell. The header selects selectable filtered rows across all pages and preserves selections hidden by filters. It shows a mixed state when some of those rows are selected and disables itself when none are selectable. Its default label is "Select all filtered rows"; provide `label` to name the scope in your application. Cells follow native row selection rules, including disabled rows and partially selected parents. The controls observe selection changes without requiring the parent table selector to include selection state.
 
-For grids that must fit their container, set `VirtualDataGrid fitColumns`. Use exactly one `meta.fill` column with an explicit `minSize`; required columns' minima plus that minimum must fit the smallest supported container. The grid reserves that space and temporarily hides optional columns that do not fit, prioritizing their chosen order. It lists those columns and explains how to reveal them. This mode replaces `meta.visibleFrom` breakpoints and offers resize handles on leaf headers only.
+For grids that must fit their container, set `VirtualDataGrid fitColumns`. Use exactly one `meta.fill` column with an explicit `minSize` and a preferred `size`; required columns' minima plus that minimum must fit the smallest supported container. The grid reserves the fill column's native current size, including controlled sizing state and its min/max bounds, and temporarily hides optional columns that do not fit, prioritizing their chosen order. When only required columns remain, the fill column can shrink toward its minimum. The grid lists hidden columns and explains how to reveal them. This mode replaces `meta.visibleFrom` breakpoints and offers resize handles on leaf headers only.
 
-Keep preferred widths separate from the table's rendered sizing atom. In `onFitWidthChange`, store the reported width in a ref and write `fitDataGridColumnSizing(table, preferredWidths, width)` into the sizing atom. The helper temporarily shrinks required resizable columns toward their minima when needed and restores their preferred widths when space returns. In `onColumnSizingChange`, obtain new preferences with `constrainDataGridColumnSizing(table, updater, widthRef.current, preferredWidths)`, then derive the sizing atom with `fitDataGridColumnSizing`. Persist only the preferred widths, after the resize settles. Native pointer and keyboard resizing starts at the displayed width, stays within the available space, and leaves other columns' preferences unchanged. Container changes never overwrite user visibility, order, or width preferences. The `VirtualDataGridExample` fixture demonstrates this controlled integration.
+Keep preferred widths separate from the table's rendered sizing atom. In `onFitWidthChange`, store the reported width in a ref and write `fitDataGridColumnSizing(table, preferredWidths, width)` into the sizing atom. The helper temporarily shrinks required resizable columns toward their minima when needed and restores their preferred widths when space returns. In `onColumnSizingChange`, obtain new preferences with `constrainDataGridColumnSizing(table, updater, widthRef.current, preferredWidths)`, then derive the sizing atom with `fitDataGridColumnSizing`. Persist only the preferred widths, after the resize settles. Native pointer and keyboard resizing starts at the displayed width, stays within the available space, and leaves other columns' preferences unchanged. Widening a required column can hide optional columns again; widening an optional column preserves its fitted neighbours and the fill column's preferred space. Container changes never overwrite user visibility, order, or width preferences. The `VirtualDataGridExample` fixture demonstrates this controlled integration.
 
 `ActionsMenu` shares one `items` definition between a dropdown action and an optional context menu. Supply an accessible `label`; the default trigger is a ghost icon button. `size="sm"` displays the label, and `variant`, `disabled`, and `trigger` customize the action. Supplying `contextTarget` composes the native context trigger with that element and adds its popup. Compose items with `MenuItem`, `MenuLinkItem`, checkbox/radio parts, groups, labels, separators, shortcuts, and submenu parts; dropdown and context menus share these implementations. `MenuLinkItem` retains its native anchor and menu keyboard semantics.
 

package/dist/{chunk-74xynyzg.js → chunk-8m97h03v.js}

@@ -62,7 +62,7 @@ function getDataGridColumnFit(table, width) {
   let remaining = width;
   for (const column of columns) {
     if (column.columnDef.meta?.fill)
-      remaining -= column.columnDef.minSize ?? 20;
+      remaining -= column.getSize();
     else if (!column.getCanHide())
       remaining -= column.getSize();
   }
@@ -82,10 +82,16 @@ function getDataGridColumnFit(table, width) {
 function getDataGridColumnFitMaximum(table, columnId, width) {
   const hidden = getDataGridColumnFit(table, width);
   const column = table.getColumn(columnId);
+  const isRequired = column && !column.getCanHide();
   const occupied = table.getVisibleLeafColumns().reduce((sum, other) => {
-    if (other.id === columnId || hidden.includes(other.id))
+    if (other.id === columnId)
+      return sum;
+    if (other.columnDef.meta?.fill) {
+      return sum + (isRequired ? other.columnDef.minSize ?? 20 : other.getSize());
+    }
+    if (isRequired && other.getCanHide() || hidden.includes(other.id))
       return sum;
-    return sum + (other.columnDef.meta?.fill ? other.columnDef.minSize ?? 20 : other.getSize());
+    return sum + other.getSize();
   }, 0);
   return Math.max(column?.columnDef.minSize ?? 20, Math.min(column?.columnDef.maxSize ?? Number.MAX_SAFE_INTEGER, Math.floor(width - occupied)));
 }

package/dist/components/data-grid/constrainDataGridColumnSizing.d.ts

@@ -1,7 +1,8 @@
 import { type ColumnSizingState, type RowData, type Table, type Updater } from "@tanstack/react-table";
 import type { DataGridFeatures } from "./DataGrid.js";
 /**
- * Apply a user resize without displacing another fitted column or collapsing a fill column. Use in the table's
+ * Apply a user resize while preserving fill space. Required columns may displace optional columns; optional
+ * columns preserve fitted neighbours and the fill preference. Use in the table's
  * `onColumnSizingChange`, passing the width reported by `VirtualDataGrid.onFitWidthChange`, then store the result in
  * preferred sizes. Then pass those preferences through `fitDataGridColumnSizing` into the table's sizing atom.
  * Container changes never call this helper or rewrite preferred sizes.

package/dist/components/data-grid/getDataGridColumnFit.d.ts

@@ -1,4 +1,4 @@
 import type { RowData, Table } from "@tanstack/react-table";
 import type { DataGridFeatures } from "./DataGrid.js";
-/** Columns that do not fit after reserving each fill column's minimum and every required fixed column. */
+/** Columns that do not fit after reserving each fill column's preferred size and every required fixed column. */
 export declare function getDataGridColumnFit<T extends RowData>(table: Table<DataGridFeatures, T>, width: number): string[];

package/dist/components/data-grid/getDataGridColumnFitMaximum.d.ts

@@ -1,4 +1,4 @@
 import type { RowData, Table } from "@tanstack/react-table";
 import type { DataGridFeatures } from "./DataGrid.js";
-/** The resize ceiling that keeps the current fitted columns and the fill columns' minimum space. */
+/** Required columns reclaim optional space; optional columns keep fitted neighbours and the fill preference. */
 export declare function getDataGridColumnFitMaximum<T extends RowData>(table: Table<DataGridFeatures, T>, columnId: string, width: number): number;

package/dist/components/data-grid/index.js

@@ -7,7 +7,7 @@ import {
   DataGridColumnHeader2,
   DataGridFilter2,
   DataGridPagination2
-} from "../../chunk-74xynyzg.js";
+} from "../../chunk-8m97h03v.js";
 import"../../chunk-7ny0vyek.js";
 import"../../chunk-8ssktt4b.js";
 import"../../chunk-en44w1pn.js";

package/dist/components/virtual-data-grid/VirtualDataGrid.d.ts

@@ -9,7 +9,8 @@ interface IVirtualDataGridProps<T extends RowData, TSelected> {
     estimateRowHeight?: number;
     overscan?: number;
     /**
-     * Reserve one fill column's `minSize` and hide optional columns that do not fit, in their chosen order. Replaces
+     * Reserve one fill column's native current size and hide optional columns that do not fit, in their chosen order.
+     * The fill column may shrink toward `minSize` when only required columns remain. Replaces
      * `meta.visibleFrom` breakpoints; saved visibility and widths are unchanged. Use exactly one fill column, and
      * ensure required columns' minima plus its minimum fit the smallest supported container. Only leaf headers resize.
      * Pair with `fitDataGridColumnSizing` and `constrainDataGridColumnSizing` to preserve preferred widths separately

package/dist/components/virtual-data-grid/index.js

@@ -10,7 +10,7 @@ import {
   DataGridHeaderRows,
   DataGridCells2,
   DataGridColumns
-} from "../../chunk-74xynyzg.js";
+} from "../../chunk-8m97h03v.js";
 import"../../chunk-7ny0vyek.js";
 import"../../chunk-8ssktt4b.js";
 import"../../chunk-e6hk39ev.js";

package/dist/prototype.js

@@ -2051,7 +2051,7 @@ var program = new Command;
 // package.json
 var package_default = {
   name: "@alexgorbatchev/shadcn",
-  version: "0.0.56",
+  version: "0.0.58",
   description: "Sharp, monospace React components with compact and comfortable densities.",
   license: "MIT",
   repository: {

package/llms/components/data-display/VirtualDataGrid.md

@@ -84,6 +84,14 @@ Storybook CSF excerpts. Default args and render apply unless overridden. Local h
 }
 ```
 
+### PreferredFillWidth
+
+```tsx
+{
+    render: () => <VirtualDataGridExample files={fixture_gridFiles} width={420} fitColumns preferredFillSize={240}/>
+}
+```
+
 ### FittedColumnGroups
 
 ```tsx

package/llms/setup.md

@@ -439,9 +439,9 @@ Column `meta.filter` offers a column in `DataGridFilters`, hidden columns includ
 
 Import `DataGridSelectHeader` and `DataGridSelectCell` from `@alexgorbatchev/shadcn/data-grid`. Pass the current `useTable` result as `table` to both controls, and pass `row` and an accessible `label` to each cell. The header selects selectable filtered rows across all pages and preserves selections hidden by filters. It shows a mixed state when some of those rows are selected and disables itself when none are selectable. Its default label is "Select all filtered rows"; provide `label` to name the scope in your application. Cells follow native row selection rules, including disabled rows and partially selected parents. The controls observe selection changes without requiring the parent table selector to include selection state.
 
-For grids that must fit their container, set `VirtualDataGrid fitColumns`. Use exactly one `meta.fill` column with an explicit `minSize`; required columns' minima plus that minimum must fit the smallest supported container. The grid reserves that space and temporarily hides optional columns that do not fit, prioritizing their chosen order. It lists those columns and explains how to reveal them. This mode replaces `meta.visibleFrom` breakpoints and offers resize handles on leaf headers only.
+For grids that must fit their container, set `VirtualDataGrid fitColumns`. Use exactly one `meta.fill` column with an explicit `minSize` and a preferred `size`; required columns' minima plus that minimum must fit the smallest supported container. The grid reserves the fill column's native current size, including controlled sizing state and its min/max bounds, and temporarily hides optional columns that do not fit, prioritizing their chosen order. When only required columns remain, the fill column can shrink toward its minimum. The grid lists hidden columns and explains how to reveal them. This mode replaces `meta.visibleFrom` breakpoints and offers resize handles on leaf headers only.
 
-Keep preferred widths separate from the table's rendered sizing atom. In `onFitWidthChange`, store the reported width in a ref and write `fitDataGridColumnSizing(table, preferredWidths, width)` into the sizing atom. The helper temporarily shrinks required resizable columns toward their minima when needed and restores their preferred widths when space returns. In `onColumnSizingChange`, obtain new preferences with `constrainDataGridColumnSizing(table, updater, widthRef.current, preferredWidths)`, then derive the sizing atom with `fitDataGridColumnSizing`. Persist only the preferred widths, after the resize settles. Native pointer and keyboard resizing starts at the displayed width, stays within the available space, and leaves other columns' preferences unchanged. Container changes never overwrite user visibility, order, or width preferences. The `VirtualDataGridExample` fixture demonstrates this controlled integration.
+Keep preferred widths separate from the table's rendered sizing atom. In `onFitWidthChange`, store the reported width in a ref and write `fitDataGridColumnSizing(table, preferredWidths, width)` into the sizing atom. The helper temporarily shrinks required resizable columns toward their minima when needed and restores their preferred widths when space returns. In `onColumnSizingChange`, obtain new preferences with `constrainDataGridColumnSizing(table, updater, widthRef.current, preferredWidths)`, then derive the sizing atom with `fitDataGridColumnSizing`. Persist only the preferred widths, after the resize settles. Native pointer and keyboard resizing starts at the displayed width, stays within the available space, and leaves other columns' preferences unchanged. Widening a required column can hide optional columns again; widening an optional column preserves its fitted neighbours and the fill column's preferred space. Container changes never overwrite user visibility, order, or width preferences. The `VirtualDataGridExample` fixture demonstrates this controlled integration.
 
 `ActionsMenu` shares one `items` definition between a dropdown action and an optional context menu. Supply an accessible `label`; the default trigger is a ghost icon button. `size="sm"` displays the label, and `variant`, `disabled`, and `trigger` customize the action. Supplying `contextTarget` composes the native context trigger with that element and adds its popup. Compose items with `MenuItem`, `MenuLinkItem`, checkbox/radio parts, groups, labels, separators, shortcuts, and submenu parts; dropdown and context menus share these implementations. `MenuLinkItem` retains its native anchor and menu keyboard semantics.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alexgorbatchev/shadcn",
-  "version": "0.0.56",
+  "version": "0.0.58",
   "description": "Sharp, monospace React components with compact and comfortable densities.",
   "license": "MIT",
   "repository": {