@@ -34,6 +34,7 @@ import {
3434 type Painted ,
3535} from "./sheet-paint" ;
3636import { externalUrl } from "./links" ;
37+ import { bufferedViewport , cachedViewport , retainCachedViewport } from "./sheet-viewport" ;
3738
3839const isSupersededError = Schema . is ( SupersededError ) ;
3940
@@ -164,6 +165,8 @@ function SpreadsheetGrid(props: {
164165 const scroller = useRef < HTMLDivElement > ( null ) ;
165166 const canvas = useRef < HTMLCanvasElement > ( null ) ;
166167 const spacer = useRef < HTMLDivElement > ( null ) ;
168+ const columnHeaderBand = useRef < HTMLDivElement > ( null ) ;
169+ const rowHeaderBand = useRef < HTMLDivElement > ( null ) ;
167170 const [ notice , setNotice ] = useState ( "" ) ;
168171 const [ reader , setReader ] = useState < { row : number ; col : number ; text : string } [ ] > ( [ ] ) ;
169172 const [ active , setActive ] = useState ( { row : 0 , col : 0 } ) ;
@@ -177,11 +180,15 @@ function SpreadsheetGrid(props: {
177180 const root = scroller . current ;
178181 const target = canvas . current ;
179182 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 ;
181186 const context = target . getContext ( "2d" ) ;
182187 if ( ! context ) return ;
183188 const controller = new AbortController ( ) ;
184- const info = layout . info ;
189+ let info = layout . info ;
190+ let chartWidth = layout . chartWidth ;
191+ let chartHeight = layout . chartHeight ;
185192 const sheet = info . activeSheet ;
186193 const frozen = { rows : info . frozenRows , cols : info . frozenCols } ;
187194 const headers = { width : 44 , height : headerHeight } ;
@@ -193,11 +200,23 @@ function SpreadsheetGrid(props: {
193200 let sent = 0 ;
194201 let received = 0 ;
195202 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 ;
196214 let header : "row" | "column" | "all" | undefined ;
197215 let pressed : { row : number ; col : number } | undefined ;
198216 let end : { x : number ; y : number } | undefined ;
199217 let left = info . initialScrollX ;
200218 let top = info . initialScrollY ;
219+ let drawn = { x : left , y : top } ;
201220 let reachX = 0 ;
202221 let reachY = 0 ;
203222 let readController : AbortController | undefined ;
@@ -216,12 +235,11 @@ function SpreadsheetGrid(props: {
216235 const resizeArea = ( ) => {
217236 const width = Math . min (
218237 ( 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 ,
221239 ) ;
222240 const height = Math . min (
223241 ( 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 ) +
225243 root . clientHeight ,
226244 ) ;
227245 space . style . width = `${ headers . width + width } px` ;
@@ -233,20 +251,32 @@ function SpreadsheetGrid(props: {
233251 const height = root . clientHeight ;
234252 const size = { width : width - headers . width , height : height - headers . height } ;
235253 if ( size . width <= 0 || size . height <= 0 ) return ;
254+ columns . style . width = `${ size . width } px` ;
255+ rows . style . height = `${ size . height } px` ;
236256 left = root . scrollLeft ;
237257 top = root . scrollTop ;
238258 resizeArea ( ) ;
259+ const viewport = { x : left , y : top , ...size } ;
260+ drawn = painted ? cachedViewport ( painted . frame . viewport , viewport ) : viewport ;
239261 const input : SheetFrameRequest = {
240262 sheet,
241263 x : left ,
242264 y : top ,
243265 ...size ,
244266 ratio,
245267 offset : { x : 0 , y : 0 } ,
246- wider : undefined ,
268+ wider : bufferedViewport ( viewport ) ,
247269 } ;
248270 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 ) {
250280 requested = key ;
251281 sent += 1 ;
252282 const order = sent ;
@@ -259,18 +289,34 @@ function SpreadsheetGrid(props: {
259289 }
260290 received = order ;
261291 if ( ! reply ) {
292+ if ( requested === key ) requested = "" ;
262293 setNotice ( "These cells could not be drawn. Try scrolling to another area." ) ;
263294 return ;
264295 }
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+ }
265309 setNotice ( "" ) ;
266310 painted ?. frame . bitmap . close ( ) ;
267311 painted = { request : input , frame : reply } ;
268312 end = reply . end ;
269313 schedule ( ) ;
270314 } )
271315 . catch ( ( cause : unknown ) => {
272- if ( ! isSupersededError ( cause ) && ! controller . signal . aborted )
316+ if ( ! isSupersededError ( cause ) && ! controller . signal . aborted ) {
317+ if ( requested === key ) requested = "" ;
273318 setNotice ( "These cells could not be drawn." ) ;
319+ }
274320 } ) ;
275321 }
276322 if (
@@ -287,12 +333,12 @@ function SpreadsheetGrid(props: {
287333 context . fillRect ( 0 , 0 , target . width , target . height ) ;
288334 return ;
289335 }
290- paintCells ( context , painted , { ratio, headers, x : left , y : top , ...size } ) ;
336+ paintCells ( context , painted , { ratio, headers, ... drawn , ...size } ) ;
291337 grid =
292338 painted . frame . grid &&
293339 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 ,
296342 } ) ;
297343 if ( ! grid ) return ;
298344 const anchor = selection . anchor ;
@@ -308,6 +354,24 @@ function SpreadsheetGrid(props: {
308354 ) ,
309355 } ) ;
310356 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+ }
311375 } ;
312376 const read = ( ) => {
313377 const focus = selection . focus ;
@@ -382,8 +446,8 @@ function SpreadsheetGrid(props: {
382446 const frame = painted ?. frame ;
383447 if (
384448 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 ) )
387451 )
388452 return ;
389453 const cell = cellAtPoint (
@@ -393,8 +457,44 @@ function SpreadsheetGrid(props: {
393457 ) ;
394458 return cell ? { cell, x, y } : undefined ;
395459 } ;
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+ } ;
396486 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+ }
398498 const found = hit ( event ) ;
399499 if ( ! found ) return ;
400500 root . focus ( { preventScroll : true } ) ;
@@ -417,6 +517,15 @@ function SpreadsheetGrid(props: {
417517 else select ( event . shiftKey ? extendTo ( selection , found . cell ) : at ( found . cell ) ) ;
418518 } ;
419519 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" ) : "" ;
420529 if ( ! drag ) return ;
421530 const found = hit ( event ) ;
422531 if ( found && header !== "all" )
@@ -428,6 +537,44 @@ function SpreadsheetGrid(props: {
428537 ) ;
429538 } ;
430539 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+ }
431578 drag = false ;
432579 const found = hit ( event ) ;
433580 if ( ! found || ! pressed || found . cell . row !== pressed . row || found . cell . col !== pressed . col )
@@ -480,6 +627,13 @@ function SpreadsheetGrid(props: {
480627 } ) ;
481628 } ;
482629 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+ }
483637 const command = event . ctrlKey || event . metaKey ;
484638 if ( command && event . key . toLowerCase ( ) === "c" ) {
485639 event . preventDefault ( ) ;
@@ -503,15 +657,25 @@ function SpreadsheetGrid(props: {
503657 ) ;
504658 reveal ( ) ;
505659 } ;
506- const cancel = ( ) => {
660+ const cancel = ( event : PointerEvent ) => {
661+ if ( resizing && event . pointerId !== resizing . pointerId ) return ;
507662 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 = "" ;
508670 } ;
509671 root . addEventListener ( "scroll" , schedule ) ;
510672 root . addEventListener ( "keydown" , key ) ;
511673 root . addEventListener ( "pointerdown" , pointerDown ) ;
512674 root . addEventListener ( "pointermove" , pointerMove ) ;
513675 root . addEventListener ( "pointerup" , pointerUp ) ;
514676 root . addEventListener ( "pointercancel" , cancel ) ;
677+ root . addEventListener ( "lostpointercapture" , cancel ) ;
678+ root . addEventListener ( "pointerleave" , leave ) ;
515679 const unobserve = observeResize ( root , schedule ) ;
516680 window . addEventListener ( "resize" , schedule ) ;
517681 resizeArea ( ) ;
@@ -535,6 +699,8 @@ function SpreadsheetGrid(props: {
535699 root . removeEventListener ( "pointermove" , pointerMove ) ;
536700 root . removeEventListener ( "pointerup" , pointerUp ) ;
537701 root . removeEventListener ( "pointercancel" , cancel ) ;
702+ root . removeEventListener ( "lostpointercapture" , cancel ) ;
703+ root . removeEventListener ( "pointerleave" , leave ) ;
538704 } ;
539705 } , [ engine , layout , initialCell ] ) ;
540706 return (
@@ -559,6 +725,8 @@ function SpreadsheetGrid(props: {
559725 />
560726 < div aria-hidden = "true" className = "sticky left-0 top-0 h-0 w-0" >
561727 < 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" />
562730 </ div >
563731 < div className = "sr-only" >
564732 { [ ...new Set ( reader . map ( ( cell ) => cell . row ) ) ] . map ( ( row ) => (
0 commit comments