Conversation
Phase 1: Restore CrossButton, EmptyButton, GridCenter as standalone components - Created src/components/CrossButton/ (moved from Common/CrossButton.tsx) - Created src/components/EmptyButton/ (moved from Common/EmptyButton.tsx) - Created src/components/GridCenter/ (moved from Common/GridCenter.tsx) - Added index.ts exports for each new component - Updated Common/index.ts to remove exports for moved components - Updated imports in: - Dialog.tsx, Flyout.tsx (CrossButton) - Popover.tsx, CodeBlock.tsx, Collapsible.tsx (EmptyButton) - 4 story files (GridCenter)
Phase 3: Clean Up Common directory and reorganize imports - FormContainer/index.ts: Added exports for FormRoot, Error, FormElementContainer - Common/index.ts: Removed all component exports, keeping only type re-exports - SplitButton.tsx: Updated to import BaseButton directly from @/components/Button/BaseButton - Switch.tsx, RadioGroup.tsx, InternalSelect.tsx, InputWrapper.tsx, Checkbox.tsx, FormContainer.tsx: Changed imports from @/components/Common to @/components/FormContainer or relative imports Removes Common/ as a component barrel, keeping it only for type re-exports.
Removes the entire Common/ directory including: - BaseButton.tsx (duplicate of Button/BaseButton.tsx) - Error.tsx (duplicate of FormContainer/Error.tsx) - FormElementContainer.tsx (duplicate of FormContainer/FormElementContainer.tsx) - FormRoot.tsx (duplicate of FormContainer/FormRoot.tsx) - EllipsisContainer.tsx (unused, local versions exist in other components) - index.ts (type re-exports no longer needed) All imports have been updated to use the canonical locations in previous commits.
🦋 Changeset detectedLatest commit: e91a340 The changes in this PR will be included in the next version bump. This PR includes changesets to release 1 package
Not sure what this means? Click here to learn what changesets are. Click here if you're a maintainer who wants to add another changeset to this PR |
|
Claude finished @punkbit's task in 1m 23s —— View job PR Review
This PR cleanly restores the intended architecture: dissolving the Verified:
💡 Suggestion (non-blocking)
✅ Looks great — clean restoration of the right architecture. Nice work! 🙌 |
…1-845-merge-conflict-resolution
|
Claude finished @punkbit's task in 1m 0s —— View job PR Review
Clean restoration of the intended architecture — dissolving Verified:
💡 Suggestion (non-blocking)
✅ Looks great — clean, minimal, and correct. Nice work! 🙌 |
|
Claude finished @punkbit's task in 1m 4s —— View job PR Review
Clean restoration of the intended architecture — dissolving Verified:
💡 Suggestions (non-blocking, pre-existing)
✅ Looks great — clean, minimal, and correct. Nice work! 🙌 |
📚 Storybook Preview Deployed✅ Preview URL: https://click-2c6dbn23r-clickhouse.vercel.app Built from commit: |
Why?
Help correct bad merge conflict decisions/resolutions caused by squash-merging chained branches and loss of base context. Public API changes from PR #845 had leaked into PR #841, resulting in incorrect decisions when merging main back to the target branch.
💡 Relates to #879
How?
Preview?
N/A