@extend-ai/react-xlsx 0.11.0 → 0.12.1

package/dist/index.js

@@ -6423,7 +6423,7 @@ function getSheetsWasmModule() {
   if (!wasmModulePromise) {
     wasmModulePromise = import("@dukelib/sheets-wasm").then(async (mod) => {
       if (configuredWasmSource !== void 0) {
-        await mod.default(configuredWasmSource);
+        await mod.default({ module_or_path: configuredWasmSource });
       } else {
         await mod.default();
       }
@@ -7161,6 +7161,22 @@ function pushHistoryEntry(stack, entry) {
 function normalizeCellValue(value) {
   return value ?? "";
 }
+function cloneCellStyle(style) {
+  if (!style || typeof style !== "object") {
+    return style;
+  }
+  if (typeof structuredClone === "function") {
+    try {
+      return structuredClone(style);
+    } catch {
+    }
+  }
+  try {
+    return JSON.parse(JSON.stringify(style));
+  } catch {
+    return style;
+  }
+}
 function coerceUserEnteredValue(value) {
   const trimmed = value.trim();
   if (!trimmed) {
@@ -7183,9 +7199,12 @@ function coerceUserEnteredValue(value) {
 function applyCellMutationState(worksheet, cell, state) {
   if (state.formula) {
     worksheet.setFormula(cellAddressToA1(cell), state.formula);
-    return;
+  } else {
+    worksheet.setCell(cellAddressToA1(cell), normalizeCellValue(state.value));
+  }
+  if (state.style && typeof state.style === "object") {
+    worksheet.setCellStyleAt(cell.row, cell.col, state.style);
   }
-  worksheet.setCell(cellAddressToA1(cell), normalizeCellValue(state.value));
 }
 function escapeHtml(value) {
   return value.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#39;");
@@ -7917,7 +7936,11 @@ function useXlsxViewerController(options) {
     return false;
   }, []);
   const ensureChartAssetsHydrated = React.useCallback((targetWorkbook, targetSheets) => {
-    if (chartAssetsRef.current || !targetWorkbook || !imageAssetsRef.current) {
+    const currentAssets = chartAssetsRef.current;
+    if (currentAssets && (currentAssets.chartOriginsById.size > 0 || !targetWorkbook || !imageAssetsRef.current)) {
+      return currentAssets;
+    }
+    if (!targetWorkbook || !imageAssetsRef.current) {
       return chartAssetsRef.current;
     }
     const assets = loadWorkbookChartAssets(
@@ -8892,6 +8915,7 @@ function useXlsxViewerController(options) {
     }
     return {
       formula: worksheet.getFormulaAt(cell.row, cell.col) ?? null,
+      style: worksheet.getCellStyleAt(cell.row, cell.col),
       value: worksheet.getCellAt(cell.row, cell.col).toJs()
     };
   }, [getActiveWorksheet]);
@@ -9036,6 +9060,7 @@ function useXlsxViewerController(options) {
       for (let col = startCol; col <= endCol; col += 1) {
         cells.push({
           formula: worksheet.getFormulaAt(row, col) ?? null,
+          style: worksheet.getCellStyleAt(row, col),
           value: worksheet.getCellAt(row, col).toJs()
         });
       }
@@ -9202,11 +9227,27 @@ function useXlsxViewerController(options) {
   }, [getColumnWidthPx, getRowHeightPx]);
   const setChartRect = React.useCallback((id, rect) => {
     const hydratedChartAssets = ensureChartAssetsHydrated(workbook, sheets);
+    console.info("[react-xlsx debug] setChartRect", {
+      hasActiveSheet: Boolean(activeSheet),
+      hasHydratedChartAssets: Boolean(hydratedChartAssets),
+      hasImageAssets: Boolean(imageAssetsRef.current),
+      hasWorkbook: Boolean(workbook),
+      id,
+      readOnly,
+      rect
+    });
     if (readOnly || !workbook || !activeSheet || !imageAssetsRef.current || !hydratedChartAssets) {
       return;
     }
     const worksheet = workbook.getSheet(activeSheet.workbookSheetIndex);
     const currentChart = getChartById(id);
+    console.info("[react-xlsx debug] currentChart", {
+      activeWorkbookSheetIndex: activeSheet.workbookSheetIndex,
+      editable: currentChart?.editable,
+      found: Boolean(currentChart),
+      originCount: hydratedChartAssets.chartOriginsById.size,
+      workbookSheetIndex: currentChart?.workbookSheetIndex
+    });
     if (!currentChart || currentChart.editable === false || currentChart.workbookSheetIndex !== activeSheet.workbookSheetIndex) {
       return;
     }
@@ -9217,7 +9258,8 @@ function useXlsxViewerController(options) {
       getRowHeightPx: (row) => getRowHeightPx(worksheet, row)
     });
     recordHistoryBeforeMutation();
-    updateWorkbookChartAnchor(imageAssetsRef.current, hydratedChartAssets, id, nextAnchor);
+    const didUpdateAnchor = updateWorkbookChartAnchor(imageAssetsRef.current, hydratedChartAssets, id, nextAnchor);
+    console.info("[react-xlsx debug] updateWorkbookChartAnchor", { didUpdateAnchor, nextAnchor });
     hydratedChartAssets.chartsByWorkbookSheetIndex = hydratedChartAssets.chartsByWorkbookSheetIndex.map((sheetCharts) => sheetCharts.map((chart) => chart.id === id ? { ...chart, anchor: nextAnchor } : chart));
     setChartsByWorkbookSheetIndex((current) => current.map((sheetCharts) => sheetCharts.map((chart) => chart.id === id ? { ...chart, anchor: nextAnchor } : chart)));
     setRevision((current) => current + 1);
@@ -9433,8 +9475,12 @@ function useXlsxViewerController(options) {
           continue;
         }
         worksheet.setCell(cellAddressToA1({ row, col }), "");
+        const after = captureCellMutationState(cell);
+        if (!after) {
+          continue;
+        }
         mutations.push({
-          after: { formula: null, value: "" },
+          after,
           before,
           cell
         });
@@ -9465,9 +9511,13 @@ function useXlsxViewerController(options) {
     }
     const nextValue = coerceUserEnteredValue(value);
     worksheet.setCell(cellAddressToA1(cell), nextValue);
+    const after = captureCellMutationState(cell);
+    if (!after) {
+      return;
+    }
     maybeRecalculateWorkbook(workbook);
     refreshWorkbookState(workbook);
-    recordCellEditHistory(cell, before, { formula: null, value: nextValue });
+    recordCellEditHistory(cell, before, after);
   }, [captureCellMutationState, getActiveWorksheet, maybeRecalculateWorkbook, readOnly, recordCellEditHistory, refreshWorkbookState, workbook]);
   const setCellFormula = React.useCallback((cell, formula) => {
     const worksheet = getActiveWorksheet();
@@ -9484,13 +9534,31 @@ function useXlsxViewerController(options) {
     } else {
       worksheet.setFormula(cellAddressToA1(cell), formula);
     }
+    const after = captureCellMutationState(cell);
+    if (!after) {
+      return;
+    }
     maybeRecalculateWorkbook(workbook);
     refreshWorkbookState(workbook);
-    recordCellEditHistory(cell, before, {
-      formula: trimmedFormula || null,
-      value: trimmedFormula ? null : ""
-    });
+    recordCellEditHistory(cell, before, after);
   }, [captureCellMutationState, getActiveWorksheet, maybeRecalculateWorkbook, readOnly, recordCellEditHistory, refreshWorkbookState, workbook]);
+  const setCellStyle = React.useCallback((cell, style) => {
+    const worksheet = getActiveWorksheet();
+    if (readOnly || !worksheet || !workbook) {
+      return;
+    }
+    const before = captureCellMutationState(cell);
+    if (!before) {
+      return;
+    }
+    worksheet.setCellStyleAt(cell.row, cell.col, style);
+    const after = captureCellMutationState(cell);
+    if (!after) {
+      return;
+    }
+    refreshWorkbookState(workbook);
+    recordCellEditHistory(cell, before, after);
+  }, [captureCellMutationState, getActiveWorksheet, readOnly, recordCellEditHistory, refreshWorkbookState, workbook]);
   const setSelectedCellValue = React.useCallback((value) => {
     if (!activeCell) {
       return;
@@ -9503,6 +9571,51 @@ function useXlsxViewerController(options) {
     }
     setCellFormula(activeCell, formula);
   }, [activeCell, setCellFormula]);
+  const setSelectedCellStyle = React.useCallback((style) => {
+    if (!activeCell) {
+      return;
+    }
+    setCellStyle(activeCell, style);
+  }, [activeCell, setCellStyle]);
+  const setRangeStyle = React.useCallback((range, style) => {
+    const worksheet = getActiveWorksheet();
+    if (readOnly || !worksheet || !workbook) {
+      return;
+    }
+    const normalized = normalizeRange(range);
+    const beforeStates = [];
+    for (let row = normalized.start.row; row <= normalized.end.row; row += 1) {
+      for (let col = normalized.start.col; col <= normalized.end.col; col += 1) {
+        const cell = { row, col };
+        const before = captureCellMutationState(cell);
+        if (!before) {
+          continue;
+        }
+        beforeStates.push({
+          before,
+          cell
+        });
+      }
+    }
+    if (beforeStates.length === 0) {
+      return;
+    }
+    worksheet.setRangeStyle(rangeToA1(normalized), style);
+    const mutations = [];
+    for (const mutation of beforeStates) {
+      const after = captureCellMutationState(mutation.cell);
+      if (!after) {
+        continue;
+      }
+      mutations.push({
+        after,
+        before: mutation.before,
+        cell: mutation.cell
+      });
+    }
+    refreshWorkbookState(workbook);
+    recordRangeEditHistory(mutations, selection, activeCell);
+  }, [activeCell, captureCellMutationState, getActiveWorksheet, readOnly, recordRangeEditHistory, refreshWorkbookState, selection, workbook]);
   const fillSelection = React.useCallback((targetRange) => {
     const worksheet = getActiveWorksheet();
     if (readOnly || !worksheet || !workbook || !selection) {
@@ -9529,19 +9642,22 @@ function useXlsxViewerController(options) {
         const sourceRow = sourceRange.start.row + (row - nextRange.start.row) % sourceHeight;
         const sourceCol = sourceRange.start.col + (col - nextRange.start.col) % sourceWidth;
         const sourceFormula = worksheet.getFormulaAt(sourceRow, sourceCol);
+        const sourceStyle = cloneCellStyle(worksheet.getCellStyleAt(sourceRow, sourceCol));
         if (sourceFormula) {
           worksheet.setFormula(cellAddressToA1(targetCell), sourceFormula);
-          mutations.push({
-            after: { formula: sourceFormula, value: null },
-            before,
-            cell: targetCell
-          });
+        } else {
+          const sourceValue = normalizeCellValue(worksheet.getCellAt(sourceRow, sourceCol).toJs());
+          worksheet.setCell(cellAddressToA1(targetCell), sourceValue);
+        }
+        if (sourceStyle && typeof sourceStyle === "object") {
+          worksheet.setCellStyleAt(targetCell.row, targetCell.col, sourceStyle);
+        }
+        const after = captureCellMutationState(targetCell);
+        if (!after) {
           continue;
         }
-        const sourceValue = normalizeCellValue(worksheet.getCellAt(sourceRow, sourceCol).toJs());
-        worksheet.setCell(cellAddressToA1(targetCell), sourceValue);
         mutations.push({
-          after: { formula: null, value: sourceValue },
+          after,
           before,
           cell: targetCell
         });
@@ -9681,16 +9797,24 @@ function useXlsxViewerController(options) {
         }
         if (rawValue.startsWith("=") && rawValue.length > 1) {
           worksheet.setFormula(cellAddressToA1(nextCell), rawValue);
+          const after = captureCellMutationState(nextCell);
+          if (!after) {
+            continue;
+          }
           mutations.push({
-            after: { formula: rawValue, value: null },
+            after,
             before,
             cell: nextCell
           });
         } else {
           const nextValue = coerceUserEnteredValue(rawValue);
           worksheet.setCell(cellAddressToA1(nextCell), nextValue);
+          const after = captureCellMutationState(nextCell);
+          if (!after) {
+            continue;
+          }
           mutations.push({
-            after: { formula: null, value: nextValue },
+            after,
             before,
             cell: nextCell
           });
@@ -9741,8 +9865,12 @@ function useXlsxViewerController(options) {
       if (cell.formula) {
         worksheet.setFormula(cellAddressToA1(nextCell), cell.formula);
         if (before) {
+          const after = captureCellMutationState(nextCell);
+          if (!after) {
+            continue;
+          }
           mutations.push({
-            after: { formula: cell.formula, value: null },
+            after,
             before,
             cell: nextCell
           });
@@ -9750,8 +9878,12 @@ function useXlsxViewerController(options) {
       } else {
         worksheet.setCell(cellAddressToA1(nextCell), cell.value);
         if (before) {
+          const after = captureCellMutationState(nextCell);
+          if (!after) {
+            continue;
+          }
           mutations.push({
-            after: { formula: null, value: cell.value },
+            after,
             before,
             cell: nextCell
           });
@@ -9968,7 +10100,9 @@ function useXlsxViewerController(options) {
       resizeColumn,
       resizeRow,
       setCellFormula,
+      setCellStyle,
       setCellValue,
+      setRangeStyle,
       setZoomScale,
       setChartRect,
       setImageRect,
@@ -9987,6 +10121,7 @@ function useXlsxViewerController(options) {
       setActiveSheetIndex,
       setActiveTabIndex,
       setSelectedCellFormula,
+      setSelectedCellStyle,
       setSelectedCellValue,
       sheets,
       shapes,
@@ -10070,7 +10205,9 @@ function useXlsxViewerController(options) {
       resizeColumn,
       resizeRow,
       setCellFormula,
+      setCellStyle,
       setCellValue,
+      setRangeStyle,
       setZoomScale,
       setChartRect,
       setImageRect,
@@ -10089,6 +10226,7 @@ function useXlsxViewerController(options) {
       setActiveSheetIndex,
       setActiveTabIndex,
       setSelectedCellFormula,
+      setSelectedCellStyle,
       setSelectedCellValue,
       sheets,
       shapes,
@@ -16584,6 +16722,9 @@ var WHEEL_ZOOM_SENSITIVITY = 25e-5;
 var WHEEL_LINE_DELTA_PX = 16;
 var CHART_SOURCE_HIGHLIGHT_COLORS = ["#2563eb", "#dc2626", "#7c3aed", "#059669", "#ea580c", "#db2777"];
 var SHEET_SURFACE = "#ffffff";
+var DRAWING_SELECTION_STROKE = "#64748b";
+var DRAWING_SELECTION_HANDLE_FILL = "#ffffff";
+var DRAWING_SELECTION_HANDLE_SHADOW = "rgba(15, 23, 42, 0.18)";
 var DEFAULT_CELL_PADDING = "0 4px";
 var IMAGE_HANDLE_POSITIONS = ["nw", "n", "ne", "e", "se", "s", "sw", "w"];
 var CANVAS_CELL_STYLE_CACHE_LIMIT = 4096;
@@ -16669,6 +16810,38 @@ function measureCanvasTextWidth(context, text) {
     CANVAS_TEXT_MEASURE_CACHE_LIMIT
   );
 }
+function drawCanvasTextDecorations(context, {
+  align,
+  color,
+  decoration,
+  ellipsize = false,
+  lineThroughY,
+  maxWidth,
+  text,
+  textX,
+  underlineY,
+  zoomFactor
+}) {
+  if (!decoration || text.length === 0) {
+    return;
+  }
+  const measured = ellipsize && maxWidth !== void 0 ? Math.min(maxWidth, measureCanvasTextWidth(context, text)) : measureCanvasTextWidth(context, text);
+  const startX = align === "right" ? textX - measured : align === "center" ? textX - measured / 2 : textX;
+  context.strokeStyle = color;
+  context.lineWidth = Math.max(1, zoomFactor * 0.75);
+  if (decoration.includes("underline")) {
+    context.beginPath();
+    context.moveTo(startX, underlineY);
+    context.lineTo(startX + measured, underlineY);
+    context.stroke();
+  }
+  if (decoration.includes("line-through")) {
+    context.beginPath();
+    context.moveTo(startX, lineThroughY);
+    context.lineTo(startX + measured, lineThroughY);
+    context.stroke();
+  }
+}
 function getCachedCanvasPath2D(path) {
   if (typeof Path2D === "undefined") {
     return null;
@@ -16972,6 +17145,15 @@ function resolveCanvasLineHeight(style, fallbackFontSize = 12) {
   }
   return fontSizePx * 1.2;
 }
+function resolveCanvasTextMiddleY(verticalAlign, contentTop, contentHeight, lineHeight) {
+  if (verticalAlign === "top") {
+    return contentTop + lineHeight / 2;
+  }
+  if (verticalAlign === "middle") {
+    return contentTop + contentHeight / 2;
+  }
+  return contentTop + contentHeight - lineHeight / 2;
+}
 function resolveCanvasWrapIndex(context, text, maxWidth) {
   if (text.length <= 1) {
     return text.length;
@@ -18714,7 +18896,9 @@ function resolveImageHandleStyle(position, stroke, surface, scale = 1) {
   const style = {
     backgroundColor: surface,
     border: `${Math.max(1, scale)}px solid ${stroke}`,
-    borderRadius: 6 * scale,
+    borderRadius: 3 * scale,
+    boxShadow: `0 1px ${3 * scale}px ${DRAWING_SELECTION_HANDLE_SHADOW}`,
+    boxSizing: "border-box",
     cursor: IMAGE_HANDLE_CURSOR[position],
     height: handleSize,
     pointerEvents: "auto",
@@ -26202,8 +26386,9 @@ function XlsxGrid({
               const textColor = canvasCellStyle.textColor;
               const shouldEllipsizeText = canvasCellStyle.textOverflowEllipsis;
               const shouldWrapText = canvasCellStyle.usesWrappedText || rawText.includes("\n");
+              const singleLineHeight = cellData.shrinkToFitFontSizePx ? resolveCanvasLineHeight(cellStyle, cellData.shrinkToFitFontSizePx) : resolveCanvasLineHeight(cellStyle, 12 * zoomFactor);
               if (cellData.textRotationDeg && rawText.length > 0) {
-                const textY = contentTop + contentHeight / 2;
+                const textY = resolveCanvasTextMiddleY(cellStyle.verticalAlign, contentTop, contentHeight, singleLineHeight);
                 const rotationOriginX = contentLeft + contentWidth / 2;
                 paneContext.save();
                 paneContext.translate(rotationOriginX, textY);
@@ -26229,20 +26414,21 @@ function XlsxGrid({
                 wrappedLines.forEach((line, lineIndex) => {
                   const textY = textBlockTop + lineIndex * lineHeight + lineHeight / 2;
                   paneContext.fillText(line, textX, textY);
-                  if (canvasCellStyle.textDecoration?.includes("underline") && line.length > 0) {
-                    const measured = Math.min(maxTextWidth, measureCanvasTextWidth(paneContext, line));
-                    const underlineStartX = align === "right" ? textX - measured : align === "center" ? textX - measured / 2 : textX;
-                    paneContext.beginPath();
-                    paneContext.moveTo(underlineStartX, textY + Math.max(2, lineHeight * 0.24));
-                    paneContext.lineTo(underlineStartX + measured, textY + Math.max(2, lineHeight * 0.24));
-                    paneContext.strokeStyle = textColor;
-                    paneContext.lineWidth = Math.max(1, zoomFactor * 0.75);
-                    paneContext.stroke();
-                  }
+                  drawCanvasTextDecorations(paneContext, {
+                    align,
+                    color: textColor,
+                    decoration: canvasCellStyle.textDecoration,
+                    lineThroughY: textY,
+                    maxWidth: maxTextWidth,
+                    text: line,
+                    textX,
+                    underlineY: textY + Math.max(2, lineHeight * 0.24),
+                    zoomFactor
+                  });
                 });
               } else if (spillMaxWidth != null) {
                 const text = shouldEllipsizeText ? truncateCanvasText(paneContext, rawText, maxTextWidth) : rawText;
-                const textY = contentTop + contentHeight / 2;
+                const textY = resolveCanvasTextMiddleY(cellStyle.verticalAlign, contentTop, contentHeight, singleLineHeight);
                 deferredSpillTextsByPane[pane].push({
                   align,
                   clipHeight: contentHeight + textClipOverscan * 2,
@@ -26257,22 +26443,25 @@ function XlsxGrid({
                   textDecoration: canvasCellStyle.textDecoration,
                   textX,
                   textY,
+                  lineThroughY: textY,
                   underlineY: textY + 6 * zoomFactor
                 });
               } else {
                 const text = cellData.shrinkToFit ? rawText : shouldEllipsizeText ? truncateCanvasText(paneContext, rawText, maxTextWidth) : rawText;
-                const textY = contentTop + contentHeight / 2;
+                const textY = resolveCanvasTextMiddleY(cellStyle.verticalAlign, contentTop, contentHeight, singleLineHeight);
                 paneContext.fillText(text, textX, textY);
-                if (canvasCellStyle.textDecoration?.includes("underline") && text.length > 0) {
-                  const measured = shouldEllipsizeText ? Math.min(maxTextWidth, measureCanvasTextWidth(paneContext, text)) : measureCanvasTextWidth(paneContext, text);
-                  const underlineStartX = align === "right" ? textX - measured : align === "center" ? textX - measured / 2 : textX;
-                  paneContext.beginPath();
-                  paneContext.moveTo(underlineStartX, textY + 6 * zoomFactor);
-                  paneContext.lineTo(underlineStartX + measured, textY + 6 * zoomFactor);
-                  paneContext.strokeStyle = textColor;
-                  paneContext.lineWidth = Math.max(1, zoomFactor * 0.75);
-                  paneContext.stroke();
-                }
+                drawCanvasTextDecorations(paneContext, {
+                  align,
+                  color: textColor,
+                  decoration: canvasCellStyle.textDecoration,
+                  ellipsize: shouldEllipsizeText,
+                  lineThroughY: textY,
+                  maxWidth: maxTextWidth,
+                  text,
+                  textX,
+                  underlineY: textY + 6 * zoomFactor,
+                  zoomFactor
+                });
               }
             }
             if (cellData.conditionalIcon) {
@@ -26306,16 +26495,18 @@ function XlsxGrid({
           paneContext.textAlign = spillText.align;
           paneContext.textBaseline = "middle";
           paneContext.fillText(spillText.text, spillText.textX, spillText.textY);
-          if (spillText.textDecoration?.includes("underline") && spillText.text.length > 0) {
-            const measured = spillText.ellipsize ? Math.min(spillText.maxWidth, measureCanvasTextWidth(paneContext, spillText.text)) : measureCanvasTextWidth(paneContext, spillText.text);
-            const underlineStartX = spillText.align === "right" ? spillText.textX - measured : spillText.align === "center" ? spillText.textX - measured / 2 : spillText.textX;
-            paneContext.beginPath();
-            paneContext.moveTo(underlineStartX, spillText.underlineY);
-            paneContext.lineTo(underlineStartX + measured, spillText.underlineY);
-            paneContext.strokeStyle = spillText.color;
-            paneContext.lineWidth = Math.max(1, zoomFactor * 0.75);
-            paneContext.stroke();
-          }
+          drawCanvasTextDecorations(paneContext, {
+            align: spillText.align,
+            color: spillText.color,
+            decoration: spillText.textDecoration,
+            ellipsize: spillText.ellipsize,
+            lineThroughY: spillText.lineThroughY,
+            maxWidth: spillText.maxWidth,
+            text: spillText.text,
+            textX: spillText.textX,
+            underlineY: spillText.underlineY,
+            zoomFactor
+          });
           paneContext.restore();
         }
       }
@@ -27224,6 +27415,7 @@ function XlsxGrid({
     }
     const isFrozenDrawing = pane !== "scroll";
     const canEditImage = !readOnly && image.editable !== false;
+    const drawingSelectionSurface = paletteIsDark(palette) ? palette.canvas : DRAWING_SELECTION_HANDLE_FILL;
     const style = {
       contain: "layout paint",
       height: rect.height,
@@ -27255,6 +27447,7 @@ function XlsxGrid({
       {
         style: {
           ...style,
+          contain: "layout",
           overflow: "visible",
           pointerEvents: "none",
           zIndex: isFrozenDrawing ? image.zIndex + 22 : image.zIndex + 2
@@ -27264,8 +27457,8 @@ function XlsxGrid({
             "div",
             {
               style: {
-                border: `${Math.max(1, zoomFactor)}px solid ${selectionStroke}`,
-                boxShadow: `0 0 0 ${Math.max(1, zoomFactor)}px ${palette.surface}`,
+                border: `${Math.max(1, zoomFactor)}px solid ${DRAWING_SELECTION_STROKE}`,
+                boxShadow: `0 0 0 ${Math.max(1, zoomFactor)}px ${drawingSelectionSurface}`,
                 boxSizing: "border-box",
                 inset: 0,
                 pointerEvents: "none",
@@ -27275,7 +27468,7 @@ function XlsxGrid({
                 "div",
                 {
                   onPointerDown: (event) => startImageResize(event, image, rect, position),
-                  style: resolveImageHandleStyle(position, selectionStroke, palette.surface, zoomFactor)
+                  style: resolveImageHandleStyle(position, DRAWING_SELECTION_STROKE, drawingSelectionSurface, zoomFactor)
                 },
                 position
               )) : null
@@ -27287,7 +27480,7 @@ function XlsxGrid({
                 startImageResize(event, image, rect, position);
               }
             },
-            style: canEditImage ? resolveImageHandleStyle(position, selectionStroke, palette.surface, zoomFactor) : { ...resolveImageHandleStyle(position, selectionStroke, palette.surface, zoomFactor), display: "none" }
+            style: canEditImage ? resolveImageHandleStyle(position, DRAWING_SELECTION_STROKE, drawingSelectionSurface, zoomFactor) : { ...resolveImageHandleStyle(position, DRAWING_SELECTION_STROKE, drawingSelectionSurface, zoomFactor), display: "none" }
           }),
           image,
           rect
@@ -27295,8 +27488,8 @@ function XlsxGrid({
           "div",
           {
             style: {
-              border: `${Math.max(1, zoomFactor)}px solid ${selectionStroke}`,
-              boxShadow: `0 0 0 ${Math.max(1, zoomFactor)}px ${palette.surface}`,
+              border: `${Math.max(1, zoomFactor)}px solid ${DRAWING_SELECTION_STROKE}`,
+              boxShadow: `0 0 0 ${Math.max(1, zoomFactor)}px ${drawingSelectionSurface}`,
               boxSizing: "border-box",
               inset: 0,
               pointerEvents: "none",
@@ -27306,7 +27499,7 @@ function XlsxGrid({
               "div",
               {
                 onPointerDown: (event) => startImageResize(event, image, rect, position),
-                style: resolveImageHandleStyle(position, selectionStroke, palette.surface, zoomFactor)
+                style: resolveImageHandleStyle(position, DRAWING_SELECTION_STROKE, drawingSelectionSurface, zoomFactor)
               },
               position
             )) : null
@@ -27344,6 +27537,7 @@ function XlsxGrid({
     }
     const isFrozenDrawing = pane !== "scroll";
     const canEditChart = !readOnly && chart.editable !== false;
+    const drawingSelectionSurface = paletteIsDark(palette) ? palette.canvas : DRAWING_SELECTION_HANDLE_FILL;
     const style = {
       contain: "layout paint",
       height: rect.height,
@@ -27360,6 +27554,7 @@ function XlsxGrid({
       {
         style: {
           ...style,
+          contain: "layout",
           overflow: "visible",
           pointerEvents: "none",
           zIndex: isFrozenDrawing ? chart.zIndex + 22 : chart.zIndex + 2
@@ -27368,8 +27563,8 @@ function XlsxGrid({
           "div",
           {
             style: {
-              border: `${Math.max(1, zoomFactor)}px solid ${selectionStroke}`,
-              boxShadow: `0 0 0 ${Math.max(1, zoomFactor)}px ${palette.surface}`,
+              border: `${Math.max(1, zoomFactor)}px solid ${DRAWING_SELECTION_STROKE}`,
+              boxShadow: `0 0 0 ${Math.max(1, zoomFactor)}px ${drawingSelectionSurface}`,
               boxSizing: "border-box",
               inset: 0,
               pointerEvents: "none",
@@ -27379,7 +27574,7 @@ function XlsxGrid({
               "div",
               {
                 onPointerDown: (event) => startChartResize(event, chart, rect, position),
-                style: resolveImageHandleStyle(position, selectionStroke, palette.surface, zoomFactor)
+                style: resolveImageHandleStyle(position, DRAWING_SELECTION_STROKE, drawingSelectionSurface, zoomFactor)
               },
               position
             )) : null
@@ -27659,6 +27854,22 @@ function XlsxGrid({
   }
   function installImageInteractionListeners(pointerId) {
     imageInteractionCleanupRef.current?.();
+    const resolveInteractionRect = (interaction, clientX, clientY) => {
+      const deltaX = clientX - interaction.startClientX;
+      const deltaY = clientY - interaction.startClientY;
+      return clampImageRect(
+        interaction.type === "move" ? {
+          ...interaction.baseRect,
+          left: interaction.baseRect.left + deltaX,
+          top: interaction.baseRect.top + deltaY
+        } : resizeImageRect(interaction.baseRect, interaction.handle, deltaX, deltaY, displayImageMinSize),
+        {
+          contentOffsetLeft: displayRowHeaderWidth,
+          contentOffsetTop: displayHeaderHeight,
+          minSizePx: displayImageMinSize
+        }
+      );
+    };
     const handlePointerMove = (event) => {
       if (event.pointerId !== pointerId) {
         return;
@@ -27672,18 +27883,7 @@ function XlsxGrid({
       if (!interaction.didMove && (Math.abs(deltaX) > 3 || Math.abs(deltaY) > 3)) {
         interaction.didMove = true;
       }
-      const nextRect = clampImageRect(
-        interaction.type === "move" ? {
-          ...interaction.baseRect,
-          left: interaction.baseRect.left + deltaX,
-          top: interaction.baseRect.top + deltaY
-        } : resizeImageRect(interaction.baseRect, interaction.handle, deltaX, deltaY, displayImageMinSize),
-        {
-          contentOffsetLeft: displayRowHeaderWidth,
-          contentOffsetTop: displayHeaderHeight,
-          minSizePx: displayImageMinSize
-        }
-      );
+      const nextRect = resolveInteractionRect(interaction, event.clientX, event.clientY);
       scheduleImagePreviewRect({ id: interaction.imageId, rect: nextRect });
     };
     const cleanup = () => {
@@ -27706,18 +27906,20 @@ function XlsxGrid({
         imagePreviewRectRef.current = pendingPreview;
         setImagePreviewRect(pendingPreview);
       }
-      const preview = pendingPreview ?? imagePreviewRectRef.current;
+      const finalRect = interaction ? resolveInteractionRect(interaction, event.clientX, event.clientY) : null;
       imageInteractionRef.current = null;
       imageInteractionCleanupRef.current = null;
       setInteractionMode("idle");
       document.body.style.cursor = "";
       document.body.style.userSelect = "";
       cleanup();
-      if (interaction && preview && preview.id === interaction.imageId) {
+      if (interaction) {
         if (interaction.didMove) {
           skipNextImageClickRef.current = interaction.imageId;
         }
-        setImageRect(interaction.imageId, toLogicalRect(preview.rect));
+        if (interaction.didMove && finalRect) {
+          setImageRect(interaction.imageId, toLogicalRect(finalRect));
+        }
       }
       imagePreviewRectRef.current = null;
       setImagePreviewRect(null);
@@ -27729,6 +27931,22 @@ function XlsxGrid({
   }
   function installChartInteractionListeners(pointerId) {
     chartInteractionCleanupRef.current?.();
+    const resolveInteractionRect = (interaction, clientX, clientY) => {
+      const deltaX = clientX - interaction.startClientX;
+      const deltaY = clientY - interaction.startClientY;
+      return clampImageRect(
+        interaction.type === "move" ? {
+          ...interaction.baseRect,
+          left: interaction.baseRect.left + deltaX,
+          top: interaction.baseRect.top + deltaY
+        } : resizeImageRect(interaction.baseRect, interaction.handle, deltaX, deltaY, 48 * zoomFactor),
+        {
+          contentOffsetLeft: displayRowHeaderWidth,
+          contentOffsetTop: displayHeaderHeight,
+          minSizePx: 48 * zoomFactor
+        }
+      );
+    };
     const handlePointerMove = (event) => {
       if (event.pointerId !== pointerId) {
         return;
@@ -27742,18 +27960,7 @@ function XlsxGrid({
       if (!interaction.didMove && (Math.abs(deltaX) > 3 || Math.abs(deltaY) > 3)) {
         interaction.didMove = true;
       }
-      const nextRect = clampImageRect(
-        interaction.type === "move" ? {
-          ...interaction.baseRect,
-          left: interaction.baseRect.left + deltaX,
-          top: interaction.baseRect.top + deltaY
-        } : resizeImageRect(interaction.baseRect, interaction.handle, deltaX, deltaY, 48 * zoomFactor),
-        {
-          contentOffsetLeft: displayRowHeaderWidth,
-          contentOffsetTop: displayHeaderHeight,
-          minSizePx: 48 * zoomFactor
-        }
-      );
+      const nextRect = resolveInteractionRect(interaction, event.clientX, event.clientY);
       scheduleChartPreviewRect({ id: interaction.chartId, rect: nextRect });
     };
     const cleanup = () => {
@@ -27776,18 +27983,20 @@ function XlsxGrid({
         chartPreviewRectRef.current = pendingPreview;
         setChartPreviewRect(pendingPreview);
       }
-      const preview = pendingPreview ?? chartPreviewRectRef.current;
+      const finalRect = interaction ? resolveInteractionRect(interaction, event.clientX, event.clientY) : null;
       chartInteractionRef.current = null;
       chartInteractionCleanupRef.current = null;
       setInteractionMode("idle");
       document.body.style.cursor = "";
       document.body.style.userSelect = "";
       cleanup();
-      if (interaction && preview && preview.id === interaction.chartId) {
+      if (interaction) {
         if (interaction.didMove) {
           skipNextChartClickRef.current = interaction.chartId;
         }
-        setChartRect(interaction.chartId, toLogicalRect(preview.rect));
+        if (interaction.didMove && finalRect) {
+          setChartRect(interaction.chartId, toLogicalRect(finalRect));
+        }
       }
       chartPreviewRectRef.current = null;
       setChartPreviewRect(null);
@@ -28090,7 +28299,6 @@ function XlsxGrid({
   }
   gridKeyboardHandlerRef.current = handleGridKeyDown;
   const scrollerViewportProps = {
-    key: activeTabIndex,
     ref: scrollRef,
     "aria-colcount": Math.max(activeSheet?.colCount ?? 0, displayColLimit),
     "aria-keyshortcuts": "ArrowUp ArrowDown ArrowLeft ArrowRight Home End PageUp PageDown Control+Home Control+End",
@@ -28728,7 +28936,7 @@ function XlsxGrid({
       )
     }
   );
-  return /* @__PURE__ */ jsx3("div", { style: { backgroundColor: palette.canvas, display: "flex", flex: 1, minHeight: 0, minWidth: 0 }, children: renderScroller ? renderScroller({ children: scrollerContent, viewportProps: scrollerViewportProps }) : /* @__PURE__ */ jsx3("div", { ...scrollerViewportProps, children: scrollerContent }) });
+  return /* @__PURE__ */ jsx3("div", { style: { backgroundColor: palette.canvas, display: "flex", flex: 1, minHeight: 0, minWidth: 0 }, children: renderScroller ? renderScroller({ children: scrollerContent, viewportProps: scrollerViewportProps }) : /* @__PURE__ */ jsx3("div", { ...scrollerViewportProps, children: scrollerContent }, activeTabIndex) });
 }
 function XlsxViewerInner({
   allowResizeInReadOnly = false,
@@ -28933,8 +29141,11 @@ function useXlsxViewerEditing() {
     selectedFormula,
     selectedValue,
     setCellFormula,
+    setCellStyle,
     setCellValue,
+    setRangeStyle,
     setSelectedCellFormula,
+    setSelectedCellStyle,
     setSelectedCellValue,
     undo,
     unmergeSelection
@@ -28961,8 +29172,11 @@ function useXlsxViewerEditing() {
       selectedFormula,
       selectedValue,
       setCellFormula,
+      setCellStyle,
       setCellValue,
+      setRangeStyle,
       setSelectedCellFormula,
+      setSelectedCellStyle,
       setSelectedCellValue,
       undo,
       unmergeSelection
@@ -28988,8 +29202,11 @@ function useXlsxViewerEditing() {
       selectedFormula,
       selectedValue,
       setCellFormula,
+      setCellStyle,
       setCellValue,
+      setRangeStyle,
       setSelectedCellFormula,
+      setSelectedCellStyle,
       setSelectedCellValue,
       undo,
       unmergeSelection
@@ -29660,13 +29877,14 @@ function useXlsxViewerThumbnails(options = {}) {
               const align = canvasCellStyle.textAlign;
               context.textAlign = align;
               const textX = align === "right" ? contentLeft + contentWidth : align === "center" ? contentLeft + contentWidth / 2 : contentLeft;
-              const textY = contentTop + contentHeight / 2;
               const trailingInset = cellData.conditionalIcon ? 18 : 0;
               const maxTextWidth = Math.max(0, contentWidth - trailingInset);
+              const singleLineHeight = resolveCanvasLineHeight(cellData.style, 12);
               if (cellData.textRotationDeg) {
+                const alignedTextY = resolveCanvasTextMiddleY(cellData.style.verticalAlign, contentTop, contentHeight, singleLineHeight);
                 const rotationOriginX = contentLeft + contentWidth / 2;
                 context.save();
-                context.translate(rotationOriginX, textY);
+                context.translate(rotationOriginX, alignedTextY);
                 context.rotate(cellData.textRotationDeg * Math.PI / 180);
                 context.fillText(
                   rawText,
@@ -29689,7 +29907,7 @@ function useXlsxViewerThumbnails(options = {}) {
                 });
               } else {
                 const text = canvasCellStyle.textOverflowEllipsis ? truncateCanvasText(context, rawText, maxTextWidth) : rawText;
-                context.fillText(text, textX, textY);
+                context.fillText(text, textX, resolveCanvasTextMiddleY(cellData.style.verticalAlign, contentTop, contentHeight, singleLineHeight));
               }
             }
             if (cellData.conditionalIcon) {