An open source design system that's fully customizable and agent ready
TypeScript
[Component Audit] Grid: make responsive track behavior and evidence trustworthy (#7789)
Cindy Zhang577a62e59019
diff --git a/.changeset/grid-audit-docs.md b/.changeset/grid-audit-docs.mdnew file mode 100644index 0000000000..7b74b0fad7--- /dev/null+++ b/.changeset/grid-audit-docs.md@@ -0,0 +1,7 @@+---+'@astryxdesign/core': patch+---++[docs] Make `Grid` and `GridSpan` documentation match fractional track sizing, responsive repeat behavior, implicit rows, and explicit-column spans.++@cixzhangdiff --git a/.github/scripts/story-play-guard.js b/.github/scripts/story-play-guard.jsindex 045657944d..15312b2fae 100644--- a/.github/scripts/story-play-guard.js+++ b/.github/scripts/story-play-guard.js@@ -295,6 +295,28 @@ const TARGETS = [guards:'a full-width GridSpan holding a Tokenizer with a long token stays within its 500px host',},+ {+ component: 'Grid audit (phone)',+ story: 'core-grid--audit-matrix',+ viewport: {width: 320, height: 900},+ guards:+ 'fixed tracks retain logical order, capped responsive tracks collapse to one, and every grid stays inside the phone viewport',+ },+ {+ component: 'Grid audit (wide)',+ story: 'core-grid--audit-matrix',+ viewport: {width: 800, height: 900},+ guards:+ 'capped responsive tracks reach three columns, auto-fit expands beyond auto-fill, and full span covers the explicit grid',+ },+ {+ component: 'Grid audit (RTL)',+ story: 'core-grid--audit-matrix',+ direction: 'rtl',+ viewport: {width: 800, height: 900},+ guards:+ 'the rendered RTL wrapper mirrors fixed-track item order while responsive and span geometry remain bounded',+ },{component: 'TabList',story: 'core-tablist--full-bleed-geometry',diff --git a/apps/storybook/stories/Grid.stories.tsx b/apps/storybook/stories/Grid.stories.tsxindex f21538f4d7..06ba1ee24b 100644--- a/apps/storybook/stories/Grid.stories.tsx+++ b/apps/storybook/stories/Grid.stories.tsx@@ -54,6 +54,12 @@ const styles = stylex.create({minWidth: 0,outline: `1px dashed ${colorVars['--color-border-emphasized']}`,},+ auditHost: {+ boxSizing: 'border-box',+ inlineSize: '100%',+ maxInlineSize: 720,+ minInlineSize: 0,+ },});const meta: Meta<typeof Grid> = {@@ -172,20 +178,19 @@ export const ResponsiveAutoFit: Story = {<div {...stylex.props(styles.container)}><Text type="supporting" xstyle={styles.sectionLabel}>{- 'columns={{minWidth: 200}} with 2 items — cards stretch to fill (auto-fit)'+ "columns={{minWidth: 200, repeat: 'fit'}} with 2 items — cards stretch to fill"}</Text>- <Grid columns={{minWidth: 200}} gap={4}>+ <Grid columns={{minWidth: 200, repeat: 'fit'}} gap={4}><GridItem>Item 1</GridItem><GridItem>Item 2</GridItem></Grid></div><div {...stylex.props(styles.container)}><Text type="supporting" xstyle={styles.sectionLabel}>-- Same grid with 6 items; looks fine because items fill the tracks+ Same auto-fit grid with 6 items; items fill the available tracks</Text>- <Grid columns={{minWidth: 200}} gap={4}>+ <Grid columns={{minWidth: 200, repeat: 'fit'}} gap={4}><GridItem>Item 1</GridItem><GridItem>Item 2</GridItem><GridItem>Item 3</GridItem>@@ -492,7 +497,7 @@ export const DashboardLayout: Story = {Full-width Section</Text><Text type="supporting" display="block">- This section spans the entire width of the grid+ This section spans all explicit columns</Text></Card></GridSpan>@@ -500,3 +505,135 @@ export const DashboardLayout: Story = {</Section>),};++/** Bounded browser fixture for the Grid and GridSpan public layout contract. */+export const AuditMatrix: Story = {+ parameters: {layout: 'padded'},+ render: () => (+ <div+ data-testid="grid-audit-host"+ {...stylex.props(styles.storyWrapper, styles.auditHost)}>+ <Grid data-testid="grid-audit-fixed" columns={3} gap={2}>+ <GridItem>One</GridItem>+ <GridItem>Two</GridItem>+ <GridItem>Three</GridItem>+ </Grid>++ <Grid+ data-testid="grid-audit-responsive"+ columns={{minWidth: 180, max: 3}}+ gap={2}>+ <GridItem>One</GridItem>+ <GridItem>Two</GridItem>+ <GridItem>Three</GridItem>+ </Grid>++ <Grid data-testid="grid-audit-fill" columns={{minWidth: 160}} gap={2}>+ <GridItem>Fill one</GridItem>+ <GridItem>Fill two</GridItem>+ </Grid>++ <Grid+ data-testid="grid-audit-fit"+ columns={{minWidth: 160, repeat: 'fit'}}+ gap={2}>+ <GridItem>Fit one</GridItem>+ <GridItem>Fit two</GridItem>+ </Grid>++ <Grid data-testid="grid-audit-span-grid" columns={3} gap={2}>+ <GridSpan data-testid="grid-audit-span" columns="full">+ <GridItem>All explicit columns</GridItem>+ </GridSpan>+ <GridItem>One</GridItem>+ <GridItem>Two</GridItem>+ <GridItem>Three</GridItem>+ </Grid>+ </div>+ ),+ play: async ({canvasElement}) => {+ const host = canvasElement.querySelector<HTMLElement>(+ '[data-testid="grid-audit-host"]',+ );+ const fixed = canvasElement.querySelector<HTMLElement>(+ '[data-testid="grid-audit-fixed"]',+ );+ const responsive = canvasElement.querySelector<HTMLElement>(+ '[data-testid="grid-audit-responsive"]',+ );+ const fill = canvasElement.querySelector<HTMLElement>(+ '[data-testid="grid-audit-fill"]',+ );+ const fit = canvasElement.querySelector<HTMLElement>(+ '[data-testid="grid-audit-fit"]',+ );+ const spanGrid = canvasElement.querySelector<HTMLElement>(+ '[data-testid="grid-audit-span-grid"]',+ );+ const span = canvasElement.querySelector<HTMLElement>(+ '[data-testid="grid-audit-span"]',+ );+ if (!host || !fixed || !responsive || !fill || !fit || !spanGrid || !span) {+ throw new Error('Expected the complete Grid audit fixture');+ }++ await expect(fixed).toHaveClass('astryx-grid');+ await expect(span).toHaveClass('astryx-grid-span');+ await expect(getComputedStyle(fixed).display).toBe('grid');++ const direction = getComputedStyle(fixed).direction;+ const fixedItems = Array.from(fixed.children) as HTMLElement[];+ const fixedStarts = fixedItems.map(+ item => item.getBoundingClientRect().left,+ );+ if (direction === 'rtl') {+ await expect(fixedStarts[0]).toBeGreaterThan(fixedStarts[1]);+ await expect(fixedStarts[1]).toBeGreaterThan(fixedStarts[2]);+ } else {+ await expect(fixedStarts[0]).toBeLessThan(fixedStarts[1]);+ await expect(fixedStarts[1]).toBeLessThan(fixedStarts[2]);+ }++ const hostRight = host.getBoundingClientRect().right;+ for (const grid of [fixed, responsive, fill, fit, spanGrid]) {+ await expect(grid.getBoundingClientRect().right).toBeLessThanOrEqual(+ hostRight + 0.5,+ );+ }+ await expect(host.scrollWidth).toBeLessThanOrEqual(host.clientWidth + 1);++ const responsiveStyle = getComputedStyle(responsive);+ const responsiveTracks = responsiveStyle.gridTemplateColumns+ .split(' ')+ .filter(Boolean).length;+ const responsiveGap = Number.parseFloat(responsiveStyle.columnGap) || 0;+ const expectedResponsiveTracks = Math.min(+ 3,+ Math.max(+ 1,+ Math.floor(+ (responsive.clientWidth + responsiveGap) / (180 + responsiveGap),+ ),+ ),+ );+ await expect(responsiveTracks).toBe(expectedResponsiveTracks);+ if (expectedResponsiveTracks === 3) {+ const fillWidth = (+ fill.firstElementChild as HTMLElement+ ).getBoundingClientRect().width;+ const fitWidth = (+ fit.firstElementChild as HTMLElement+ ).getBoundingClientRect().width;+ await expect(fitWidth).toBeGreaterThan(fillWidth);+ }++ const gridRect = spanGrid.getBoundingClientRect();+ const spanRect = span.getBoundingClientRect();+ await expect(Math.abs(spanRect.left - gridRect.left)).toBeLessThanOrEqual(+ 0.5,+ );+ await expect(Math.abs(spanRect.right - gridRect.right)).toBeLessThanOrEqual(+ 0.5,+ );+ },+};diff --git a/packages/cli/test/core-prop-docs.known-drift.json b/packages/cli/test/core-prop-docs.known-drift.jsonindex 205bc8c4f2..9d7667c971 100644--- a/packages/cli/test/core-prop-docs.known-drift.json+++ b/packages/cli/test/core-prop-docs.known-drift.json@@ -32,7 +32,6 @@"src/DropdownMenu/DropdownMenuSubMenu.doc.mjs DropdownMenuSubMenu.label required_mismatch","src/DropdownMenu/DropdownMenuSubMenu.doc.mjs DropdownMenuSubMenu.menuDataTestId not_in_doc","src/FieldStatus/FieldStatus.doc.mjs FieldStatus.variant type_mismatch",- "src/Grid/Grid.doc.mjs Grid.rowHeight not_in_doc","src/HoverCard/HoverCard.doc.mjs HoverCard.children required_mismatch","src/Icon/Icon.doc.mjs Icon.color type_mismatch","src/IconButton/IconButton.doc.mjs IconButton.as not_in_doc",diff --git a/packages/core/src/Grid/Grid.doc.mjs b/packages/core/src/Grid/Grid.doc.mjsindex 5312a8a8a3..f082abcb95 100644--- a/packages/core/src/Grid/Grid.doc.mjs+++ b/packages/core/src/Grid/Grid.doc.mjs@@ -60,7 +60,7 @@ export const docs = {{name: 'columns',type: "number | {minWidth: number, max?: number, repeat?: 'fill' | 'fit'}",- description: 'Column configuration. A number is exactly N equal columns at every width and never reflows (e.g. `columns={3}`); for columns that reflow on small screens, use `{minWidth, max}`. Use an object for responsive columns: `minWidth` sets the minimum column width in px, `repeat` controls track behavior (`"fill"` preserves empty tracks for consistent widths, `"fit"` collapses empty tracks so items stretch; defaults to `"fill"`), and `max` caps the maximum number of columns.',+ description: 'Column configuration. A number creates exactly N `1fr` tracks at every width and never reflows (e.g. `columns={3}`); a child\'s minimum content may widen its track. For columns that reflow on small screens, use `{minWidth, max}`. Use an object for responsive columns: `minWidth` sets the minimum column width in px, `repeat` controls track behavior (`"fill"` preserves empty tracks for consistent widths, `"fit"` collapses empty tracks so items stretch; defaults to `"fill"`), and `max` caps the maximum number of columns.',},{name: 'width',@@ -97,6 +97,12 @@ export const docs = {type: '0 | 0.5 | 1 | 1.5 | 2 | 3 | 4 | 5 | 6 | 8 | 10',description: 'Column spacing; overrides `gap` for the column axis.',},+ {+ name: 'rowHeight',+ type: 'number',+ description:+ 'Height of each implicit row track in pixels. Pair with `GridSpan rows={N}` for masonry-style layouts.',+ },{name: 'align',type: "'start' | 'center' | 'end' | 'stretch'",diff --git a/packages/core/src/Grid/Grid.spec.md b/packages/core/src/Grid/Grid.spec.mdindex 4e472e0c54..9136dcc210 100644--- a/packages/core/src/Grid/Grid.spec.md+++ b/packages/core/src/Grid/Grid.spec.md@@ -1,6 +1,6 @@---schema_version: 3-template_version: 3+template_version: 7kind: componentid: component:Gridauthority: draft@@ -9,10 +9,12 @@ superseded_by: nullapproved_by: nullapproved_at: nullowners: [cixzhang]-review_triggers: [layout, theming]+review_triggers: [public-api, behavior, layout, theming, accessibility]verified_by:[packages/core/src/Grid/Grid.test.tsx,+ apps/storybook/stories/Grid.stories.tsx,+ .github/scripts/story-play-guard.js,packages/core/src/theme/themingTargets.test.ts,scripts/check-knowledge.mjs,]@@ -20,27 +22,41 @@ modules: []families: [family:layout-primitives]design_specs: []architecture:- [architecture:component-theming-surface, architecture:public-component-api]+ [+ architecture:component-theming-surface,+ architecture:public-component-api,+ architecture:component-test-sufficiency,+ ]contributing: []system_specs: []---# Grid component contract+## Contract at a glance++| Area | Contract |+| ----------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |+| Public contract | `Grid` owns fixed and intrinsic column-track construction; `GridSpan` changes one direct item's row or column participation. Both accept root `BaseProps`. |+| Behavior | A positive number creates exactly N `1fr` tracks without reflow; an object creates fill/fit tracks from a pixel minimum and optional count cap; axis gaps override uniform gap. |+| End-user impact | Content keeps DOM order and logical direction while responsive object-form grids reduce their count to fit. Fixed tracks may narrow or overflow when their content cannot shrink. |+| Builder impact | Builders choose fixed numeric tracks or responsive object tracks explicitly. `'full'` spans all explicit columns, not implicit tracks created by an oversized numeric span. |+| Compatibility/readiness | This draft records released behavior. It changes no public API, default, target, or runtime behavior. |+| Review checks | Reject automatic reflow for numeric columns, equal-width promises that ignore minimum content, lost gap precedence, raw inline track templates, caller-overridable owned metadata, or `'full'` as all implicit tracks. |+| Governing rules | `family:layout-primitives/FR1–FR7`; `architecture:public-component-api/INV5–INV9`; `architecture:component-theming-surface/INV2–INV6`. |++This table is a review projection; the body below is authoritative.+## Intent-Grid arranges caller-supplied items in two-dimensional tracks. GridSpan-optionally wraps one item to control its row or column participation. This draft-records the current consumer anatomy and theming ownership without changing-layout, targets, or public API.+Grid arranges caller-supplied items in two-dimensional tracks. GridSpan optionally wraps one item to control its row or column participation. Neither component owns the content, a surface, or structural page semantics.## Compatibility and migration-- Released default preserved: `yes`-- Compatibility class: additive documentation only; runtime, DOM, styling,- targets, and public API remain unchanged-- Controlled/uncontrolled behavior: not applicable-- Migration decision: none+- Released default preserved: yes; omitted, zero, or negative numeric `columns` resolves to one track.+- Compatibility class: observational only; runtime, DOM, styling, targets, and public API remain unchanged.+- Controlled/uncontrolled behavior: not applicable.+- Migration decision: none.Consumer migration instructions belong in consumer docs and release notes.@@ -48,106 +64,82 @@ Consumer migration instructions belong in consumer docs and release notes.**Owns**-- The Grid container and its current `grid` theming target.-- The optional GridSpan wrapper and its current `grid-span` theming target.-- Grid track construction and GridSpan row/column participation.+- Grid's root container, current `grid` target, track construction, axis gaps, item alignment, and explicit box dimensions.+- GridSpan's optional wrapper, current `grid-span` target, and one item's row/column participation.+- Root prop and style composition on each owned element.**Does not own / non-goals**-- Content supplied to Grid or GridSpan — owned by the caller.-- Structural page-region or surface semantics.-- New responsive behavior, layout props, targets, or target placement.+- Caller content, item semantics, surfaces, or interaction — owned by the product callsite or rendered child component.+- A shared breakpoint or automatic reflow for numeric columns — responsiveness is selected by Grid's object form.+- Implicit tracks created by CSS Grid when a numeric span exceeds the explicit grid.## Public concepts-No new public concept is introduced. Consumer props and usage remain documented-in the canonical `Grid.doc.mjs` and the subordinate `GridSpan.doc.mjs`;-`family:layout-primitives` owns the shared composition vocabulary.+| Concept | Closed values or states | Meaning | Availability by variant/orientation/state | Default | Owner | Stability | Invalid-value behavior |+| -------------------- | ------------------------------------------ | ----------------------------------------------------------------------- | ----------------------------------------- | --------------------------- | -------------------------- | --------- | --------------------------------------------------------- |+| column shape | fixed number; responsive object; omitted | Selects fixed `1fr` tracks or intrinsic fill/fit tracks. | Every Grid | one track | `component:Grid` | released | zero/negative number falls back to one track |+| responsive repeat | `fill`; `fit` | Keeps empty tracks or collapses them so present items stretch. | Object-form columns | `fill` | `component:Grid` | released | Type-constrained |+| responsive count cap | absent; positive `max`; non-positive `max` | Caps the number of intrinsic tracks while allowing present tracks fill. | Object-form columns | absent | `component:Grid` | released | non-positive behaves as uncapped |+| spacing | shared `SpacingStep` values | Separates rows/columns; axis values override uniform gap. | Every Grid | browser grid gap default | `family:layout-primitives` | released | Type-constrained |+| item alignment | `start`; `center`; `end`; `stretch` | Sets `align-items` and `justify-items`. | Every Grid | `stretch` | `component:Grid` | released | Type-constrained |+| box size | number; CSS value string; absent | Sizes the Grid box; numbers become pixels. | Every Grid | caller/container-determined | `family:layout-primitives` | released | Browser validates strings |+| implicit row height | number; absent | Sets pixel height for implicit rows used by row spans. | Every Grid | browser `auto` | `component:Grid` | released | Browser validates the resulting CSS |+| column participation | number; `full`; absent | Spans N columns or every explicit column. | GridSpan under a grid | intrinsic item placement | `component:GridSpan` | released | Browser resolves numeric spans, including implicit tracks |+| row participation | number; absent | Spans N rows. | GridSpan under a grid | intrinsic item placement | `component:GridSpan` | released | Browser validates the resulting CSS |## Behavioral and layout contract-| ID | Candidate invariant | Basis | Draft review state |-| --- | ----------------------------------------------------------------------------------------------------------------------------- | --------------------------------------- | -------------------------------------------------- |-| FR1 | Grid renders one Grid container carrying the current `grid` target and arranges caller content using the current track model. | Current source, docs, tests, and family | Verified current behavior; no new behavior decided |-| FR2 | GridSpan renders one optional Spanning item wrapper carrying the current `grid-span` target. | Current source, docs, and tests | Verified current behavior; no target change |-| FR3 | GridSpan's current `columns` and `rows` inputs affect only the wrapped item's participation in its parent grid. | Current source, tests, and family | Verified current behavior; no layout change |+Draft requirements identify their basis so observed code is not mistaken for an intentional decision.++| ID | Candidate invariant | Basis | Draft review state |+| --- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------- | ------------------- |+| FR1 | A positive numeric `columns={N}` creates exactly N `1fr` tracks at every width and never reflows; minimum content may widen one track and overflow a narrow container. | DEC-1; released docs, source, tests, and browser evidence | settled observation |+| FR2 | Object-form columns use auto-fill by default or auto-fit for `repeat: 'fit'`; `minWidth` is the track floor, while a positive `max` caps count and allows a lone track to shrink to the container. | Released docs, source, tests, and browser evidence | settled observation |+| FR3 | `rowGap` overrides `gap` only for rows, and `columnGap` overrides `gap` only for columns; the effective column gap participates in capped-track math. | `family:layout-primitives/FR4`; source and tests | settled observation |+| FR4 | Grid's dynamic track template uses CSS-variable-backed StyleX so caller `xstyle` and class rules, including media rules, can replace it. Caller `style` wins other inline declarations, including `gridTemplateColumns`; explicit `width`, `height`, `maxWidth`, and `minHeight` props override matching `style` keys. | `architecture:public-component-api/INV5–INV8`; source/tests | settled observation |+| FR5 | GridSpan changes only its wrapper's participation. `columns="full"` uses `1 / -1`, which covers explicit tracks; a wider numeric span may create implicit tracks that participate in later placement. | Released source, tests, and browser CSS Grid behavior | settled observation |+| FR6 | Root refs, DOM/data/ARIA/events, `xstyle`, class name, and inline style reach or compose on the owned root without replacing the canonical target or Grid's owned reflected metadata. | `architecture:public-component-api/INV5–INV8` | settled observation |+| FR7 | Grid and GridSpan preserve caller DOM order and use the document's logical inline direction; neither creates a separate keyboard order. | Platform layout behavior and browser evidence | settled observation |### Allowed variation-- Grid may use fixed or intrinsic responsive tracks without changing Grid- container ownership.-- Caller content may render directly in Grid or inside optional GridSpan wrappers.-- A Spanning item may span columns, rows, both, or neither while retaining the- same target.--### Responsive contract--The `columns` prop decides how many column tracks Grid lays out and whether-that count changes with the container's width. Other inputs change the result-only by changing what `columns` has to fit: `width` and `maxWidth` set the-container width a reflowing shape measures against; an `xstyle`, `className`,-or `style` that sets the track template (including under a media query)-replaces the computed one; and a numeric GridSpan wider than the grid's tracks-makes the browser add implicit tracks to the whole grid, which later items flow-into. No other prop changes the count.--| `columns` | Behavior | Reflows |-| --------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------- |-| `N` (number) | Exactly N tracks that share the row equally at every container width; a child wider than its share widens its track and can push the grid past a narrow container. | never |-| `{minWidth}` | As many tracks as fit while each stays at least `minWidth` px wide. A container narrower than `minWidth` keeps one `minWidth`-wide track that overflows it. Empty tracks keep their width. | yes |-| `{minWidth, repeat: 'fit'}` | As above, and empty tracks collapse so the present items stretch across the row. | yes |-| `{minWidth, max}` | Up to `max` tracks, each at least `minWidth` px and never narrower than an equal share of the row; fewer tracks as the container narrows, down to one track that shrinks to the container rather than overflowing it. `repeat: 'fit'` applies the same way. | yes |-| omitted, `0`, or negative | One track. | never |--- `gap` and `columnGap` count toward the width a reflowing shape has to fit, so- the full count is reached only when the container has room for the tracks and- the gaps between them. They never change the count of a numeric `columns`.-- `height`, `minHeight`, `rowHeight`, `align`, and `justify` size or place the- container and its items and do not change the column count.-- GridSpan spans `k` tracks, or the whole row for `'full'`. `'full'` never- adds tracks. A numeric span wider than the grid's current tracks makes the- browser add implicit tracks to the grid for the remainder; they persist for- every row, items placed before and after the span flow into them, and once- they exist `'full'` covers only the explicit tracks. In a reflowing grid keep- spans within the smallest count the grid can reach or use `'full'`.-- For columns that reflow on small screens, use `{minWidth, max}`: `max` is- what lets the last track shrink to a narrow container, so `{minWidth}` alone- still overflows a phone narrower than `minWidth`. A numeric `columns` never- reflows, so a four-up numeric row on a phone renders four narrow tracks, or- overflows when a child cannot shrink to its share; that is the fixed- contract, not a defect.+- **AV1 — Caller content.** Any caller-owned element may participate directly or inside GridSpan; Grid does not inspect or rewrite it.+- **AV2 — Track count.** Container width, minimum content, gaps, and object-form options may change the rendered responsive count within FR1–FR3.+- **AV3 — Root styling.** Caller styles may replace track templates or box presentation while preserving component-owned targets and metadata.### Representative states-| State | Required invariant | Allowed variation |-| -------------- | --------------------------------------------------------- | ----------------------------------------------------- |-| Fixed Grid | Grid container owns the current `grid` target. | Positive fixed column count and spacing may vary. |-| Intrinsic Grid | The same container owns responsive track construction. | Fill/fit mode, minimum width, and count cap may vary. |-| Direct item | Caller content participates without a Grid-owned wrapper. | Caller owns its element and styling. |-| Spanning item | GridSpan owns one wrapper and the `grid-span` target. | Column and row span values may vary. |+| State | Required invariant | Allowed variation |+| --------------------- | ------------------------------------------------------------------------ | ----------------------------------------------------- |+| fixed Grid | Exactly N explicit `1fr` tracks; no component-owned reflow. | N, content minimums, gaps, and caller styling. |+| responsive fill | Empty tracks remain allocated while count responds to available width. | Minimum width, cap, content count, and effective gap. |+| responsive fit | Empty tracks collapse and present items stretch. | Minimum width, cap, content count, and effective gap. |+| capped narrow Grid | Count drops and one present track can fill a container below `minWidth`. | Container width and caller content. |+| direct item | Caller content participates without a Grid-owned wrapper. | Any caller-owned element and semantics. |+| numeric spanning item | The wrapper spans N rows/columns and may cause implicit tracks. | Positive browser-valid span counts. |+| full spanning item | The wrapper covers the explicit grid from line 1 to -1. | Explicit count and caller content. |### Transformation and precedence order-- No new track construction, gap, alignment, sizing, or span precedence rule is- introduced.+- **ORD1 — Track shape.** Responsive object with positive `max` → capped fill/fit template; responsive object without positive `max` → uncapped fill/fit template; positive number → fixed `repeat(N, 1fr)`; otherwise → one `1fr` track.+- **ORD2 — Gap.** Axis gap → uniform gap → zero gap for capped-track arithmetic.+- **ORD3 — Root composition.** Neutral pass-throughs apply first; component-owned target/reflection and StyleX compose next; `xstyle`, class name, and caller inline style retain their documented styling precedence.+- **ORD4 — Span.** `'full'` becomes `1 / -1`; a number becomes `span N`; absence leaves browser placement intrinsic.### Performance and resources-- No new performance or resource rule is introduced.+- **PR1 — CSS-owned layout.** Grid and GridSpan own no state, effect, observer, listener, timer, or JavaScript measurement loop; layout and reflow remain CSS-owned.## Accessibility contract-This draft does not add semantic roles to Grid or GridSpan or change their-current DOM forwarding and caller-owned content semantics.+- **AR1 — Layout remains nonsemantic.** Grid and GridSpan render `<div>` elements without inventing grid, list, group, or landmark semantics; callers provide semantics when their composition needs them.+- **AR2 — Order remains perceivable.** DOM order remains the reading and keyboard order in LTR and RTL; visual tracks do not create a second sequence.+- **AR3 — Content remains reachable.** GridSpan keeps a zero inline minimum so supported shrinkable descendants can remain inside their track; caller content that cannot shrink may still overflow under FR1.## Design relationships-| Anatomy or state | Design requirement | Representation authority | Hierarchy role | Component contract |-| ---------------- | ------------------------------------------------------------------ | ----------------------------------------- | -------------- | ------------------ |-| Grid container | Presents the current two-dimensional layout container. | Current source, docs, and family contract | Supporting | FR1 |-| Spanning item | Optionally changes one item's row or column participation in Grid. | Current source, docs, and family contract | Supporting | FR2, FR3 |--Direct caller content is not an additional Grid-owned anatomy part.+No current component-local or shared design record prescribes a Grid-specific visual representation. Grid and GridSpan own geometry only; caller content owns visible surfaces and states.### Theming anatomy@@ -162,42 +154,32 @@ Direct caller content is not an additional Grid-owned anatomy part.## Family and system relationships-- `family:layout-primitives` owns the shared spacing, sizing, alignment, and item- participation vocabulary for Grid and GridSpan.-- `architecture:component-theming-surface` owns anatomy qualification and the- two current local target mappings.-- `architecture:public-component-api` owns the stable prop surface; this- documentation adds no API.+- `family:layout-primitives` owns shared spacing, sizing, alignment, and item-participation vocabulary; Grid owns the two-dimensional realization.+- `architecture:public-component-api` owns root prop, styling, event, ref, and released-type composition.+- `architecture:component-theming-surface` owns the two exact target mappings and Grid's reflected visual axes.+- `architecture:component-test-sufficiency` owns bounded, mutation-sensitive evidence selection.## Verification map-| Contract | Verification | Representative states | Mutation or failure expectation | Audit section |-| ------------------- | ------------------------------------------------------------ | -------------------------------------------- | ---------------------------------------------------------------------------------------------------------------------------- | ------------------------ |-| FR1 | `Grid.test.tsx` track, sizing, alignment, and content suites | Fixed, default, fill, fit, capped, and sized | Changing current track output or removing the container/content fails exact style-variable, inline-style, or content checks. | `audit:Grid/anatomy` |-| FR2, FR3 | `Grid.test.tsx` GridSpan suites | Column, full-row, row, combined, and no span | Changing wrapper rendering or span values fails exact inline-style and content assertions. | `audit:GridSpan/anatomy` |-| Target inventory | Source inspection and `themingTargets.test.ts` | Grid and GridSpan targets | Runtime and documented target metadata drift fails target validation. | `audit:Grid/theming` |-| Theming anatomy map | `scripts/check-knowledge.mjs` | Canonical anatomy and both current targets | Missing, extra, prefixed, or stale mappings fail repository validation. | `audit:Grid/theming` |--Grid tests pin track and span output, content rendering, and prop forwarding.-They do not assert both target classes in focused component tests; target-placement is source-inspected and the global inventory checks the runtime/docs-relationship.+| Contract | Verification | Representative states | Mutation or failure expectation | Audit section |+| --------------- | ------------------------------------------------------------------------- | -------------------------------------------------------- | -------------------------------------------------------------------------------------------------- | ------------------------- |+| FR1–FR3, ORD1–2 | `Grid.test.tsx` exact track tests and exact-head AuditMatrix story guards | fixed; fill; fit; capped wide/narrow; uniform/axis gap | Track output, count, fill behavior, or gap precedence changes fail exact source or browser checks. | `audit:Grid/behavior` |+| FR4, FR6, ORD3 | root composition tests, BaseProps lint, theming target tests | DOM/data/ARIA/events; class/style/xstyle; reflected axes | A caller input drops, owned metadata is replaced, or a raw inline track defeats media xstyle. | `audit:Grid/api` |+| FR5, ORD4, AR3 | `Grid.test.tsx`, long-content play, and AuditMatrix full-span assertion | numeric/full/row/combined spans; long shrinkable child | Span CSS, explicit-grid coverage, target, or bounded shrink behavior changes. | `audit:GridSpan/behavior` |+| FR7, AR1–AR2 | DOM tests and exact-head LTR/RTL AuditMatrix guards | plain roots; fixed tracks in LTR/RTL | A semantic role appears, DOM order changes, or logical order stops mirroring. | `audit:Grid/a11y-rtl` |+| Theming anatomy | knowledge validation and `themingTargets.test.ts` | Grid and GridSpan targets | A target loses its semantic owner or the anatomy map drifts. | `audit:Grid/theming` |+| Documentation | docs typecheck, prop literal/reference tests, and Storybook typecheck | fixed/responsive columns; row height; spans | Docs claim equal widths, automatic numeric reflow, whole implicit rows, or omit public behavior. | `audit:Grid/docs` |## Decision log### DEC-1 — Numeric `columns` stays fixed; reflow uses the existing object form+**Reference:** `component:Grid/DEC-1`**Decider:** `cixzhang`, `2026-10-11`-`columns={N}` means exactly N equal tracks at every width, and a grid that-reflows on small screens uses `{minWidth, max?, repeat?}`. Two shapes, one-responsibility each: the number is the fixed contract, the object form is the-responsive one, and the record and the docs say so where a caller first meets-`columns`.+`columns={N}` means exactly N `1fr` tracks at every width, and a grid that reflows on small screens uses `{minWidth, max?, repeat?}`. The number is the fixed contract; the object form is the responsive contract.-Rejected: redefining the number as "at most N" (breaks every released numeric-grid and needs an opt-out shape); a `{count, isFixed}` shape (duplicates the-number and the `max` cap).+Rejected: redefining the number as "at most N" would break released numeric grids; a `{count, isFixed}` shape would duplicate the number and the `max` cap.## Open questions@@ -205,6 +187,4 @@ None.## Content boundary-This file does not duplicate consumer prop tables, examples, family layout-rules, track algorithms, implementation steps, or system rules. It links to-their owners.+This file records verified shipped behavior. It does not duplicate consumer prop tables or examples, prescribe caller content or visuals, approve a new API or target, or store audit scores and run evidence.diff --git a/packages/core/src/Grid/Grid.tsx b/packages/core/src/Grid/Grid.tsxindex 7f77ed3493..3c6077b2f7 100644--- a/packages/core/src/Grid/Grid.tsx+++ b/packages/core/src/Grid/Grid.tsx@@ -31,13 +31,14 @@ export type GridAlignment = 'start' | 'center' | 'end' | 'stretch';/*** Column configuration for Grid.*- * A number means exactly N equal columns at every width; it never reflows, so- * `columns={4}` on a phone renders four narrow tracks. For columns that reflow+ * A number means exactly N `1fr` tracks at every width; it never reflows, so+ * `columns={4}` on a phone renders four narrow tracks. A child's minimum+ * content can widen its track beyond an equal fraction. For columns that reflow* on small screens, use the object form: `{minWidth: 240, max: 4}` renders at* most four columns, each at least 240px, and fewer when the container is* narrower.*- * - `number` — exactly N equal-width columns (e.g. `columns={3}`); never reflows+ * - `number` — exactly N `1fr` tracks (e.g. `columns={3}`); never reflows* - `object` — responsive columns based on minimum child width:* - `minWidth` — minimum width (px) for each column track* - `repeat` — `'fill'` (default) preserves empty tracks for consistent widths;@@ -59,10 +60,10 @@ export interface GridProps extends BaseProps<HTMLDivElement> {/** Ref forwarded to the root element */ref?: React.Ref<HTMLDivElement>;/**- * Column configuration. A number is exactly N equal columns and never- * reflows; for columns that reflow on small screens, use- * `{minWidth, max}`.- * - `number` — exactly N equal-width columns at every width+ * Column configuration. A number creates exactly N `1fr` tracks and never+ * reflows; a child's minimum content may widen its track. For columns that+ * reflow on small screens, use `{minWidth, max}`.+ * - `number` — exactly N `1fr` tracks at every width* - `{minWidth, max?, repeat?}` — responsive columns with a px floor and an* optional cap*diff --git a/packages/core/src/Grid/GridSpan.doc.mjs b/packages/core/src/Grid/GridSpan.doc.mjsindex e0c8518768..489e3b67d6 100644--- a/packages/core/src/Grid/GridSpan.doc.mjs+++ b/packages/core/src/Grid/GridSpan.doc.mjs@@ -19,7 +19,7 @@ export const docs = {{name: 'columns',type: "number | 'full'",- description: "Columns to span; use `'full'` to span the entire row.",+ description: "Columns to span; use `'full'` to span all explicit columns.",},{name: 'rows',@@ -43,7 +43,7 @@ export const docsZh = {{name: 'columns',type: "number | 'full'",- description: "要跨越的列数;使用 `'full'` 跨越整行。",+ description: "要跨越的列数;使用 `'full'` 跨越所有显式列。",},{name: 'rows',@@ -64,7 +64,7 @@ export const docsDense = {displayName: 'Grid Span',description: 'Grid item spanning multiple columns/rows.',propDescriptions: {- columns: "Columns to span; 'full' spans entire row.",+ columns: "Columns to span; 'full' spans all explicit columns.",rows: 'Rows to span.',children: 'Content.',},diff --git a/packages/core/src/Grid/GridSpan.tsx b/packages/core/src/Grid/GridSpan.tsxindex 0fa1a4cf81..7f6f4cde35 100644--- a/packages/core/src/Grid/GridSpan.tsx+++ b/packages/core/src/Grid/GridSpan.tsx@@ -25,7 +25,7 @@ export interface GridSpanProps extends BaseProps<HTMLDivElement> {/*** Number of columns to span, or 'full' to span all columns.* - Number: `grid-column: span N`- * - 'full': `grid-column: 1 / -1` (spans entire row)+ * - 'full': `grid-column: 1 / -1` (spans all explicit columns)*/columns?: number | 'full';