@odoo/o-spreadsheet 17.0.17 → 17.0.18

package/dist/o-spreadsheet.cjs.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.0.17
- * @date 2024-04-05T13:59:37.139Z
- * @hash 33f09d7
+ * @version 17.0.18
+ * @date 2024-04-10T13:28:23.664Z
+ * @hash 6294758
  */
 
 'use strict';
@@ -650,7 +650,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
     for (const key in o2) {
         if (!(key in o1) && o2[key] !== undefined) {
@@ -26964,6 +26964,11 @@ class Composer extends owl.Component {
             }
         }
     }
+    onContextMenu(ev) {
+        if (this.env.model.getters.getEditionMode() === "inactive") {
+            this.props.onInputContextMenu?.(ev);
+        }
+    }
     // ---------------------------------------------------------------------------
     // Private
     // ---------------------------------------------------------------------------
@@ -27201,6 +27206,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;
@@ -27276,6 +27282,7 @@ class GridComposer extends owl.Component {
             isDefaultFocus: true,
             onComposerContentFocused: this.props.onComposerContentFocused,
             onComposerCellFocused: this.props.onComposerCellFocused,
+            onInputContextMenu: this.props.onInputContextMenu,
         };
     }
     get containerStyle() {
@@ -27364,6 +27371,7 @@ GridComposer.props = {
     onComposerContentFocused: Function,
     gridDims: Object,
     onComposerCellFocused: Function,
+    onInputContextMenu: Function,
 };
 
 const CSS$1 = css /* scss */ `
@@ -31317,29 +31325,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,
@@ -31353,7 +31344,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
@@ -31375,15 +31366,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,
@@ -31391,8 +31379,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) {
@@ -31400,8 +31387,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;
 }
@@ -31426,20 +31412,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 = [];
 /**
@@ -32160,7 +32141,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: [],
@@ -32183,7 +32182,7 @@ function getDefaultXLSXStructure() {
             },
         ],
         fills: [{ reservedAttribute: "none" }, { reservedAttribute: "gray125" }],
-        borders: [{}],
+        borders,
         numFmts: [],
         dxfs: [],
     };
@@ -37369,7 +37368,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: [],
+                });
+            }
+        }
     }
 }
 
@@ -41098,7 +41107,9 @@ class Evaluator {
         this.blockedArrayFormulas = new Set();
         this.spreadingRelations = new SpreadingRelation();
         this.formulaDependencies = lazy(() => {
-            const dependencies = [...this.getAllCells()].flatMap((positionId) => this.getDirectDependencies(positionId).map((range) => ({
+            const dependencies = [...this.getAllCells()].flatMap((positionId) => this.getDirectDependencies(positionId)
+                .filter((range) => !range.invalidSheetName && !range.invalidXc)
+                .map((range) => ({
                 data: positionId,
                 boundingBox: {
                     zone: range.zone,
@@ -55236,8 +55247,7 @@ function addContent(content, sharedStrings, forceString = false) {
         attrs.push(["t", "b"]);
     }
     else if (forceString || !isNumber(value, DEFAULT_LOCALE)) {
-        const { id } = pushElement(content, sharedStrings);
-        value = id.toString();
+        value = pushElement(content, sharedStrings);
         attrs.push(["t", "s"]);
     }
     return { attrs, node: escapeXml /*xml*/ `<v>${value}</v>` };
@@ -55362,8 +55372,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)}>
@@ -56172,7 +56181,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));
@@ -57052,6 +57061,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.0.17";
-__info__.date = "2024-04-05T13:59:37.139Z";
-__info__.hash = "33f09d7";
+__info__.version = "17.0.18";
+__info__.date = "2024-04-10T13:28:23.664Z";
+__info__.hash = "6294758";

package/dist/o-spreadsheet.d.ts

@@ -7207,6 +7207,7 @@ interface ComposerProps {
     delimitation?: DOMDimension;
     onComposerContentFocused: () => void;
     onComposerCellFocused?: (content: String) => void;
+    onInputContextMenu?: (event: MouseEvent) => void;
     isDefaultFocus?: boolean;
 }
 interface ComposerState$1 {
@@ -7280,6 +7281,7 @@ declare class Composer extends Component<ComposerProps, SpreadsheetChildEnv> {
     onMousedown(ev: MouseEvent): void;
     onClick(): void;
     onDblClick(): void;
+    onContextMenu(ev: MouseEvent): void;
     private processContent;
     /**
      * Get the HTML content corresponding to the current composer token, divided by lines.
@@ -7461,6 +7463,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.

package/dist/o-spreadsheet.esm.js

@@ -2,9 +2,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.0.17
- * @date 2024-04-05T13:59:37.139Z
- * @hash 33f09d7
+ * @version 17.0.18
+ * @date 2024-04-10T13:28:23.664Z
+ * @hash 6294758
  */
 
 import { Component, useRef, onMounted, useEffect, onWillPatch, useState, onWillUpdateProps, onPatched, useComponent, useExternalListener, onWillUnmount, onWillStart, xml, useChildSubEnv, useSubEnv, markRaw } from '@odoo/owl';
@@ -648,7 +648,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
     for (const key in o2) {
         if (!(key in o1) && o2[key] !== undefined) {
@@ -26962,6 +26962,11 @@ class Composer extends Component {
             }
         }
     }
+    onContextMenu(ev) {
+        if (this.env.model.getters.getEditionMode() === "inactive") {
+            this.props.onInputContextMenu?.(ev);
+        }
+    }
     // ---------------------------------------------------------------------------
     // Private
     // ---------------------------------------------------------------------------
@@ -27199,6 +27204,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;
@@ -27274,6 +27280,7 @@ class GridComposer extends Component {
             isDefaultFocus: true,
             onComposerContentFocused: this.props.onComposerContentFocused,
             onComposerCellFocused: this.props.onComposerCellFocused,
+            onInputContextMenu: this.props.onInputContextMenu,
         };
     }
     get containerStyle() {
@@ -27362,6 +27369,7 @@ GridComposer.props = {
     onComposerContentFocused: Function,
     gridDims: Object,
     onComposerCellFocused: Function,
+    onInputContextMenu: Function,
 };
 
 const CSS$1 = css /* scss */ `
@@ -31315,29 +31323,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,
@@ -31351,7 +31342,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
@@ -31373,15 +31364,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,
@@ -31389,8 +31377,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) {
@@ -31398,8 +31385,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;
 }
@@ -31424,20 +31410,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 = [];
 /**
@@ -32158,7 +32139,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: [],
@@ -32181,7 +32180,7 @@ function getDefaultXLSXStructure() {
             },
         ],
         fills: [{ reservedAttribute: "none" }, { reservedAttribute: "gray125" }],
-        borders: [{}],
+        borders,
         numFmts: [],
         dxfs: [],
     };
@@ -37367,7 +37366,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: [],
+                });
+            }
+        }
     }
 }
 
@@ -41096,7 +41105,9 @@ class Evaluator {
         this.blockedArrayFormulas = new Set();
         this.spreadingRelations = new SpreadingRelation();
         this.formulaDependencies = lazy(() => {
-            const dependencies = [...this.getAllCells()].flatMap((positionId) => this.getDirectDependencies(positionId).map((range) => ({
+            const dependencies = [...this.getAllCells()].flatMap((positionId) => this.getDirectDependencies(positionId)
+                .filter((range) => !range.invalidSheetName && !range.invalidXc)
+                .map((range) => ({
                 data: positionId,
                 boundingBox: {
                     zone: range.zone,
@@ -55234,8 +55245,7 @@ function addContent(content, sharedStrings, forceString = false) {
         attrs.push(["t", "b"]);
     }
     else if (forceString || !isNumber(value, DEFAULT_LOCALE)) {
-        const { id } = pushElement(content, sharedStrings);
-        value = id.toString();
+        value = pushElement(content, sharedStrings);
         attrs.push(["t", "s"]);
     }
     return { attrs, node: escapeXml /*xml*/ `<v>${value}</v>` };
@@ -55360,8 +55370,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)}>
@@ -56170,7 +56179,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));
@@ -57015,6 +57024,6 @@ const constants = {
 export { AbstractChart, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, compileTokens, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, hooks, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, tokenize };
 
 
-__info__.version = "17.0.17";
-__info__.date = "2024-04-05T13:59:37.139Z";
-__info__.hash = "33f09d7";
+__info__.version = "17.0.18";
+__info__.date = "2024-04-10T13:28:23.664Z";
+__info__.hash = "6294758";