chore: sync dev with master - #3482
Merged
Merged
Conversation
…sign the forwarded ref during commit (useCombinedRef) (clientIO#3455)
…IO#3467) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
…O#3478) Co-authored-by: Claude Fable 5 <noreply@anthropic.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
# Conflicts: # packages/joint-react/src/components/paper/__tests__/paper-html-content-events.test.tsx # packages/joint-react/src/hooks/__tests__/use-container-keys.test.tsx # packages/joint-react/src/presets/paper.ts # packages/joint-react/src/store/__tests__/state-container.test.ts # packages/joint-react/src/store/state-container.ts # packages/joint-react/stories/examples/fixed-connection-points/code.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Merges
masterintodev— 27 commits that landed on master only (guard fixes, arrowhead anchor fix, avoid router package, changesets release automation, CI/sonar updates,v4.4.0/ reactv1.0.4–v1.0.6releases).Conflict resolutions
All conflicts were in
joint-react, caused by cross-picked PRs and the dev-only container/storybook refactors:src/store/state-container.ts— kept the dev version. The dev refactor (refactor(joint-react): immutable lazy Map-backed cells container (O(1) commits) #3423, Map-backed container) already handles what the master fix (fix(joint-react): add tests for container key updates on membership changes #3462) addressed: any add/remove in a batch invalidatesgetIds()even when the net count is unchanged, and commit subscribers always fire.src/store/__tests__/state-container.test.ts— kept the dev tests and ported the two scenarios added on master by fix(joint-react): add tests for container key updates on membership changes #3462 (same-count membership swap in one batch, same-count replace-all with different ids) to the newbatchSet/getIdsAPI.src/hooks/__tests__/use-container-keys.test.tsx— deleted; theuseContainerKeyshook was removed on dev by refactor(joint-react): immutable lazy Map-backed cells container (O(1) commits) #3423 (replaced bygetIds()), so master's test additions (fix(joint-react): add tests for container key updates on membership changes #3462) no longer apply.src/presets/paper.ts— took master's fix(joint-react): stop guarding events targeting paper container itself #3476 fix (target !== this.elinguardExplicit, so events replayed onto the paper container are not guarded) and kept dev'scell:focus/cell:blurdelegation (feat(joint-react): cell focus/blur events, reactive grid, collection setters #3427).src/components/paper/__tests__/paper-html-content-events.test.tsx— add/add conflict between fix: let the guard option veto a blank pointerdown; buttons that click and drag #3438 (dev) and fix: let the guard option veto a blank pointerdown; buttons that click and drag #3446/fix(joint-react): stop guarding events targeting paper container itself #3476 (master); master's version is a superset, took it.stories/examples/fixed-connection-points/code.tsx— kept dev's rewritten story (refactor(joint-react): unify Storybook design system, remove embedded docs #3431) and applied the semantics of master's fix(joint-react): account for the arrowhead on a custom link anchor #3453: removed the manualANCHOR_MARGINarrowhead compensation, since the mergedlink-routing.ts/wrappers.tsnow account for the arrowhead in the library.Verification
joint-react:yarn typecheck,yarn lint(0 errors),yarn jest— 1054 tests pass on React 18 and 19yarn test-serverpasses🤖 Generated with Claude Code