@devries-cameron20 / t3code-1 / commits / ee2cddf357
Fork 0

The best way to control Claude Code, Codex and more from any computer or phone

chore(web): upgrade @pierre/diffs to 1.7.0-beta.4 and drop patched find (#36974)

Julius Marminge committed Nov 14, 2026 at 15:27 UTC ee2cddf357a774caf0bbbb2a8d87be46a5616ae0
9 files changed +182 -540
apps/web/src/components/DiffPanel.tsx
+5 -5
@@ -778,12 +778,12 @@ export default function DiffPanel({
778 return next;
779 });
780 });
781 - // Find can ask again before the unfolded file reaches the viewer, so this must never fold.
782 - const unfoldDiffFile = useStableCallback((fileKey: string) => {
781 + const setDiffFileCollapsed = useStableCallback((fileKey: string, collapsed: boolean) => {
782 updateCollapsedDiffFiles((current) => {
784 - if (!current.has(fileKey)) return current;
783 + if (current.has(fileKey) === collapsed) return current;
784 const next = new Set(current);
786 - next.delete(fileKey);
785 + if (collapsed) next.add(fileKey);
786 + else next.delete(fileKey);
787 return next;
788 });
789 });
@@ -1461,7 +1461,7 @@ export default function DiffPanel({
1461 },
1462 }
1463 : {})}
1464 - onRevealSearchMatch={unfoldDiffFile}
1464 + onFileCollapsedChange={setDiffFileCollapsed}
1465 renderHeaderPrefix={(fileDiff, fileKey, collapsed) => {
1466 return (
1467 <DiffFileCollapseToggle
apps/web/src/components/diffs/AnnotatableCodeView.browser.test.tsx
+1 -1
@@ -92,7 +92,7 @@ function view(
92 options={{}}
93 renderHeaderFilenameSuffix={() => null}
94 renderHeaderPrefix={() => null}
95 - onRevealSearchMatch={() => {}}
95 + onFileCollapsedChange={() => {}}
96 />
97 </StrictMode>
98 );
apps/web/src/components/diffs/AnnotatableCodeView.tsx
+4 -3
@@ -99,7 +99,7 @@ interface AnnotatableCodeViewProps {
99 fileKey: string,
100 collapsed: boolean,
101 ) => ReactNode;
102 - onRevealSearchMatch: (fileKey: string) => void;
102 + onFileCollapsedChange: (fileKey: string, collapsed: boolean) => void;
103 }
104
105 interface DiffSelectionContext {
@@ -124,7 +124,7 @@ export function AnnotatableCodeView({
124 renderHeaderMetadata,
125 renderHeaderFilenameSuffix,
126 renderHeaderPrefix,
127 - onRevealSearchMatch,
127 + onFileCollapsedChange,
128 }: AnnotatableCodeViewProps) {
129 const addReviewComment = useComposerDraftStore((store) => store.addReviewComment);
130 const removeReviewComment = useComposerDraftStore((store) => store.removeReviewComment);
@@ -280,7 +280,8 @@ export function AnnotatableCodeView({
280 enableGutterUtility: draft === null,
281 enableLineSelection: draft === null,
282 onGutterUtilityClick: beginComment,
283 - onRevealSearchMatch: (item) => onRevealSearchMatch(item.id),
283 + onItemCollapsedChange: (_item, nextItem) =>
284 + onFileCollapsedChange(nextItem.id, nextItem.collapsed === true),
285 }}
286 renderHeaderFilenameSuffix={(item) =>
287 item.type === "diff" ? renderHeaderFilenameSuffix(item.fileDiff) : null
apps/web/src/components/diffs/codeViewSearch.browser.test.ts deleted
-87
@@ -1,87 +0,0 @@
1 -import {
2 - CodeView,
3 - DEFAULT_THEMES,
4 - parseDiffFromFile,
5 - preloadHighlighter,
6 - type CodeViewItem,
7 -} from "@pierre/diffs";
8 -import { expect, it, vi } from "vite-plus/test";
9 -
10 -const LINES = Array.from({ length: 80 }, (_, index) => `line ${index + 1}`);
11 -
12 -function contents(changes: Record<number, string>) {
13 - return `${LINES.map((line, index) => changes[index] ?? line).join("\n")}\n`;
14 -}
15 -
16 -function currentMatchText() {
17 - return Array.from(CSS.highlights.get("diffs-search-current") ?? [], String);
18 -}
19 -
20 -// Upstream find skips folded files and collapsed context, and drops focus on close. Our @pierre/diffs patch covers all three.
21 -it("finds and reveals matches in folded files and collapsed context, then hands focus back", async () => {
22 - await preloadHighlighter({ themes: Object.values(DEFAULT_THEMES), langs: ["text"] });
23 - let items: CodeViewItem<undefined>[] = [
24 - {
25 - id: "folded",
26 - type: "diff",
27 - collapsed: true,
28 - fileDiff: parseDiffFromFile(
29 - { name: "folded.txt", contents: "old\n" },
30 - { name: "folded.txt", contents: "NEEDLE added\n" },
31 - ),
32 - },
33 - {
34 - id: "context",
35 - type: "diff",
36 - fileDiff: parseDiffFromFile(
37 - { name: "context.txt", contents: contents({ 39: "needle in context" }) },
38 - {
39 - name: "context.txt",
40 - contents: contents({ 0: "changed", 39: "needle in context", 79: "changed" }),
41 - },
42 - ),
43 - },
44 - ];
45 - const root = document.createElement("div");
46 - root.style.cssText = "width: 800px; height: 300px; overflow: auto;";
47 - document.body.append(root);
48 - const search = { matchCount: 0, currentMatchIndex: undefined as number | undefined };
49 - const view = new CodeView<undefined>({
50 - diffStyle: "unified",
51 - searchOptions: { scrollBehavior: "instant" },
52 - onSearchStateChange: (state) => {
53 - search.matchCount = state?.matchCount ?? 0;
54 - search.currentMatchIndex = state?.currentMatchIndex;
55 - },
56 - onRevealSearchMatch: (item) => {
57 - items = items.map((candidate) =>
58 - candidate.id === item.id ? { ...candidate, collapsed: false, version: 1 } : candidate,
59 - );
60 - view.setItems(items);
61 - },
62 - });
63 - using _view = {
64 - [Symbol.dispose]: () => {
65 - view.cleanUp();
66 - root.remove();
67 - },
68 - };
69 - view.setup(root);
70 - view.setItems(items);
71 -
72 - view.openSearch({ query: "needle" });
73 - await vi.waitFor(() => expect(search).toEqual({ matchCount: 2, currentMatchIndex: 0 }));
74 - await vi.waitFor(() => expect(currentMatchText()).toEqual(["NEEDLE"]));
75 -
76 - view.navigateSearch("next");
77 - await vi.waitFor(() => expect(currentMatchText()).toEqual(["needle"]));
78 - expect(search.currentMatchIndex).toBe(1);
79 -
80 - // Focus that leaves the viewer on close takes the find shortcut with it.
81 - const input = root.querySelector("[data-search-panel]")?.shadowRoot?.querySelector("input");
82 - input!.dispatchEvent(
83 - new KeyboardEvent("keydown", { key: "Escape", bubbles: true, composed: true }),
84 - );
85 - expect(view.isSearchOpen()).toBe(false);
86 - expect(document.activeElement).toBe(root);
87 -});
apps/web/src/components/pullRequest/PullRequestCodeTab.tsx
+7 -3
@@ -1036,9 +1036,13 @@ function PullRequestCodeTab({
1036 onGutterUtilityClick: beginComment,
1037 onLineSelectionEnd: beginComment,
1038 onPostRender: codeViewReveal.flush,
1039 - // Find may repeat requests before render; only unfold, never toggle.
1040 - onRevealSearchMatch: (item: CodeViewItem<ReviewAnnotationGroup>) =>
1041 - setFoldChoices((current) => withFileDiffFold(current, item.id, false)),
1039 + onItemCollapsedChange: (
1040 + _item: CodeViewItem<ReviewAnnotationGroup>,
1041 + nextItem: CodeViewItem<ReviewAnnotationGroup>,
1042 + ) =>
1043 + setFoldChoices((current) =>
1044 + withFileDiffFold(current, nextItem.id, nextItem.collapsed === true),
1045 + ),
1046 };
1047
1048 const runThreadCommand = async (
patches/@pierre__diffs@1.7.0-beta.3.patch deleted
-423
@@ -1,423 +0,0 @@
1 -diff --git a/dist/components/CodeView.d.ts b/dist/components/CodeView.d.ts
2 -index 774c1abbf4c00586b4fd3af0bf525a5d7c45d015..8e27d2982f5c593e7204bc8fdae9a7ad5e8a85e4 100644
3 ---- a/dist/components/CodeView.d.ts
4 -+++ b/dist/components/CodeView.d.ts
5 -@@ -166,6 +166,13 @@ interface CodeViewOptions<LAnnotation, Caret> extends CodeViewPassThroughOptions
6 - * change, and with undefined when it closes.
7 - */
8 - onSearchStateChange?(state: SearchPanelState | undefined): void;
9 -+ /**
10 -+ * T3 patch. Makes find cover collapsed items and collapsed diff context.
11 -+ * Called when find navigates to a match in a collapsed item: folding is host
12 -+ * state, so the host unfolds it (a controlled update with `collapsed: false`
13 -+ * and a new `version`) and the viewer then scrolls to the match.
14 -+ */
15 -+ onRevealSearchMatch?(item: CodeViewItem<LAnnotation>): void;
16 - /**
17 - * Return an in-memory retention key for an item's editable draft and
18 - * undo/redo history. Called only when CodeView creates the item's editor.
19 -diff --git a/dist/components/CodeView.js b/dist/components/CodeView.js
20 -index 6ee5032aee523b4c3e10f70202874f141f28ff10..94cd3f4b2e16490994707c28fa45c4f43f0c6065 100644
21 ---- a/dist/components/CodeView.js
22 -+++ b/dist/components/CodeView.js
23 -@@ -213,7 +213,8 @@ var CodeView = class CodeView {
24 - matchesByItem: /* @__PURE__ */ new Map(),
25 - current: void 0,
26 - centerNavigation: false,
27 -- pendingHorizontalReveal: false
28 -+ pendingHorizontalReveal: false,
29 -+ pendingReveal: void 0
30 - };
31 - searchMatchesDirty = false;
32 - searchHighlighter;
33 -@@ -593,10 +594,29 @@ var CodeView = class CodeView {
34 - this.searchState.centerNavigation = false;
35 - this.searchMatchesDirty = false;
36 - this.searchState.pendingHorizontalReveal = false;
37 -+ this.searchState.pendingReveal = void 0;
38 -+ }
39 -+ /** T3 patch: whether a diff match sits in collapsed context. Deletion cells carry their row's addition line. */
40 -+ isSearchMatchHidden(item, match) {
41 -+ const lineNumber = match.side === "additions" ? match.lineNumber : match.revealLineNumber;
42 -+ return item.type === "diff" && lineNumber != null && !item.instance.isLineRenderable(lineNumber);
43 -+ }
44 -+ /** T3 patch: finish a reveal that waited for the host to unfold the item, or for its first render. */
45 -+ resumeSearchReveal(updatedItems) {
46 -+ const { current: match, pendingReveal } = this.searchState;
47 -+ if (pendingReveal == null || match == null) return;
48 -+ for (const item of updatedItems) {
49 -+ if (item.item.id !== match.itemId || item.item.collapsed === true || item.type === "diff" && item.instance.getRenderedDiff() == null) continue;
50 -+ this.searchState.pendingReveal = void 0;
51 -+ if (pendingReveal === "unfold" || this.isSearchMatchHidden(item, match)) queueMicrotask(() => {
52 -+ if (areOptionalCodeViewSearchMatchesEqual(this.searchState.current, match)) this.scrollToSearchMatch(match);
53 -+ });
54 -+ return;
55 -+ }
56 - }
57 - isSearchMatchInView(match) {
58 - const item = this.idToItem.get(match.itemId);
59 -- if (item == null || item.type === "diff" && match.side === "additions" && !item.instance.isLineRenderable(match.lineNumber)) return false;
60 -+ if (item == null || this.isSearchMatchHidden(item, match)) return false;
61 - const rect = this.getScrollTargetRect({
62 - type: "line",
63 - id: match.itemId,
64 -@@ -616,13 +636,21 @@ var CodeView = class CodeView {
65 - this.searchState.pendingHorizontalReveal = true;
66 - this.searchState.current = match;
67 - this.render();
68 -- if (!this.searchState.centerNavigation && this.isSearchMatchInView(match)) {
69 -+ const item = this.idToItem.get(match.itemId);
70 -+ const folded = item?.item.collapsed === true;
71 -+ this.searchState.pendingReveal = void 0;
72 -+ if (!folded && !this.searchState.centerNavigation && this.isSearchMatchInView(match)) {
73 - this.clearPendingScroll();
74 - return;
75 - }
76 - this.searchState.centerNavigation = true;
77 -- const item = this.idToItem.get(match.itemId);
78 -- if (item?.type === "diff" && match.side === "additions" && !item.instance.isLineRenderable(match.lineNumber)) item.instance.revealLine(match.lineNumber);
79 -+ // T3 patch: folding is host state, and a diff that has not rendered reports every line
80 -+ // renderable. Scroll to the item now; resumeSearchReveal finishes once it has rendered.
81 -+ if (folded) {
82 -+ this.searchState.pendingReveal = "unfold";
83 -+ this.options.onRevealSearchMatch?.(item.item);
84 -+ } else if (item?.type === "diff" && item.instance.getRenderedDiff() == null) this.searchState.pendingReveal = "render";
85 -+ else if (item != null && this.isSearchMatchHidden(item, match)) item.instance.revealLine(match.revealLineNumber ?? match.lineNumber);
86 - this.scrollTo({
87 - type: "line",
88 - id: match.itemId,
89 -@@ -732,9 +760,12 @@ var CodeView = class CodeView {
90 - for (const item of items) {
91 - const remaining = MAX_SEARCH_MATCHES - matches.length;
92 - if (remaining <= 0) break;
93 -- if (item.item.collapsed === true) continue;
94 -+ // T3 patch: a host that can unfold items (onRevealSearchMatch) gets them searched.
95 -+ if (item.item.collapsed === true && this.options.onRevealSearchMatch == null) continue;
96 - const nextMatches = (scope != null || item.type === "file" ? this.searchEditedItem(item, searchParams, remaining) : void 0) ?? (item.type === "file" ? this.searchFileItem(item, searchParams, remaining) : this.searchDiffItem(item, searchParams, remaining));
97 - const bounds = item.element == null ? void 0 : item.instance.getRenderedBounds();
98 -+ // T3 patch: a mounted folded item has no rendered lines, so its header stands in for them.
99 -+ if (item.item.collapsed === true && item.element != null && nextMatches.length > 0) firstRendered ??= matches.length;
100 - for (const match of nextMatches) {
101 - const canBeRendered = firstVisible == null && bounds != null;
102 - const canBeAfter = firstAfterRendered == null && lastRenderedItem != null && item.index >= lastRenderedItem.index;
103 -@@ -744,7 +775,7 @@ var CodeView = class CodeView {
104 - lineNumber: match.lineNumber,
105 - side: match.side
106 - }) : void 0;
107 -- if (canBeRendered && position != null && position.height > 0 && position.top >= bounds.top && position.top < bounds.bottom && (item.type !== "diff" || match.side !== "additions" || item.instance.isLineRenderable(match.lineNumber))) {
108 -+ if (canBeRendered && position != null && position.height > 0 && position.top >= bounds.top && position.top < bounds.bottom) {
109 - firstRendered ??= matches.length;
110 - if (this.isSearchMatchInView(match)) firstVisible = matches.length;
111 - }
112 -@@ -791,9 +822,10 @@ var CodeView = class CodeView {
113 - const fileDiff = doc == null ? item.item.fileDiff : item.instance.getDiffForSearch() ?? item.item.fileDiff;
114 - const scoped = this.searchState.scope?.itemId === item.item.id;
115 - const diffStyle = this.options.diffStyle ?? "split";
116 -- const expandedHunks = scoped || this.options.expandUnchanged === true ? true : item.instance.getExpandedHunksForSearch();
117 -+ // T3 patch: the same opt-in searches collapsed context; navigating to a match expands it.
118 -+ const expandedHunks = scoped || this.options.expandUnchanged === true || this.options.onRevealSearchMatch != null ? true : item.instance.getExpandedHunksForSearch();
119 - const lines = [];
120 -- const addLine = (side, line) => {
121 -+ const addLine = (side, line, revealLineNumber) => {
122 - if (line === void 0) return;
123 - const sourceLines = side === "additions" ? fileDiff.additionLines : fileDiff.deletionLines;
124 - const text = side === "additions" && doc != null ? doc.getLineText(line.lineIndex, true) : sourceLines[line.lineIndex];
125 -@@ -805,7 +837,8 @@ var CodeView = class CodeView {
126 - itemType: "diff",
127 - side,
128 - lineNumber: line.lineNumber,
129 -- lineIndex: line.lineIndex
130 -+ lineIndex: line.lineIndex,
131 -+ revealLineNumber
132 - }
133 - });
134 - };
135 -@@ -824,7 +857,7 @@ var CodeView = class CodeView {
136 - else addLine("deletions", deletionLine);
137 - return;
138 - }
139 -- addLine("deletions", deletionLine);
140 -+ addLine("deletions", deletionLine, additionLine?.lineNumber);
141 - addLine("additions", additionLine);
142 - }
143 - });
144 -@@ -1081,6 +1114,9 @@ var CodeView = class CodeView {
145 - this.resetSearchState();
146 - if (searchPanel == null) return;
147 - searchPanel.cleanup();
148 -+ // T3 patch: a panel that closes while focused drops focus to the body; keep it in the viewer.
149 -+ const doc = this.root?.ownerDocument;
150 -+ if (doc != null && doc.activeElement === doc.body) this.root.focus({ preventScroll: true });
151 - const { onSearchStateChange } = this.options;
152 - onSearchStateChange?.(void 0);
153 - }
154 -@@ -2239,6 +2275,7 @@ var CodeView = class CodeView {
155 - if (measured) this.validateStickyContainerHeight();
156 - this.fixContainerFocus();
157 - this.paintSearchHighlights();
158 -+ this.resumeSearchReveal(updatedItems);
159 - if (this.pendingScrollTarget == null) this.finishPendingScroll("settled");
160 - if (fitPerfectly || this.scrollAnimation != null || this.renderState.measurementsPending) this.render();
161 - };
162 -@@ -2340,6 +2377,7 @@ var CodeView = class CodeView {
163 - clearPendingScroll = (event) => {
164 - if (event != null && !isUserScrollInput(event)) return;
165 - if (event != null) this.searchState.pendingHorizontalReveal = false;
166 -+ if (event != null) this.searchState.pendingReveal = void 0;
167 - this.pendingLayoutAnchor = void 0;
168 - this.cancelScroll();
169 - };
170 -diff --git a/dist/components/FileDiff.js b/dist/components/FileDiff.js
171 -index 734ff9862cdfe65b8082599c6c221c4886436e01..f18798a3d56dd0749550b5aff62a06fb0513b28e 100644
172 ---- a/dist/components/FileDiff.js
173 -+++ b/dist/components/FileDiff.js
174 -@@ -1,7 +1,8 @@
175 --import { CUSTOM_HEADER_SLOT_ID, DEFAULT_THEMES, EMPTY_LINE_ANNOTATIONS, EMPTY_RENDER_RANGE, HEADER_FILENAME_SUFFIX_SLOT_ID, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID } from "../constants.js";
176 -+import { CUSTOM_HEADER_SLOT_ID, DEFAULT_THEMES, EMPTY_LINE_ANNOTATIONS, HEADER_FILENAME_SUFFIX_SLOT_ID, HEADER_METADATA_SLOT_ID, HEADER_PREFIX_SLOT_ID } from "../constants.js";
177 - import { isSafari } from "../utils/platform.js";
178 - import { HighlighterDisposedError } from "../highlighter/highlighterType.js";
179 - import { getThemes } from "../utils/getThemes.js";
180 -+import { getHighlighterThemeStyles } from "../utils/getHighlighterThemeStyles.js";
181 - import { getHighlighterIfLoaded, getSharedHighlighter } from "../highlighter/shared_highlighter.js";
182 - import { dequeueRender, queueRender } from "../managers/UniversalRenderingManager.js";
183 - import { areObjectsEqual } from "../utils/areObjectsEqual.js";
184 -@@ -733,7 +734,7 @@ var FileDiff = class {
185 - if (expandUnchanged) this.loadFilesIfNecessary();
186 - this.hunksRenderer.setOptions(this.getHunksRendererOptions(this.options));
187 - this.syncInteractionOptions();
188 -- this.prepareRenderData(this.hunksRenderer.getDiffForNextRender(workingDiff));
189 -+ this.prepareRenderData(collapsed ? workingDiff : this.hunksRenderer.getDiffForNextRender(workingDiff));
190 - const { disableErrorHandling = false, disableFileHeader = false } = this.options;
191 - if (disableFileHeader) {
192 - if (this.headerElement != null) {
193 -@@ -750,11 +751,22 @@ var FileDiff = class {
194 - this.removeRenderedCode();
195 - this.clearAuxiliaryNodes();
196 - try {
197 -- const hunksResult = this.hunksRenderer.renderDiff(workingDiff, EMPTY_RENDER_RANGE);
198 -- if (hunksResult != null) this.applyThemeState(fileContainer, hunksResult.themeStyles, themeType, hunksResult.baseThemeType);
199 -- if (hunksResult?.headerElement != null) this.applyHeaderToDOM(hunksResult.headerElement, fileContainer, hunksResult.fileDiff);
200 -+ // An empty render range still highlights the full diff. Headers only need the theme.
201 -+ const theme = this.getTheme();
202 -+ const highlighter = getHighlighterIfLoaded({ theme, lang: "text" });
203 -+ if (highlighter != null) this.applyThemeState(fileContainer, getHighlighterThemeStyles({ theme, highlighter }), themeType, typeof theme === "string" ? highlighter.getTheme(theme).type : void 0);
204 -+ else getSharedHighlighter({
205 -+ themes: getThemes(theme),
206 -+ langs: ["text"],
207 -+ preferredHighlighter: resolvePreferredHighlighter(this.workerManager, this.options)
208 -+ }).then(() => {
209 -+ if (this.enabled && this.fileContainer === fileContainer && this.options.collapsed && areThemesEqual(theme, this.getTheme())) this.rerender();
210 -+ }).catch((error) => {
211 -+ if (!(error instanceof HighlighterDisposedError)) console.error(error);
212 -+ });
213 -+ if (!disableFileHeader) this.applyHeaderToDOM(this.hunksRenderer.renderHeader(workingDiff), fileContainer, workingDiff);
214 - this.renderSeparators([]);
215 -- this.adoptRenderData(hunksResult?.fileDiff ?? workingDiff);
216 -+ this.adoptRenderData(workingDiff);
217 - this.injectUnsafeCSS();
218 - } catch (error) {
219 - if (disableErrorHandling) throw error;
220 -diff --git a/dist/components/VirtualizedFileDiff.js b/dist/components/VirtualizedFileDiff.js
221 -index 984f049ff3694dd353fa6637b0f09fc7dce74992..4d6599905be0fe7b5b5c1a225c0b3ff8d810c72a 100644
222 ---- a/dist/components/VirtualizedFileDiff.js
223 -+++ b/dist/components/VirtualizedFileDiff.js
224 -@@ -264,7 +264,8 @@ var VirtualizedFileDiff = class extends FileDiff {
225 - const { pendingExpansions, pendingHydratedDiff, options: { collapsed = false } } = this;
226 - if (pendingHydratedDiff != null) {
227 - this.pendingHydratedDiff = void 0;
228 -- if (pendingHydratedDiff.expectedDiff === fileDiff) {
229 -+ // T3 patch: a host may re-supply an unchanged diff as a new object; it is still this diff.
230 -+ if (areDiffTargetsEqual(pendingHydratedDiff.expectedDiff, fileDiff)) {
231 - Object.assign(fileDiff, pendingHydratedDiff.nextDiff);
232 - this.setHydratedState(pendingHydratedDiff.files);
233 - this.installHydratedDiff(fileDiff);
234 -@@ -626,7 +627,7 @@ var VirtualizedFileDiff = class extends FileDiff {
235 - rerender() {
236 - if (!this.enabled || this.getInputDiff() == null && this.additionFile == null && this.deletionFile == null) return;
237 - const workingDiff = this.getWorkingDiff();
238 -- const nextRenderDiff = workingDiff == null ? void 0 : this.hunksRenderer.getDiffForNextRender(workingDiff);
239 -+ const nextRenderDiff = workingDiff == null || this.options.collapsed === true ? workingDiff : this.hunksRenderer.getDiffForNextRender(workingDiff);
240 - if (this.isSimpleMode()) this.pendingRender = void 0;
241 - this.forceRenderOverride = true;
242 - if (this.isSimpleMode() && this.requestRender()) return;
243 -@@ -790,7 +791,7 @@ var VirtualizedFileDiff = class extends FileDiff {
244 - const previousRenderedDiff = this.getRenderedDiff();
245 - const { pendingRender } = this;
246 - const previousLayoutDiff = pendingRender?.diff ?? previousRenderedDiff;
247 -- const pendingRenderDiff = this.hunksRenderer.getDiffForNextRender(workingDiff);
248 -+ const pendingRenderDiff = this.options.collapsed === true ? workingDiff : this.hunksRenderer.getDiffForNextRender(workingDiff);
249 - this.pendingRender = {
250 - workingDiff,
251 - diff: pendingRenderDiff
252 -diff --git a/dist/editor/editor.js b/dist/editor/editor.js
253 -index a9905d43382de2ca03d6111ba9ab3725d8cb6981..294f537622b9a62d89111d7ed4a7c07cc24dac30 100644
254 ---- a/dist/editor/editor.js
255 -+++ b/dist/editor/editor.js
256 -@@ -106,6 +106,7 @@ var Editor = class {
257 - #deletionsColumn;
258 - #overlayElement;
259 - #overlayElements;
260 -+ #fontProbeElement;
261 - #caretElements;
262 - #caretHighlightElements;
263 - #primaryCaretElement;
264 -@@ -490,7 +491,9 @@ var Editor = class {
265 - selections: this.#selections
266 - });
267 - const primarySelection = resolvedSelections.at(-1);
268 -- if (primarySelection !== void 0) this.#revealLineIfCollapsed(getCaretPosition(primarySelection).line);
269 -+ // Clearing keeps the selection while search matches or markers exist; scrolling to it steals focus.
270 -+ if (primarySelection === void 0) return;
271 -+ this.#revealLineIfCollapsed(getCaretPosition(primarySelection).line);
272 - this.#scrollToPrimaryCaret();
273 - }
274 - setMarkers(markers) {
275 -@@ -595,6 +598,7 @@ var Editor = class {
276 - this.#contentHasFocus = false;
277 - this.#overlayElement?.remove();
278 - this.#overlayElement = void 0;
279 -+ this.#fontProbeElement = void 0;
280 - this.#resizeObserver?.disconnect();
281 - this.#resizeObserver = void 0;
282 - this.#fontRemeasureScheduled = false;
283 -@@ -1033,6 +1037,19 @@ var Editor = class {
284 - this.#tokenizer?.applyStyle();
285 - this.#spriteElement = createSpriteElement();
286 - this.#overlayElement = h("div", { dataset: "editorOverlay" });
287 -+ // Resizes when the inherited code font changes, so the observer can re-measure.
288 -+ this.#fontProbeElement = h("span", {
289 -+ ariaHidden: "true",
290 -+ style: {
291 -+ position: "absolute",
292 -+ top: "0",
293 -+ left: "0",
294 -+ visibility: "hidden",
295 -+ pointerEvents: "none",
296 -+ whiteSpace: "pre"
297 -+ },
298 -+ textContent: "0"
299 -+ }, this.#overlayElement);
300 - const replacementFocusTargetIsContent = (event) => {
301 - const target = event.composedPath()[0];
302 - return target instanceof Node && this.#contentElement?.contains(target) === true;
303 -@@ -1409,6 +1426,7 @@ var Editor = class {
304 - this.#resizeObserver = new ResizeObserver(this.#handleLayoutResize);
305 - this.#resizeObserver.observe(contentEl);
306 - this.#resizeObserver.observe(contentEl.parentElement);
307 -+ if (this.#fontProbeElement !== void 0) this.#resizeObserver.observe(this.#fontProbeElement);
308 - this.#computeContentOffset(contentEl);
309 - }
310 - #handleCustomPasteEvent = async () => {
311 -@@ -1864,7 +1882,9 @@ var Editor = class {
312 - const change = textDocument.applyEdits(edits, true, selections, nextSelections, true);
313 - if (change !== void 0) this.#applyChange(change, nextSelections);
314 - }
315 -- #handleLayoutResize = () => {
316 -+ #handleLayoutResize = (entries) => {
317 -+ const contentElement = this.#contentElement;
318 -+ const metricsChanged = contentElement !== void 0 && entries.some((entry) => entry.target === this.#fontProbeElement) && this.#metrics.init(contentElement);
319 - const lineAnnotations = this.#lineAnnotations?.length ?? 0;
320 - const prevGutterWidth = this.#gutterWidthCache;
321 - const prevContentWidth = this.#contentWidthCache;
322 -@@ -1872,12 +1892,12 @@ var Editor = class {
323 - this.#contentWidthCache = void 0;
324 - const gutterWidthChanged = this.#getGutterWidth() !== prevGutterWidth;
325 - const contentWidthChanged = this.#getContentWidth() !== prevContentWidth;
326 -- if (!gutterWidthChanged && !contentWidthChanged) return;
327 -+ if (!gutterWidthChanged && !contentWidthChanged && !metricsChanged) return;
328 - this.#lastAccessedCharX = void 0;
329 - this.#metrics.clearTextWidthCache();
330 -- if (contentWidthChanged) {
331 -+ if (contentWidthChanged || metricsChanged) {
332 - this.#wrapLineOffsetsCache.clear();
333 -- if (this.#isWrap || lineAnnotations > 0) this.#lineYCache.clear();
334 -+ if (metricsChanged || this.#isWrap || lineAnnotations > 0) this.#lineYCache.clear();
335 - }
336 - if (this.#selections !== void 0 || this.#matches !== void 0 || this.#markerRenderer !== void 0) {
337 - this.#updateSelections(this.#selections ?? []);
338 -diff --git a/dist/editor/textMeasure.d.ts b/dist/editor/textMeasure.d.ts
339 -index 89e938d89eca77d351aeed65f3c5495383effd97..cde1d6ba89a97bbb1614754a48f8994388c186bd 100644
340 ---- a/dist/editor/textMeasure.d.ts
341 -+++ b/dist/editor/textMeasure.d.ts
342 -@@ -9,8 +9,8 @@ declare class Metrics {
343 - lineHeight: number;
344 - /** Padding top of the root element. */
345 - paddingTop: number;
346 -- /** initialize the metrics */
347 -- init(root: HTMLElement): void;
348 -+ /** (re)read the metrics from root, returning true when they changed */
349 -+ init(root: HTMLElement): boolean;
350 - /**
351 - * Re-measure the '0' character width against the font that is loaded right
352 - * now, returning true when measurement-dependent UI should refresh.
353 -diff --git a/dist/editor/textMeasure.js b/dist/editor/textMeasure.js
354 -index 96d4fb137ea683b66381b1ce6e47e8708a89366c..13f2564897a5bf53a8f311300003b3ea875c73a5 100644
355 ---- a/dist/editor/textMeasure.js
356 -+++ b/dist/editor/textMeasure.js
357 -@@ -16,9 +16,10 @@ var Metrics = class {
358 - lineHeight = 20;
359 - /** Padding top of the root element. */
360 - paddingTop = 0;
361 -- /** initialize the metrics */
362 -+ /** (re)read the metrics from root, returning true when they changed */
363 - init(root) {
364 -- if (this.#root === root && this.#canvasCtx !== void 0 && this.ch !== -1) return;
365 -+ const previousLineHeight = this.lineHeight;
366 -+ let fontChanged = false;
367 - this.#root = root;
368 - this.#canvas ??= h("canvas", { style: { display: "none" } });
369 - this.#canvasCtx ??= this.#canvas.getContext("2d") ?? void 0;
370 -@@ -37,9 +38,11 @@ var Metrics = class {
371 - this.#setCanvasFont(font);
372 - this.ch = this.canvasMeasureTextWidth("0");
373 - this.clearTextWidthCache();
374 -+ fontChanged = true;
375 - }
376 - const nextTabSize = parseInt(tabSize, 10);
377 - if (!Number.isNaN(nextTabSize)) this.tabSize = nextTabSize;
378 -+ return fontChanged || this.lineHeight !== previousLineHeight;
379 - }
380 - /**
381 - * Re-measure the '0' character width against the font that is loaded right
382 -diff --git a/dist/utils/createFileHeaderElement.js b/dist/utils/createFileHeaderElement.js
383 -index 19934176d0787ae1304e771c707230d5c8837e83..298b3386eac5126a7c1ec985674e799aac0ffd42 100644
384 ---- a/dist/utils/createFileHeaderElement.js
385 -+++ b/dist/utils/createFileHeaderElement.js
386 -@@ -73,12 +73,12 @@ function createMetadataElement(fileDiff) {
387 - }
388 - if (deletions > 0 || additions === 0) children.push(createHastElement({
389 - tagName: "span",
390 -- children: [createTextNodeElement(`-${deletions}`)],
391 -+ children: [createTextNodeElement(`-${deletions.toLocaleString()}`)],
392 - properties: { "data-deletions-count": "" }
393 - }));
394 - if (additions > 0 || deletions === 0) children.push(createHastElement({
395 - tagName: "span",
396 -- children: [createTextNodeElement(`+${additions}`)],
397 -+ children: [createTextNodeElement(`+${additions.toLocaleString()}`)],
398 - properties: { "data-additions-count": "" }
399 - }));
400 - }
401 -diff --git a/package.json b/package.json
402 -index 0a0acc4c8734a61cf2d684162914002adf74960d..935937d68f52ed96b7af6b1dbb890dbf512eb0fe 100644
403 ---- a/package.json
404 -+++ b/package.json
405 -@@ -60,6 +60,18 @@
406 - "./worker/worker-portable.js": {
407 - "types": "./dist/worker/worker-portable.d.ts",
408 - "import": "./dist/worker/worker-portable.js"
409 -+ },
410 -+ "./types": {
411 -+ "types": "./dist/types.d.ts",
412 -+ "import": "./dist/types.js"
413 -+ },
414 -+ "./utils/getFiletypeFromFileName": {
415 -+ "types": "./dist/utils/getFiletypeFromFileName.d.ts",
416 -+ "import": "./dist/utils/getFiletypeFromFileName.js"
417 -+ },
418 -+ "./utils/parsePatchFiles": {
419 -+ "types": "./dist/utils/parsePatchFiles.d.ts",
420 -+ "import": "./dist/utils/parsePatchFiles.js"
421 - }
422 - },
423 - "publishConfig": {
patches/@pierre__diffs@1.7.0-beta.4.patch new
+142
@@ -0,0 +1,142 @@
1 +diff --git a/dist/editor/editor.js b/dist/editor/editor.js
2 +index b4c280390b52434f63fbe7916d81b150d9006fb4..8564980bdfe2ef8e17e8ab0a87627709091101ee 100644
3 +--- a/dist/editor/editor.js
4 ++++ b/dist/editor/editor.js
5 +@@ -95,6 +95,7 @@ var Editor = class {
6 + #deletionsColumn;
7 + #overlayElement;
8 + #overlayElements;
9 ++ #fontProbeElement;
10 + #caretElements;
11 + #caretHighlightElements;
12 + #primaryCaretElement;
13 +@@ -584,6 +585,7 @@ var Editor = class {
14 + this.#contentHasFocus = false;
15 + this.#overlayElement?.remove();
16 + this.#overlayElement = void 0;
17 ++ this.#fontProbeElement = void 0;
18 + this.#resizeObserver?.disconnect();
19 + this.#resizeObserver = void 0;
20 + this.#fontRemeasureScheduled = false;
21 +@@ -1022,6 +1024,19 @@ var Editor = class {
22 + this.#tokenizer?.applyStyle();
23 + this.#spriteElement = createSpriteElement();
24 + this.#overlayElement = h("div", { dataset: "editorOverlay" });
25 ++ // Resizes when the inherited code font changes, so the observer can re-measure.
26 ++ this.#fontProbeElement = h("span", {
27 ++ ariaHidden: "true",
28 ++ style: {
29 ++ position: "absolute",
30 ++ top: "0",
31 ++ left: "0",
32 ++ visibility: "hidden",
33 ++ pointerEvents: "none",
34 ++ whiteSpace: "pre"
35 ++ },
36 ++ textContent: "0"
37 ++ }, this.#overlayElement);
38 + const replacementFocusTargetIsContent = (event) => {
39 + const target = event.composedPath()[0];
40 + return target instanceof Node && this.#contentElement?.contains(target) === true;
41 +@@ -1397,6 +1412,7 @@ var Editor = class {
42 + this.#resizeObserver = new ResizeObserver(this.#handleLayoutResize);
43 + this.#resizeObserver.observe(contentEl);
44 + this.#resizeObserver.observe(contentEl.parentElement);
45 ++ if (this.#fontProbeElement !== void 0) this.#resizeObserver.observe(this.#fontProbeElement);
46 + this.#computeContentOffset(contentEl);
47 + }
48 + #handleCustomPasteEvent = async () => {
49 +@@ -1852,7 +1868,9 @@ var Editor = class {
50 + const change = textDocument.applyEdits(edits, true, selections, nextSelections, true);
51 + if (change !== void 0) this.#applyChange(change, nextSelections);
52 + }
53 +- #handleLayoutResize = () => {
54 ++ #handleLayoutResize = (entries) => {
55 ++ const contentElement = this.#contentElement;
56 ++ const metricsChanged = contentElement !== void 0 && entries.some((entry) => entry.target === this.#fontProbeElement) && this.#metrics.init(contentElement);
57 + const lineAnnotations = this.#lineAnnotations?.length ?? 0;
58 + const prevGutterWidth = this.#gutterWidthCache;
59 + const prevContentWidth = this.#contentWidthCache;
60 +@@ -1860,12 +1878,12 @@ var Editor = class {
61 + this.#contentWidthCache = void 0;
62 + const gutterWidthChanged = this.#getGutterWidth() !== prevGutterWidth;
63 + const contentWidthChanged = this.#getContentWidth() !== prevContentWidth;
64 +- if (!gutterWidthChanged && !contentWidthChanged) return;
65 ++ if (!gutterWidthChanged && !contentWidthChanged && !metricsChanged) return;
66 + this.#lastAccessedCharX = void 0;
67 + this.#metrics.clearTextWidthCache();
68 +- if (contentWidthChanged) {
69 ++ if (contentWidthChanged || metricsChanged) {
70 + this.#wrapLineOffsetsCache.clear();
71 +- if (this.#isWrap || lineAnnotations > 0) this.#lineYCache.clear();
72 ++ if (metricsChanged || this.#isWrap || lineAnnotations > 0) this.#lineYCache.clear();
73 + }
74 + if (this.#selections !== void 0 || this.#matches !== void 0 || this.#markerRenderer !== void 0) {
75 + this.#updateSelections(this.#selections ?? []);
76 +diff --git a/dist/editor/textMeasure.d.ts b/dist/editor/textMeasure.d.ts
77 +index 89e938d89eca77d351aeed65f3c5495383effd97..cde1d6ba89a97bbb1614754a48f8994388c186bd 100644
78 +--- a/dist/editor/textMeasure.d.ts
79 ++++ b/dist/editor/textMeasure.d.ts
80 +@@ -9,8 +9,8 @@ declare class Metrics {
81 + lineHeight: number;
82 + /** Padding top of the root element. */
83 + paddingTop: number;
84 +- /** initialize the metrics */
85 +- init(root: HTMLElement): void;
86 ++ /** (re)read the metrics from root, returning true when they changed */
87 ++ init(root: HTMLElement): boolean;
88 + /**
89 + * Re-measure the '0' character width against the font that is loaded right
90 + * now, returning true when measurement-dependent UI should refresh.
91 +diff --git a/dist/editor/textMeasure.js b/dist/editor/textMeasure.js
92 +index 96d4fb137ea683b66381b1ce6e47e8708a89366c..13f2564897a5bf53a8f311300003b3ea875c73a5 100644
93 +--- a/dist/editor/textMeasure.js
94 ++++ b/dist/editor/textMeasure.js
95 +@@ -16,9 +16,10 @@ var Metrics = class {
96 + lineHeight = 20;
97 + /** Padding top of the root element. */
98 + paddingTop = 0;
99 +- /** initialize the metrics */
100 ++ /** (re)read the metrics from root, returning true when they changed */
101 + init(root) {
102 +- if (this.#root === root && this.#canvasCtx !== void 0 && this.ch !== -1) return;
103 ++ const previousLineHeight = this.lineHeight;
104 ++ let fontChanged = false;
105 + this.#root = root;
106 + this.#canvas ??= h("canvas", { style: { display: "none" } });
107 + this.#canvasCtx ??= this.#canvas.getContext("2d") ?? void 0;
108 +@@ -37,9 +38,11 @@ var Metrics = class {
109 + this.#setCanvasFont(font);
110 + this.ch = this.canvasMeasureTextWidth("0");
111 + this.clearTextWidthCache();
112 ++ fontChanged = true;
113 + }
114 + const nextTabSize = parseInt(tabSize, 10);
115 + if (!Number.isNaN(nextTabSize)) this.tabSize = nextTabSize;
116 ++ return fontChanged || this.lineHeight !== previousLineHeight;
117 + }
118 + /**
119 + * Re-measure the '0' character width against the font that is loaded right
120 +diff --git a/package.json b/package.json
121 +index d1fa4d5d79ba70b6cd990b0ac9df5206fe55b58d..8762624a075174f5d9f35224cf091596d951a1a7 100644
122 +--- a/package.json
123 ++++ b/package.json
124 +@@ -60,6 +60,18 @@
125 + "./worker/worker-portable.js": {
126 + "types": "./dist/worker/worker-portable.d.ts",
127 + "import": "./dist/worker/worker-portable.js"
128 ++ },
129 ++ "./types": {
130 ++ "types": "./dist/types.d.ts",
131 ++ "import": "./dist/types.js"
132 ++ },
133 ++ "./utils/getFiletypeFromFileName": {
134 ++ "types": "./dist/utils/getFiletypeFromFileName.d.ts",
135 ++ "import": "./dist/utils/getFiletypeFromFileName.js"
136 ++ },
137 ++ "./utils/parsePatchFiles": {
138 ++ "types": "./dist/utils/parsePatchFiles.d.ts",
139 ++ "import": "./dist/utils/parsePatchFiles.js"
140 + }
141 + },
142 + "publishConfig": {
pnpm-lock.yaml
+17 -12
@@ -282,7 +282,7 @@ overrides:
282 expo-widgets: 58.0.27
283 '@ff-labs/fff-node': 0.11.0
284 '@legendapp/list': 3.7.2
285 - '@pierre/diffs': 1.7.0-beta.3
285 + '@pierre/diffs': 1.7.0-beta.4
286 '@react-native-ai/apple': 0.12.0
287 '@react-native-menu/menu': 2.0.0
288 '@react-navigation/native-stack': 7.21.0
@@ -369,7 +369,7 @@ patchedDependencies:
369 '@ff-labs/fff-node@0.11.0': 3be7107340e5f388114da259637828cd47f2b32eb8ae572440715c4e38cffe6e
370 '@legendapp/list@3.7.2': 3c68607b8bb7a531873bcbe0b197d163ef1fdb4d4cf52a4ddf9d2b3804671658
371 '@muse-code/sdk@1.4.6': 7b495b607fc5d76b444c7c4d58821e839726a30e6f3c53564f0d59f2d5b42101
372 - '@pierre/diffs@1.7.0-beta.3': 4a64f63a0def94c5add9d86d70560d26d6857e1f5150133862e42e1fd77bc4e8
372 + '@pierre/diffs@1.7.0-beta.4': dd078a7448ce6727aaaa8b8b6702fe0ff02e85f18efa7c441a768530cabbe0cc
373 '@react-native-ai/apple@0.12.0': 2d09870c2848d185cb05b53ed823a46e12dba519324d8dd8e584e28731990f9d
374 '@react-native-menu/menu@2.0.0': 6872ba71b9847c5a0210b1b896923dadc3860faedfe28d9f062bcedfe786ef1d
375 '@react-navigation/native-stack@7.21.0': 990d575444c4af2ce8218b3b7a8280fe244c03abbdb32b822a2e862f791dbf42
@@ -569,8 +569,8 @@ importers:
569 specifier: 0.3.0
570 version: 0.3.0
571 '@pierre/diffs':
572 - specifier: 1.7.0-beta.3
573 - version: 1.7.0-beta.3(patch_hash=4a64f63a0def94c5add9d86d70560d26d6857e1f5150133862e42e1fd77bc4e8)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
572 + specifier: 1.7.0-beta.4
573 + version: 1.7.0-beta.4(patch_hash=dd078a7448ce6727aaaa8b8b6702fe0ff02e85f18efa7c441a768530cabbe0cc)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
574 '@pierre/highlights':
575 specifier: 'catalog:'
576 version: 0.5.0
@@ -1090,8 +1090,8 @@ importers:
1090 specifier: 'catalog:'
1091 version: 1.8.0
1092 '@pierre/diffs':
1093 - specifier: 1.7.0-beta.3
1094 - version: 1.7.0-beta.3(patch_hash=4a64f63a0def94c5add9d86d70560d26d6857e1f5150133862e42e1fd77bc4e8)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
1093 + specifier: 1.7.0-beta.4
1094 + version: 1.7.0-beta.4(patch_hash=dd078a7448ce6727aaaa8b8b6702fe0ff02e85f18efa7c441a768530cabbe0cc)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
1095 '@pierre/trees':
1096 specifier: 1.0.0-beta.6
1097 version: 1.0.0-beta.6(@pierre/theme@2.0.0)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(shiki@4.2.0)
@@ -1506,8 +1506,8 @@ importers:
1506 packages/client-runtime:
1507 dependencies:
1508 '@pierre/diffs':
1509 - specifier: 1.7.0-beta.3
1510 - version: 1.7.0-beta.3(patch_hash=4a64f63a0def94c5add9d86d70560d26d6857e1f5150133862e42e1fd77bc4e8)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
1509 + specifier: 1.7.0-beta.4
1510 + version: 1.7.0-beta.4(patch_hash=dd078a7448ce6727aaaa8b8b6702fe0ff02e85f18efa7c441a768530cabbe0cc)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)
1511 '@t3tools/contracts':
1512 specifier: workspace:*
1513 version: link:../contracts
@@ -6352,8 +6352,8 @@ packages:
6352 resolution: {integrity: sha512-ODOov0sGMJMf3jPonOkgGqPknTsu+DdQ7kD++gz8aI+aFMOMHFbWAA2taqXXVTdP+OTOQR/znGvSpmkeI0WTYQ==}
6353 engines: {node: '>=14.18.0'}
6354
6355 - '@pierre/diffs@1.7.0-beta.3':
6356 - resolution: {integrity: sha512-eAoAoL9aoO7vR9VV5NCLIuIAEr4yu5LsBnhTbyoy8wDFjT0y7bDrlhX8doO7FUb/MCd0Ldcd15Ga/yTOq2mjBA==}
6355 + '@pierre/diffs@1.7.0-beta.4':
6356 + resolution: {integrity: sha512-QtsUN1eO1hfAie0SUBRZ8xfjzybetaOzq3xFPw7UYl/XLkx9KxQ1uRDXHat4B44S2SW8HBt63yWKCSzQ6OQmEQ==}
6357 peerDependencies:
6358 react: ^18.3.1 || ^19.0.0
6359 react-dom: ^18.3.1 || ^19.0.0
@@ -6366,6 +6366,9 @@ packages:
6366 '@pierre/highlights@0.5.0':
6367 resolution: {integrity: sha512-G8gscrHrik3YjKd+tPTcmivJ/W0zRrtg4adVxnfX7+415+0Qplo6qUWuEX5R0UkA1fMhmE2sOSuLBMNGDtLhIw==}
6368
6369 + '@pierre/highlights@0.5.1':
6370 + resolution: {integrity: sha512-c2WF6sgwgKdxXU6FpWDLWUYHRca/cJy+3QJkWAqYqEAFxqlPf8eSH0ehHcFFjKBmT+9KBl9H7q6z7HMRU7+m6g==}
6371 +
6372 '@pierre/patches@0.0.1':
6373 resolution: {integrity: sha512-NycJQVQNuqmBdr7u1LsUcmkiIz1fRm9xhWZyRbm21oJYd0MVVCa45t9Lsuj5IKrTMBonxOuh4LMv+R3BpL4bmQ==}
6374
@@ -16431,9 +16434,9 @@ snapshots:
16434 tslib: 2.8.1
16435 webcrypto-core: 1.9.2
16436
16434 - '@pierre/diffs@1.7.0-beta.3(patch_hash=4a64f63a0def94c5add9d86d70560d26d6857e1f5150133862e42e1fd77bc4e8)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)':
16437 + '@pierre/diffs@1.7.0-beta.4(patch_hash=dd078a7448ce6727aaaa8b8b6702fe0ff02e85f18efa7c441a768530cabbe0cc)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)':
16438 dependencies:
16436 - '@pierre/highlights': 0.5.0
16439 + '@pierre/highlights': 0.5.1
16440 '@pierre/patches': 0.0.1
16441 '@pierre/theme': 2.0.0
16442 '@pierre/theming': 1.0.2(@pierre/theme@2.0.0)(@shikijs/themes@4.2.0)(react-dom@19.3.0(react@19.3.0))(react@19.3.0)(shiki@4.2.0)
@@ -16449,6 +16452,8 @@ snapshots:
16452
16453 '@pierre/highlights@0.5.0': {}
16454
16455 + '@pierre/highlights@0.5.1': {}
16456 +
16457 '@pierre/patches@0.0.1': {}
16458
16459 '@pierre/theme@2.0.0': {}
pnpm-workspace.yaml
+6 -6
@@ -57,7 +57,7 @@ catalog:
57 "@legendapp/list": 3.7.2
58 "@noble/curves": 1.9.1
59 "@noble/hashes": 1.8.0
60 - "@pierre/diffs": 1.7.0-beta.3
60 + "@pierre/diffs": 1.7.0-beta.4
61 "@pierre/highlights": 0.5.0
62 "@tailwindcss/node": 4.3.3
63 "@tailwindcss/oxide": 4.3.3
@@ -115,7 +115,7 @@ overrides:
115 expo-widgets: 58.0.27
116 "@ff-labs/fff-node": 0.11.0
117 "@legendapp/list": 3.7.2
118 - "@pierre/diffs": 1.7.0-beta.3
118 + "@pierre/diffs": 1.7.0-beta.4
119 "@react-native-ai/apple": 0.12.0
120 "@react-native-menu/menu": 2.0.0
121 "@react-navigation/native-stack": 7.21.0
@@ -247,9 +247,9 @@ patchedDependencies:
247 # scroll target a Material bottom sheet picks, so sheet content can sit below its header.
248 "@expo/ui@58.0.27": patches/@expo__ui@58.0.27.patch
249 "@ff-labs/fff-node@0.11.0": patches/@ff-labs__fff-node@0.11.0.patch
250 - # Exports the dependency-light subpaths mobile and the web diff parser import, and makes find
251 - # cover folded files and collapsed context (onRevealSearchMatch).
252 - "@pierre/diffs@1.7.0-beta.3": patches/@pierre__diffs@1.7.0-beta.3.patch
250 + # Exports the dependency-light subpaths mobile and the web diff parser import, and re-measures
251 + # editor carets when the code font changes.
252 + "@pierre/diffs@1.7.0-beta.4": patches/@pierre__diffs@1.7.0-beta.4.patch
253 "@react-native-ai/apple@0.12.0": patches/@react-native-ai__apple@0.12.0.patch
254 "@react-native-menu/menu@2.0.0": patches/@react-native-menu__menu@2.0.0.patch
255 "@react-navigation/native-stack@7.21.0": patches/@react-navigation%2Fnative-stack@7.21.0.patch
@@ -327,5 +327,5 @@ minimumReleaseAgeExclude:
327 - "@effect/tsgo-win32-x64@0.67.1"
328 - "@effect/tsgo@0.67.1"
329 - "@anthropic-ai/claude-agent-sdk@0.3.321"
330 - - "@pierre/diffs@1.7.0-beta.3"
330 + - "@pierre/diffs@1.7.0-beta.4"
331 - "@pierre/highlights@0.5.0"