The best way to control Claude Code, Codex and more from any computer or phone
Mirrored from https://github.com/Camo67/t3code.git
Synced Nov 21, 18:30 UTC
feat(web): resize rows and columns in spreadsheet previews (#35548)
Yash Singh committed
Nov 12, 2026 at 14:02 UTC
5cff012416c25e6b88d7f61036171e47729c3f18
8 files changed
+566
-23
apps/web/src/components/files/office/Spreadsheet.tsx
+183
-15
@@ -34,6 +34,7 @@ import {
34
type Painted,
35
} from "./sheet-paint";
36
import { externalUrl } from "./links";
37
+import { bufferedViewport, cachedViewport, retainCachedViewport } from "./sheet-viewport";
38
39
const isSupersededError = Schema.is(SupersededError);
40
@@ -164,6 +165,8 @@ function SpreadsheetGrid(props: {
165
const scroller = useRef<HTMLDivElement>(null);
166
const canvas = useRef<HTMLCanvasElement>(null);
167
const spacer = useRef<HTMLDivElement>(null);
168
+ const columnHeaderBand = useRef<HTMLDivElement>(null);
169
+ const rowHeaderBand = useRef<HTMLDivElement>(null);
170
const [notice, setNotice] = useState("");
171
const [reader, setReader] = useState<{ row: number; col: number; text: string }[]>([]);
172
const [active, setActive] = useState({ row: 0, col: 0 });
@@ -177,11 +180,15 @@ function SpreadsheetGrid(props: {
180
const root = scroller.current;
181
const target = canvas.current;
182
const space = spacer.current;
180
- if (!root || !target || !space) return;
183
+ const columns = columnHeaderBand.current;
184
+ const rows = rowHeaderBand.current;
185
+ if (!root || !target || !space || !columns || !rows) return;
186
const context = target.getContext("2d");
187
if (!context) return;
188
const controller = new AbortController();
184
- const info = layout.info;
189
+ let info = layout.info;
190
+ let chartWidth = layout.chartWidth;
191
+ let chartHeight = layout.chartHeight;
192
const sheet = info.activeSheet;
193
const frozen = { rows: info.frozenRows, cols: info.frozenCols };
194
const headers = { width: 44, height: headerHeight };
@@ -193,11 +200,23 @@ function SpreadsheetGrid(props: {
200
let sent = 0;
201
let received = 0;
202
let drag = false;
203
+ let resizing:
204
+ | {
205
+ axis: "row" | "column";
206
+ pointerId: number;
207
+ index: number;
208
+ start: number;
209
+ edge: number;
210
+ delta: number;
211
+ }
212
+ | undefined;
213
+ let resizingPending = false;
214
let header: "row" | "column" | "all" | undefined;
215
let pressed: { row: number; col: number } | undefined;
216
let end: { x: number; y: number } | undefined;
217
let left = info.initialScrollX;
218
let top = info.initialScrollY;
219
+ let drawn = { x: left, y: top };
220
let reachX = 0;
221
let reachY = 0;
222
let readController: AbortController | undefined;
@@ -216,12 +235,11 @@ function SpreadsheetGrid(props: {
235
const resizeArea = () => {
236
const width = Math.min(
237
(end?.x ?? Infinity) + (painted?.frame.frozen.width ?? 0),
219
- Math.max(info.contentWidth, layout.chartWidth, reachX, left + root.clientWidth) +
220
- root.clientWidth,
238
+ Math.max(info.contentWidth, chartWidth, reachX, left + root.clientWidth) + root.clientWidth,
239
);
240
const height = Math.min(
241
(end?.y ?? Infinity) + (painted?.frame.frozen.height ?? 0),
224
- Math.max(info.contentHeight, layout.chartHeight, reachY, top + root.clientHeight) +
242
+ Math.max(info.contentHeight, chartHeight, reachY, top + root.clientHeight) +
243
root.clientHeight,
244
);
245
space.style.width = `${headers.width + width}px`;
@@ -233,9 +251,13 @@ function SpreadsheetGrid(props: {
251
const height = root.clientHeight;
252
const size = { width: width - headers.width, height: height - headers.height };
253
if (size.width <= 0 || size.height <= 0) return;
254
+ columns.style.width = `${size.width}px`;
255
+ rows.style.height = `${size.height}px`;
256
left = root.scrollLeft;
257
top = root.scrollTop;
258
resizeArea();
259
+ const viewport = { x: left, y: top, ...size };
260
+ drawn = painted ? cachedViewport(painted.frame.viewport, viewport) : viewport;
261
const input: SheetFrameRequest = {
262
sheet,
263
x: left,
@@ -243,10 +265,18 @@ function SpreadsheetGrid(props: {
265
...size,
266
ratio,
267
offset: { x: 0, y: 0 },
246
- wider: undefined,
268
+ wider: bufferedViewport(viewport),
269
};
270
const key = JSON.stringify(input);
249
- if (key !== requested) {
271
+ const needsFrame =
272
+ !painted ||
273
+ requested === "" ||
274
+ drawn.x !== left ||
275
+ drawn.y !== top ||
276
+ painted.request.width !== size.width ||
277
+ painted.request.height !== size.height ||
278
+ painted.request.ratio !== ratio;
279
+ if (needsFrame && key !== requested) {
280
requested = key;
281
sent += 1;
282
const order = sent;
@@ -259,9 +289,23 @@ function SpreadsheetGrid(props: {
289
}
290
received = order;
291
if (!reply) {
292
+ if (requested === key) requested = "";
293
setNotice("These cells could not be drawn. Try scrolling to another area.");
294
return;
295
}
296
+ if (
297
+ painted &&
298
+ retainCachedViewport(painted.frame.viewport, reply.viewport, {
299
+ x: root.scrollLeft,
300
+ y: root.scrollTop,
301
+ width: root.clientWidth - headers.width,
302
+ height: root.clientHeight - headers.height,
303
+ })
304
+ ) {
305
+ reply.bitmap.close();
306
+ if (requested === key) requested = JSON.stringify(painted.request);
307
+ return;
308
+ }
309
setNotice("");
310
painted?.frame.bitmap.close();
311
painted = { request: input, frame: reply };
@@ -269,8 +313,10 @@ function SpreadsheetGrid(props: {
313
schedule();
314
})
315
.catch((cause: unknown) => {
272
- if (!isSupersededError(cause) && !controller.signal.aborted)
316
+ if (!isSupersededError(cause) && !controller.signal.aborted) {
317
+ if (requested === key) requested = "";
318
setNotice("These cells could not be drawn.");
319
+ }
320
});
321
}
322
if (
@@ -287,12 +333,12 @@ function SpreadsheetGrid(props: {
333
context.fillRect(0, 0, target.width, target.height);
334
return;
335
}
290
- paintCells(context, painted, { ratio, headers, x: left, y: top, ...size });
336
+ paintCells(context, painted, { ratio, headers, ...drawn, ...size });
337
grid =
338
painted.frame.grid &&
339
shiftGrid(painted.frame.grid, frozen, painted.frame.frozen, {
294
- x: painted.frame.viewport.x - left,
295
- y: painted.frame.viewport.y - top,
340
+ x: painted.frame.viewport.x - drawn.x,
341
+ y: painted.frame.viewport.y - drawn.y,
342
});
343
if (!grid) return;
344
const anchor = selection.anchor;
@@ -308,6 +354,24 @@ function SpreadsheetGrid(props: {
354
),
355
});
356
paintHeaders(context, { grid, ratio, headers, width, height, selected: range() });
357
+ if (resizing) {
358
+ const edge = resizing.edge + resizing.delta;
359
+ context.save();
360
+ context.setTransform(ratio, 0, 0, ratio, 0, 0);
361
+ context.strokeStyle = "#217346";
362
+ context.lineWidth = 1;
363
+ context.setLineDash([4, 3]);
364
+ context.beginPath();
365
+ if (resizing.axis === "column") {
366
+ context.moveTo(edge + headers.width, 0);
367
+ context.lineTo(edge + headers.width, height);
368
+ } else {
369
+ context.moveTo(0, edge + headers.height);
370
+ context.lineTo(width, edge + headers.height);
371
+ }
372
+ context.stroke();
373
+ context.restore();
374
+ }
375
};
376
const read = () => {
377
const focus = selection.focus;
@@ -382,8 +446,8 @@ function SpreadsheetGrid(props: {
446
const frame = painted?.frame;
447
if (
448
frame &&
385
- ((x >= frame.frozen.width && x < frame.frozen.width + frame.viewport.x - left) ||
386
- (y >= frame.frozen.height && y < frame.frozen.height + frame.viewport.y - top))
449
+ ((x >= frame.frozen.width && x < frame.frozen.width + frame.viewport.x - drawn.x) ||
450
+ (y >= frame.frozen.height && y < frame.frozen.height + frame.viewport.y - drawn.y))
451
)
452
return;
453
const cell = cellAtPoint(
@@ -393,8 +457,44 @@ function SpreadsheetGrid(props: {
457
);
458
return cell ? { cell, x, y } : undefined;
459
};
460
+ const resizeHit = (event: PointerEvent) => {
461
+ if (!grid || resizingPending) return;
462
+ const rect = target.getBoundingClientRect();
463
+ const x = event.clientX - rect.left - headers.width;
464
+ const y = event.clientY - rect.top - headers.height;
465
+ const axis: "row" | "column" | undefined =
466
+ x >= 0 && y < 0 ? "column" : y >= 0 && x < 0 ? "row" : undefined;
467
+ if (!axis) return;
468
+ const offsets = axis === "column" ? grid.colOffsets : grid.rowOffsets;
469
+ const indices = axis === "column" ? grid.colIndices : grid.rowIndices;
470
+ const start = axis === "column" ? grid.startCol : grid.startRow;
471
+ const point = axis === "column" ? x : y;
472
+ for (let i = 1; i < offsets.length; i++) {
473
+ const edge = offsets[i]!;
474
+ const size = edge - offsets[i - 1]!;
475
+ if (edge > 0 && size > 0 && Math.abs(point - edge) <= 4)
476
+ return {
477
+ axis,
478
+ pointerId: event.pointerId,
479
+ index: indices?.[i - 1] ?? start + i - 1,
480
+ start: axis === "column" ? event.clientX : event.clientY,
481
+ delta: 0,
482
+ edge,
483
+ } satisfies NonNullable<typeof resizing>;
484
+ }
485
+ };
486
const pointerDown = (event: PointerEvent) => {
397
- if (event.button !== 0) return;
487
+ if (event.button !== 0 || resizingPending || resizing) return;
488
+ const track = resizeHit(event);
489
+ if (track) {
490
+ event.preventDefault();
491
+ root.focus({ preventScroll: true });
492
+ root.setPointerCapture(event.pointerId);
493
+ resizing = track;
494
+ pressed = undefined;
495
+ schedule();
496
+ return;
497
+ }
498
const found = hit(event);
499
if (!found) return;
500
root.focus({ preventScroll: true });
@@ -417,6 +517,15 @@ function SpreadsheetGrid(props: {
517
else select(event.shiftKey ? extendTo(selection, found.cell) : at(found.cell));
518
};
519
const pointerMove = (event: PointerEvent) => {
520
+ if (resizing) {
521
+ if (event.pointerId !== resizing.pointerId) return;
522
+ const point = resizing.axis === "column" ? event.clientX : event.clientY;
523
+ resizing.delta = Math.round(point - resizing.start);
524
+ schedule();
525
+ return;
526
+ }
527
+ const hovered = resizeHit(event);
528
+ root.style.cursor = hovered ? (hovered.axis === "column" ? "col-resize" : "row-resize") : "";
529
if (!drag) return;
530
const found = hit(event);
531
if (found && header !== "all")
@@ -428,6 +537,44 @@ function SpreadsheetGrid(props: {
537
);
538
};
539
const pointerUp = (event: PointerEvent) => {
540
+ if (resizing) {
541
+ if (event.pointerId !== resizing.pointerId) return;
542
+ const track = resizing;
543
+ resizing = undefined;
544
+ root.style.cursor = "";
545
+ root.releasePointerCapture(event.pointerId);
546
+ schedule();
547
+ if (track.delta === 0) return;
548
+ resizingPending = true;
549
+ setNotice("Resizing preview...");
550
+ void engine
551
+ .call(
552
+ "resize",
553
+ { sheet, axis: track.axis, index: track.index, delta: track.delta },
554
+ { signal: controller.signal },
555
+ )
556
+ .then((nextLayout) => {
557
+ if (controller.signal.aborted) return;
558
+ info = nextLayout.info;
559
+ chartWidth = nextLayout.chartWidth;
560
+ chartHeight = nextLayout.chartHeight;
561
+ painted?.frame.bitmap.close();
562
+ painted = undefined;
563
+ grid = undefined;
564
+ sent += 1;
565
+ received = sent;
566
+ requested = "";
567
+ end = undefined;
568
+ schedule();
569
+ })
570
+ .catch(() => {
571
+ if (!controller.signal.aborted) setNotice("This row or column could not be resized.");
572
+ })
573
+ .finally(() => {
574
+ resizingPending = false;
575
+ });
576
+ return;
577
+ }
578
drag = false;
579
const found = hit(event);
580
if (!found || !pressed || found.cell.row !== pressed.row || found.cell.col !== pressed.col)
@@ -480,6 +627,13 @@ function SpreadsheetGrid(props: {
627
});
628
};
629
const key = (event: KeyboardEvent) => {
630
+ if (event.key === "Escape" && resizing) {
631
+ event.preventDefault();
632
+ resizing = undefined;
633
+ root.style.cursor = "";
634
+ schedule();
635
+ return;
636
+ }
637
const command = event.ctrlKey || event.metaKey;
638
if (command && event.key.toLowerCase() === "c") {
639
event.preventDefault();
@@ -503,8 +657,16 @@ function SpreadsheetGrid(props: {
657
);
658
reveal();
659
};
506
- const cancel = () => {
660
+ const cancel = (event: PointerEvent) => {
661
+ if (resizing && event.pointerId !== resizing.pointerId) return;
662
drag = false;
663
+ pressed = undefined;
664
+ resizing = undefined;
665
+ root.style.cursor = "";
666
+ schedule();
667
+ };
668
+ const leave = () => {
669
+ if (!drag && !resizing) root.style.cursor = "";
670
};
671
root.addEventListener("scroll", schedule);
672
root.addEventListener("keydown", key);
@@ -512,6 +674,8 @@ function SpreadsheetGrid(props: {
674
root.addEventListener("pointermove", pointerMove);
675
root.addEventListener("pointerup", pointerUp);
676
root.addEventListener("pointercancel", cancel);
677
+ root.addEventListener("lostpointercapture", cancel);
678
+ root.addEventListener("pointerleave", leave);
679
const unobserve = observeResize(root, schedule);
680
window.addEventListener("resize", schedule);
681
resizeArea();
@@ -535,6 +699,8 @@ function SpreadsheetGrid(props: {
699
root.removeEventListener("pointermove", pointerMove);
700
root.removeEventListener("pointerup", pointerUp);
701
root.removeEventListener("pointercancel", cancel);
702
+ root.removeEventListener("lostpointercapture", cancel);
703
+ root.removeEventListener("pointerleave", leave);
704
};
705
}, [engine, layout, initialCell]);
706
return (
@@ -559,6 +725,8 @@ function SpreadsheetGrid(props: {
725
/>
726
<div aria-hidden="true" className="sticky left-0 top-0 h-0 w-0">
727
<canvas ref={canvas} className="absolute left-0 top-0 block" />
728
+ <div ref={columnHeaderBand} className="absolute left-11 top-0 h-5 touch-none" />
729
+ <div ref={rowHeaderBand} className="absolute left-0 top-5 w-11 touch-none" />
730
</div>
731
<div className="sr-only">
732
{[...new Set(reader.map((cell) => cell.row))].map((row) => (
apps/web/src/components/files/office/sheet-paint.ts
+9
-8
@@ -104,17 +104,18 @@ export function paintCells(
104
columns.forEach((column) => {
105
if (row.end <= row.start || column.end <= column.start) return;
106
107
- const left = Math.round(origin.x + column.start * ratio);
108
- const top = Math.round(origin.y + row.start * ratio);
107
+ // A shifted bitmap's frozen pixels must never enter a scrolling pane.
108
+ const left = Math.round(
109
+ origin.x + Math.max(column.start, column.start + column.shift) * ratio,
110
+ );
111
+ const top = Math.round(origin.y + Math.max(row.start, row.start + row.shift) * ratio);
112
+ const right = Math.round(origin.x + column.end * ratio);
113
+ const bottom = Math.round(origin.y + row.end * ratio);
114
+ if (left >= right || top >= bottom) return;
115
116
context.save();
117
context.beginPath();
112
- context.rect(
113
- left,
114
- top,
115
- Math.round(origin.x + column.end * ratio) - left,
116
- Math.round(origin.y + row.end * ratio) - top,
117
- );
118
+ context.rect(left, top, right - left, bottom - top);
119
context.clip();
120
// Whole device pixels, so a frame at its own position lands exactly where the worker painted its cells.
121
context.drawImage(
apps/web/src/components/files/office/sheet-protocol.ts
+10
@@ -76,6 +76,16 @@ export type SheetMethods = {
76
>;
77
/** Makes a sheet the active one; rejects, leaving the sheet before it active, when it cannot open. */
78
readonly show: Method<{ readonly sheet: number }, SheetLayout>;
79
+ /** Preview-only size changes in CSS pixels; the source file is never saved. */
80
+ readonly resize: Method<
81
+ {
82
+ readonly sheet: number;
83
+ readonly axis: "row" | "column";
84
+ readonly index: number;
85
+ readonly delta: number;
86
+ },
87
+ Pick<SheetLayout, "info" | "chartWidth" | "chartHeight">
88
+ >;
89
/** Paints a frame; undefined when even its smallest tiles cannot be drawn. */
90
readonly frame: Method<SheetFrameRequest, SheetFrame | undefined>;
91
/** Where a cell starts and where the cell past it starts, to scroll it into view. */
apps/web/src/components/files/office/sheet-resize.browser.test.ts
new
+241
@@ -0,0 +1,241 @@
1
+import { createElement } from "react";
2
+import { expect, it, vi } from "vite-plus/test";
3
+import JSZip from "jszip";
4
+import "~/index.css";
5
+import { act, render } from "../../../../test/render";
6
+import Spreadsheet from "./Spreadsheet";
7
+import { createWorkerClient } from "./worker-rpc";
8
+import type { SheetMethods } from "./sheet-protocol";
9
+import { maximumTrackSize } from "./sheet-sizing";
10
+
11
+it.each([false, true])(
12
+ "reflows preview tracks through sheet switches, frozen and hidden tracks: %s",
13
+ async (frozen) => {
14
+ const archive = new JSZip();
15
+ archive.file(
16
+ "xl/workbook.xml",
17
+ '<workbook xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"><sheets><sheet name="Budget" sheetId="1" r:id="rId1"/><sheet name="Other" sheetId="2" r:id="rId2"/></sheets></workbook>',
18
+ );
19
+ archive.file(
20
+ "xl/_rels/workbook.xml.rels",
21
+ '<Relationships><Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/sheet1.xml"/><Relationship Id="rId2" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/sheet2.xml"/></Relationships>',
22
+ );
23
+ for (const sheet of [1, 2])
24
+ archive.file(
25
+ `xl/worksheets/sheet${sheet}.xml`,
26
+ `<worksheet>${frozen ? '<sheetViews><sheetView workbookViewId="0"><pane xSplit="1" ySplit="1" state="frozen" topLeftCell="B2"/></sheetView></sheetViews><cols><col min="2" max="2" width="0" hidden="1"/></cols>' : ""}<sheetData><row r="1"><c r="A1"><v>42</v></c></row>${frozen ? '<row r="2" ht="0" hidden="1"/>' : ""}</sheetData>${frozen ? '<mergeCells><mergeCell ref="A1:C1"/></mergeCells>' : ""}</worksheet>`,
27
+ );
28
+ const namespace = "http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing";
29
+ archive.file(
30
+ "xl/worksheets/_rels/sheet1.xml.rels",
31
+ '<Relationships><Relationship Id="drawing" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/drawing" Target="../drawings/drawing1.xml"/></Relationships>',
32
+ );
33
+ archive.file(
34
+ "xl/drawings/drawing1.xml",
35
+ `<xdr:wsDr xmlns:xdr="${namespace}" xmlns:a="http://schemas.openxmlformats.org/drawingml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"><xdr:twoCellAnchor><xdr:from><xdr:col>10</xdr:col><xdr:colOff>0</xdr:colOff><xdr:row>10</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:from><xdr:to><xdr:col>13</xdr:col><xdr:colOff>0</xdr:colOff><xdr:row>17</xdr:row><xdr:rowOff>0</xdr:rowOff></xdr:to><xdr:graphicFrame><xdr:nvGraphicFramePr><xdr:cNvPr id="2" name="Sample chart"/><xdr:cNvGraphicFramePr/></xdr:nvGraphicFramePr><xdr:xfrm><a:off x="0" y="0"/><a:ext cx="0" cy="0"/></xdr:xfrm><a:graphic><a:graphicData uri="http://schemas.openxmlformats.org/drawingml/2006/chart"><c:chart xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart" r:id="chart"/></a:graphicData></a:graphic></xdr:graphicFrame><xdr:clientData/></xdr:twoCellAnchor></xdr:wsDr>`,
36
+ );
37
+ archive.file(
38
+ "xl/drawings/_rels/drawing1.xml.rels",
39
+ '<Relationships><Relationship Id="chart" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart" Target="../charts/chart1.xml"/></Relationships>',
40
+ );
41
+ archive.file(
42
+ "xl/charts/chart1.xml",
43
+ '<c:chartSpace xmlns:c="http://schemas.openxmlformats.org/drawingml/2006/chart"><c:chart><c:plotArea><c:barChart><c:barDir val="col"/><c:grouping val="clustered"/><c:ser><c:idx val="0"/><c:order val="0"/><c:cat><c:strLit><c:ptCount val="1"/><c:pt idx="0"><c:v>Sample</c:v></c:pt></c:strLit></c:cat><c:val><c:numLit><c:formatCode>General</c:formatCode><c:ptCount val="1"/><c:pt idx="0"><c:v>42</c:v></c:pt></c:numLit></c:val></c:ser></c:barChart></c:plotArea></c:chart></c:chartSpace>',
44
+ );
45
+ const sheetXml = await archive.file("xl/worksheets/sheet1.xml")!.async("string");
46
+ archive.file(
47
+ "xl/worksheets/sheet1.xml",
48
+ sheetXml.replace(
49
+ "</worksheet>",
50
+ '<drawing xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" r:id="drawing"/></worksheet>',
51
+ ),
52
+ );
53
+ const bytes = await archive.generateAsync({ type: "arraybuffer" });
54
+ const client = createWorkerClient<SheetMethods>(
55
+ new Worker(new URL("./spreadsheet.worker.ts", import.meta.url), { type: "module" }),
56
+ );
57
+ try {
58
+ const opened = await client.call("open", {
59
+ bytes,
60
+ view: { hiddenGridlines: [], themeFonts: { major: "Calibri Light", minor: "Calibri" } },
61
+ });
62
+ expect(opened!.layout.chartWidth).toBeGreaterThan(0);
63
+ expect(opened!.layout.chartHeight).toBeGreaterThan(0);
64
+ if (frozen) {
65
+ const viewport = {
66
+ sheet: 0,
67
+ width: 400,
68
+ height: 200,
69
+ ratio: 1,
70
+ offset: { x: 0, y: 0 },
71
+ wider: undefined,
72
+ };
73
+ const clipped = await client.call("frame", { ...viewport, x: 32, y: 10 });
74
+ expect(clipped!.grid!.colOffsets[2]! - clipped!.grid!.colOffsets[1]!).toBeCloseTo(32, 0);
75
+ expect(clipped!.grid!.rowOffsets[2]! - clipped!.grid!.rowOffsets[1]!).toBeCloseTo(10, 0);
76
+ clipped!.bitmap.close();
77
+ await client.call("resize", { sheet: 0, axis: "column", index: 2, delta: 1 });
78
+ await client.call("resize", { sheet: 0, axis: "row", index: 2, delta: 1 });
79
+ const resized = await client.call("frame", { ...viewport, x: 0, y: 0 });
80
+ expect(resized!.grid!.colOffsets[2]! - resized!.grid!.colOffsets[1]!).toBeCloseTo(65, 0);
81
+ expect(resized!.grid!.rowOffsets[2]! - resized!.grid!.rowOffsets[1]!).toBeCloseTo(21, 0);
82
+ resized!.bitmap.close();
83
+ }
84
+ const other = await client.call("position", { sheet: 1, cell: { row: 0, col: 0 } });
85
+ const widened = await client.call("resize", {
86
+ sheet: 0,
87
+ axis: "column",
88
+ index: 0,
89
+ delta: 81,
90
+ });
91
+ expect(widened.chartWidth - opened!.layout.chartWidth).toBeCloseTo(frozen ? 1 : 81, 0);
92
+ const taller = await client.call("resize", { sheet: 0, axis: "row", index: 0, delta: 40 });
93
+ expect(taller.chartHeight - opened!.layout.chartHeight).toBeCloseTo(frozen ? 1 : 40, 0);
94
+ await expect(
95
+ client.call("resize", { sheet: 0, axis: "row", index: 0, delta: NaN }),
96
+ ).rejects.toThrow("Invalid track resize");
97
+ expect(await client.call("position", { sheet: 1, cell: { row: 0, col: 0 } })).toEqual(other);
98
+ await client.call("show", { sheet: 1 });
99
+ await client.call("show", { sheet: 0 });
100
+ const position = await client.call("position", { sheet: 0, cell: { row: 0, col: 0 } });
101
+ if (!frozen) {
102
+ expect(position!.next.x - position!.start.x).toBeCloseTo(145, 0);
103
+ expect(position!.next.y - position!.start.y).toBeCloseTo(60, 0);
104
+ }
105
+ expect(
106
+ await client.call("cells", { sheet: 0, range: { top: 0, bottom: 0, left: 0, right: 0 } }),
107
+ ).toEqual([["42"]]);
108
+ const frame = await client.call("frame", {
109
+ sheet: 0,
110
+ x: 0,
111
+ y: 0,
112
+ width: 400,
113
+ height: 200,
114
+ ratio: 1,
115
+ offset: { x: 0, y: 0 },
116
+ wider: undefined,
117
+ });
118
+ expect(frame?.grid?.colOffsets[1]).toBeCloseTo(145, 0);
119
+ expect(frame?.grid?.rowOffsets[1]).toBeCloseTo(60, 0);
120
+ if (frozen) {
121
+ expect(frame?.frozen.width).toBeCloseTo(145, 0);
122
+ expect(frame?.frozen.height).toBeCloseTo(60, 0);
123
+ expect(frame?.grid?.colIndices).not.toContain(1);
124
+ expect(frame?.grid?.rowIndices).not.toContain(1);
125
+ }
126
+ frame?.bitmap.close();
127
+ await client.call("resize", { sheet: 0, axis: "column", index: 0, delta: 10_000 });
128
+ await client.call("resize", { sheet: 0, axis: "row", index: 0, delta: -10_000 });
129
+ const limited = await client.call("frame", {
130
+ sheet: 0,
131
+ x: 0,
132
+ y: 0,
133
+ width: 2000,
134
+ height: 200,
135
+ ratio: 1,
136
+ offset: { x: 0, y: 0 },
137
+ wider: undefined,
138
+ });
139
+ expect(limited!.grid!.colOffsets[1]).toBeCloseTo(maximumTrackSize.column, 0);
140
+ expect(limited!.grid!.rowOffsets[1]).toBeCloseTo(16, 0);
141
+ limited!.bitmap.close();
142
+ } finally {
143
+ client.close();
144
+ }
145
+ },
146
+);
147
+
148
+it("requests current dimensions after resizing and scrolling away and back before a frame arrives", async () => {
149
+ const archive = new JSZip();
150
+ archive.file(
151
+ "xl/workbook.xml",
152
+ '<workbook xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships"><sheets><sheet name="Sample" sheetId="1" r:id="sheet"/></sheets></workbook>',
153
+ );
154
+ archive.file(
155
+ "xl/_rels/workbook.xml.rels",
156
+ '<Relationships><Relationship Id="sheet" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet" Target="worksheets/sheet1.xml"/></Relationships>',
157
+ );
158
+ archive.file(
159
+ "xl/worksheets/sheet1.xml",
160
+ '<worksheet><sheetData><row r="1"><c r="A1"><v>42</v></c></row><row r="1000"><c r="A1000"><v>99</v></c></row></sheetData></worksheet>',
161
+ );
162
+ const bytes = await archive.generateAsync({ type: "arraybuffer" });
163
+ const container = document.createElement("div");
164
+ Object.assign(container.style, { display: "flex", width: "500px", height: "300px" });
165
+ const onError = vi.fn();
166
+ await using screen = await render(
167
+ createElement(Spreadsheet, {
168
+ bytes,
169
+ view: { hiddenGridlines: [], themeFonts: { major: "Calibri Light", minor: "Calibri" } },
170
+ onDetails: vi.fn(),
171
+ onError,
172
+ }),
173
+ { container },
174
+ );
175
+ await expect.element(screen.getByRole("grid", { name: "Sample" })).toBeVisible();
176
+ const root = screen.getByRole("grid", { name: "Sample" }).element();
177
+ const canvas = root.querySelector("canvas")!;
178
+ await vi.waitFor(() => {
179
+ expect(canvas.getContext("2d")!.getImageData(10, 10, 1, 1).data[0]).toBeGreaterThan(0);
180
+ expect(canvas.getContext("2d")!.getImageData(10, 10, 1, 1).data[0]).toBeLessThan(255);
181
+ });
182
+ const postMessage = Worker.prototype.postMessage;
183
+ const pending: { worker: Worker; message: unknown; options: unknown }[] = [];
184
+ using _frames = vi.spyOn(Worker.prototype, "postMessage").mockImplementation(function (
185
+ this: Worker,
186
+ message: unknown,
187
+ options?: Transferable[] | StructuredSerializeOptions,
188
+ ) {
189
+ if (
190
+ typeof message === "object" &&
191
+ message !== null &&
192
+ "method" in message &&
193
+ message.method === "frame"
194
+ ) {
195
+ pending.push({ worker: this, message, options });
196
+ return;
197
+ }
198
+ Reflect.apply(postMessage, this, [message, options]);
199
+ });
200
+ // Synthetic pointer events have no browser pointer to capture.
201
+ using _capture = vi.spyOn(root, "setPointerCapture").mockImplementation(() => {});
202
+ using _release = vi.spyOn(root, "releasePointerCapture").mockImplementation(() => {});
203
+ const rect = canvas.getBoundingClientRect();
204
+ const pointer = { bubbles: true, pointerId: 1, button: 0, clientY: rect.top + 10 };
205
+ await act(() => {
206
+ root.dispatchEvent(new PointerEvent("pointerdown", { ...pointer, clientX: rect.left + 108 }));
207
+ root.dispatchEvent(new PointerEvent("pointermove", { ...pointer, clientX: rect.left + 148 }));
208
+ root.dispatchEvent(new PointerEvent("pointerup", { ...pointer, clientX: rect.left + 148 }));
209
+ });
210
+ await vi.waitFor(() => expect(pending).toHaveLength(1));
211
+ await act(() => root.scrollTo({ top: 2000 }));
212
+ await vi.waitFor(() => expect(pending).toHaveLength(2));
213
+ await act(() => root.scrollTo({ top: 0 }));
214
+ await vi.waitFor(() => expect(pending).toHaveLength(3));
215
+ expect(pending[2]!.message).toMatchObject({ input: { x: 0, y: 0 } });
216
+ const frame = pending[2]!;
217
+ if (typeof frame.message !== "object" || frame.message === null || !("id" in frame.message))
218
+ throw new Error("Missing frame request id");
219
+ frame.worker.dispatchEvent(
220
+ new MessageEvent("message", {
221
+ data: { id: frame.message.id, ok: false, superseded: false, message: "Frame failed" },
222
+ }),
223
+ );
224
+ await expect
225
+ .element(screen.getByRole("status"))
226
+ .toHaveTextContent("These cells could not be drawn.");
227
+ await act(() => root.dispatchEvent(new Event("scroll")));
228
+ await vi.waitFor(() => expect(pending).toHaveLength(4));
229
+ const retry = pending[3]!;
230
+ expect(retry.message).toMatchObject({ input: { x: 0, y: 0 } });
231
+ Reflect.apply(postMessage, retry.worker, [retry.message, retry.options]);
232
+ await expect.element(screen.getByRole("status")).not.toBeInTheDocument();
233
+ const ratio = window.devicePixelRatio || 1;
234
+ await vi.waitFor(() => {
235
+ expect([
236
+ ...canvas.getContext("2d")!.getImageData(Math.round(140 * ratio), Math.round(5 * ratio), 1, 1)
237
+ .data,
238
+ ]).toEqual([211, 236, 221, 255]);
239
+ });
240
+ expect(onError).not.toHaveBeenCalled();
241
+});
apps/web/src/components/files/office/sheet-sizing.ts
new
+3
@@ -0,0 +1,3 @@
1
+// Excel's 255-character column width and 409.5-point row height, in the renderer's CSS pixels.
2
+export const maximumTrackSize = { column: 255 * 7 + 5, row: (409.5 * 4) / 3 };
3
+export const minimumTrackSize = 16;
apps/web/src/components/files/office/sheet-viewport.test.ts
new
+54
@@ -0,0 +1,54 @@
1
+import { expect, it } from "vite-plus/test";
2
+import { bufferedViewport, cachedViewport, retainCachedViewport } from "./sheet-viewport";
3
+
4
+it.each([
5
+ { x: 150, y: 400, expected: { x: 150, y: 400 } },
6
+ { x: 50, y: 100, expected: { x: 100, y: 300 } },
7
+ { x: 500, y: 1000, expected: { x: 300, y: 700 } },
8
+])("keeps a viewport at ($x, $y) inside the cached bitmap", ({ x, y, expected }) => {
9
+ expect(
10
+ cachedViewport({ x: 100, y: 300, width: 800, height: 1000 }, { x, y, width: 600, height: 600 }),
11
+ ).toEqual(expected);
12
+});
13
+
14
+it("keeps the cache origin when a resized viewport is larger than the bitmap", () => {
15
+ expect(
16
+ cachedViewport(
17
+ { x: 100, y: 300, width: 400, height: 400 },
18
+ { x: 50, y: 100, width: 600, height: 600 },
19
+ ),
20
+ ).toEqual({ x: 100, y: 300 });
21
+});
22
+
23
+it.each([
24
+ { x: 0, y: 0 },
25
+ { x: 50, y: 100 },
26
+ { x: 1000, y: 2000 },
27
+])("buffers both scroll directions without going past the sheet origin ($x, $y)", (point) => {
28
+ const viewport = { ...point, width: 600, height: 600 };
29
+ const frame = bufferedViewport(viewport);
30
+ expect(frame.x).toBe(Math.max(0, point.x - 128));
31
+ expect(frame.y).toBe(Math.max(0, point.y - 200));
32
+ expect(frame.x + frame.width).toBe(point.x + viewport.width + 128);
33
+ expect(frame.y + frame.height).toBe(point.y + viewport.height + 200);
34
+ expect(cachedViewport(frame, viewport)).toEqual(point);
35
+});
36
+
37
+it.each([
38
+ { cachedX: 0, incomingX: 1000, currentX: 0, expected: true },
39
+ { cachedX: 0, incomingX: 1000, currentX: 1000, expected: false },
40
+ { cachedX: 0, incomingX: 1000, currentX: 2000, expected: false },
41
+ { cachedX: 0, incomingX: 100, currentX: 200, expected: false },
42
+])(
43
+ "retains useful cached cells when a distant frame arrives at $currentX",
44
+ ({ cachedX, incomingX, currentX, expected }) => {
45
+ const size = { y: 0, width: 800, height: 800 };
46
+ expect(
47
+ retainCachedViewport(
48
+ { ...size, x: cachedX },
49
+ { ...size, x: incomingX },
50
+ { ...size, x: currentX, width: 400, height: 400 },
51
+ ),
52
+ ).toBe(expected);
53
+ },
54
+);
apps/web/src/components/files/office/sheet-viewport.ts
new
+37
@@ -0,0 +1,37 @@
1
+import type { SheetViewport } from "./sheet-protocol";
2
+
3
+export function cachedViewport(frame: SheetViewport, viewport: SheetViewport) {
4
+ return {
5
+ x: Math.max(frame.x, Math.min(viewport.x, frame.x + Math.max(0, frame.width - viewport.width))),
6
+ y: Math.max(
7
+ frame.y,
8
+ Math.min(viewport.y, frame.y + Math.max(0, frame.height - viewport.height)),
9
+ ),
10
+ };
11
+}
12
+
13
+export function bufferedViewport(viewport: SheetViewport): SheetViewport {
14
+ const marginX = Math.min(128, viewport.width / 4);
15
+ const marginY = Math.min(256, viewport.height / 3);
16
+ const x = Math.max(0, viewport.x - marginX);
17
+ const y = Math.max(0, viewport.y - marginY);
18
+ return {
19
+ x,
20
+ y,
21
+ width: viewport.width + viewport.x - x + marginX,
22
+ height: viewport.height + viewport.y - y + marginY,
23
+ };
24
+}
25
+
26
+export function retainCachedViewport(
27
+ cached: SheetViewport,
28
+ incoming: SheetViewport,
29
+ current: SheetViewport,
30
+) {
31
+ const covers = (frame: SheetViewport) =>
32
+ frame.x <= current.x &&
33
+ frame.y <= current.y &&
34
+ frame.x + frame.width >= current.x + current.width &&
35
+ frame.y + frame.height >= current.y + current.height;
36
+ return covers(cached) && !covers(incoming);
37
+}
apps/web/src/components/files/office/spreadsheet.worker.ts
+29
@@ -12,6 +12,7 @@ import type { CellRange } from "@betteroffice/xlsx/headless";
12
import { anchorRange, attempt, lastCell, parseRange, parseSpans } from "./sheet-cells";
13
import type { WorkbookView } from "../officePreviewProtocol";
14
import { chartFonts, drawFrame, paintFrame, withoutGridlines } from "./sheet-frame";
15
+import { maximumTrackSize, minimumTrackSize } from "./sheet-sizing";
16
import { sheetFonts } from "./sheet-fonts";
17
import { frozenSize } from "./sheet-paint";
18
import type { SheetLayout, SheetMethods, SheetTab } from "./sheet-protocol";
@@ -78,6 +79,34 @@ serveWorker<SheetMethods>({
79
80
throw new Error(`Sheet ${input.sheet} could not open`);
81
},
82
+ resize: (input) => {
83
+ const opened = active(input.sheet);
84
+ if (
85
+ !Number.isInteger(input.index) ||
86
+ input.index < 0 ||
87
+ input.index > (input.axis === "row" ? lastCell.row : lastCell.col) ||
88
+ !Number.isFinite(input.delta)
89
+ )
90
+ throw new Error("Invalid track resize");
91
+ const rect = opened.workbook.cellRect(
92
+ input.sheet,
93
+ input.axis === "row" ? input.index : 0,
94
+ input.axis === "column" ? input.index : 0,
95
+ );
96
+ const current = input.axis === "column" ? rect.w : rect.h;
97
+ const size = Math.max(
98
+ minimumTrackSize,
99
+ Math.min(maximumTrackSize[input.axis], current + input.delta),
100
+ );
101
+ const operation =
102
+ input.axis === "column"
103
+ ? { type: "setColWidth", sheet: input.sheet, col: input.index, width: (size - 5) / 7 }
104
+ : { type: "setRowHeight", sheet: input.sheet, row: input.index, height: size * 0.75 };
105
+ opened.info = opened.workbook.applyOps([operation]).sheetInfo;
106
+ opened.ends.clear();
107
+ const { chartWidth, chartHeight } = layout(opened.workbook, input.sheet);
108
+ return { info: opened.info, chartWidth, chartHeight };
109
+ },
110
frame: async (input) => {
111
const opened = active(input.sheet);
112
const frozen = { rows: opened.info.frozenRows, cols: opened.info.frozenCols };