Collection of fixes - #289
Open
StableLlama wants to merge 3 commits into
Open
Conversation
StableLlama
commented
Aug 8, 2026
StableLlama
commented
Collaborator
- Fix marker‑free and marker‑inclusive mix up
…er theming Rework the Edit Scene dialog's diff so large AI rewrites are easy to read and the dialog follows the app's paper scheme. Diff view - Replace the oversized block cards with a compact Diff/Old/New tab control (DiffViewTabs) on changed Summary / Linked Prose fields: Diff shows the inline word-level diff, Old shows the previous content, New shows the current editable content. - Accepting a diff now ends the diff view: accepting the linked prose advances its baseline, hides the tabs, and clears the inline marks so only the new content remains. - Wire the linked-prose section into the diff accept/reject flow (detected by label) and mirror the summary's implicit-accept on edit. Dialog theming - Content fields (summary, linked prose, beats) now sit on the same "paper" as the main editor, driven by the shared getPaperColors() helper so they respect the user's brightness and contrast settings exactly like the writing paper (cream in light/mixed, dark in dark). - Share per-paper diff highlight tokens via getEditorHighlightColors() and pass editorSettings from ScenesPanelContainer. - Soften dark/mixed typography (gray-300 body text, solid surfaces) and add the Diff/Old/New + empty-state i18n keys. Diff engine - Add pure diff segmentation (diffBlockMode) deciding inline vs block rendering, with field-level block mode for wholesale rewrites. - Convert the CodeMirror diff plugin to a StateField so block-level decorations are permitted, and render large changes as soft red/green blocks for the main editor; include block classes in the floating diff toolbar selector. Tests - Add paperColors, diffBlockMode and dialog theming/accept tests and update diff/editor sync tests for block-aware assertions.
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
1 participant
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.