@odoo/o-spreadsheet 17.2.28 → 17.2.30

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.28
- * @date 2024-11-28T09:04:19.153Z
- * @hash fb1cbd8
+ * @version 17.2.30
+ * @date 2024-12-19T07:48:16.226Z
+ * @hash 9a9ae31
  */
 
 'use strict';
@@ -626,6 +626,7 @@ function removeFalsyAttributes(obj) {
  * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions/Character_Classes
  */
 const whiteSpaceSpecialCharacters = [
+    " ",
     "\t",
     "\f",
     "\v",
@@ -640,17 +641,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.
@@ -5163,7 +5162,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()) {
@@ -5310,12 +5309,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;
 }
@@ -18751,6 +18750,18 @@ 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"))],
+    returns: ["NUMBER"],
+    compute: function (value) {
+        return toNumber(value, this.locale);
+    },
+    isExported: true,
+};
 
 var text = /*#__PURE__*/Object.freeze({
   __proto__: null,
@@ -18773,7 +18784,8 @@ var text = /*#__PURE__*/Object.freeze({
   TEXT: TEXT,
   TEXTJOIN: TEXTJOIN,
   TRIM: TRIM,
-  UPPER: UPPER
+  UPPER: UPPER,
+  VALUE: VALUE
 });
 
 // -----------------------------------------------------------------------------
@@ -33515,6 +33527,7 @@ class FiguresContainer extends owl.Component {
         draggedFigure: undefined,
         horizontalSnap: undefined,
         verticalSnap: undefined,
+        cancelDnd: undefined,
     });
     setup() {
         owl.onMounted(() => {
@@ -33527,12 +33540,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;
     }
@@ -33651,7 +33680,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
@@ -33699,7 +33728,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);
@@ -37659,7 +37688,7 @@ function extractStyle(cell, data) {
             vertical: style.verticalAlign
                 ? V_ALIGNMENT_EXPORT_CONVERSION_MAP[style.verticalAlign]
                 : undefined,
-            wrapText: style.wrapping === "wrap",
+            wrapText: style.wrapping === "wrap" || cell.content?.includes(NEWLINE) ? true : undefined,
         },
     };
     styles.font["strike"] = !!style?.strikethrough || undefined;
@@ -38111,9 +38140,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 = {};
@@ -38955,15 +38983,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("");
         });
     }
 }
@@ -41857,7 +41880,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;
@@ -54179,6 +54202,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);
@@ -56149,7 +56173,7 @@ class ActionButton extends owl.Component {
     setup() {
         owl.onWillUpdateProps((nextProps) => {
             if (nextProps.action !== this.props.action) {
-                this.actionButton = createAction(this.props.action);
+                this.actionButton = createAction(nextProps.action);
             }
         });
     }
@@ -56416,7 +56440,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)}");
@@ -56458,6 +56481,7 @@ class TopBarComposer extends owl.Component {
         }
         return cssPropertiesToCss({
             "border-color": SELECTION_BORDER_COLOR,
+            "z-index": String(ComponentsImportance.TopBarComposer),
         });
     }
     get delimitation() {
@@ -60241,7 +60265,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)}
@@ -61006,6 +61035,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.2.28";
-__info__.date = "2024-11-28T09:04:19.153Z";
-__info__.hash = "fb1cbd8";
+__info__.version = "17.2.30";
+__info__.date = "2024-12-19T07:48:16.226Z";
+__info__.hash = "9a9ae31";

package/dist/o-spreadsheet.d.ts

@@ -7311,6 +7311,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

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.28
- * @date 2024-11-28T09:04:19.153Z
- * @hash fb1cbd8
+ * @version 17.2.30
+ * @date 2024-12-19T07:48:16.226Z
+ * @hash 9a9ae31
  */
 
 import { useEnv, useSubEnv, onWillUnmount, useComponent, status, Component, useRef, onMounted, useEffect, useState, onPatched, onWillPatch, onWillUpdateProps, useExternalListener, onWillStart, xml, useChildSubEnv, markRaw } from '@odoo/owl';
@@ -624,6 +624,7 @@ function removeFalsyAttributes(obj) {
  * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions/Character_Classes
  */
 const whiteSpaceSpecialCharacters = [
+    " ",
     "\t",
     "\f",
     "\v",
@@ -638,17 +639,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.
@@ -5161,7 +5160,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()) {
@@ -5308,12 +5307,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;
 }
@@ -18749,6 +18748,18 @@ 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"))],
+    returns: ["NUMBER"],
+    compute: function (value) {
+        return toNumber(value, this.locale);
+    },
+    isExported: true,
+};
 
 var text = /*#__PURE__*/Object.freeze({
   __proto__: null,
@@ -18771,7 +18782,8 @@ var text = /*#__PURE__*/Object.freeze({
   TEXT: TEXT,
   TEXTJOIN: TEXTJOIN,
   TRIM: TRIM,
-  UPPER: UPPER
+  UPPER: UPPER,
+  VALUE: VALUE
 });
 
 // -----------------------------------------------------------------------------
@@ -33513,6 +33525,7 @@ class FiguresContainer extends Component {
         draggedFigure: undefined,
         horizontalSnap: undefined,
         verticalSnap: undefined,
+        cancelDnd: undefined,
     });
     setup() {
         onMounted(() => {
@@ -33525,12 +33538,28 @@ class FiguresContainer extends Component {
             // new rendering
             this.render();
         });
+        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;
     }
@@ -33649,7 +33678,7 @@ class FiguresContainer extends 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
@@ -33697,7 +33726,7 @@ class FiguresContainer extends 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);
@@ -37657,7 +37686,7 @@ function extractStyle(cell, data) {
             vertical: style.verticalAlign
                 ? V_ALIGNMENT_EXPORT_CONVERSION_MAP[style.verticalAlign]
                 : undefined,
-            wrapText: style.wrapping === "wrap",
+            wrapText: style.wrapping === "wrap" || cell.content?.includes(NEWLINE) ? true : undefined,
         },
     };
     styles.font["strike"] = !!style?.strikethrough || undefined;
@@ -38109,9 +38138,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 = {};
@@ -38953,15 +38981,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("");
         });
     }
 }
@@ -41855,7 +41878,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;
@@ -54177,6 +54200,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);
@@ -56147,7 +56171,7 @@ class ActionButton extends Component {
     setup() {
         onWillUpdateProps((nextProps) => {
             if (nextProps.action !== this.props.action) {
-                this.actionButton = createAction(this.props.action);
+                this.actionButton = createAction(nextProps.action);
             }
         });
     }
@@ -56414,7 +56438,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)}");
@@ -56456,6 +56479,7 @@ class TopBarComposer extends Component {
         }
         return cssPropertiesToCss({
             "border-color": SELECTION_BORDER_COLOR,
+            "z-index": String(ComponentsImportance.TopBarComposer),
         });
     }
     get delimitation() {
@@ -60239,7 +60263,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)}
@@ -60963,6 +60992,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.28";
-__info__.date = "2024-11-28T09:04:19.153Z";
-__info__.hash = "fb1cbd8";
+__info__.version = "17.2.30";
+__info__.date = "2024-12-19T07:48:16.226Z";
+__info__.hash = "9a9ae31";