@odoo/o-spreadsheet 17.4.15 → 17.4.17

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.4.15
- * @date 2024-12-05T10:40:45.905Z
- * @hash 9b13f22
+ * @version 17.4.17
+ * @date 2025-01-14T11:34:44.930Z
+ * @hash fd2a7ab
  */
 
 'use strict';
@@ -768,6 +768,7 @@ function removeFalsyAttributes(obj) {
  * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions/Character_Classes
  */
 const whiteSpaceSpecialCharacters = [
+    " ",
     "\t",
     "\f",
     "\v",
@@ -782,17 +783,15 @@ const whiteSpaceSpecialCharacters = [
     String.fromCharCode(parseInt("3000", 16)),
     String.fromCharCode(parseInt("feff", 16)),
 ];
-const whiteSpaceRegexp = new RegExp(whiteSpaceSpecialCharacters.join("|") + "|(\r\n|\r|\n)", "g");
+const whiteSpaceRegexp = new RegExp(whiteSpaceSpecialCharacters.join("|"), "g");
+const newLineRegexp = /(\r\n|\r)/g;
 /**
- * Replace all the special spaces in a string (non-breaking, tabs, ...) by normal spaces, and all the
- * different newlines types by \n.
+ * Replace all different newlines characters by \n
  */
-function replaceSpecialSpaces(text) {
+function replaceNewLines(text) {
     if (!text)
         return "";
-    if (!whiteSpaceRegexp.test(text))
-        return text;
-    return text.replace(whiteSpaceRegexp, (match, newLine) => (newLine ? NEWLINE : " "));
+    return text.replace(newLineRegexp, NEWLINE);
 }
 /**
  * Determine if the numbers are consecutive.
@@ -5684,7 +5683,7 @@ class BorderClipboardHandler extends AbstractCellClipboardHandler {
 const POSTFIX_UNARY_OPERATORS = ["%"];
 const OPERATORS = "+,-,*,/,:,=,<>,>=,>,<=,<,^,&".split(",").concat(POSTFIX_UNARY_OPERATORS);
 function tokenize(str, locale = DEFAULT_LOCALE) {
-    str = replaceSpecialSpaces(str);
+    str = replaceNewLines(str);
     const chars = new TokenizingChars(str);
     const result = [];
     while (!chars.isOver()) {
@@ -5831,12 +5830,12 @@ function tokenizeSpace(chars) {
     if (length) {
         return { type: "SPACE", value: NEWLINE.repeat(length) };
     }
-    while (chars.current === " ") {
-        length++;
-        chars.shift();
+    let spaces = "";
+    while (chars.current && chars.current.match(whiteSpaceRegexp)) {
+        spaces += chars.shift();
     }
-    if (length) {
-        return { type: "SPACE", value: " ".repeat(length) };
+    if (spaces) {
+        return { type: "SPACE", value: spaces };
     }
     return null;
 }
@@ -20368,6 +20367,17 @@ const TEXT = {
     },
     isExported: true,
 };
+// -----------------------------------------------------------------------------
+// VALUE
+// -----------------------------------------------------------------------------
+const VALUE = {
+    description: _t("Converts a string to a numeric value."),
+    args: [arg("value (number)", _t("the string to be converted"))],
+    compute: function (value) {
+        return toNumber(value, this.locale);
+    },
+    isExported: true,
+};
 
 var text = /*#__PURE__*/Object.freeze({
   __proto__: null,
@@ -20390,7 +20400,8 @@ var text = /*#__PURE__*/Object.freeze({
   TEXT: TEXT,
   TEXTJOIN: TEXTJOIN,
   TRIM: TRIM,
-  UPPER: UPPER
+  UPPER: UPPER,
+  VALUE: VALUE
 });
 
 // -----------------------------------------------------------------------------
@@ -20647,14 +20658,11 @@ autoCompleteProviders.add("functions", {
 });
 
 class DOMFocusableElementStore {
-    mutators = ["setFocusableElement", "focus"];
+    mutators = ["setFocusableElement"];
     focusableElement = undefined;
     setFocusableElement(element) {
         this.focusableElement = element;
     }
-    focus() {
-        this.focusableElement?.focus();
-    }
 }
 
 /**
@@ -24682,7 +24690,11 @@ function createGaugeChartRuntime(chart, getters) {
     colors.push(chartColors.upperColor);
     return {
         background: getters.getStyleOfSingleCellChart(chart.background, dataRange).background,
-        title: chart.title ?? { text: "" },
+        title: {
+            ...chart.title,
+            // chart titles are extracted from .json files and they are translated at runtime here
+            text: _t(chart.title.text ?? ""),
+        },
         minValue: {
             value: minValue,
             label: formatValue(minValue, { locale, format }),
@@ -38566,6 +38578,7 @@ css /* scss */ `
     }
   }
 `;
+const DEFAULT_TABLE_STYLE_COLOR = "#3C78D8";
 class TableStyleEditorPanel extends owl.Component {
     static template = "o-spreadsheet-TableStyleEditorPanel";
     static components = { Section, RoundColorPicker, TableStylePreview };
@@ -38584,7 +38597,7 @@ class TableStyleEditorPanel extends owl.Component {
             : null;
         return {
             pickerOpened: false,
-            primaryColor: editedStyle?.primaryColor || "#3C78D8",
+            primaryColor: editedStyle?.primaryColor || DEFAULT_TABLE_STYLE_COLOR,
             selectedTemplateName: editedStyle?.templateName || "lightColoredText",
             styleName: editedStyle?.displayName || this.env.model.getters.getNewCustomTableStyleName(),
         };
@@ -38593,7 +38606,7 @@ class TableStyleEditorPanel extends owl.Component {
         this.state.pickerOpened = !this.state.pickerOpened;
     }
     onColorPicked(color) {
-        this.state.primaryColor = color;
+        this.state.primaryColor = isColorValid(color) ? color : DEFAULT_TABLE_STYLE_COLOR;
         this.state.pickerOpened = false;
     }
     onTemplatePicked(templateName) {
@@ -39421,7 +39434,7 @@ class GridComposer extends owl.Component {
             this.isEditing = isEditing;
             if (!isEditing) {
                 this.rect = this.defaultRect;
-                this.DOMFocusableElementStore.focus();
+                this.DOMFocusableElementStore.focusableElement?.focus();
                 return;
             }
             const position = this.env.model.getters.getActivePosition();
@@ -39940,6 +39953,7 @@ class FiguresContainer extends owl.Component {
         draggedFigure: undefined,
         horizontalSnap: undefined,
         verticalSnap: undefined,
+        cancelDnd: undefined,
     });
     setup() {
         owl.onMounted(() => {
@@ -39952,12 +39966,28 @@ class FiguresContainer extends owl.Component {
             // new rendering
             this.render();
         });
+        owl.onWillUpdateProps(() => {
+            const sheetId = this.env.model.getters.getActiveSheetId();
+            const draggedFigureId = this.dnd.draggedFigure?.id;
+            if (draggedFigureId && !this.env.model.getters.getFigure(sheetId, draggedFigureId)) {
+                if (this.dnd.cancelDnd) {
+                    this.dnd.cancelDnd();
+                }
+                this.dnd.draggedFigure = undefined;
+                this.dnd.horizontalSnap = undefined;
+                this.dnd.verticalSnap = undefined;
+                this.dnd.cancelDnd = undefined;
+            }
+        });
     }
     getVisibleFigures() {
         const visibleFigures = this.env.model.getters.getVisibleFigures();
         if (this.dnd.draggedFigure &&
             !visibleFigures.some((figure) => figure.id === this.dnd.draggedFigure?.id)) {
-            visibleFigures.push(this.env.model.getters.getFigure(this.env.model.getters.getActiveSheetId(), this.dnd.draggedFigure?.id));
+            const draggedFigure = this.env.model.getters.getFigure(this.env.model.getters.getActiveSheetId(), this.dnd.draggedFigure?.id);
+            if (draggedFigure) {
+                visibleFigures.push(draggedFigure);
+            }
         }
         return visibleFigures;
     }
@@ -40076,7 +40106,7 @@ class FiguresContainer extends owl.Component {
             this.dnd.verticalSnap = undefined;
             this.env.model.dispatch("UPDATE_FIGURE", { sheetId, id: figure.id, x, y });
         };
-        startDnd(onMouseMove, onMouseUp);
+        this.dnd.cancelDnd = startDnd(onMouseMove, onMouseUp);
     }
     /**
      * Initialize the resize of a figure with mouse movements
@@ -40124,7 +40154,7 @@ class FiguresContainer extends owl.Component {
             this.dnd.horizontalSnap = undefined;
             this.dnd.verticalSnap = undefined;
         };
-        startDnd(onMouseMove, onMouseUp);
+        this.dnd.cancelDnd = startDnd(onMouseMove, onMouseUp);
     }
     getOtherFigures(figId) {
         return this.getVisibleFigures().filter((f) => f.id !== figId);
@@ -42444,7 +42474,7 @@ class Grid extends owl.Component {
         this.cellPopovers = useStore(CellPopoverStore);
         owl.useEffect(() => {
             if (!this.sidePanel.isOpen) {
-                this.DOMFocusableElementStore.focus();
+                this.DOMFocusableElementStore.focusableElement?.focus();
             }
         }, () => [this.sidePanel.isOpen]);
     }
@@ -42648,7 +42678,7 @@ class Grid extends owl.Component {
     focusDefaultElement() {
         if (!this.env.model.getters.getSelectedFigureId() &&
             this.composerStore.editionMode === "inactive") {
-            this.DOMFocusableElementStore.focus();
+            this.DOMFocusableElementStore.focusableElement?.focus();
         }
     }
     get gridEl() {
@@ -44265,7 +44295,7 @@ function extractStyle(cell, data) {
             vertical: style.verticalAlign
                 ? V_ALIGNMENT_EXPORT_CONVERSION_MAP[style.verticalAlign]
                 : undefined,
-            wrapText: style.wrapping === "wrap" || undefined,
+            wrapText: style.wrapping === "wrap" || cell.content?.includes(NEWLINE) ? true : undefined,
         },
     };
     styles.font["strike"] = !!style?.strikethrough || undefined;
@@ -44488,7 +44518,7 @@ function convertFigure(figure, id, sheetData) {
     return undefined;
 }
 function isChartData(data) {
-    return "dataSets" in data;
+    return "dataSets" in data && data.dataSets.length > 0;
 }
 function isImageData(data) {
     return "imageSrc" in data;
@@ -44726,9 +44756,8 @@ function convertRows(sheet, numberOfRows, headerGroups) {
     }
     return rows;
 }
-/** Remove newlines (\n) in shared strings, We do not support them */
 function convertSharedStrings(xlsxSharedStrings) {
-    return xlsxSharedStrings.map((str) => str.replace(/\n/g, ""));
+    return xlsxSharedStrings.map(replaceNewLines);
 }
 function convertCells(sheet, data, sheetDims, warningManager) {
     const cells = {};
@@ -45497,15 +45526,10 @@ class XlsxMiscExtractor extends XlsxBaseExtractor {
     getSharedStrings() {
         return this.mapOnElements({ parent: this.rootFile.file.xml, query: "si" }, (ssElement) => {
             // Shared string can either be a simple text, or a rich text (text with formatting, possibly in multiple parts)
-            if (ssElement.children[0].tagName === "t") {
-                return this.extractTextContent(ssElement) || "";
-            }
             // We don't support rich text formatting, we'll only extract the text
-            else {
-                return this.mapOnElements({ parent: ssElement, query: "t" }, (textElement) => {
-                    return this.extractTextContent(textElement) || "";
-                }).join("");
-            }
+            return this.mapOnElements({ parent: ssElement, query: "t" }, (textElement) => {
+                return this.extractTextContent(textElement) || "";
+            }).join("");
         });
     }
 }
@@ -47379,10 +47403,34 @@ class BordersPlugin extends CorePlugin {
                 const elements = [...cmd.elements].sort((a, b) => b - a);
                 for (const group of groupConsecutive(elements)) {
                     if (cmd.dimension === "COL") {
-                        this.shiftBordersHorizontally(cmd.sheetId, group[group.length - 1] + 1, -group.length);
+                        if (group[0] >= this.getters.getNumberCols(cmd.sheetId)) {
+                            for (let row = 0; row < this.getters.getNumberRows(cmd.sheetId); row++) {
+                                this.history.update("borders", cmd.sheetId, group[0] + 1, row, "vertical", undefined);
+                            }
+                        }
+                        if (group[group.length - 1] === 0) {
+                            for (let row = 0; row < this.getters.getNumberRows(cmd.sheetId); row++) {
+                                this.history.update("borders", cmd.sheetId, 0, row, "vertical", undefined);
+                            }
+                        }
+                        const zone = this.getters.getColsZone(cmd.sheetId, group[group.length - 1] + 1, group[0]);
+                        this.clearInsideBorders(cmd.sheetId, [zone]);
+                        this.shiftBordersHorizontally(cmd.sheetId, group[0] + 1, -group.length);
                     }
                     else {
-                        this.shiftBordersVertically(cmd.sheetId, group[group.length - 1] + 1, -group.length);
+                        if (group[0] >= this.getters.getNumberRows(cmd.sheetId)) {
+                            for (let col = 0; col < this.getters.getNumberCols(cmd.sheetId); col++) {
+                                this.history.update("borders", cmd.sheetId, col, group[0] + 1, "horizontal", undefined);
+                            }
+                        }
+                        if (group[group.length - 1] === 0) {
+                            for (let col = 0; col < this.getters.getNumberCols(cmd.sheetId); col++) {
+                                this.history.update("borders", cmd.sheetId, col, 0, "horizontal", undefined);
+                            }
+                        }
+                        const zone = this.getters.getRowsZone(cmd.sheetId, group[group.length - 1] + 1, group[0]);
+                        this.clearInsideBorders(cmd.sheetId, [zone]);
+                        this.shiftBordersVertically(cmd.sheetId, group[0] + 1, -group.length);
                     }
                 }
                 break;
@@ -47689,6 +47737,18 @@ class BordersPlugin extends CorePlugin {
             }
         }
     }
+    /**
+     * Remove the borders inside of a zone
+     */
+    clearInsideBorders(sheetId, zones) {
+        for (let zone of zones) {
+            for (let row = zone.top; row <= zone.bottom; row++) {
+                for (let col = zone.left; col <= zone.right; col++) {
+                    this.history.update("borders", sheetId, col, row, undefined);
+                }
+            }
+        }
+    }
     /**
      * Add a border to the existing one to a cell
      */
@@ -48236,7 +48296,7 @@ class CellPlugin extends CorePlugin {
         const before = this.getters.getCell({ sheetId, col, row });
         const hasContent = "content" in after || "formula" in after;
         // Compute the new cell properties
-        const afterContent = hasContent ? replaceSpecialSpaces(after?.content) : before?.content || "";
+        const afterContent = hasContent ? replaceNewLines(after?.content) : before?.content || "";
         let style;
         if (after.style !== undefined) {
             style = after.style || undefined;
@@ -51097,6 +51157,9 @@ class SheetPlugin extends CorePlugin {
         };
     }
     getUnboundedZone(sheetId, zone) {
+        if (zone.bottom === undefined || zone.right === undefined) {
+            return zone;
+        }
         const isFullRow = zone.left === 0 && zone.right === this.getNumberCols(sheetId) - 1;
         const isFullCol = zone.top === 0 && zone.bottom === this.getNumberRows(sheetId) - 1;
         return {
@@ -57515,6 +57578,9 @@ class Session extends EventBus {
             }
         }
         this.acknowledge(message);
+        if (message.type === "REMOTE_REVISION" && message.clientId === this.clientId) {
+            return;
+        }
         this.trigger("collaborative-event-received");
     }
     onClientMoved(message) {
@@ -61306,6 +61372,7 @@ class SheetViewPlugin extends UIPlugin {
                 break;
             case "DELETE_SHEET":
                 this.cleanViewports();
+                this.sheetsWithDirtyViewports.delete(cmd.sheetId);
                 break;
             case "ACTIVATE_SHEET":
                 this.sheetsWithDirtyViewports.add(cmd.sheetIdTo);
@@ -62267,11 +62334,6 @@ class BottomBarSheet extends owl.Component {
     editionState = "initializing";
     DOMFocusableElementStore;
     setup() {
-        owl.onMounted(() => {
-            if (this.isSheetActive) {
-                this.scrollToSheet();
-            }
-        });
         owl.onPatched(() => {
             if (this.sheetNameRef.el && this.state.isEditing && this.editionState === "initializing") {
                 this.editionState = "editing";
@@ -62279,6 +62341,11 @@ class BottomBarSheet extends owl.Component {
             }
         });
         this.DOMFocusableElementStore = useStore(DOMFocusableElementStore);
+        owl.useEffect((sheetId) => {
+            if (this.props.sheetId === sheetId) {
+                this.scrollToSheet();
+            }
+        }, () => [this.env.model.getters.getActiveSheetId()]);
     }
     focusInputAndSelectContent() {
         if (!this.state.isEditing || !this.sheetNameRef.el)
@@ -62290,7 +62357,10 @@ class BottomBarSheet extends owl.Component {
         }
     }
     scrollToSheet() {
-        this.sheetDivRef.el?.scrollIntoView?.();
+        this.sheetDivRef.el?.scrollIntoView?.({
+            behavior: "smooth",
+            inline: "nearest",
+        });
     }
     onFocusOut() {
         if (this.state.isEditing && this.editionState !== "initializing") {
@@ -62320,11 +62390,11 @@ class BottomBarSheet extends owl.Component {
         if (ev.key === "Enter") {
             ev.preventDefault();
             this.stopEdition();
-            this.DOMFocusableElementStore.focus();
+            this.DOMFocusableElementStore.focusableElement?.focus();
         }
         if (ev.key === "Escape") {
             this.cancelEdition();
-            this.DOMFocusableElementStore.focus();
+            this.DOMFocusableElementStore.focusableElement?.focus();
         }
     }
     onMouseEventSheetName(ev) {
@@ -63729,7 +63799,6 @@ css /* scss */ `
     height: fit-content;
     margin-top: -1px;
     border: 1px solid;
-    z-index: ${ComponentsImportance.TopBarComposer};
 
     .o-composer:empty:not(:focus):not(.active)::before {
       content: url("data:image/svg+xml,${encodeURIComponent(FX_SVG)}");
@@ -63771,6 +63840,7 @@ class TopBarComposer extends owl.Component {
         }
         return cssPropertiesToCss({
             "border-color": SELECTION_BORDER_COLOR,
+            "z-index": String(ComponentsImportance.TopBarComposer),
         });
     }
     get delimitation() {
@@ -67859,7 +67929,12 @@ function createSharedStrings(strings) {
         ["count", strings.length],
         ["uniqueCount", strings.length],
     ];
-    const stringNodes = strings.map((string) => escapeXml /*xml*/ `<si><t>${string}</t></si>`);
+    const stringNodes = strings.map((string) => {
+        if (string.trim() !== string) {
+            return escapeXml /*xml*/ `<si><t xml:space="preserve">${string}</t></si>`;
+        }
+        return escapeXml /*xml*/ `<si><t>${string}</t></si>`;
+    });
     const xml = escapeXml /*xml*/ `
     <sst ${formatAttributes(namespaces)}>
       ${joinXmlNodes(stringNodes)}
@@ -68596,6 +68671,8 @@ const helpers = {
     areDomainArgsFieldsValid,
     formatTickValue,
     sanitizeSheetName,
+    isNumber,
+    isDateTime,
 };
 const links = {
     isMarkdownLink,
@@ -68726,6 +68803,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.4.15";
-__info__.date = "2024-12-05T10:40:45.905Z";
-__info__.hash = "9b13f22";
+__info__.version = "17.4.17";
+__info__.date = "2025-01-14T11:34:44.930Z";
+__info__.hash = "fd2a7ab";

package/dist/o-spreadsheet.d.ts

@@ -2671,6 +2671,10 @@ declare class BordersPlugin extends CorePlugin<BordersPluginState> implements Bo
      * Remove the borders of a zone
      */
     private clearBorders;
+    /**
+     * Remove the borders inside of a zone
+     */
+    private clearInsideBorders;
     /**
      * Add a border to the existing one to a cell
      */
@@ -5534,6 +5538,7 @@ declare class DateTime {
     setMinutes(minutes: number): number;
     setSeconds(seconds: number): number;
 }
+declare function isDateTime(str: string, locale: Locale): boolean;
 
 /**
  * Formats a cell value with its format.
@@ -5573,6 +5578,13 @@ declare function lazy<T>(fn: (() => T) | T): Lazy<T>;
  */
 declare function deepEquals(o1: any, o2: any): boolean;
 
+/**
+ * Return true if the argument is a "number string".
+ *
+ * Note that "" (empty string) does not count as a number string
+ */
+declare function isNumber(value: string | undefined, locale: Locale): boolean;
+
 interface ConstructorArgs {
     readonly zone: Readonly<Zone | UnboundedZone>;
     readonly parts: readonly RangePart[];
@@ -8285,6 +8297,7 @@ interface DndState {
     draggedFigure?: Figure;
     horizontalSnap?: Snap<HFigureAxisType>;
     verticalSnap?: Snap<VFigureAxisType>;
+    cancelDnd: (() => void) | undefined;
 }
 /**
  * Each figure ⭐ is positioned inside a container `div` placed and sized
@@ -11534,6 +11547,8 @@ declare const helpers: {
     areDomainArgsFieldsValid: typeof areDomainArgsFieldsValid;
     formatTickValue: typeof formatTickValue;
     sanitizeSheetName: typeof sanitizeSheetName;
+    isNumber: typeof isNumber;
+    isDateTime: typeof isDateTime;
 };
 declare const links: {
     isMarkdownLink: typeof isMarkdownLink;