@odoo/o-spreadsheet 17.2.2 → 17.2.3

package/dist/o-spreadsheet.cjs.js

@@ -3,9 +3,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.2.2
- * @date 2024-04-05T14:01:19.824Z
- * @hash c15836d
+ * @version 17.2.3
+ * @date 2024-04-10T12:28:36.552Z
+ * @hash ab5e22d
  */
 
 'use strict';
@@ -562,7 +562,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) {
@@ -31969,6 +31969,7 @@ class Composer extends owl.Component {
         onComposerCellFocused: { type: Function, optional: true },
         onComposerContentFocused: Function,
         isDefaultFocus: { type: Boolean, optional: true },
+        onInputContextMenu: { type: Function, optional: true },
     };
     static components = { TextValueProvider, FunctionDescriptionProvider };
     static defaultProps = {
@@ -32019,6 +32020,9 @@ class Composer extends owl.Component {
                 assistantStyle.right = `0px`;
             }
         }
+        else if (this.props.delimitation) {
+            assistantStyle["max-height"] = `${this.props.delimitation.height}px`;
+        }
         return cssPropertiesToCss(assistantStyle);
     }
     // we can't allow input events to be triggered while we remove and add back the content of the composer in processContent
@@ -32305,6 +32309,11 @@ class Composer extends owl.Component {
             }
         }
     }
+    onContextMenu(ev) {
+        if (this.composerStore.editionMode === "inactive") {
+            this.props.onInputContextMenu?.(ev);
+        }
+    }
     // ---------------------------------------------------------------------------
     // Private
     // ---------------------------------------------------------------------------
@@ -32526,6 +32535,7 @@ class GridComposer extends owl.Component {
     static template = "o-spreadsheet-GridComposer";
     static props = {
         gridDims: Object,
+        onInputContextMenu: Function,
     };
     static components = { Composer };
     rect = this.defaultRect;
@@ -32573,6 +32583,7 @@ class GridComposer extends owl.Component {
             isDefaultFocus: true,
             onComposerContentFocused: () => this.composerFocusStore.focusGridComposerContent(),
             onComposerCellFocused: (content) => this.composerFocusStore.focusGridComposerCell(content),
+            onInputContextMenu: this.props.onInputContextMenu,
         };
     }
     get containerStyle() {
@@ -37295,29 +37306,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,
@@ -37331,7 +37325,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
@@ -37353,15 +37347,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,
@@ -37369,8 +37360,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) {
@@ -37378,8 +37368,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;
 }
@@ -37404,20 +37393,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 = [];
 /**
@@ -38212,7 +38196,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: [],
@@ -38235,7 +38237,7 @@ function getDefaultXLSXStructure() {
             },
         ],
         fills: [{ reservedAttribute: "none" }, { reservedAttribute: "gray125" }],
-        borders: [{}],
+        borders,
         numFmts: [],
         dxfs: [],
     };
@@ -45272,7 +45274,15 @@ class TablePlugin extends CorePlugin {
         }
     }
     exportForExcel(data) {
-        this.export(data);
+        for (const sheet of data.sheets) {
+            for (const table of this.getTables(sheet.id)) {
+                if (zoneToDimension(table.range.zone).numberOfRows === 1) {
+                    continue;
+                }
+                const tableData = { range: zoneToXc(table.range.zone), filters: [] };
+                sheet.tables.push(tableData);
+            }
+        }
     }
 }
 
@@ -47044,7 +47054,9 @@ class Evaluator {
         this.blockedArrayFormulas = this.createEmptyPositionSet();
         this.spreadingRelations = new SpreadingRelation(this.createEmptyPositionSet.bind(this));
         this.formulaDependencies = lazy(() => {
-            const dependencies = [...this.getAllCells()].flatMap((position) => this.getDirectDependencies(position).map((range) => ({
+            const dependencies = [...this.getAllCells()].flatMap((position) => this.getDirectDependencies(position)
+                .filter((range) => !range.invalidSheetName && !range.invalidXc)
+                .map((range) => ({
                 data: position,
                 boundingBox: {
                     zone: range.zone,
@@ -55689,6 +55701,13 @@ class TopBarComposer extends owl.Component {
             "border-color": SELECTION_BORDER_COLOR,
         });
     }
+    get delimitation() {
+        const { width, height } = this.env.model.getters.getSheetViewDimensionWithHeaders();
+        return {
+            width,
+            height,
+        };
+    }
     onFocus(selection) {
         this.composerFocusStore.focusTopBarComposer(selection);
     }
@@ -58320,8 +58339,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>` };
@@ -58446,8 +58464,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)}>
@@ -59277,7 +59294,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));
@@ -60212,6 +60229,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.2.2";
-__info__.date = "2024-04-05T14:01:19.824Z";
-__info__.hash = "c15836d";
+__info__.version = "17.2.3";
+__info__.date = "2024-04-10T12:28:36.552Z";
+__info__.hash = "ab5e22d";

package/dist/o-spreadsheet.d.ts

@@ -6685,6 +6685,7 @@ interface ComposerProps {
     delimitation?: DOMDimension;
     onComposerContentFocused: () => void;
     onComposerCellFocused?: (content: String) => void;
+    onInputContextMenu?: (event: MouseEvent) => void;
     isDefaultFocus?: boolean;
 }
 interface ComposerState {
@@ -6728,6 +6729,10 @@ declare class Composer extends Component<ComposerProps, SpreadsheetChildEnv> {
             type: BooleanConstructor;
             optional: boolean;
         };
+        onInputContextMenu: {
+            type: FunctionConstructor;
+            optional: boolean;
+        };
     };
     static components: {
         TextValueProvider: typeof TextValueProvider;
@@ -6784,6 +6789,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.
@@ -7088,6 +7094,7 @@ declare class ClientTag extends Component<ClientTagProps, SpreadsheetChildEnv> {
 
 interface Props$s {
     gridDims: DOMDimension;
+    onInputContextMenu: (event: MouseEvent) => void;
 }
 /**
  * This component is a composer which positions itself on the grid at the anchor cell.
@@ -7097,6 +7104,7 @@ declare class GridComposer extends Component<Props$s, SpreadsheetChildEnv> {
     static template: string;
     static props: {
         gridDims: ObjectConstructor;
+        onInputContextMenu: FunctionConstructor;
     };
     static components: {
         Composer: typeof Composer;
@@ -8830,6 +8838,7 @@ declare class TopBarComposer extends Component<any, SpreadsheetChildEnv> {
     get focus(): Omit<ComposerFocusType, "cellFocus">;
     get composerStyle(): string;
     get containerStyle(): string;
+    get delimitation(): DOMDimension;
     onFocus(selection: ComposerSelection): void;
 }
 

package/dist/o-spreadsheet.esm.js

@@ -3,9 +3,9 @@
 /**
  * This file is generated by o-spreadsheet build tools. Do not edit it.
  * @see https://github.com/odoo/o-spreadsheet
- * @version 17.2.2
- * @date 2024-04-05T14:01:19.824Z
- * @hash c15836d
+ * @version 17.2.3
+ * @date 2024-04-10T12:28:36.552Z
+ * @hash ab5e22d
  */
 
 import { reactive, useEnv, useSubEnv, useState, onWillUnmount, markRaw, toRaw, Component, useRef, onMounted, useEffect, onPatched, useComponent, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv } from '@odoo/owl';
@@ -560,7 +560,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) {
@@ -31967,6 +31967,7 @@ class Composer extends Component {
         onComposerCellFocused: { type: Function, optional: true },
         onComposerContentFocused: Function,
         isDefaultFocus: { type: Boolean, optional: true },
+        onInputContextMenu: { type: Function, optional: true },
     };
     static components = { TextValueProvider, FunctionDescriptionProvider };
     static defaultProps = {
@@ -32017,6 +32018,9 @@ class Composer extends Component {
                 assistantStyle.right = `0px`;
             }
         }
+        else if (this.props.delimitation) {
+            assistantStyle["max-height"] = `${this.props.delimitation.height}px`;
+        }
         return cssPropertiesToCss(assistantStyle);
     }
     // we can't allow input events to be triggered while we remove and add back the content of the composer in processContent
@@ -32303,6 +32307,11 @@ class Composer extends Component {
             }
         }
     }
+    onContextMenu(ev) {
+        if (this.composerStore.editionMode === "inactive") {
+            this.props.onInputContextMenu?.(ev);
+        }
+    }
     // ---------------------------------------------------------------------------
     // Private
     // ---------------------------------------------------------------------------
@@ -32524,6 +32533,7 @@ class GridComposer extends Component {
     static template = "o-spreadsheet-GridComposer";
     static props = {
         gridDims: Object,
+        onInputContextMenu: Function,
     };
     static components = { Composer };
     rect = this.defaultRect;
@@ -32571,6 +32581,7 @@ class GridComposer extends Component {
             isDefaultFocus: true,
             onComposerContentFocused: () => this.composerFocusStore.focusGridComposerContent(),
             onComposerCellFocused: (content) => this.composerFocusStore.focusGridComposerCell(content),
+            onInputContextMenu: this.props.onInputContextMenu,
         };
     }
     get containerStyle() {
@@ -37293,29 +37304,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,
@@ -37329,7 +37323,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
@@ -37351,15 +37345,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,
@@ -37367,8 +37358,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) {
@@ -37376,8 +37366,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;
 }
@@ -37402,20 +37391,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 = [];
 /**
@@ -38210,7 +38194,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: [],
@@ -38233,7 +38235,7 @@ function getDefaultXLSXStructure() {
             },
         ],
         fills: [{ reservedAttribute: "none" }, { reservedAttribute: "gray125" }],
-        borders: [{}],
+        borders,
         numFmts: [],
         dxfs: [],
     };
@@ -45270,7 +45272,15 @@ class TablePlugin extends CorePlugin {
         }
     }
     exportForExcel(data) {
-        this.export(data);
+        for (const sheet of data.sheets) {
+            for (const table of this.getTables(sheet.id)) {
+                if (zoneToDimension(table.range.zone).numberOfRows === 1) {
+                    continue;
+                }
+                const tableData = { range: zoneToXc(table.range.zone), filters: [] };
+                sheet.tables.push(tableData);
+            }
+        }
     }
 }
 
@@ -47042,7 +47052,9 @@ class Evaluator {
         this.blockedArrayFormulas = this.createEmptyPositionSet();
         this.spreadingRelations = new SpreadingRelation(this.createEmptyPositionSet.bind(this));
         this.formulaDependencies = lazy(() => {
-            const dependencies = [...this.getAllCells()].flatMap((position) => this.getDirectDependencies(position).map((range) => ({
+            const dependencies = [...this.getAllCells()].flatMap((position) => this.getDirectDependencies(position)
+                .filter((range) => !range.invalidSheetName && !range.invalidXc)
+                .map((range) => ({
                 data: position,
                 boundingBox: {
                     zone: range.zone,
@@ -55687,6 +55699,13 @@ class TopBarComposer extends Component {
             "border-color": SELECTION_BORDER_COLOR,
         });
     }
+    get delimitation() {
+        const { width, height } = this.env.model.getters.getSheetViewDimensionWithHeaders();
+        return {
+            width,
+            height,
+        };
+    }
     onFocus(selection) {
         this.composerFocusStore.focusTopBarComposer(selection);
     }
@@ -58318,8 +58337,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>` };
@@ -58444,8 +58462,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)}>
@@ -59275,7 +59292,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));
@@ -60169,6 +60186,6 @@ const constants = {
 export { AbstractCellClipboardHandler, AbstractChart, AbstractFigureClipboardHandler, CellErrorType, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, addRenderingLayer, astToFormula, compile, compileTokens, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, hooks, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, parseTokens, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, stores, tokenColors, tokenize };
 
 
-__info__.version = "17.2.2";
-__info__.date = "2024-04-05T14:01:19.824Z";
-__info__.hash = "c15836d";
+__info__.version = "17.2.3";
+__info__.date = "2024-04-10T12:28:36.552Z";
+__info__.hash = "ab5e22d";