@odoo/o-spreadsheet 16.3.31 → 16.3.33

package/dist/o-spreadsheet.cjs.js

@@ -1127,7 +1127,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));
@@ -6286,6 +6286,7 @@ class LinkEditor extends owl.Component {
                     this.save();
                 }
                 ev.stopPropagation();
+                ev.preventDefault();
                 break;
             case "Escape":
                 this.cancel();
@@ -9474,9 +9475,12 @@ const INSERT_LINK_NAME = (env) => {
 // Filters action
 //------------------------------------------------------------------------------
 const FILTERS_CREATE_FILTER_TABLE = (env) => {
+    const zones = env.model.getters.getSelectedZones();
+    if (zones.length === 1 && getZoneArea(zones[0]) === 1) {
+        env.model.selection.selectTableAroundSelection();
+    }
     const sheetId = env.model.getters.getActiveSheetId();
-    const selection = env.model.getters.getSelection().zones;
-    interactiveAddFilter(env, sheetId, selection);
+    interactiveAddFilter(env, sheetId, env.model.getters.getSelectedZones());
 };
 const FILTERS_REMOVE_FILTER_TABLE = (env) => {
     const sheetId = env.model.getters.getActiveSheetId();
@@ -21340,6 +21344,11 @@ class Composer extends owl.Component {
     onBlur() {
         this.isKeyStillDown = false;
     }
+    onContextMenu(ev) {
+        if (this.env.model.getters.getEditionMode() === "inactive") {
+            this.props.onInputContextMenu?.(ev);
+        }
+    }
     // ---------------------------------------------------------------------------
     // Private
     // ---------------------------------------------------------------------------
@@ -21561,6 +21570,7 @@ Composer.props = {
     onComposerCellFocused: { type: Function, optional: true },
     onComposerContentFocused: Function,
     isDefaultFocus: { type: Boolean, optional: true },
+    onInputContextMenu: { type: Function, optional: true },
 };
 
 const COMPOSER_BORDER_WIDTH = 3 * 0.4 * window.devicePixelRatio || 1;
@@ -21637,6 +21647,7 @@ class GridComposer extends owl.Component {
             isDefaultFocus: true,
             onComposerContentFocused: this.props.onComposerContentFocused,
             onComposerCellFocused: this.props.onComposerCellFocused,
+            onInputContextMenu: this.props.onInputContextMenu,
         };
     }
     get containerStyle() {
@@ -21725,6 +21736,7 @@ GridComposer.props = {
     onComposerContentFocused: Function,
     gridDims: Object,
     onComposerCellFocused: Function,
+    onInputContextMenu: Function,
 };
 
 const CSS$1 = css /* scss */ `
@@ -24060,8 +24072,8 @@ class Grid extends owl.Component {
         else if (this.env.model.getters.getActiveRows().has(row)) {
             type = "ROW";
         }
-        const { x, y, width, height } = this.env.model.getters.getVisibleRect(lastZone);
-        this.toggleContextMenu(type, x + width, y + height);
+        const { x, y, width } = this.env.model.getters.getVisibleRect(lastZone);
+        this.toggleContextMenu(type, this.canvasPosition.x + x + width, this.canvasPosition.y + y);
     }
     onCellRightClicked(col, row, { x, y }) {
         const zones = this.env.model.getters.getSelectedZones();
@@ -26388,29 +26400,12 @@ function convertWidthFromExcel(width) {
         return width;
     return Math.round((width / WIDTH_FACTOR) * 100) / 100;
 }
-function convertBorderDescr(descr) {
-    if (!descr) {
-        return undefined;
-    }
-    return {
-        style: descr.style,
-        color: { rgb: descr.color },
-    };
-}
 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?.fontSize || DEFAULT_FONT_SIZE,
@@ -26424,7 +26419,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: {
             horizontal: style.align,
             vertical: style.verticalAlign
@@ -26456,15 +26451,12 @@ 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,
@@ -26472,8 +26464,7 @@ function normalizeStyle(construct, styles) {
             wrapText: styles.alignment.wrapText,
         },
     };
-    const { id } = pushElement(style, construct.styles);
-    return id;
+    return pushElement(style, construct.styles);
 }
 function convertFormat(format, numFmtStructure) {
     if (!format) {
@@ -26481,8 +26472,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;
 }
@@ -26507,20 +26497,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 = [];
 /**
@@ -27226,7 +27211,25 @@ function parseXML(xmlString, mimeType = "text/xml") {
     }
     return document;
 }
-function getDefaultXLSXStructure() {
+function convertBorderDescr(descr) {
+    if (!descr) {
+        return undefined;
+    }
+    return {
+        style: descr.style,
+        color: { rgb: descr.color },
+    };
+}
+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: [],
@@ -27249,7 +27252,7 @@ function getDefaultXLSXStructure() {
             },
         ],
         fills: [{ reservedAttribute: "none" }, { reservedAttribute: "gray125" }],
-        borders: [{}],
+        borders,
         numFmts: [],
         dxfs: [],
     };
@@ -31200,7 +31203,17 @@ class FiltersPlugin extends CorePlugin {
         }
     }
     exportForExcel(data) {
-        this.export(data);
+        for (const sheet of data.sheets) {
+            for (const filterTable of this.getFilterTables(sheet.id)) {
+                if (zoneToDimension(filterTable.zone).numberOfRows === 1) {
+                    continue;
+                }
+                sheet.filterTables.push({
+                    range: zoneToXc(filterTable.zone),
+                    filters: [],
+                });
+            }
+        }
     }
 }
 
@@ -35068,12 +35081,13 @@ class SheetViewPlugin extends UIPlugin {
             case "AlterZone":
                 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;
                     }
@@ -35081,10 +35095,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;
         }
     }
@@ -35108,16 +35121,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":
@@ -35479,17 +35492,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) {
         return {
             x: this.viewports[sheetId]?.bottomRight.offsetScrollbarX || 0,
@@ -35545,12 +35547,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();
@@ -43100,7 +43105,6 @@ css /* scss */ `
     cursor: pointer;
   }
 `;
-let tKey = 1;
 class SpreadsheetDashboard extends owl.Component {
     static template = "o-spreadsheet-SpreadsheetDashboard";
     static components = {
@@ -43178,13 +43182,9 @@ class SpreadsheetDashboard extends owl.Component {
                     coordinates: rect,
                     position: { col, row },
                     action,
-                    // we can't rely on position only because a row or a column could
-                    // be inserted at any time.
-                    tKey: `${tKey}-${col}-${row}`,
                 });
             }
         }
-        tKey++;
         return cells;
     }
     getClickableAction(position) {
@@ -46322,8 +46322,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>` };
@@ -46448,8 +46447,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)}>
@@ -47253,7 +47251,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));
@@ -48094,6 +48092,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.3.31';
-__info__.date = '2024-04-05T13:57:05.657Z';
-__info__.hash = '052efd4';
+__info__.version = '16.3.33';
+__info__.date = '2024-04-18T16:36:40.811Z';
+__info__.hash = '89f04ea';

package/dist/o-spreadsheet.d.ts

@@ -4089,11 +4089,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;
     /**
@@ -6093,7 +6088,6 @@ interface ClickableCell {
     coordinates: Rect;
     position: Position$1;
     action: (position: CellPosition, env: SpreadsheetChildEnv) => void;
-    tKey: string;
 }
 declare class SpreadsheetDashboard extends Component<Props$e, SpreadsheetChildEnv> {
     static template: string;
@@ -6570,6 +6564,7 @@ interface ComposerProps {
     delimitation?: DOMDimension;
     onComposerContentFocused: () => void;
     onComposerCellFocused?: (content: String) => void;
+    onInputContextMenu?: (event: MouseEvent) => void;
     isDefaultFocus?: boolean;
 }
 interface ComposerState$1 {
@@ -6630,6 +6625,7 @@ declare class Composer extends Component<ComposerProps, SpreadsheetChildEnv> {
     onMousedown(ev: MouseEvent): void;
     onClick(): void;
     onBlur(): void;
+    onContextMenu(ev: MouseEvent): void;
     private processContent;
     /**
      * Get the HTML content corresponding to the current composer token, divided by lines.
@@ -6797,6 +6793,7 @@ interface Props$5 {
     onComposerContentFocused: () => void;
     onComposerCellFocused: () => void;
     gridDims: DOMDimension;
+    onInputContextMenu: (event: MouseEvent) => void;
 }
 /**
  * This component is a composer which positions itself on the grid at the anchor cell.