@open-file-viewer/core 0.1.17 → 0.1.18

package/dist/index.js

@@ -331,7 +331,7 @@ function getFileNameFromUrl(source) {
 function getExtension(name) {
   const clean = name.split("?")[0]?.split("#")[0] || "";
   const index = clean.lastIndexOf(".");
-  return index >= 0 ? clean.slice(index + 1).toLowerCase() : "";
+  return index >= 0 ? clean.slice(index + 1).split("!", 1)[0].toLowerCase() : "";
 }
 function isTextLike(file) {
   const textFileName = normalizeFileName(file.name);
@@ -590,7 +590,7 @@ var defaultMessages = {
 };
 function resolveMessages(options) {
   return {
-    ...defaultMessages[options.locale || "zh-CN"],
+    ...defaultMessages[options.locale || "en-US"],
     ...options.messages
   };
 }
@@ -8464,7 +8464,7 @@ async function renderSheet(panel, arrayBuffer, extension) {
     heading.textContent = sheetName;
     const sheet = workbook.Sheets[sheetName];
     const sheetImages = workbookImages.get(sheetName) || [];
-    const range = trimWorkbookSheetRange(sheet, xlsx.utils.decode_range(sheet["!ref"] || "A1:A1"), xlsx.utils.decode_cell);
+    const range = trimWorkbookSheetRange(sheet, xlsx.utils.decode_range(sheet["!ref"] || "A1:A1"), xlsx.utils.decode_cell, sheetImages);
     const rowCount = range.e.r - range.s.r + 1;
     const columnCount = range.e.c - range.s.c + 1;
     const formulaRows = collectFormulaRows(sheet, range, xlsx.utils.encode_cell);
@@ -8563,7 +8563,7 @@ function renderSheetFallback(panel, extension, detail) {
 async function readWorkbookSheetImages(arrayBuffer) {
   const zip = await JSZip3.loadAsync(arrayBuffer);
   const fileNames = Object.keys(zip.files);
-  if (!fileNames.some((name) => /^xl\/drawings\/.+\.xml$/i.test(name)) || !fileNames.some((name) => /^xl\/media\//i.test(name))) {
+  if (!fileNames.some((name) => /^xl\/drawings\/.+\.xml$/i.test(name))) {
     return /* @__PURE__ */ new Map();
   }
   const workbookXml = await zip.file("xl/workbook.xml")?.async("text");
@@ -8623,6 +8623,7 @@ async function readWorksheetDrawingImages(zip, drawingPath) {
   const images = [];
   for (const anchor of anchors) {
     const from = Array.from(anchor.children).find((element) => element.localName === "from");
+    const to = Array.from(anchor.children).find((element) => element.localName === "to");
     const embedId = findDrawingImageRelationshipId(anchor);
     const mediaRel = drawingRels.find((rel) => rel.id === embedId && /\/image$/i.test(rel.type));
     const mediaPath = resolveOfficeRelationshipTarget(drawingPath, mediaRel?.target);
@@ -8634,6 +8635,8 @@ async function readWorksheetDrawingImages(zip, drawingPath) {
     images.push({
       row: readDrawingMarkerIndex(from, "row"),
       column: readDrawingMarkerIndex(from, "col"),
+      endRow: to ? readDrawingMarkerIndex(to, "row") : void 0,
+      endColumn: to ? readDrawingMarkerIndex(to, "col") : void 0,
       fileName: mediaPath.split("/").pop() || "image",
       mimeType,
       dataUrl: `data:${mimeType};base64,${await mediaFile.async("base64")}`,
@@ -9089,7 +9092,7 @@ function chartText(element) {
 function chartStringValues(element) {
   return Array.from(element.querySelectorAll("*")).filter((item) => item.localName === "v" || item.localName === "t").map((item) => item.textContent?.trim() || "").filter(Boolean);
 }
-function trimWorkbookSheetRange(sheet, range, decodeCell) {
+function trimWorkbookSheetRange(sheet, range, decodeCell, images = []) {
   let minRow = Number.POSITIVE_INFINITY;
   let minColumn = Number.POSITIVE_INFINITY;
   let maxRow = Number.NEGATIVE_INFINITY;
@@ -9114,17 +9117,21 @@ function trimWorkbookSheetRange(sheet, range, decodeCell) {
     include(merge.s.r, merge.s.c);
     include(merge.e.r, merge.e.c);
   }
+  for (const image of images) {
+    include(image.row, image.column);
+    include(image.endRow ?? image.row, image.endColumn ?? image.column);
+  }
   if (!Number.isFinite(minRow) || !Number.isFinite(minColumn) || !Number.isFinite(maxRow) || !Number.isFinite(maxColumn)) {
     return range;
   }
   return {
     s: {
-      r: Math.max(range.s.r, minRow),
-      c: Math.max(range.s.c, minColumn)
+      r: minRow,
+      c: minColumn
     },
     e: {
-      r: Math.min(range.e.r, maxRow),
-      c: Math.min(range.e.c, maxColumn)
+      r: maxRow,
+      c: maxColumn
     }
   };
 }
@@ -9255,7 +9262,9 @@ function createWorkbookSheetTable(sheet, range, sheetIndex, viewport, encodeCell
         cell.classList.add("ofv-cell-multiline");
       }
       appendWorkbookCellImages(cell, imagesByCell.get(`${rowIndex}:${columnIndex}`), text);
-      appendColumnResizeHandle(cell, columnIndex, columnSizing);
+      if (rowIndex === rowStart) {
+        appendColumnResizeHandle(cell, columnIndex, columnSizing);
+      }
       row.append(cell);
     }
     table.append(row);
@@ -9481,7 +9490,9 @@ function createParsedSheetTable(sheet, sheetIndex, viewport, columnSizing, reren
       if (value.includes("\n")) {
         cell.classList.add("ofv-cell-multiline");
       }
-      appendColumnResizeHandle(cell, columnIndex, columnSizing);
+      if (rowIndex === viewport.rowStart) {
+        appendColumnResizeHandle(cell, columnIndex, columnSizing);
+      }
       row.append(cell);
     }
     table.append(row);