@odoo/o-spreadsheet 16.0.37 → 16.0.38

package/dist/o-spreadsheet.cjs.js

@@ -1083,7 +1083,7 @@ function deepEquals(o1, o2) {
     if (typeof o1 !== typeof o2)
         return false;
     if (typeof o1 !== "object")
-        return o1 === o2;
+        return false;
     // Objects can have different keys if the values are undefined
     const keys = new Set();
     Object.keys(o1).forEach((key) => keys.add(key));
@@ -4713,6 +4713,7 @@ class LinkEditor extends owl.Component {
                 if (this.state.link.url) {
                     this.save();
                 }
+                ev.preventDefault();
                 break;
             case "Escape":
                 this.cancel();
@@ -24692,29 +24693,12 @@ function convertWidthFromExcel(width) {
         return width;
     return Math.round((width / WIDTH_FACTOR) * 100) / 100;
 }
-function convertBorderDescr(descr) {
-    if (!descr) {
-        return undefined;
-    }
-    return {
-        style: descr[0],
-        color: { rgb: descr[1] },
-    };
-}
 function extractStyle(cell, data) {
     let style = {};
     if (cell.style) {
         style = data.styles[cell.style];
     }
     const format = extractFormat(cell, data);
-    const exportedBorder = {};
-    if (cell.border) {
-        const border = data.borders[cell.border];
-        exportedBorder.left = convertBorderDescr(border.left);
-        exportedBorder.right = convertBorderDescr(border.right);
-        exportedBorder.bottom = convertBorderDescr(border.bottom);
-        exportedBorder.top = convertBorderDescr(border.top);
-    }
     const styles = {
         font: {
             size: (style === null || style === void 0 ? void 0 : style.fontSize) || DEFAULT_FONT_SIZE,
@@ -24728,7 +24712,7 @@ function extractStyle(cell, data) {
             }
             : { reservedAttribute: "none" },
         numFmt: format ? { format: format, id: 0 /* id not used for export */ } : undefined,
-        border: exportedBorder || {},
+        border: cell.border || 0,
         alignment: {
             vertical: "center",
             horizontal: style.align,
@@ -24757,23 +24741,19 @@ function extractFormat(cell, data) {
     return undefined;
 }
 function normalizeStyle(construct, styles) {
-    const { id: fontId } = pushElement(styles["font"], construct.fonts);
-    const { id: fillId } = pushElement(styles["fill"], construct.fills);
-    const { id: borderId } = pushElement(styles["border"], construct.borders);
     // Normalize this
     const numFmtId = convertFormat(styles["numFmt"], construct.numFmts);
     const style = {
-        fontId,
-        fillId,
-        borderId,
+        fontId: pushElement(styles.font, construct.fonts),
+        fillId: pushElement(styles.fill, construct.fills),
+        borderId: styles.border,
         numFmtId,
         alignment: {
             vertical: styles.alignment.vertical,
             horizontal: styles.alignment.horizontal,
         },
     };
-    const { id } = pushElement(style, construct.styles);
-    return id;
+    return pushElement(style, construct.styles);
 }
 function convertFormat(format, numFmtStructure) {
     if (!format) {
@@ -24781,8 +24761,7 @@ function convertFormat(format, numFmtStructure) {
     }
     let formatId = XLSX_FORMAT_MAP[format.format];
     if (!formatId) {
-        const { id } = pushElement(format, numFmtStructure);
-        formatId = id + FIRST_NUMFMT_ID;
+        formatId = pushElement(format, numFmtStructure) + FIRST_NUMFMT_ID;
     }
     return formatId;
 }
@@ -24807,20 +24786,15 @@ function addRelsToFile(relsFiles, path, rel) {
     return id;
 }
 function pushElement(property, propertyList) {
-    for (let [key, value] of Object.entries(propertyList)) {
-        if (JSON.stringify(value) === JSON.stringify(property)) {
-            return { id: parseInt(key, 10), list: propertyList };
+    let len = propertyList.length;
+    const operator = typeof property === "object" ? deepEquals : (a, b) => a === b;
+    for (let i = 0; i < len; i++) {
+        if (operator(property, propertyList[i])) {
+            return i;
         }
     }
-    let elemId = propertyList.findIndex((elem) => JSON.stringify(elem) === JSON.stringify(property));
-    if (elemId === -1) {
-        propertyList.push(property);
-        elemId = propertyList.length - 1;
-    }
-    return {
-        id: elemId,
-        list: propertyList,
-    };
+    propertyList[propertyList.length] = property;
+    return propertyList.length - 1;
 }
 const chartIds = [];
 /**
@@ -25494,7 +25468,25 @@ function parseXML(xmlString) {
     }
     return document;
 }
-function getDefaultXLSXStructure() {
+function convertBorderDescr(descr) {
+    if (!descr) {
+        return undefined;
+    }
+    return {
+        style: descr[0],
+        color: { rgb: descr[1] },
+    };
+}
+function getDefaultXLSXStructure(data) {
+    const xlsxBorders = Object.values(data.borders).map((border) => {
+        return {
+            left: convertBorderDescr(border.left),
+            right: convertBorderDescr(border.right),
+            bottom: convertBorderDescr(border.bottom),
+            top: convertBorderDescr(border.top),
+        };
+    });
+    const borders = [{}, ...xlsxBorders];
     return {
         relsFiles: [],
         sharedStrings: [],
@@ -25517,7 +25509,7 @@ function getDefaultXLSXStructure() {
             },
         ],
         fills: [{ reservedAttribute: "none" }, { reservedAttribute: "gray125" }],
-        borders: [{}],
+        borders,
         numFmts: [],
         dxfs: [],
     };
@@ -36996,12 +36988,13 @@ class SheetViewPlugin extends UIPlugin {
             case "AlterZoneCorner":
                 break;
             case "ZonesSelected":
+                const sheetId = this.getters.getActiveSheetId();
                 let { col, row } = findCellInNewZone(event.previousAnchor.zone, event.anchor.zone);
                 if (event.mode === "updateAnchor") {
                     const oldZone = event.previousAnchor.zone;
                     const newZone = event.anchor.zone;
                     // altering a zone should not move the viewport in a dimension that wasn't changed
-                    const { top, bottom, left, right } = this.getters.getActiveMainViewport();
+                    const { top, bottom, left, right } = this.getMainInternalViewport(sheetId);
                     if (oldZone.left === newZone.left && oldZone.right === newZone.right) {
                         col = left > col || col > right ? left : col;
                     }
@@ -37009,10 +37002,9 @@ class SheetViewPlugin extends UIPlugin {
                         row = top > row || row > bottom ? top : row;
                     }
                 }
-                const sheetId = this.getters.getActiveSheetId();
                 col = Math.min(col, this.getters.getNumberCols(sheetId) - 1);
                 row = Math.min(row, this.getters.getNumberRows(sheetId) - 1);
-                this.refreshViewport(this.getters.getActiveSheetId(), { col, row });
+                this.refreshViewport(sheetId, { col, row });
                 break;
         }
     }
@@ -37037,16 +37029,16 @@ class SheetViewPlugin extends UIPlugin {
                 this.setSheetViewOffset(cmd.offsetX, cmd.offsetY);
                 break;
             case "SHIFT_VIEWPORT_DOWN":
-                const { top } = this.getActiveMainViewport();
                 const sheetId = this.getters.getActiveSheetId();
-                const shiftedOffsetY = this.clipOffsetY(this.getters.getRowDimensions(sheetId, top).start + this.sheetViewHeight);
-                this.shiftVertically(shiftedOffsetY);
+                const { top, viewportHeight, offsetCorrectionY } = this.getMainInternalViewport(sheetId);
+                const topRowDims = this.getters.getRowDimensions(sheetId, top);
+                this.shiftVertically(topRowDims.start + viewportHeight - offsetCorrectionY);
                 break;
             case "SHIFT_VIEWPORT_UP": {
-                const { top } = this.getActiveMainViewport();
                 const sheetId = this.getters.getActiveSheetId();
-                const shiftedOffsetY = this.clipOffsetY(this.getters.getRowDimensions(sheetId, top).end - this.sheetViewHeight);
-                this.shiftVertically(shiftedOffsetY);
+                const { top, viewportHeight, offsetCorrectionY } = this.getMainInternalViewport(sheetId);
+                const topRowDims = this.getters.getRowDimensions(sheetId, top);
+                this.shiftVertically(topRowDims.end - offsetCorrectionY - viewportHeight);
                 break;
             }
             case "REMOVE_COLUMNS_ROWS":
@@ -37405,17 +37397,6 @@ class SheetViewPlugin extends UIPlugin {
         const { maxOffsetX, maxOffsetY } = this.getMaximumSheetOffset();
         Object.values(this.getSubViewports(sheetId)).forEach((viewport) => viewport.setViewportOffset(clip(offsetX, 0, maxOffsetX), clip(offsetY, 0, maxOffsetY)));
     }
-    /**
-     * Clip the vertical offset within the allowed range.
-     * Not above the sheet, nor below the sheet.
-     */
-    clipOffsetY(offsetY) {
-        const { height } = this.getMainViewportRect();
-        const maxOffset = height - this.sheetViewHeight;
-        offsetY = Math.min(offsetY, maxOffset);
-        offsetY = Math.max(offsetY, 0);
-        return offsetY;
-    }
     getViewportOffset(sheetId) {
         var _a, _b;
         return {
@@ -37469,12 +37450,15 @@ class SheetViewPlugin extends UIPlugin {
      * viewport top.
      */
     shiftVertically(offset) {
-        const { top } = this.getActiveMainViewport();
+        const sheetId = this.getters.getActiveSheetId();
+        const { top } = this.getMainInternalViewport(sheetId);
         const { scrollX } = this.getActiveSheetScrollInfo();
         this.setSheetViewOffset(scrollX, offset);
         const { anchor } = this.getters.getSelection();
-        const deltaRow = this.getActiveMainViewport().top - top;
-        this.selection.selectCell(anchor.cell.col, anchor.cell.row + deltaRow);
+        if (anchor.cell.row >= this.getters.getPaneDivisions(sheetId).ySplit) {
+            const deltaRow = this.getMainInternalViewport(sheetId).top - top;
+            this.selection.selectCell(anchor.cell.col, anchor.cell.row + deltaRow);
+        }
     }
     getVisibleFigures() {
         const sheetId = this.getters.getActiveSheetId();
@@ -41794,8 +41778,7 @@ function addContent(content, sharedStrings, forceString = false) {
         attrs.push(["t", "b"]);
     }
     else if (forceString || !isNumber(value)) {
-        const { id } = pushElement(content, sharedStrings);
-        value = id.toString();
+        value = pushElement(content, sharedStrings);
         attrs.push(["t", "s"]);
     }
     return { attrs, node: escapeXml /*xml*/ `<v>${value}</v>` };
@@ -41920,8 +41903,7 @@ function addCellIsRule(cf, rule, dxfs) {
     if (rule.style.fillColor) {
         dxf.fill = { fgColor: { rgb: rule.style.fillColor } };
     }
-    const { id } = pushElement(dxf, dxfs);
-    ruleAttributes.push(["dxfId", id]);
+    ruleAttributes.push(["dxfId", pushElement(dxf, dxfs)]);
     return escapeXml /*xml*/ `
     <conditionalFormatting sqref="${cf.ranges.join(" ")}">
       <cfRule ${formatAttributes(ruleAttributes)}>
@@ -42632,7 +42614,7 @@ function addSheetViews(sheet) {
  */
 function getXLSX(data) {
     const files = [];
-    const construct = getDefaultXLSXStructure();
+    const construct = getDefaultXLSXStructure(data);
     files.push(createWorkbook(data, construct));
     files.push(...createWorksheets(data, construct));
     files.push(createStylesSheet(construct));
@@ -43340,6 +43322,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.0.37';
-__info__.date = '2024-04-05T13:58:08.848Z';
-__info__.hash = 'e95827b';
+__info__.version = '16.0.38';
+__info__.date = '2024-04-10T12:16:41.911Z';
+__info__.hash = '6c7d510';

package/dist/o-spreadsheet.d.ts

@@ -4483,11 +4483,6 @@ declare class SheetViewPlugin extends UIPlugin {
     private resizeSheetView;
     private recomputeViewports;
     private setSheetViewOffset;
-    /**
-     * Clip the vertical offset within the allowed range.
-     * Not above the sheet, nor below the sheet.
-     */
-    private clipOffsetY;
     private getViewportOffset;
     private resetViewports;
     /**

package/dist/o-spreadsheet.esm.js

@@ -1079,7 +1079,7 @@ function deepEquals(o1, o2) {
     if (typeof o1 !== typeof o2)
         return false;
     if (typeof o1 !== "object")
-        return o1 === o2;
+        return false;
     // Objects can have different keys if the values are undefined
     const keys = new Set();
     Object.keys(o1).forEach((key) => keys.add(key));
@@ -4709,6 +4709,7 @@ class LinkEditor extends Component {
                 if (this.state.link.url) {
                     this.save();
                 }
+                ev.preventDefault();
                 break;
             case "Escape":
                 this.cancel();
@@ -24688,29 +24689,12 @@ function convertWidthFromExcel(width) {
         return width;
     return Math.round((width / WIDTH_FACTOR) * 100) / 100;
 }
-function convertBorderDescr(descr) {
-    if (!descr) {
-        return undefined;
-    }
-    return {
-        style: descr[0],
-        color: { rgb: descr[1] },
-    };
-}
 function extractStyle(cell, data) {
     let style = {};
     if (cell.style) {
         style = data.styles[cell.style];
     }
     const format = extractFormat(cell, data);
-    const exportedBorder = {};
-    if (cell.border) {
-        const border = data.borders[cell.border];
-        exportedBorder.left = convertBorderDescr(border.left);
-        exportedBorder.right = convertBorderDescr(border.right);
-        exportedBorder.bottom = convertBorderDescr(border.bottom);
-        exportedBorder.top = convertBorderDescr(border.top);
-    }
     const styles = {
         font: {
             size: (style === null || style === void 0 ? void 0 : style.fontSize) || DEFAULT_FONT_SIZE,
@@ -24724,7 +24708,7 @@ function extractStyle(cell, data) {
             }
             : { reservedAttribute: "none" },
         numFmt: format ? { format: format, id: 0 /* id not used for export */ } : undefined,
-        border: exportedBorder || {},
+        border: cell.border || 0,
         alignment: {
             vertical: "center",
             horizontal: style.align,
@@ -24753,23 +24737,19 @@ function extractFormat(cell, data) {
     return undefined;
 }
 function normalizeStyle(construct, styles) {
-    const { id: fontId } = pushElement(styles["font"], construct.fonts);
-    const { id: fillId } = pushElement(styles["fill"], construct.fills);
-    const { id: borderId } = pushElement(styles["border"], construct.borders);
     // Normalize this
     const numFmtId = convertFormat(styles["numFmt"], construct.numFmts);
     const style = {
-        fontId,
-        fillId,
-        borderId,
+        fontId: pushElement(styles.font, construct.fonts),
+        fillId: pushElement(styles.fill, construct.fills),
+        borderId: styles.border,
         numFmtId,
         alignment: {
             vertical: styles.alignment.vertical,
             horizontal: styles.alignment.horizontal,
         },
     };
-    const { id } = pushElement(style, construct.styles);
-    return id;
+    return pushElement(style, construct.styles);
 }
 function convertFormat(format, numFmtStructure) {
     if (!format) {
@@ -24777,8 +24757,7 @@ function convertFormat(format, numFmtStructure) {
     }
     let formatId = XLSX_FORMAT_MAP[format.format];
     if (!formatId) {
-        const { id } = pushElement(format, numFmtStructure);
-        formatId = id + FIRST_NUMFMT_ID;
+        formatId = pushElement(format, numFmtStructure) + FIRST_NUMFMT_ID;
     }
     return formatId;
 }
@@ -24803,20 +24782,15 @@ function addRelsToFile(relsFiles, path, rel) {
     return id;
 }
 function pushElement(property, propertyList) {
-    for (let [key, value] of Object.entries(propertyList)) {
-        if (JSON.stringify(value) === JSON.stringify(property)) {
-            return { id: parseInt(key, 10), list: propertyList };
+    let len = propertyList.length;
+    const operator = typeof property === "object" ? deepEquals : (a, b) => a === b;
+    for (let i = 0; i < len; i++) {
+        if (operator(property, propertyList[i])) {
+            return i;
         }
     }
-    let elemId = propertyList.findIndex((elem) => JSON.stringify(elem) === JSON.stringify(property));
-    if (elemId === -1) {
-        propertyList.push(property);
-        elemId = propertyList.length - 1;
-    }
-    return {
-        id: elemId,
-        list: propertyList,
-    };
+    propertyList[propertyList.length] = property;
+    return propertyList.length - 1;
 }
 const chartIds = [];
 /**
@@ -25490,7 +25464,25 @@ function parseXML(xmlString) {
     }
     return document;
 }
-function getDefaultXLSXStructure() {
+function convertBorderDescr(descr) {
+    if (!descr) {
+        return undefined;
+    }
+    return {
+        style: descr[0],
+        color: { rgb: descr[1] },
+    };
+}
+function getDefaultXLSXStructure(data) {
+    const xlsxBorders = Object.values(data.borders).map((border) => {
+        return {
+            left: convertBorderDescr(border.left),
+            right: convertBorderDescr(border.right),
+            bottom: convertBorderDescr(border.bottom),
+            top: convertBorderDescr(border.top),
+        };
+    });
+    const borders = [{}, ...xlsxBorders];
     return {
         relsFiles: [],
         sharedStrings: [],
@@ -25513,7 +25505,7 @@ function getDefaultXLSXStructure() {
             },
         ],
         fills: [{ reservedAttribute: "none" }, { reservedAttribute: "gray125" }],
-        borders: [{}],
+        borders,
         numFmts: [],
         dxfs: [],
     };
@@ -36992,12 +36984,13 @@ class SheetViewPlugin extends UIPlugin {
             case "AlterZoneCorner":
                 break;
             case "ZonesSelected":
+                const sheetId = this.getters.getActiveSheetId();
                 let { col, row } = findCellInNewZone(event.previousAnchor.zone, event.anchor.zone);
                 if (event.mode === "updateAnchor") {
                     const oldZone = event.previousAnchor.zone;
                     const newZone = event.anchor.zone;
                     // altering a zone should not move the viewport in a dimension that wasn't changed
-                    const { top, bottom, left, right } = this.getters.getActiveMainViewport();
+                    const { top, bottom, left, right } = this.getMainInternalViewport(sheetId);
                     if (oldZone.left === newZone.left && oldZone.right === newZone.right) {
                         col = left > col || col > right ? left : col;
                     }
@@ -37005,10 +36998,9 @@ class SheetViewPlugin extends UIPlugin {
                         row = top > row || row > bottom ? top : row;
                     }
                 }
-                const sheetId = this.getters.getActiveSheetId();
                 col = Math.min(col, this.getters.getNumberCols(sheetId) - 1);
                 row = Math.min(row, this.getters.getNumberRows(sheetId) - 1);
-                this.refreshViewport(this.getters.getActiveSheetId(), { col, row });
+                this.refreshViewport(sheetId, { col, row });
                 break;
         }
     }
@@ -37033,16 +37025,16 @@ class SheetViewPlugin extends UIPlugin {
                 this.setSheetViewOffset(cmd.offsetX, cmd.offsetY);
                 break;
             case "SHIFT_VIEWPORT_DOWN":
-                const { top } = this.getActiveMainViewport();
                 const sheetId = this.getters.getActiveSheetId();
-                const shiftedOffsetY = this.clipOffsetY(this.getters.getRowDimensions(sheetId, top).start + this.sheetViewHeight);
-                this.shiftVertically(shiftedOffsetY);
+                const { top, viewportHeight, offsetCorrectionY } = this.getMainInternalViewport(sheetId);
+                const topRowDims = this.getters.getRowDimensions(sheetId, top);
+                this.shiftVertically(topRowDims.start + viewportHeight - offsetCorrectionY);
                 break;
             case "SHIFT_VIEWPORT_UP": {
-                const { top } = this.getActiveMainViewport();
                 const sheetId = this.getters.getActiveSheetId();
-                const shiftedOffsetY = this.clipOffsetY(this.getters.getRowDimensions(sheetId, top).end - this.sheetViewHeight);
-                this.shiftVertically(shiftedOffsetY);
+                const { top, viewportHeight, offsetCorrectionY } = this.getMainInternalViewport(sheetId);
+                const topRowDims = this.getters.getRowDimensions(sheetId, top);
+                this.shiftVertically(topRowDims.end - offsetCorrectionY - viewportHeight);
                 break;
             }
             case "REMOVE_COLUMNS_ROWS":
@@ -37401,17 +37393,6 @@ class SheetViewPlugin extends UIPlugin {
         const { maxOffsetX, maxOffsetY } = this.getMaximumSheetOffset();
         Object.values(this.getSubViewports(sheetId)).forEach((viewport) => viewport.setViewportOffset(clip(offsetX, 0, maxOffsetX), clip(offsetY, 0, maxOffsetY)));
     }
-    /**
-     * Clip the vertical offset within the allowed range.
-     * Not above the sheet, nor below the sheet.
-     */
-    clipOffsetY(offsetY) {
-        const { height } = this.getMainViewportRect();
-        const maxOffset = height - this.sheetViewHeight;
-        offsetY = Math.min(offsetY, maxOffset);
-        offsetY = Math.max(offsetY, 0);
-        return offsetY;
-    }
     getViewportOffset(sheetId) {
         var _a, _b;
         return {
@@ -37465,12 +37446,15 @@ class SheetViewPlugin extends UIPlugin {
      * viewport top.
      */
     shiftVertically(offset) {
-        const { top } = this.getActiveMainViewport();
+        const sheetId = this.getters.getActiveSheetId();
+        const { top } = this.getMainInternalViewport(sheetId);
         const { scrollX } = this.getActiveSheetScrollInfo();
         this.setSheetViewOffset(scrollX, offset);
         const { anchor } = this.getters.getSelection();
-        const deltaRow = this.getActiveMainViewport().top - top;
-        this.selection.selectCell(anchor.cell.col, anchor.cell.row + deltaRow);
+        if (anchor.cell.row >= this.getters.getPaneDivisions(sheetId).ySplit) {
+            const deltaRow = this.getMainInternalViewport(sheetId).top - top;
+            this.selection.selectCell(anchor.cell.col, anchor.cell.row + deltaRow);
+        }
     }
     getVisibleFigures() {
         const sheetId = this.getters.getActiveSheetId();
@@ -41790,8 +41774,7 @@ function addContent(content, sharedStrings, forceString = false) {
         attrs.push(["t", "b"]);
     }
     else if (forceString || !isNumber(value)) {
-        const { id } = pushElement(content, sharedStrings);
-        value = id.toString();
+        value = pushElement(content, sharedStrings);
         attrs.push(["t", "s"]);
     }
     return { attrs, node: escapeXml /*xml*/ `<v>${value}</v>` };
@@ -41916,8 +41899,7 @@ function addCellIsRule(cf, rule, dxfs) {
     if (rule.style.fillColor) {
         dxf.fill = { fgColor: { rgb: rule.style.fillColor } };
     }
-    const { id } = pushElement(dxf, dxfs);
-    ruleAttributes.push(["dxfId", id]);
+    ruleAttributes.push(["dxfId", pushElement(dxf, dxfs)]);
     return escapeXml /*xml*/ `
     <conditionalFormatting sqref="${cf.ranges.join(" ")}">
       <cfRule ${formatAttributes(ruleAttributes)}>
@@ -42628,7 +42610,7 @@ function addSheetViews(sheet) {
  */
 function getXLSX(data) {
     const files = [];
-    const construct = getDefaultXLSXStructure();
+    const construct = getDefaultXLSXStructure(data);
     files.push(createWorkbook(data, construct));
     files.push(...createWorksheets(data, construct));
     files.push(createStylesSheet(construct));
@@ -43308,6 +43290,6 @@ function addFunction(functionName, functionDescription) {
 export { AbstractChart, CommandResult, CorePlugin, DATETIME_FORMAT, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, cellTypes, compile, components, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateEvaluationCommands, load, parse, readonlyAllowedCommands, registries, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.0.37';
-__info__.date = '2024-04-05T13:58:08.848Z';
-__info__.hash = 'e95827b';
+__info__.version = '16.0.38';
+__info__.date = '2024-04-10T12:16:41.911Z';
+__info__.hash = '6c7d510';