@elementor/editor-variables 4.0.0-609 → 4.0.0-621

package/dist/index.mjs

@@ -1224,7 +1224,7 @@ var MenuOption = ({
       promotionRef.current?.toggle();
       return;
     }
-    const defaultName = getDefaultName(variables, config.key, config.variableType);
+    const defaultName = getDefaultName(variables, config.variableType);
     onCreate(config.key, defaultName, config.defaultValue);
     trackVariablesManagerEvent({ action: "add", varType: config.variableType });
     onClose();
@@ -1238,15 +1238,15 @@ var MenuOption = ({
     }
   ));
 };
-var getDefaultName = (variables, type, baseName) => {
-  const existingNames = Object.values(variables).filter((variable) => variable.type === type).map((variable) => variable.label);
+var getDefaultName = (variables, baseName) => {
+  const pattern = new RegExp(`^${baseName}-(\\d+)$`, "i");
   let counter = 1;
-  let name = `${baseName}-${counter}`;
-  while (existingNames.includes(name)) {
-    counter++;
-    name = `${baseName}-${counter}`;
-  }
-  return name;
+  Object.values(variables).forEach((variable) => {
+    if (pattern.test(variable.label)) {
+      counter = Math.max(counter, parseInt(variable.label.match(pattern)?.[1] ?? "0", 10) + 1);
+    }
+  });
+  return `${baseName}-${counter}`;
 };
 
 // src/components/variables-manager/variables-manager-table.tsx