@odoo/o-spreadsheet 16.0.67 → 16.0.69

package/dist/o-spreadsheet.cjs.js

@@ -2373,6 +2373,32 @@ function createDefaultRows(rowNumber) {
         rows.push(row);
     }
     return rows;
+}
+function isSheetNameEqual(name1, name2) {
+    if (name1 === undefined || name2 === undefined) {
+        return false;
+    }
+    return (getUnquotedSheetName(name1.trim().toUpperCase()) ===
+        getUnquotedSheetName(name2.trim().toUpperCase()));
+}
+function getNextSheetName(existingNames, baseName = "Sheet") {
+    let i = 1;
+    let name = `${baseName}${i}`;
+    while (existingNames.includes(name)) {
+        name = `${baseName}${i}`;
+        i++;
+    }
+    return name;
+}
+function getDuplicateSheetName(nameToDuplicate, existingNames) {
+    let i = 1;
+    const baseName = _lt("Copy of %s", nameToDuplicate);
+    let name = baseName.toString();
+    while (existingNames.includes(name)) {
+        name = `${baseName} (${i})`;
+        i++;
+    }
+    return name;
 }
 
 /*
@@ -6081,10 +6107,13 @@ sheetMenuRegistry
     sequence: 20,
     action: (env) => {
         const sheetIdFrom = env.model.getters.getActiveSheetId();
+        const sheetNameFrom = env.model.getters.getSheetName(sheetIdFrom);
         const sheetIdTo = env.model.uuidGenerator.smallUuid();
+        const sheetNameTo = env.model.getters.getDuplicateSheetName(sheetNameFrom);
         env.model.dispatch("DUPLICATE_SHEET", {
             sheetId: sheetIdFrom,
             sheetIdTo,
+            sheetNameTo,
         });
         env.model.dispatch("ACTIVATE_SHEET", { sheetIdFrom, sheetIdTo });
     },
@@ -19637,7 +19666,7 @@ class EditionPlugin extends UIPlugin {
                     const { xc, sheetName: sheet } = splitReference(token.value);
                     const sheetName = sheet || this.getters.getSheetName(this.sheetId);
                     const activeSheetId = this.getters.getActiveSheetId();
-                    if (this.getters.getSheetName(activeSheetId) !== sheetName) {
+                    if (!isSheetNameEqual(this.getters.getSheetName(activeSheetId), sheetName)) {
                         return false;
                     }
                     const refRange = this.getters.getRangeFromSheetXC(activeSheetId, xc);
@@ -21716,18 +21745,28 @@ figureRegistry.add("chart", { Component: ChartFigure, SidePanelComponent: "Chart
 function useInterval(callback, delay) {
     let intervalId;
     const { setInterval, clearInterval } = window;
+    const pause = () => {
+        clearInterval(intervalId);
+        intervalId = undefined;
+    };
+    const safeCallback = () => {
+        try {
+            callback();
+        }
+        catch (e) {
+            pause();
+            throw e;
+        }
+    };
     owl.useEffect(() => {
-        intervalId = setInterval(callback, delay);
+        intervalId = setInterval(safeCallback, delay);
         return () => clearInterval(intervalId);
     }, () => [delay]);
     return {
-        pause: () => {
-            clearInterval(intervalId);
-            intervalId = undefined;
-        },
+        pause,
         resume: () => {
             if (intervalId === undefined) {
-                intervalId = setInterval(callback, delay);
+                intervalId = setInterval(safeCallback, delay);
             }
         },
     };
@@ -22134,7 +22173,7 @@ css /* scss */ `
     position: absolute;
     top: 0;
     left: ${HEADER_WIDTH}px;
-    right: 0;
+    right: ${SCROLLBAR_WIDTH}px;
     height: ${HEADER_HEIGHT}px;
     &.o-dragging {
       cursor: grabbing;
@@ -22305,9 +22344,8 @@ css /* scss */ `
     position: absolute;
     top: ${HEADER_HEIGHT}px;
     left: 0;
-    right: 0;
+    bottom: ${SCROLLBAR_WIDTH}px;
     width: ${HEADER_WIDTH}px;
-    height: calc(100% - ${HEADER_HEIGHT + SCROLLBAR_WIDTH}px);
     &.o-dragging {
       cursor: grabbing;
     }
@@ -25032,7 +25070,7 @@ function getRangeSize(reference, defaultSheetIndex, data) {
     ({ xc, sheetName } = splitReference(reference));
     let rangeSheetIndex;
     if (sheetName) {
-        const index = data.sheets.findIndex((sheet) => sheet.name === sheetName);
+        const index = data.sheets.findIndex((sheet) => isSheetNameEqual(sheet.name, sheetName));
         if (index < 0) {
             throw new Error("Unable to find a sheet with the name " + sheetName);
         }
@@ -25204,7 +25242,7 @@ function convertFormula(formula, data) {
         var _a;
         externalRefId = Number(externalRefId) - 1;
         cellRef = cellRef.replace(/\$/g, "");
-        const sheetIndex = data.externalBooks[externalRefId].sheetNames.findIndex((name) => name === sheetName);
+        const sheetIndex = data.externalBooks[externalRefId].sheetNames.findIndex((name) => isSheetNameEqual(name, sheetName));
         if (sheetIndex === -1) {
             return match;
         }
@@ -25543,7 +25581,7 @@ function applyStyleToZone(appliedStyle, zone, cells, styles) {
  */
 function convertTableFormulaReferences(convertedSheets, xlsxSheets) {
     for (let tableSheet of convertedSheets) {
-        const tables = xlsxSheets.find((s) => s.sheetName === tableSheet.name).tables;
+        const tables = xlsxSheets.find((s) => isSheetNameEqual(s.sheetName, tableSheet.name)).tables;
         for (let table of tables) {
             const tabRef = table.name + "[";
             for (let sheet of convertedSheets) {
@@ -27423,6 +27461,7 @@ function repairInitialMessages(data, initialMessages) {
     initialMessages = dropCommands(initialMessages, "SORT_CELLS");
     initialMessages = dropCommands(initialMessages, "SET_DECIMAL");
     initialMessages = fixChartDefinitions(data, initialMessages);
+    initialMessages = fixTranslatedDuplicateSheetName(data, initialMessages);
     return initialMessages;
 }
 /**
@@ -27523,6 +27562,40 @@ function fixChartDefinitions(data, initialMessages) {
     }
     return messages;
 }
+function fixTranslatedDuplicateSheetName(data, initialMessages) {
+    var _a;
+    const sheetNames = {};
+    for (const sheet of data.sheets || []) {
+        sheetNames[sheet.id] = sheet.name;
+    }
+    const messages = [];
+    for (const message of initialMessages) {
+        if (message.type === "REMOTE_REVISION") {
+            const commands = [];
+            for (const cmd of message.commands) {
+                switch (cmd.type) {
+                    case "DUPLICATE_SHEET":
+                        cmd.sheetNameTo =
+                            (_a = cmd.sheetNameTo) !== null && _a !== void 0 ? _a : getDuplicateSheetName(sheetNames[cmd.sheetId], Object.values(sheetNames));
+                        break;
+                    case "CREATE_SHEET":
+                    case "RENAME_SHEET":
+                        sheetNames[cmd.sheetId] = cmd.name || getNextSheetName(Object.values(sheetNames));
+                        break;
+                }
+                commands.push(cmd);
+            }
+            messages.push({
+                ...message,
+                commands,
+            });
+        }
+        else {
+            messages.push(message);
+        }
+    }
+    return initialMessages;
+}
 // -----------------------------------------------------------------------------
 // Helpers
 // -----------------------------------------------------------------------------
@@ -30515,7 +30588,11 @@ class SheetPlugin extends CorePlugin {
                 return this.checkValidations(cmd, this.checkSheetName, this.checkSheetPosition);
             }
             case "DUPLICATE_SHEET": {
-                return this.sheets[cmd.sheetIdTo] ? 12 /* CommandResult.DuplicatedSheetId */ : 0 /* CommandResult.Success */;
+                if (this.sheets[cmd.sheetIdTo])
+                    return 12 /* CommandResult.DuplicatedSheetId */;
+                if (this.orderedSheetIds.map(this.getSheetName.bind(this)).includes(cmd.sheetNameTo))
+                    return 11 /* CommandResult.DuplicatedSheetName */;
+                return 0 /* CommandResult.Success */;
             }
             case "MOVE_SHEET":
                 const currentIndex = this.orderedSheetIds.indexOf(cmd.sheetId);
@@ -30601,7 +30678,7 @@ class SheetPlugin extends CorePlugin {
                 this.showSheet(cmd.sheetId);
                 break;
             case "DUPLICATE_SHEET":
-                this.duplicateSheet(cmd.sheetId, cmd.sheetIdTo);
+                this.duplicateSheet(cmd.sheetId, cmd.sheetIdTo, cmd.sheetNameTo);
                 break;
             case "DELETE_SHEET":
                 this.deleteSheet(this.sheets[cmd.sheetId]);
@@ -30741,7 +30818,7 @@ class SheetPlugin extends CorePlugin {
         if (name) {
             const unquotedName = getUnquotedSheetName(name);
             for (const key in this.sheetIdsMapName) {
-                if (key.toUpperCase() === unquotedName.toUpperCase()) {
+                if (isSheetNameEqual(key, unquotedName)) {
                     return this.sheetIdsMapName[key];
                 }
             }
@@ -30825,14 +30902,8 @@ class SheetPlugin extends CorePlugin {
         return dimension === "COL" ? this.getNumberCols(sheetId) : this.getNumberRows(sheetId);
     }
     getNextSheetName(baseName = "Sheet") {
-        let i = 1;
         const names = this.orderedSheetIds.map(this.getSheetName.bind(this));
-        let name = `${baseName}${i}`;
-        while (names.includes(name)) {
-            name = `${baseName}${i}`;
-            i++;
-        }
-        return name;
+        return getNextSheetName(names, baseName);
     }
     getSheetSize(sheetId) {
         return {
@@ -30996,7 +31067,7 @@ class SheetPlugin extends CorePlugin {
     checkSheetName(cmd) {
         const { orderedSheetIds, sheets } = this;
         const name = cmd.name && cmd.name.trim().toLowerCase();
-        if (orderedSheetIds.find((id) => { var _a; return ((_a = sheets[id]) === null || _a === void 0 ? void 0 : _a.name.toLowerCase()) === name; })) {
+        if (orderedSheetIds.find((id) => { var _a; return isSheetNameEqual((_a = sheets[id]) === null || _a === void 0 ? void 0 : _a.name, name); })) {
             return 11 /* CommandResult.DuplicatedSheetName */;
         }
         if (FORBIDDEN_IN_EXCEL_REGEX.test(name)) {
@@ -31060,9 +31131,8 @@ class SheetPlugin extends CorePlugin {
     showSheet(sheetId) {
         this.history.update("sheets", sheetId, "isVisible", true);
     }
-    duplicateSheet(fromId, toId) {
+    duplicateSheet(fromId, toId, toName) {
         const sheet = this.getSheet(fromId);
-        const toName = this.getDuplicateSheetName(sheet.name);
         const newSheet = deepCopy(sheet);
         newSheet.id = toId;
         newSheet.name = toName;
@@ -31094,15 +31164,8 @@ class SheetPlugin extends CorePlugin {
         this.history.update("sheetIdsMapName", sheetIdsMapName);
     }
     getDuplicateSheetName(sheetName) {
-        let i = 1;
         const names = this.orderedSheetIds.map(this.getSheetName.bind(this));
-        const baseName = _lt("Copy of %s", sheetName);
-        let name = baseName.toString();
-        while (names.includes(name)) {
-            name = `${baseName} (${i})`;
-            i++;
-        }
-        return name;
+        return getDuplicateSheetName(sheetName, names);
     }
     deleteSheet(sheet) {
         const name = sheet.name;
@@ -31389,6 +31452,7 @@ SheetPlugin.getters = [
     "getSheetZone",
     "getPaneDivisions",
     "checkElementsIncludeAllNonFrozenHeaders",
+    "getDuplicateSheetName",
 ];
 
 /**
@@ -35261,6 +35325,8 @@ class GridSelectionPlugin extends UIPlugin {
                     const { col, row } = this.getters.getNextVisibleCellPosition(cmd.sheetIdTo, 0, 0);
                     this.selectCell(col, row);
                 }
+                const { col, row } = this.gridSelection.anchor.cell;
+                this.moveClient({ sheetId: this.activeSheet.id, col, row });
                 break;
             }
             case "REMOVE_COLUMNS_ROWS": {
@@ -40875,7 +40941,7 @@ class RangeAdapter {
                     if (range.sheetId === cmd.sheetId) {
                         return { changeType: "CHANGE", range };
                     }
-                    if (cmd.name && range.invalidSheetName === cmd.name) {
+                    if (isSheetNameEqual(range.invalidSheetName, cmd.name)) {
                         const invalidSheetName = undefined;
                         const sheetId = cmd.sheetId;
                         const newRange = range.clone({ sheetId, invalidSheetName });
@@ -43782,6 +43848,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.0.67';
-__info__.date = '2025-04-18T16:22:13.893Z';
-__info__.hash = 'efeeb27';
+__info__.version = '16.0.69';
+__info__.date = '2025-05-02T12:27:49.757Z';
+__info__.hash = '51188e8';

package/dist/o-spreadsheet.d.ts

@@ -1681,6 +1681,7 @@ interface DeleteSheetCommand extends SheetDependentCommand {
 interface DuplicateSheetCommand extends SheetDependentCommand {
     type: "DUPLICATE_SHEET";
     sheetIdTo: UID;
+    sheetNameTo: string;
 }
 interface MoveSheetCommand extends SheetDependentCommand {
     type: "MOVE_SHEET";
@@ -3563,7 +3564,7 @@ interface SheetState {
     readonly cellPosition: Record<UID, CellPosition | undefined>;
 }
 declare class SheetPlugin extends CorePlugin<SheetState> implements SheetState {
-    static getters: readonly ["getSheetName", "tryGetSheetName", "getSheet", "tryGetSheet", "getSheetIdByName", "getSheetIds", "getVisibleSheetIds", "isSheetVisible", "getEvaluationSheets", "doesHeaderExist", "getCell", "getCellsInZone", "getCellPosition", "getColCells", "getColsZone", "getRowCells", "getRowsZone", "getNumberCols", "getNumberRows", "getNumberHeaders", "getGridLinesVisibility", "getNextSheetName", "isEmpty", "getSheetSize", "getSheetZone", "getPaneDivisions", "checkElementsIncludeAllNonFrozenHeaders"];
+    static getters: readonly ["getSheetName", "tryGetSheetName", "getSheet", "tryGetSheet", "getSheetIdByName", "getSheetIds", "getVisibleSheetIds", "isSheetVisible", "getEvaluationSheets", "doesHeaderExist", "getCell", "getCellsInZone", "getCellPosition", "getColCells", "getColsZone", "getRowCells", "getRowsZone", "getNumberCols", "getNumberRows", "getNumberHeaders", "getGridLinesVisibility", "getNextSheetName", "isEmpty", "getSheetSize", "getSheetZone", "getPaneDivisions", "checkElementsIncludeAllNonFrozenHeaders", "getDuplicateSheetName"];
     readonly sheetIdsMapName: Record<string, UID | undefined>;
     readonly orderedSheetIds: UID[];
     readonly sheets: Record<UID, Sheet | undefined>;
@@ -3645,7 +3646,7 @@ declare class SheetPlugin extends CorePlugin<SheetState> implements SheetState {
     private hideSheet;
     private showSheet;
     private duplicateSheet;
-    private getDuplicateSheetName;
+    getDuplicateSheetName(sheetName: string): string;
     private deleteSheet;
     /**
      * Delete column. This requires a lot of handling:

package/dist/o-spreadsheet.esm.js

@@ -2369,6 +2369,32 @@ function createDefaultRows(rowNumber) {
         rows.push(row);
     }
     return rows;
+}
+function isSheetNameEqual(name1, name2) {
+    if (name1 === undefined || name2 === undefined) {
+        return false;
+    }
+    return (getUnquotedSheetName(name1.trim().toUpperCase()) ===
+        getUnquotedSheetName(name2.trim().toUpperCase()));
+}
+function getNextSheetName(existingNames, baseName = "Sheet") {
+    let i = 1;
+    let name = `${baseName}${i}`;
+    while (existingNames.includes(name)) {
+        name = `${baseName}${i}`;
+        i++;
+    }
+    return name;
+}
+function getDuplicateSheetName(nameToDuplicate, existingNames) {
+    let i = 1;
+    const baseName = _lt("Copy of %s", nameToDuplicate);
+    let name = baseName.toString();
+    while (existingNames.includes(name)) {
+        name = `${baseName} (${i})`;
+        i++;
+    }
+    return name;
 }
 
 /*
@@ -6077,10 +6103,13 @@ sheetMenuRegistry
     sequence: 20,
     action: (env) => {
         const sheetIdFrom = env.model.getters.getActiveSheetId();
+        const sheetNameFrom = env.model.getters.getSheetName(sheetIdFrom);
         const sheetIdTo = env.model.uuidGenerator.smallUuid();
+        const sheetNameTo = env.model.getters.getDuplicateSheetName(sheetNameFrom);
         env.model.dispatch("DUPLICATE_SHEET", {
             sheetId: sheetIdFrom,
             sheetIdTo,
+            sheetNameTo,
         });
         env.model.dispatch("ACTIVATE_SHEET", { sheetIdFrom, sheetIdTo });
     },
@@ -19633,7 +19662,7 @@ class EditionPlugin extends UIPlugin {
                     const { xc, sheetName: sheet } = splitReference(token.value);
                     const sheetName = sheet || this.getters.getSheetName(this.sheetId);
                     const activeSheetId = this.getters.getActiveSheetId();
-                    if (this.getters.getSheetName(activeSheetId) !== sheetName) {
+                    if (!isSheetNameEqual(this.getters.getSheetName(activeSheetId), sheetName)) {
                         return false;
                     }
                     const refRange = this.getters.getRangeFromSheetXC(activeSheetId, xc);
@@ -21712,18 +21741,28 @@ figureRegistry.add("chart", { Component: ChartFigure, SidePanelComponent: "Chart
 function useInterval(callback, delay) {
     let intervalId;
     const { setInterval, clearInterval } = window;
+    const pause = () => {
+        clearInterval(intervalId);
+        intervalId = undefined;
+    };
+    const safeCallback = () => {
+        try {
+            callback();
+        }
+        catch (e) {
+            pause();
+            throw e;
+        }
+    };
     useEffect(() => {
-        intervalId = setInterval(callback, delay);
+        intervalId = setInterval(safeCallback, delay);
         return () => clearInterval(intervalId);
     }, () => [delay]);
     return {
-        pause: () => {
-            clearInterval(intervalId);
-            intervalId = undefined;
-        },
+        pause,
         resume: () => {
             if (intervalId === undefined) {
-                intervalId = setInterval(callback, delay);
+                intervalId = setInterval(safeCallback, delay);
             }
         },
     };
@@ -22130,7 +22169,7 @@ css /* scss */ `
     position: absolute;
     top: 0;
     left: ${HEADER_WIDTH}px;
-    right: 0;
+    right: ${SCROLLBAR_WIDTH}px;
     height: ${HEADER_HEIGHT}px;
     &.o-dragging {
       cursor: grabbing;
@@ -22301,9 +22340,8 @@ css /* scss */ `
     position: absolute;
     top: ${HEADER_HEIGHT}px;
     left: 0;
-    right: 0;
+    bottom: ${SCROLLBAR_WIDTH}px;
     width: ${HEADER_WIDTH}px;
-    height: calc(100% - ${HEADER_HEIGHT + SCROLLBAR_WIDTH}px);
     &.o-dragging {
       cursor: grabbing;
     }
@@ -25028,7 +25066,7 @@ function getRangeSize(reference, defaultSheetIndex, data) {
     ({ xc, sheetName } = splitReference(reference));
     let rangeSheetIndex;
     if (sheetName) {
-        const index = data.sheets.findIndex((sheet) => sheet.name === sheetName);
+        const index = data.sheets.findIndex((sheet) => isSheetNameEqual(sheet.name, sheetName));
         if (index < 0) {
             throw new Error("Unable to find a sheet with the name " + sheetName);
         }
@@ -25200,7 +25238,7 @@ function convertFormula(formula, data) {
         var _a;
         externalRefId = Number(externalRefId) - 1;
         cellRef = cellRef.replace(/\$/g, "");
-        const sheetIndex = data.externalBooks[externalRefId].sheetNames.findIndex((name) => name === sheetName);
+        const sheetIndex = data.externalBooks[externalRefId].sheetNames.findIndex((name) => isSheetNameEqual(name, sheetName));
         if (sheetIndex === -1) {
             return match;
         }
@@ -25539,7 +25577,7 @@ function applyStyleToZone(appliedStyle, zone, cells, styles) {
  */
 function convertTableFormulaReferences(convertedSheets, xlsxSheets) {
     for (let tableSheet of convertedSheets) {
-        const tables = xlsxSheets.find((s) => s.sheetName === tableSheet.name).tables;
+        const tables = xlsxSheets.find((s) => isSheetNameEqual(s.sheetName, tableSheet.name)).tables;
         for (let table of tables) {
             const tabRef = table.name + "[";
             for (let sheet of convertedSheets) {
@@ -27419,6 +27457,7 @@ function repairInitialMessages(data, initialMessages) {
     initialMessages = dropCommands(initialMessages, "SORT_CELLS");
     initialMessages = dropCommands(initialMessages, "SET_DECIMAL");
     initialMessages = fixChartDefinitions(data, initialMessages);
+    initialMessages = fixTranslatedDuplicateSheetName(data, initialMessages);
     return initialMessages;
 }
 /**
@@ -27519,6 +27558,40 @@ function fixChartDefinitions(data, initialMessages) {
     }
     return messages;
 }
+function fixTranslatedDuplicateSheetName(data, initialMessages) {
+    var _a;
+    const sheetNames = {};
+    for (const sheet of data.sheets || []) {
+        sheetNames[sheet.id] = sheet.name;
+    }
+    const messages = [];
+    for (const message of initialMessages) {
+        if (message.type === "REMOTE_REVISION") {
+            const commands = [];
+            for (const cmd of message.commands) {
+                switch (cmd.type) {
+                    case "DUPLICATE_SHEET":
+                        cmd.sheetNameTo =
+                            (_a = cmd.sheetNameTo) !== null && _a !== void 0 ? _a : getDuplicateSheetName(sheetNames[cmd.sheetId], Object.values(sheetNames));
+                        break;
+                    case "CREATE_SHEET":
+                    case "RENAME_SHEET":
+                        sheetNames[cmd.sheetId] = cmd.name || getNextSheetName(Object.values(sheetNames));
+                        break;
+                }
+                commands.push(cmd);
+            }
+            messages.push({
+                ...message,
+                commands,
+            });
+        }
+        else {
+            messages.push(message);
+        }
+    }
+    return initialMessages;
+}
 // -----------------------------------------------------------------------------
 // Helpers
 // -----------------------------------------------------------------------------
@@ -30511,7 +30584,11 @@ class SheetPlugin extends CorePlugin {
                 return this.checkValidations(cmd, this.checkSheetName, this.checkSheetPosition);
             }
             case "DUPLICATE_SHEET": {
-                return this.sheets[cmd.sheetIdTo] ? 12 /* CommandResult.DuplicatedSheetId */ : 0 /* CommandResult.Success */;
+                if (this.sheets[cmd.sheetIdTo])
+                    return 12 /* CommandResult.DuplicatedSheetId */;
+                if (this.orderedSheetIds.map(this.getSheetName.bind(this)).includes(cmd.sheetNameTo))
+                    return 11 /* CommandResult.DuplicatedSheetName */;
+                return 0 /* CommandResult.Success */;
             }
             case "MOVE_SHEET":
                 const currentIndex = this.orderedSheetIds.indexOf(cmd.sheetId);
@@ -30597,7 +30674,7 @@ class SheetPlugin extends CorePlugin {
                 this.showSheet(cmd.sheetId);
                 break;
             case "DUPLICATE_SHEET":
-                this.duplicateSheet(cmd.sheetId, cmd.sheetIdTo);
+                this.duplicateSheet(cmd.sheetId, cmd.sheetIdTo, cmd.sheetNameTo);
                 break;
             case "DELETE_SHEET":
                 this.deleteSheet(this.sheets[cmd.sheetId]);
@@ -30737,7 +30814,7 @@ class SheetPlugin extends CorePlugin {
         if (name) {
             const unquotedName = getUnquotedSheetName(name);
             for (const key in this.sheetIdsMapName) {
-                if (key.toUpperCase() === unquotedName.toUpperCase()) {
+                if (isSheetNameEqual(key, unquotedName)) {
                     return this.sheetIdsMapName[key];
                 }
             }
@@ -30821,14 +30898,8 @@ class SheetPlugin extends CorePlugin {
         return dimension === "COL" ? this.getNumberCols(sheetId) : this.getNumberRows(sheetId);
     }
     getNextSheetName(baseName = "Sheet") {
-        let i = 1;
         const names = this.orderedSheetIds.map(this.getSheetName.bind(this));
-        let name = `${baseName}${i}`;
-        while (names.includes(name)) {
-            name = `${baseName}${i}`;
-            i++;
-        }
-        return name;
+        return getNextSheetName(names, baseName);
     }
     getSheetSize(sheetId) {
         return {
@@ -30992,7 +31063,7 @@ class SheetPlugin extends CorePlugin {
     checkSheetName(cmd) {
         const { orderedSheetIds, sheets } = this;
         const name = cmd.name && cmd.name.trim().toLowerCase();
-        if (orderedSheetIds.find((id) => { var _a; return ((_a = sheets[id]) === null || _a === void 0 ? void 0 : _a.name.toLowerCase()) === name; })) {
+        if (orderedSheetIds.find((id) => { var _a; return isSheetNameEqual((_a = sheets[id]) === null || _a === void 0 ? void 0 : _a.name, name); })) {
             return 11 /* CommandResult.DuplicatedSheetName */;
         }
         if (FORBIDDEN_IN_EXCEL_REGEX.test(name)) {
@@ -31056,9 +31127,8 @@ class SheetPlugin extends CorePlugin {
     showSheet(sheetId) {
         this.history.update("sheets", sheetId, "isVisible", true);
     }
-    duplicateSheet(fromId, toId) {
+    duplicateSheet(fromId, toId, toName) {
         const sheet = this.getSheet(fromId);
-        const toName = this.getDuplicateSheetName(sheet.name);
         const newSheet = deepCopy(sheet);
         newSheet.id = toId;
         newSheet.name = toName;
@@ -31090,15 +31160,8 @@ class SheetPlugin extends CorePlugin {
         this.history.update("sheetIdsMapName", sheetIdsMapName);
     }
     getDuplicateSheetName(sheetName) {
-        let i = 1;
         const names = this.orderedSheetIds.map(this.getSheetName.bind(this));
-        const baseName = _lt("Copy of %s", sheetName);
-        let name = baseName.toString();
-        while (names.includes(name)) {
-            name = `${baseName} (${i})`;
-            i++;
-        }
-        return name;
+        return getDuplicateSheetName(sheetName, names);
     }
     deleteSheet(sheet) {
         const name = sheet.name;
@@ -31385,6 +31448,7 @@ SheetPlugin.getters = [
     "getSheetZone",
     "getPaneDivisions",
     "checkElementsIncludeAllNonFrozenHeaders",
+    "getDuplicateSheetName",
 ];
 
 /**
@@ -35257,6 +35321,8 @@ class GridSelectionPlugin extends UIPlugin {
                     const { col, row } = this.getters.getNextVisibleCellPosition(cmd.sheetIdTo, 0, 0);
                     this.selectCell(col, row);
                 }
+                const { col, row } = this.gridSelection.anchor.cell;
+                this.moveClient({ sheetId: this.activeSheet.id, col, row });
                 break;
             }
             case "REMOVE_COLUMNS_ROWS": {
@@ -40871,7 +40937,7 @@ class RangeAdapter {
                     if (range.sheetId === cmd.sheetId) {
                         return { changeType: "CHANGE", range };
                     }
-                    if (cmd.name && range.invalidSheetName === cmd.name) {
+                    if (isSheetNameEqual(range.invalidSheetName, cmd.name)) {
                         const invalidSheetName = undefined;
                         const sheetId = cmd.sheetId;
                         const newRange = range.clone({ sheetId, invalidSheetName });
@@ -43750,6 +43816,6 @@ function addFunction(functionName, functionDescription) {
 export { AbstractChart, CommandResult, CorePlugin, DATETIME_FORMAT, DispatchResult, EvaluationError, Model, Registry, Revision, SPREADSHEET_DIMENSIONS, Spreadsheet, UIPlugin, __info__, addFunction, astToFormula, cellTypes, compile, components, convertAstNodes, coreTypes, findCellInNewZone, functionCache, helpers, invalidateEvaluationCommands, load, parse, readonlyAllowedCommands, registries, setTranslationMethod, tokenize };
 
 
-__info__.version = '16.0.67';
-__info__.date = '2025-04-18T16:22:13.893Z';
-__info__.hash = 'efeeb27';
+__info__.version = '16.0.69';
+__info__.date = '2025-05-02T12:27:49.757Z';
+__info__.hash = '51188e8';