@elementor/editor-variables 4.0.0-607 → 4.0.0-619

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/dist/index.js +9 -9
  2. package/dist/index.js.map +1 -1
  3. package/dist/index.mjs +9 -9
  4. package/dist/index.mjs.map +1 -1
  5. package/package.json +15 -15
  6. package/src/components/variables-manager/variables-manager-create-menu.tsx +9 -11
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@elementor/editor-variables",
3
- "version": "4.0.0-607",
3
+ "version": "4.0.0-619",
4
4
  "private": false,
5
5
  "author": "Elementor Team",
6
6
  "homepage": "https://elementor.com/",
@@ -39,22 +39,22 @@
39
39
  "dev": "tsup --config=../../tsup.dev.ts"
40
40
  },
41
41
  "dependencies": {
42
- "@elementor/editor": "4.0.0-607",
43
- "@elementor/editor-canvas": "4.0.0-607",
44
- "@elementor/editor-controls": "4.0.0-607",
45
- "@elementor/editor-current-user": "4.0.0-607",
46
- "@elementor/editor-mcp": "4.0.0-607",
47
- "@elementor/editor-panels": "4.0.0-607",
48
- "@elementor/editor-props": "4.0.0-607",
49
- "@elementor/editor-ui": "4.0.0-607",
50
- "@elementor/editor-v1-adapters": "4.0.0-607",
51
- "@elementor/menus": "4.0.0-607",
52
- "@elementor/http-client": "4.0.0-607",
42
+ "@elementor/editor": "4.0.0-619",
43
+ "@elementor/editor-canvas": "4.0.0-619",
44
+ "@elementor/editor-controls": "4.0.0-619",
45
+ "@elementor/editor-current-user": "4.0.0-619",
46
+ "@elementor/editor-mcp": "4.0.0-619",
47
+ "@elementor/editor-panels": "4.0.0-619",
48
+ "@elementor/editor-props": "4.0.0-619",
49
+ "@elementor/editor-ui": "4.0.0-619",
50
+ "@elementor/editor-v1-adapters": "4.0.0-619",
51
+ "@elementor/menus": "4.0.0-619",
52
+ "@elementor/http-client": "4.0.0-619",
53
53
  "@elementor/icons": "^1.68.0",
54
- "@elementor/events": "4.0.0-607",
55
- "@elementor/schema": "4.0.0-607",
54
+ "@elementor/events": "4.0.0-619",
55
+ "@elementor/schema": "4.0.0-619",
56
56
  "@elementor/ui": "1.37.2",
57
- "@elementor/utils": "4.0.0-607",
57
+ "@elementor/utils": "4.0.0-619",
58
58
  "@wordpress/i18n": "^5.13.0"
59
59
  },
60
60
  "peerDependencies": {
package/src/components/variables-manager/variables-manager-create-menu.tsx CHANGED
@@ -115,7 +115,7 @@ const MenuOption = ( {
115
115
  return;
116
116
  }
117
117
 
118
- const defaultName = getDefaultName( variables, config.key, config.variableType );
118
+ const defaultName = getDefaultName( variables, config.variableType );
119
119
 
120
120
  onCreate( config.key, defaultName, config.defaultValue );
121
121
  trackVariablesManagerEvent( { action: 'add', varType: config.variableType } );
@@ -139,18 +139,16 @@ const MenuOption = ( {
139
139
  );
140
140
  };
141
141
 
142
- const getDefaultName = ( variables: TVariablesList, type: string, baseName: string ) => {
143
- const existingNames = Object.values( variables )
144
- .filter( ( variable ) => variable.type === type )
145
- .map( ( variable ) => variable.label );
142
+ export const getDefaultName = ( variables: TVariablesList, baseName: string ) => {
143
+ const pattern = new RegExp( `^${ baseName }-(\\d+)$`, 'i' );
146
144
 
147
145
  let counter = 1;
148
- let name = `${ baseName }-${ counter }`;
149
146
 
150
- while ( existingNames.includes( name ) ) {
151
- counter++;
152
- name = `${ baseName }-${ counter }`;
153
- }
147
+ Object.values( variables ).forEach( ( variable ) => {
148
+ if ( pattern.test( variable.label ) ) {
149
+ counter = Math.max( counter, parseInt( variable.label.match( pattern )?.[ 1 ] ?? '0', 10 ) + 1 );
150
+ }
151
+ } );
154
152
 
155
- return name;
153
+ return `${ baseName }-${ counter }`;
156
154
  };