Skip to content

feat(*): v6 - #3920

Open
cschroeter wants to merge 23 commits into
mainfrom
v6
Open

feat(*): v6#3920
cschroeter wants to merge 23 commits into
mainfrom
v6

Conversation

@cschroeter

Copy link
Copy Markdown
Member

No description provided.

@vercel

vercel Bot commented Jun 16, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
ark-docs Error Error Aug 31, 2026 12:33pm

Request Review

Comment thread packages/react/src/components/accordion/tests/accordion.test.tsx
Comment thread packages/react/src/components/color-picker/tests/basic.tsx
Comment thread packages/react/src/components/select/select-root.tsx
@cschroeter cschroeter mentioned this pull request Jun 22, 2026
Resolve conflicts between the v6 branch and main:

- package.json/bun.lock: keep the zag v2 line, bumped to 2.0.0-next.1,
  and take main's versions for everything else
- factory.ts: keep v6's `render` prop while adding main's react.lazy
  handling for children crossing the RSC boundary
- tests: keep main's absolute `@ark-ui/*` imports plus v6's `act` usage;
  keep both fieldset tests
- number-input/presence/field: keep v6's props, take main's fixes

Adapt main's new code to the zag v2 API:

- tree-view: `getCellProps` -> `getNodeCellProps`
- menu: split the new `menubar` prop
- popover (solid): drop the removed `portalled` prop
- toc `with-tree-view` example: migrate from Branch/Item to the v6
  Node/NodeGroup tree-view parts
- hotkeys: `normalizeHotkey` and the `Platform` re-export are gone in
  zag v2, so key registrations off `parseHotkey` and use ark's local
  `Platform` type
- presence: declare `onEnterComplete` on ark's props, zag v2 has not
  ported it back yet
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants