@elementor/editor-elements 4.3.0-981 → 4.3.0-983

package/src/children-dependencies/bind-settings-reconcile.ts

@@ -6,7 +6,7 @@ import { resolveInsertIndex } from '../sync/resolve-insert-index';
 import { type V1Element, type V1ElementConfig, type V1ElementData, type V1ElementModelProps } from '../sync/types';
 import { createChildrenStash } from './stash';
 import { type ChildDependencyRule, type ChildrenStash } from './types';
-import { evaluateWhen } from './utils';
+import { evaluateWhen, resolveChildModelData } from './utils';
 
 type SettingsChangeSource = {
 	get: ( key: string ) => unknown;
@@ -85,8 +85,7 @@ function attachChildFromRule( parentId: string, rule: ChildDependencyRule, stash
 		return;
 	}
 
-	const stashed = rule.stash ? stash.get( parentId, rule.child_type ) : undefined;
-	const modelData = stashed ?? rule.default_model ?? ( { elType: rule.child_type } as V1ElementData );
+	const { modelData, wasStashed } = resolveChildModelData( parentId, rule, stash );
 	const insertAt = resolveInsertIndex( rule.position, currentChildren );
 
 	const attached = addModelToParent( parentId, modelData as unknown as V1ElementModelProps, { at: insertAt } );
@@ -95,7 +94,7 @@ function attachChildFromRule( parentId: string, rule: ChildDependencyRule, stash
 		return;
 	}
 
-	if ( stashed ) {
+	if ( wasStashed ) {
 		stash.clear( parentId, rule.child_type );
 	}
 

package/src/children-dependencies/reconcile-initial-children.ts

@@ -2,7 +2,7 @@ import { resolveInsertIndex } from '../sync/resolve-insert-index';
 import { type V1ElementConfig, type V1ElementData, type V1ElementSettingsProps } from '../sync/types';
 import { createChildrenStash } from './stash';
 import { type ChildDependencyRule } from './types';
-import { evaluateWhen } from './utils';
+import { evaluateWhen, resolveChildModelData } from './utils';
 
 type ReconcileInitialChildrenArgs = {
 	elementId: string;
@@ -34,13 +34,12 @@ export function reconcileInitialChildren( {
 		const isPresent = existingIndex >= 0;
 
 		if ( isMet && ! isPresent ) {
-			const stashed = rule.stash ? stash.get( elementId, rule.child_type ) : undefined;
-			const modelData = stashed ?? rule.default_model ?? ( { elType: rule.child_type } as V1ElementData );
+			const { modelData, wasStashed } = resolveChildModelData( elementId, rule, stash );
 			const insertAt = resolveInsertIndex( rule.position, elements );
 
 			elements.splice( insertAt, 0, modelData );
 
-			if ( stashed ) {
+			if ( wasStashed ) {
 				stash.clear( elementId, rule.child_type );
 			}
 

package/src/children-dependencies/utils.ts

@@ -1,5 +1,44 @@
 import { type Dependency, isDependencyMet, type PropValue } from '@elementor/editor-props';
 
+import { generateElementId } from '../sync/generate-element-id';
+import { type V1ElementData } from '../sync/types';
+import { type ChildDependencyRule, type ChildrenStash } from './types';
+
 export function evaluateWhen( when: Dependency | undefined, settings: Record< string, PropValue > ): boolean {
 	return isDependencyMet( when, settings ).isMet;
 }
+
+export function ensureModelId( model: V1ElementData ): V1ElementData {
+	const { skipDefaultChildren: _skipDefaultChildren, ...rest } = model;
+
+	return rest.id ? rest : { ...rest, id: generateElementId() };
+}
+
+type ResolvedChildModel = {
+	modelData: V1ElementData;
+	wasStashed: boolean;
+};
+
+/**
+ * Resolve the model to attach for a child-dependency rule, preferring a previously-stashed
+ * (user-customized) model, then the rule's default, else a bare element.
+ *
+ * `default_model` and the bare fallback never carry an id, so they're run through
+ * `ensureModelId` before the model reaches Backbone.
+ *
+ * @param elementId Parent element id, used as the stash lookup key.
+ * @param rule      The child-dependency rule being resolved.
+ * @param stash     Session-backed stash for previously-detached child models.
+ */
+export function resolveChildModelData(
+	elementId: string,
+	rule: ChildDependencyRule,
+	stash: ChildrenStash
+): ResolvedChildModel {
+	const stashed = rule.stash ? stash.get( elementId, rule.child_type ) : undefined;
+	const modelData = ensureModelId(
+		stashed ?? rule.default_model ?? ( { elType: rule.child_type } as V1ElementData )
+	);
+
+	return { modelData, wasStashed: Boolean( stashed ) };
+}

package/src/sync/types.ts

@@ -163,6 +163,7 @@ export type V1ElementModelProps = {
 	interactions?: string | ElementInteractions;
 	isGlobal?: boolean;
 	skipDefaultChildren?: boolean;
+	hydrateDefaultChildren?: boolean;
 };
 
 export type V1ElementData = Omit< V1ElementModelProps, 'elements' > & {