@odoo/o-spreadsheet 16.4.6 → 16.4.7

package/dist/o-spreadsheet.cjs.js

@@ -614,13 +614,17 @@ function getAddHeaderStartIndex(position, base) {
     return position === "after" ? base + 1 : base;
 }
 /**
- * Compare two objects.
+ * Compares two objects.
  */
 function deepEquals(o1, o2) {
     if (o1 === o2)
         return true;
     if ((o1 && !o2) || (o2 && !o1))
         return false;
+    if (typeof o1 !== typeof o2)
+        return false;
+    if (typeof o1 !== "object")
+        return o1 === o2;
     // Objects can have different keys if the values are undefined
     const keys = new Set();
     Object.keys(o1).forEach((key) => keys.add(key));
@@ -5265,6 +5269,7 @@ css /* scss */ `
     padding: 10px;
     width: ${ERROR_TOOLTIP_WIDTH}px;
     box-sizing: border-box !important;
+    overflow-wrap: break-word;
   }
 `;
 class ErrorToolTip extends owl.Component {
@@ -15120,13 +15125,42 @@ function isValidLocale(locale) {
     }
     return true;
 }
-/** Change a content string to its canonical form (en_US locale) */
+/**
+ * Change a content string from the given locale to its canonical form (en_US locale). Don't convert date string.
+ *
+ * @example
+ * canonicalizeNumberContent("=SUM(1,5; 02/12/2012)", FR_LOCALE) // "=SUM(1.5, 02/12/2012)"
+ * canonicalizeNumberContent("125,9", FR_LOCALE) // "125.9"
+ * canonicalizeNumberContent("02/12/2012", FR_LOCALE) // "02/12/2012"
+ */
+function canonicalizeNumberContent(content, locale) {
+    return content.startsWith("=")
+        ? canonicalizeFormula$1(content, locale)
+        : canonicalizeNumberLiteral(content, locale);
+}
+/**
+ * Change a content string from the given locale to its canonical form (en_US locale). Also convert date string.
+ * This is destructive and won't preserve the original format.
+ *
+ * @example
+ * canonicalizeContent("=SUM(1,5; 5)", FR_LOCALE) // "=SUM(1.5, 5)"
+ * canonicalizeContent("125,9", FR_LOCALE) // "125.9"
+ * canonicalizeContent("02/12/2012", FR_LOCALE) // "12/02/2012"
+ * canonicalizeContent("02-12-2012", FR_LOCALE) // "12/02/2012"
+ */
 function canonicalizeContent(content, locale) {
     return content.startsWith("=")
         ? canonicalizeFormula$1(content, locale)
-        : toCanonicalNumberString(content, locale);
+        : canonicalizeLiteral(content, locale);
 }
-/** Change the content of a cell to its canonical form (en_US locale) */
+/**
+ * Change a content string from its canonical form (en_US locale) to the given locale. Also convert date string.
+ *
+ * @example
+ * localizeContent("=SUM(1.5, 5)", FR_LOCALE) // "=SUM(1,5; 5)"
+ * localizeContent("125.9", FR_LOCALE) // "125,9"
+ * localizeContent("12/02/2012", FR_LOCALE) // "02/12/2012"
+ */
 function localizeContent(content, locale) {
     return content.startsWith("=")
         ? localizeFormula(content, locale)
@@ -15161,24 +15195,75 @@ function _localizeFormula$1(formula, fromLocale, toLocale) {
     return localizedFormula;
 }
 /**
- *  Replace localized number with localized decimal separator by a number with "." as decimal separator
+ * Change a literal string from the given locale to its canonical form (en_US locale). Don't convert date string.
+ *
+ * @example
+ * canonicalizeNumberLiteral("125,9", FR_LOCALE) // "125.9"
+ * canonicalizeNumberLiteral("02/12/2012", FR_LOCALE) // "02/12/2012"
  */
-function toCanonicalNumberString(content, locale) {
+function canonicalizeNumberLiteral(content, locale) {
     if (locale.decimalSeparator === "." || !isNumber(content, locale)) {
         return content;
     }
     return content.replace(locale.decimalSeparator, ".");
 }
-function localizeLiteral(content, locale) {
-    if (locale.decimalSeparator === "." || !isNumber(content, DEFAULT_LOCALE)) {
-        return content;
+/**
+ * Change a content string from the given locale to its canonical form (en_US locale). Also convert date string.
+ * This is destructive and won't preserve the original format.
+ *
+ * @example
+ * canonicalizeLiteral("125,9", FR_LOCALE) // "125.9"
+ * canonicalizeLiteral("02/12/2012", FR_LOCALE) // "12/02/2012"
+ * canonicalizeLiteral("02-12-2012", FR_LOCALE) // "12/02/2012"
+ */
+function canonicalizeLiteral(content, locale) {
+    if (isDateTime(content, locale)) {
+        const dateNumber = toNumber(content, locale);
+        let format = DEFAULT_LOCALE.dateFormat;
+        if (!Number.isInteger(dateNumber)) {
+            format += " " + DEFAULT_LOCALE.timeFormat;
+        }
+        return formatValue(dateNumber, { locale: DEFAULT_LOCALE, format });
+    }
+    return canonicalizeNumberLiteral(content, locale);
+}
+/**
+ * Change a literal string from its canonical form (en_US locale) to the given locale. Don't convert date string.
+ * This is destructive and won't preserve the original format.
+ *
+ * @example
+ * localizeNumberLiteral("125.9", FR_LOCALE) // "125,9"
+ * localizeNumberLiteral("12/02/2012", FR_LOCALE) // "12/02/2012"
+ * localizeNumberLiteral("12-02-2012", FR_LOCALE) // "12/02/2012"
+ */
+function localizeNumberLiteral(literal, locale) {
+    if (locale.decimalSeparator === "." || !isNumber(literal, DEFAULT_LOCALE)) {
+        return literal;
     }
     const decimalNumberRegex = getDecimalNumberRegex(DEFAULT_LOCALE);
-    const localized = content.replace(decimalNumberRegex, (match) => {
+    const localized = literal.replace(decimalNumberRegex, (match) => {
         return match.replace(".", locale.decimalSeparator);
     });
     return localized;
 }
+/**
+ * Change a literal string from its canonical form (en_US locale) to the given locale. Also convert date string.
+ *
+ * @example
+ * localizeLiteral("125.9", FR_LOCALE) // "125,9"
+ * localizeLiteral("12/02/2012", FR_LOCALE) // "02/12/2012"
+ */
+function localizeLiteral(literal, locale) {
+    if (isDateTime(literal, DEFAULT_LOCALE)) {
+        const dateNumber = toNumber(literal, DEFAULT_LOCALE);
+        let format = locale.dateFormat;
+        if (!Number.isInteger(dateNumber)) {
+            format += " " + locale.timeFormat;
+        }
+        return formatValue(dateNumber, { locale, format });
+    }
+    return localizeNumberLiteral(literal, locale);
+}
 function canonicalizeCFRule(cf, locale) {
     return changeCFRuleLocale(cf, (content) => canonicalizeContent(content, locale));
 }
@@ -15535,7 +15620,9 @@ class LinkEditor extends owl.Component {
     save() {
         const { col, row } = this.props.cellPosition;
         const locale = this.env.model.getters.getLocale();
-        const label = this.link.label ? canonicalizeContent(this.link.label, locale) : this.link.url;
+        const label = this.link.label
+            ? canonicalizeNumberContent(this.link.label, locale)
+            : this.link.url;
         this.env.model.dispatch("UPDATE_CELL", {
             col: col,
             row: row,
@@ -25305,9 +25392,11 @@ function useCellHovered(env, gridRef, callback) {
         }
     }
     function updateMousePosition(e) {
-        x = e.offsetX;
-        y = e.offsetY;
-        lastMoved = Date.now();
+        if (gridRef.el === e.target) {
+            x = e.offsetX;
+            y = e.offsetY;
+            lastMoved = Date.now();
+        }
     }
     function recompute() {
         const { col, row } = getPosition();
@@ -36680,8 +36769,7 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
             if (cell.type === CellValueType.error) {
                 return false;
             }
-            const locale = this.getters.getLocale();
-            const values = rule.values.map((val) => parseLiteral(val, locale));
+            const values = rule.values.map((val) => parseLiteral(val, DEFAULT_LOCALE));
             switch (rule.operator) {
                 case "IsEmpty":
                     return cell.value.toString().trim() === "";
@@ -38765,7 +38853,7 @@ class FindAndReplacePlugin extends UIPlugin {
         const replaceRegex = new RegExp(this.currentSearchRegex.source, this.currentSearchRegex.flags + "g");
         const toReplace = this.getSearchableString({ sheetId, col, row });
         const content = toReplace.replace(replaceRegex, replaceWith);
-        const canonicalContent = canonicalizeContent(content, this.getters.getLocale());
+        const canonicalContent = canonicalizeNumberContent(content, this.getters.getLocale());
         this.dispatch("UPDATE_CELL", { sheetId, col, row, content: canonicalContent });
     }
     /**
@@ -40939,7 +41027,7 @@ class SplitToColumnsPlugin extends UIPlugin {
                     sheetId,
                     col: col + index,
                     row,
-                    content: canonicalizeContent(content, this.getters.getLocale()),
+                    content: canonicalizeNumberContent(content, this.getters.getLocale()),
                     format: "",
                     style: mainCell?.style || null,
                 });
@@ -41125,6 +41213,7 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
     cells;
     copiedTables;
     zones;
+    uuidGenerator = new UuidGenerator();
     constructor(zones, operation, getters, dispatch, selection) {
         super(operation, getters, dispatch, selection);
         if (!zones.length) {
@@ -41586,8 +41675,9 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
                         this.adaptCFRules(origin.sheetId, cf, [xc], toRemoveRange);
                     }
                     else {
-                        this.adaptCFRules(target.sheetId, cf, [xc], []);
                         this.adaptCFRules(origin.sheetId, cf, [], toRemoveRange);
+                        const cfToCopyTo = this.getCFToCopyTo(target.sheetId, cf);
+                        this.adaptCFRules(target.sheetId, cfToCopyTo, [xc], []);
                     }
                 }
             }
@@ -41611,6 +41701,12 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
             sheetId,
         });
     }
+    getCFToCopyTo(targetSheetId, originCF) {
+        const cfInTarget = this.getters
+            .getConditionalFormats(targetSheetId)
+            .find((cf) => cf.stopIfTrue === originCF.stopIfTrue && deepEquals(cf.rule, originCF.rule));
+        return cfInTarget ? cfInTarget : { ...originCF, id: this.uuidGenerator.uuidv4(), ranges: [] };
+    }
 }
 
 /** State of the clipboard when copying/cutting figures */
@@ -41742,7 +41838,7 @@ class ClipboardFigureImage {
 function canonicalizeNumberValue(content, locale) {
     return content.startsWith("=")
         ? canonicalizeFormula(content, locale)
-        : toCanonicalNumberString(content, locale);
+        : canonicalizeNumberLiteral(content, locale);
 }
 /** Change a formula to its canonical form (en_US locale) */
 function canonicalizeFormula(formula, locale) {
@@ -41859,7 +41955,7 @@ class ClipboardPlugin extends UIPlugin {
     allowDispatch(cmd) {
         switch (cmd.type) {
             case "CUT":
-                const zones = cmd.cutTarget || this.getters.getSelectedZones();
+                const zones = this.getters.getSelectedZones();
                 const state = this.getClipboardState(zones, cmd.type);
                 return state.isCutAllowed(zones);
             case "PASTE":
@@ -41894,7 +41990,7 @@ class ClipboardPlugin extends UIPlugin {
         switch (cmd.type) {
             case "COPY":
             case "CUT":
-                const zones = ("cutTarget" in cmd && cmd.cutTarget) || this.getters.getSelectedZones();
+                const zones = this.getters.getSelectedZones();
                 this.state = this.getClipboardState(zones, cmd.type);
                 this.status = "visible";
                 this.originSheetId = this.getters.getActiveSheetId();
@@ -42544,7 +42640,7 @@ class EditionPlugin extends UIPlugin {
             if (content) {
                 const sheetId = this.getters.getActiveSheetId();
                 const cell = this.getters.getEvaluatedCell({ sheetId, col: this.col, row: this.row });
-                content = canonicalizeContent(content, this.getters.getLocale());
+                content = canonicalizeNumberContent(content, this.getters.getLocale());
                 if (content.startsWith("=")) {
                     const left = this.currentTokens.filter((t) => t.type === "LEFT_PAREN").length;
                     const right = this.currentTokens.filter((t) => t.type === "RIGHT_PAREN").length;
@@ -43565,26 +43661,24 @@ class GridSelectionPlugin extends UIPlugin {
         const isBasedBefore = cmd.base < start;
         const deltaCol = isBasedBefore && isCol ? thickness : 0;
         const deltaRow = isBasedBefore && !isCol ? thickness : 0;
-        this.dispatch("CUT", {
-            cutTarget: [
-                {
-                    left: isCol ? start + deltaCol : 0,
-                    right: isCol ? end + deltaCol : this.getters.getNumberCols(cmd.sheetId) - 1,
-                    top: !isCol ? start + deltaRow : 0,
-                    bottom: !isCol ? end + deltaRow : this.getters.getNumberRows(cmd.sheetId) - 1,
-                },
-            ],
-        });
-        this.dispatch("PASTE", {
-            target: [
-                {
-                    left: isCol ? cmd.base : 0,
-                    right: isCol ? cmd.base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
-                    top: !isCol ? cmd.base : 0,
-                    bottom: !isCol ? cmd.base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
-                },
-            ],
-        });
+        const target = [
+            {
+                left: isCol ? start + deltaCol : 0,
+                right: isCol ? end + deltaCol : this.getters.getNumberCols(cmd.sheetId) - 1,
+                top: !isCol ? start + deltaRow : 0,
+                bottom: !isCol ? end + deltaRow : this.getters.getNumberRows(cmd.sheetId) - 1,
+            },
+        ];
+        const state = new ClipboardCellsState(target, "CUT", this.getters, this.dispatch, this.selection);
+        const pasteTarget = [
+            {
+                left: isCol ? cmd.base : 0,
+                right: isCol ? cmd.base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
+                top: !isCol ? cmd.base : 0,
+                bottom: !isCol ? cmd.base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
+            },
+        ];
+        state.paste(pasteTarget, { selectTarget: true });
         const toRemove = isBasedBefore ? cmd.elements.map((el) => el + thickness) : cmd.elements;
         let currentIndex = cmd.base;
         for (const element of toRemove) {
@@ -50602,6 +50696,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.4.6';
-__info__.date = '2023-09-12T11:43:54.243Z';
-__info__.hash = '5746355';
+__info__.version = '16.4.7';
+__info__.date = '2023-09-21T15:58:11.039Z';
+__info__.hash = 'eccdcce';

package/dist/o-spreadsheet.d.ts

@@ -1897,8 +1897,6 @@ interface CopyCommand {
 }
 interface CutCommand {
     type: "CUT";
-    /** Zones to cut. If none were given, will copy the zones in the selection*/
-    cutTarget?: Zone[];
 }
 interface PasteCommand {
     type: "PASTE";

package/dist/o-spreadsheet.esm.js

@@ -610,13 +610,17 @@ function getAddHeaderStartIndex(position, base) {
     return position === "after" ? base + 1 : base;
 }
 /**
- * Compare two objects.
+ * Compares two objects.
  */
 function deepEquals(o1, o2) {
     if (o1 === o2)
         return true;
     if ((o1 && !o2) || (o2 && !o1))
         return false;
+    if (typeof o1 !== typeof o2)
+        return false;
+    if (typeof o1 !== "object")
+        return o1 === o2;
     // Objects can have different keys if the values are undefined
     const keys = new Set();
     Object.keys(o1).forEach((key) => keys.add(key));
@@ -5261,6 +5265,7 @@ css /* scss */ `
     padding: 10px;
     width: ${ERROR_TOOLTIP_WIDTH}px;
     box-sizing: border-box !important;
+    overflow-wrap: break-word;
   }
 `;
 class ErrorToolTip extends Component {
@@ -15116,13 +15121,42 @@ function isValidLocale(locale) {
     }
     return true;
 }
-/** Change a content string to its canonical form (en_US locale) */
+/**
+ * Change a content string from the given locale to its canonical form (en_US locale). Don't convert date string.
+ *
+ * @example
+ * canonicalizeNumberContent("=SUM(1,5; 02/12/2012)", FR_LOCALE) // "=SUM(1.5, 02/12/2012)"
+ * canonicalizeNumberContent("125,9", FR_LOCALE) // "125.9"
+ * canonicalizeNumberContent("02/12/2012", FR_LOCALE) // "02/12/2012"
+ */
+function canonicalizeNumberContent(content, locale) {
+    return content.startsWith("=")
+        ? canonicalizeFormula$1(content, locale)
+        : canonicalizeNumberLiteral(content, locale);
+}
+/**
+ * Change a content string from the given locale to its canonical form (en_US locale). Also convert date string.
+ * This is destructive and won't preserve the original format.
+ *
+ * @example
+ * canonicalizeContent("=SUM(1,5; 5)", FR_LOCALE) // "=SUM(1.5, 5)"
+ * canonicalizeContent("125,9", FR_LOCALE) // "125.9"
+ * canonicalizeContent("02/12/2012", FR_LOCALE) // "12/02/2012"
+ * canonicalizeContent("02-12-2012", FR_LOCALE) // "12/02/2012"
+ */
 function canonicalizeContent(content, locale) {
     return content.startsWith("=")
         ? canonicalizeFormula$1(content, locale)
-        : toCanonicalNumberString(content, locale);
+        : canonicalizeLiteral(content, locale);
 }
-/** Change the content of a cell to its canonical form (en_US locale) */
+/**
+ * Change a content string from its canonical form (en_US locale) to the given locale. Also convert date string.
+ *
+ * @example
+ * localizeContent("=SUM(1.5, 5)", FR_LOCALE) // "=SUM(1,5; 5)"
+ * localizeContent("125.9", FR_LOCALE) // "125,9"
+ * localizeContent("12/02/2012", FR_LOCALE) // "02/12/2012"
+ */
 function localizeContent(content, locale) {
     return content.startsWith("=")
         ? localizeFormula(content, locale)
@@ -15157,24 +15191,75 @@ function _localizeFormula$1(formula, fromLocale, toLocale) {
     return localizedFormula;
 }
 /**
- *  Replace localized number with localized decimal separator by a number with "." as decimal separator
+ * Change a literal string from the given locale to its canonical form (en_US locale). Don't convert date string.
+ *
+ * @example
+ * canonicalizeNumberLiteral("125,9", FR_LOCALE) // "125.9"
+ * canonicalizeNumberLiteral("02/12/2012", FR_LOCALE) // "02/12/2012"
  */
-function toCanonicalNumberString(content, locale) {
+function canonicalizeNumberLiteral(content, locale) {
     if (locale.decimalSeparator === "." || !isNumber(content, locale)) {
         return content;
     }
     return content.replace(locale.decimalSeparator, ".");
 }
-function localizeLiteral(content, locale) {
-    if (locale.decimalSeparator === "." || !isNumber(content, DEFAULT_LOCALE)) {
-        return content;
+/**
+ * Change a content string from the given locale to its canonical form (en_US locale). Also convert date string.
+ * This is destructive and won't preserve the original format.
+ *
+ * @example
+ * canonicalizeLiteral("125,9", FR_LOCALE) // "125.9"
+ * canonicalizeLiteral("02/12/2012", FR_LOCALE) // "12/02/2012"
+ * canonicalizeLiteral("02-12-2012", FR_LOCALE) // "12/02/2012"
+ */
+function canonicalizeLiteral(content, locale) {
+    if (isDateTime(content, locale)) {
+        const dateNumber = toNumber(content, locale);
+        let format = DEFAULT_LOCALE.dateFormat;
+        if (!Number.isInteger(dateNumber)) {
+            format += " " + DEFAULT_LOCALE.timeFormat;
+        }
+        return formatValue(dateNumber, { locale: DEFAULT_LOCALE, format });
+    }
+    return canonicalizeNumberLiteral(content, locale);
+}
+/**
+ * Change a literal string from its canonical form (en_US locale) to the given locale. Don't convert date string.
+ * This is destructive and won't preserve the original format.
+ *
+ * @example
+ * localizeNumberLiteral("125.9", FR_LOCALE) // "125,9"
+ * localizeNumberLiteral("12/02/2012", FR_LOCALE) // "12/02/2012"
+ * localizeNumberLiteral("12-02-2012", FR_LOCALE) // "12/02/2012"
+ */
+function localizeNumberLiteral(literal, locale) {
+    if (locale.decimalSeparator === "." || !isNumber(literal, DEFAULT_LOCALE)) {
+        return literal;
     }
     const decimalNumberRegex = getDecimalNumberRegex(DEFAULT_LOCALE);
-    const localized = content.replace(decimalNumberRegex, (match) => {
+    const localized = literal.replace(decimalNumberRegex, (match) => {
         return match.replace(".", locale.decimalSeparator);
     });
     return localized;
 }
+/**
+ * Change a literal string from its canonical form (en_US locale) to the given locale. Also convert date string.
+ *
+ * @example
+ * localizeLiteral("125.9", FR_LOCALE) // "125,9"
+ * localizeLiteral("12/02/2012", FR_LOCALE) // "02/12/2012"
+ */
+function localizeLiteral(literal, locale) {
+    if (isDateTime(literal, DEFAULT_LOCALE)) {
+        const dateNumber = toNumber(literal, DEFAULT_LOCALE);
+        let format = locale.dateFormat;
+        if (!Number.isInteger(dateNumber)) {
+            format += " " + locale.timeFormat;
+        }
+        return formatValue(dateNumber, { locale, format });
+    }
+    return localizeNumberLiteral(literal, locale);
+}
 function canonicalizeCFRule(cf, locale) {
     return changeCFRuleLocale(cf, (content) => canonicalizeContent(content, locale));
 }
@@ -15531,7 +15616,9 @@ class LinkEditor extends Component {
     save() {
         const { col, row } = this.props.cellPosition;
         const locale = this.env.model.getters.getLocale();
-        const label = this.link.label ? canonicalizeContent(this.link.label, locale) : this.link.url;
+        const label = this.link.label
+            ? canonicalizeNumberContent(this.link.label, locale)
+            : this.link.url;
         this.env.model.dispatch("UPDATE_CELL", {
             col: col,
             row: row,
@@ -25301,9 +25388,11 @@ function useCellHovered(env, gridRef, callback) {
         }
     }
     function updateMousePosition(e) {
-        x = e.offsetX;
-        y = e.offsetY;
-        lastMoved = Date.now();
+        if (gridRef.el === e.target) {
+            x = e.offsetX;
+            y = e.offsetY;
+            lastMoved = Date.now();
+        }
     }
     function recompute() {
         const { col, row } = getPosition();
@@ -36676,8 +36765,7 @@ class EvaluationConditionalFormatPlugin extends UIPlugin {
             if (cell.type === CellValueType.error) {
                 return false;
             }
-            const locale = this.getters.getLocale();
-            const values = rule.values.map((val) => parseLiteral(val, locale));
+            const values = rule.values.map((val) => parseLiteral(val, DEFAULT_LOCALE));
             switch (rule.operator) {
                 case "IsEmpty":
                     return cell.value.toString().trim() === "";
@@ -38761,7 +38849,7 @@ class FindAndReplacePlugin extends UIPlugin {
         const replaceRegex = new RegExp(this.currentSearchRegex.source, this.currentSearchRegex.flags + "g");
         const toReplace = this.getSearchableString({ sheetId, col, row });
         const content = toReplace.replace(replaceRegex, replaceWith);
-        const canonicalContent = canonicalizeContent(content, this.getters.getLocale());
+        const canonicalContent = canonicalizeNumberContent(content, this.getters.getLocale());
         this.dispatch("UPDATE_CELL", { sheetId, col, row, content: canonicalContent });
     }
     /**
@@ -40935,7 +41023,7 @@ class SplitToColumnsPlugin extends UIPlugin {
                     sheetId,
                     col: col + index,
                     row,
-                    content: canonicalizeContent(content, this.getters.getLocale()),
+                    content: canonicalizeNumberContent(content, this.getters.getLocale()),
                     format: "",
                     style: mainCell?.style || null,
                 });
@@ -41121,6 +41209,7 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
     cells;
     copiedTables;
     zones;
+    uuidGenerator = new UuidGenerator();
     constructor(zones, operation, getters, dispatch, selection) {
         super(operation, getters, dispatch, selection);
         if (!zones.length) {
@@ -41582,8 +41671,9 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
                         this.adaptCFRules(origin.sheetId, cf, [xc], toRemoveRange);
                     }
                     else {
-                        this.adaptCFRules(target.sheetId, cf, [xc], []);
                         this.adaptCFRules(origin.sheetId, cf, [], toRemoveRange);
+                        const cfToCopyTo = this.getCFToCopyTo(target.sheetId, cf);
+                        this.adaptCFRules(target.sheetId, cfToCopyTo, [xc], []);
                     }
                 }
             }
@@ -41607,6 +41697,12 @@ class ClipboardCellsState extends ClipboardCellsAbstractState {
             sheetId,
         });
     }
+    getCFToCopyTo(targetSheetId, originCF) {
+        const cfInTarget = this.getters
+            .getConditionalFormats(targetSheetId)
+            .find((cf) => cf.stopIfTrue === originCF.stopIfTrue && deepEquals(cf.rule, originCF.rule));
+        return cfInTarget ? cfInTarget : { ...originCF, id: this.uuidGenerator.uuidv4(), ranges: [] };
+    }
 }
 
 /** State of the clipboard when copying/cutting figures */
@@ -41738,7 +41834,7 @@ class ClipboardFigureImage {
 function canonicalizeNumberValue(content, locale) {
     return content.startsWith("=")
         ? canonicalizeFormula(content, locale)
-        : toCanonicalNumberString(content, locale);
+        : canonicalizeNumberLiteral(content, locale);
 }
 /** Change a formula to its canonical form (en_US locale) */
 function canonicalizeFormula(formula, locale) {
@@ -41855,7 +41951,7 @@ class ClipboardPlugin extends UIPlugin {
     allowDispatch(cmd) {
         switch (cmd.type) {
             case "CUT":
-                const zones = cmd.cutTarget || this.getters.getSelectedZones();
+                const zones = this.getters.getSelectedZones();
                 const state = this.getClipboardState(zones, cmd.type);
                 return state.isCutAllowed(zones);
             case "PASTE":
@@ -41890,7 +41986,7 @@ class ClipboardPlugin extends UIPlugin {
         switch (cmd.type) {
             case "COPY":
             case "CUT":
-                const zones = ("cutTarget" in cmd && cmd.cutTarget) || this.getters.getSelectedZones();
+                const zones = this.getters.getSelectedZones();
                 this.state = this.getClipboardState(zones, cmd.type);
                 this.status = "visible";
                 this.originSheetId = this.getters.getActiveSheetId();
@@ -42540,7 +42636,7 @@ class EditionPlugin extends UIPlugin {
             if (content) {
                 const sheetId = this.getters.getActiveSheetId();
                 const cell = this.getters.getEvaluatedCell({ sheetId, col: this.col, row: this.row });
-                content = canonicalizeContent(content, this.getters.getLocale());
+                content = canonicalizeNumberContent(content, this.getters.getLocale());
                 if (content.startsWith("=")) {
                     const left = this.currentTokens.filter((t) => t.type === "LEFT_PAREN").length;
                     const right = this.currentTokens.filter((t) => t.type === "RIGHT_PAREN").length;
@@ -43561,26 +43657,24 @@ class GridSelectionPlugin extends UIPlugin {
         const isBasedBefore = cmd.base < start;
         const deltaCol = isBasedBefore && isCol ? thickness : 0;
         const deltaRow = isBasedBefore && !isCol ? thickness : 0;
-        this.dispatch("CUT", {
-            cutTarget: [
-                {
-                    left: isCol ? start + deltaCol : 0,
-                    right: isCol ? end + deltaCol : this.getters.getNumberCols(cmd.sheetId) - 1,
-                    top: !isCol ? start + deltaRow : 0,
-                    bottom: !isCol ? end + deltaRow : this.getters.getNumberRows(cmd.sheetId) - 1,
-                },
-            ],
-        });
-        this.dispatch("PASTE", {
-            target: [
-                {
-                    left: isCol ? cmd.base : 0,
-                    right: isCol ? cmd.base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
-                    top: !isCol ? cmd.base : 0,
-                    bottom: !isCol ? cmd.base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
-                },
-            ],
-        });
+        const target = [
+            {
+                left: isCol ? start + deltaCol : 0,
+                right: isCol ? end + deltaCol : this.getters.getNumberCols(cmd.sheetId) - 1,
+                top: !isCol ? start + deltaRow : 0,
+                bottom: !isCol ? end + deltaRow : this.getters.getNumberRows(cmd.sheetId) - 1,
+            },
+        ];
+        const state = new ClipboardCellsState(target, "CUT", this.getters, this.dispatch, this.selection);
+        const pasteTarget = [
+            {
+                left: isCol ? cmd.base : 0,
+                right: isCol ? cmd.base + thickness - 1 : this.getters.getNumberCols(cmd.sheetId) - 1,
+                top: !isCol ? cmd.base : 0,
+                bottom: !isCol ? cmd.base + thickness - 1 : this.getters.getNumberRows(cmd.sheetId) - 1,
+            },
+        ];
+        state.paste(pasteTarget, { selectTarget: true });
         const toRemove = isBasedBefore ? cmd.elements.map((el) => el + thickness) : cmd.elements;
         let currentIndex = cmd.base;
         for (const element of toRemove) {
@@ -50566,6 +50660,6 @@ const constants = {
 export { AbstractChart, CommandResult, CorePlugin, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, compile, components, constants, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateCFEvaluationCommands, invalidateDependenciesCommands, invalidateEvaluationCommands, iterateAstNodes, links, load, parse, readonlyAllowedCommands, registries, setDefaultSheetViewSize, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.4.6';
-__info__.date = '2023-09-12T11:43:54.243Z';
-__info__.hash = '5746355';
+__info__.version = '16.4.7';
+__info__.date = '2023-09-21T15:58:11.039Z';
+__info__.hash = 'eccdcce';