Skip to content

Resolve PR 89 merge conflicts and preserve toolbar step titles#225

Merged
seveibar merged 2 commits into
mainfrom
codex/fix-pr-89-conflicts
May 27, 2026
Merged

Resolve PR 89 merge conflicts and preserve toolbar step titles#225
seveibar merged 2 commits into
mainfrom
codex/fix-pr-89-conflicts

Conversation

@seveibar
Copy link
Copy Markdown
Contributor

Summary

  • Resolved the merge conflicts against main on the interactive graphics UI path.
  • Kept the newer object-interaction controls from main while preserving the PR’s step metadata and right-aligned step title support.
  • Included the related updates in lib/strokeAlphabetText.ts, site/components/InteractiveGraphics/InteractiveGraphics.tsx, site/components/InteractiveGraphics/Point.tsx, and site/components/InteractiveGraphicsCanvas.tsx.

Testing

  • bun run build
  • bun test
  • Formatting checks passed after merge resolution

@vercel
Copy link
Copy Markdown

vercel Bot commented May 25, 2026

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

Project Deployment Actions Updated (UTC)
graphics-debug Ready Ready Preview, Comment May 25, 2026 5:22pm

Request Review

@seveibar seveibar marked this pull request as ready for review May 27, 2026 16:34
@seveibar seveibar merged commit ef0d647 into main May 27, 2026
4 checks passed
@seveibar seveibar deleted the codex/fix-pr-89-conflicts branch May 27, 2026 16:35
@seveibar
Copy link
Copy Markdown
Contributor Author

@0hmX try updating graphics-debug and adding stepMetadata now, we should have titles that reflect the currently active step!!!!

@tscircuitbot
Copy link
Copy Markdown


Thank you for your contribution! 🎉

PR Rating:
Impact: Tiny

Track your contributions and see the leaderboard at: tscircuit Contribution Tracker


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.

2 participants