@odoo/o-spreadsheet 16.0.68 → 16.0.69

package/dist/o-spreadsheet.cjs.js

@@ -2380,6 +2380,25 @@ function isSheetNameEqual(name1, name2) {
     }
     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;
 }
 
 /*
@@ -6088,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 });
     },
@@ -22151,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;
@@ -22322,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;
     }
@@ -27440,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;
 }
 /**
@@ -27540,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
 // -----------------------------------------------------------------------------
@@ -30532,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);
@@ -30618,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]);
@@ -30842,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 {
@@ -31077,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;
@@ -31111,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;
@@ -31406,6 +31452,7 @@ SheetPlugin.getters = [
     "getSheetZone",
     "getPaneDivisions",
     "checkElementsIncludeAllNonFrozenHeaders",
+    "getDuplicateSheetName",
 ];
 
 /**
@@ -43801,6 +43848,6 @@ exports.setTranslationMethod = setTranslationMethod;
 exports.tokenize = tokenize;
 
 
-__info__.version = '16.0.68';
-__info__.date = '2025-04-25T08:02:52.716Z';
-__info__.hash = '682d48e';
+__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

@@ -2376,6 +2376,25 @@ function isSheetNameEqual(name1, name2) {
     }
     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;
 }
 
 /*
@@ -6084,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 });
     },
@@ -22147,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;
@@ -22318,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;
     }
@@ -27436,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;
 }
 /**
@@ -27536,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
 // -----------------------------------------------------------------------------
@@ -30528,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);
@@ -30614,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]);
@@ -30838,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 {
@@ -31073,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;
@@ -31107,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;
@@ -31402,6 +31448,7 @@ SheetPlugin.getters = [
     "getSheetZone",
     "getPaneDivisions",
     "checkElementsIncludeAllNonFrozenHeaders",
+    "getDuplicateSheetName",
 ];
 
 /**
@@ -43769,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.68';
-__info__.date = '2025-04-25T08:02:52.716Z';
-__info__.hash = '682d48e';
+__info__.version = '16.0.69';
+__info__.date = '2025-05-02T12:27:49.757Z';
+__info__.hash = '51188e8';

package/dist/o-spreadsheet.iife.js

@@ -2377,6 +2377,25 @@
       }
       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;
   }
 
   /*
@@ -6085,10 +6104,13 @@
       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 });
       },
@@ -22148,7 +22170,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
     position: absolute;
     top: 0;
     left: ${HEADER_WIDTH}px;
-    right: 0;
+    right: ${SCROLLBAR_WIDTH}px;
     height: ${HEADER_HEIGHT}px;
     &.o-dragging {
       cursor: grabbing;
@@ -22319,9 +22341,8 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
     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;
     }
@@ -27437,6 +27458,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       initialMessages = dropCommands(initialMessages, "SORT_CELLS");
       initialMessages = dropCommands(initialMessages, "SET_DECIMAL");
       initialMessages = fixChartDefinitions(data, initialMessages);
+      initialMessages = fixTranslatedDuplicateSheetName(data, initialMessages);
       return initialMessages;
   }
   /**
@@ -27537,6 +27559,40 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       }
       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
   // -----------------------------------------------------------------------------
@@ -30529,7 +30585,11 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   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);
@@ -30615,7 +30675,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
                   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]);
@@ -30839,14 +30899,8 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           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 {
@@ -31074,9 +31128,8 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       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;
@@ -31108,15 +31161,8 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
           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;
@@ -31403,6 +31449,7 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
       "getSheetZone",
       "getPaneDivisions",
       "checkElementsIncludeAllNonFrozenHeaders",
+      "getDuplicateSheetName",
   ];
 
   /**
@@ -43800,9 +43847,9 @@ day_count_convention (number, default=${DEFAULT_DAY_COUNT_CONVENTION} ) ${_lt("A
   Object.defineProperty(exports, '__esModule', { value: true });
 
 
-  __info__.version = '16.0.68';
-  __info__.date = '2025-04-25T08:02:52.716Z';
-  __info__.hash = '682d48e';
+  __info__.version = '16.0.69';
+  __info__.date = '2025-05-02T12:27:49.757Z';
+  __info__.hash = '51188e8';
 
 
 })(this.o_spreadsheet = this.o_spreadsheet || {}, owl);