@odoo/o-spreadsheet 17.2.29 → 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.29
- * @date 2024-12-05T10:39:14.167Z
- * @hash 7b4b898
+ * @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;
 }
@@ -33528,6 +33527,7 @@ class FiguresContainer extends owl.Component {
         draggedFigure: undefined,
         horizontalSnap: undefined,
         verticalSnap: undefined,
+        cancelDnd: undefined,
     });
     setup() {
         owl.onMounted(() => {
@@ -33540,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;
     }
@@ -33664,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
@@ -33712,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);
@@ -37672,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;
@@ -38124,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 = {};
@@ -38968,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("");
         });
     }
 }
@@ -41870,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;
@@ -54192,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);
@@ -56429,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)}");
@@ -56471,6 +56481,7 @@ class TopBarComposer extends owl.Component {
         }
         return cssPropertiesToCss({
             "border-color": SELECTION_BORDER_COLOR,
+            "z-index": String(ComponentsImportance.TopBarComposer),
         });
     }
     get delimitation() {
@@ -60254,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)}
@@ -61019,6 +61035,6 @@ exports.tokenColors = tokenColors;
 exports.tokenize = tokenize;
 
 
-__info__.version = "17.2.29";
-__info__.date = "2024-12-05T10:39:14.167Z";
-__info__.hash = "7b4b898";
+__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.29
- * @date 2024-12-05T10:39:14.167Z
- * @hash 7b4b898
+ * @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;
 }
@@ -33526,6 +33525,7 @@ class FiguresContainer extends Component {
         draggedFigure: undefined,
         horizontalSnap: undefined,
         verticalSnap: undefined,
+        cancelDnd: undefined,
     });
     setup() {
         onMounted(() => {
@@ -33538,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;
     }
@@ -33662,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
@@ -33710,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);
@@ -37670,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;
@@ -38122,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 = {};
@@ -38966,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("");
         });
     }
 }
@@ -41868,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;
@@ -54190,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);
@@ -56427,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)}");
@@ -56469,6 +56479,7 @@ class TopBarComposer extends Component {
         }
         return cssPropertiesToCss({
             "border-color": SELECTION_BORDER_COLOR,
+            "z-index": String(ComponentsImportance.TopBarComposer),
         });
     }
     get delimitation() {
@@ -60252,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)}
@@ -60976,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.29";
-__info__.date = "2024-12-05T10:39:14.167Z";
-__info__.hash = "7b4b898";
+__info__.version = "17.2.30";
+__info__.date = "2024-12-19T07:48:16.226Z";
+__info__.hash = "9a9ae31";

package/dist/o-spreadsheet.iife.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.29
- * @date 2024-12-05T10:39:14.167Z
- * @hash 7b4b898
+ * @version 17.2.30
+ * @date 2024-12-19T07:48:16.226Z
+ * @hash 9a9ae31
  */
 
 (function (exports, owl) {
@@ -625,6 +625,7 @@
    * https://developer.mozilla.org/en-US/docs/Web/JavaScript/Guide/Regular_Expressions/Character_Classes
    */
   const whiteSpaceSpecialCharacters = [
+      " ",
       "\t",
       "\f",
       "\v",
@@ -639,17 +640,15 @@
       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.
@@ -5162,7 +5161,7 @@
   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()) {
@@ -5309,12 +5308,12 @@
       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;
   }
@@ -33527,6 +33526,7 @@ stores.inject(MyMetaStore, storeInstance);
           draggedFigure: undefined,
           horizontalSnap: undefined,
           verticalSnap: undefined,
+          cancelDnd: undefined,
       });
       setup() {
           owl.onMounted(() => {
@@ -33539,12 +33539,28 @@ stores.inject(MyMetaStore, storeInstance);
               // 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;
       }
@@ -33663,7 +33679,7 @@ stores.inject(MyMetaStore, storeInstance);
               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
@@ -33711,7 +33727,7 @@ stores.inject(MyMetaStore, storeInstance);
               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);
@@ -37671,7 +37687,7 @@ stores.inject(MyMetaStore, storeInstance);
               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;
@@ -38123,9 +38139,8 @@ stores.inject(MyMetaStore, storeInstance);
       }
       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 = {};
@@ -38967,15 +38982,10 @@ stores.inject(MyMetaStore, storeInstance);
       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("");
           });
       }
   }
@@ -41869,7 +41879,7 @@ stores.inject(MyMetaStore, storeInstance);
           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;
@@ -54191,6 +54201,7 @@ stores.inject(MyMetaStore, storeInstance);
                   break;
               case "DELETE_SHEET":
                   this.cleanViewports();
+                  this.sheetsWithDirtyViewports.delete(cmd.sheetId);
                   break;
               case "ACTIVATE_SHEET":
                   this.sheetsWithDirtyViewports.add(cmd.sheetIdTo);
@@ -56428,7 +56439,6 @@ stores.inject(MyMetaStore, storeInstance);
     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)}");
@@ -56470,6 +56480,7 @@ stores.inject(MyMetaStore, storeInstance);
           }
           return cssPropertiesToCss({
               "border-color": SELECTION_BORDER_COLOR,
+              "z-index": String(ComponentsImportance.TopBarComposer),
           });
       }
       get delimitation() {
@@ -60253,7 +60264,12 @@ stores.inject(MyMetaStore, storeInstance);
           ["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)}
@@ -61018,9 +61034,9 @@ stores.inject(MyMetaStore, storeInstance);
   exports.tokenize = tokenize;
 
 
-  __info__.version = "17.2.29";
-  __info__.date = "2024-12-05T10:39:14.167Z";
-  __info__.hash = "7b4b898";
+  __info__.version = "17.2.30";
+  __info__.date = "2024-12-19T07:48:16.226Z";
+  __info__.hash = "9a9ae31";
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);