@elementor/editor-components 3.35.0-402 → 3.35.0-403

package/dist/index.js

@@ -362,15 +362,44 @@ var import_store5 = require("@elementor/store");
 
 // src/utils/switch-to-component.ts
 var import_editor_v1_adapters2 = require("@elementor/editor-v1-adapters");
-function switchToComponent(componentId, componentInstanceId) {
+function switchToComponent(componentId, componentInstanceId, element) {
+  const selector = getSelector(element, componentInstanceId);
   (0, import_editor_v1_adapters2.__privateRunCommand)("editor/documents/switch", {
     id: componentId,
-    selector: componentInstanceId ? `[data-id="${componentInstanceId}"]` : void 0,
+    selector,
     mode: "autosave",
     setAsInitial: false,
     shouldScroll: false
   });
 }
+function getSelector(element, componentInstanceId) {
+  if (element) {
+    return buildUniqueSelector(element);
+  }
+  if (componentInstanceId) {
+    return `[data-id="${componentInstanceId}"]`;
+  }
+  return void 0;
+}
+function buildUniqueSelector(element) {
+  const selectors = [];
+  let current = element.closest("[data-id]");
+  while (current) {
+    const dataId = current.dataset.id;
+    const isComponentInstance2 = current.hasAttribute("data-elementor-id");
+    if (isComponentInstance2) {
+      selectors.unshift(`[data-id="${dataId}"]`);
+    }
+    current = current.parentElement?.closest("[data-id]") ?? null;
+  }
+  if (selectors.length === 0) {
+    const closestElement = element.closest("[data-id]");
+    if (closestElement?.dataset?.id) {
+      return `[data-id="${closestElement.dataset.id}"]`;
+    }
+  }
+  return selectors.join(" ");
+}
 
 // src/hooks/use-navigate-back.ts
 function useNavigateBack() {
@@ -1790,7 +1819,7 @@ function createComponentView(options) {
       if (!isAllowedToSwitchDocument) {
         options.showLockedByModal?.(lockedBy || "");
       } else {
-        switchToComponent(this.getComponentId(), this.model.get("id"));
+        switchToComponent(this.getComponentId(), this.model.get("id"), this.el);
       }
     }
     editComponent({ trigger, location, secondaryLocation }) {