@elementor/editor-components 4.2.0-914 → 4.2.0-916

package/dist/index.mjs

@@ -1061,7 +1061,12 @@ import { DetachIcon } from "@elementor/icons";
 import { __ as __10 } from "@wordpress/i18n";
 
 // src/utils/detach-component-instance/detach-component-instance.ts
-import { getContainer, replaceElement } from "@elementor/editor-elements";
+import { doAfterRender } from "@elementor/editor-canvas";
+import {
+  getContainer,
+  replaceElement,
+  selectElement
+} from "@elementor/editor-elements";
 import { undoable } from "@elementor/editor-v1-adapters";
 import { __dispatch as dispatch2, __getState as getState3 } from "@elementor/store";
 import { __ as __9 } from "@wordpress/i18n";
@@ -1259,7 +1264,7 @@ function resolvePropValue(propValue, overrideMap, options) {
     return resolveOverridableOverride(matchingOverride, originValue);
   }
   const matchingOverrideValue = componentInstanceOverridePropTypeUtil.extract(matchingOverride)?.override_value;
-  return matchingOverrideValue;
+  return matchingOverrideValue ?? originValue;
 }
 function resolveOverridableOverride(matchingOverride, originValue) {
   if (!originValue || !componentInstanceOverridePropTypeUtil.isValid(originValue)) {
@@ -1355,6 +1360,7 @@ async function detachComponentInstance({
           newElement: detachedInstanceElementData,
           withHistory: false
         });
+        selectElement(detachedElement.id);
         const componentUid = selectComponent(getState3(), componentId)?.uid;
         trackComponentEvent({
           action: "detached",
@@ -1393,6 +1399,9 @@ async function detachComponentInstance({
             })
           );
         }
+        doAfterRender([restoredInstance.id], () => {
+          selectElement(restoredInstance.id);
+        });
         return restoredInstance;
       },
       redo: (_, doReturn, restoredInstance) => {
@@ -1404,6 +1413,7 @@ async function detachComponentInstance({
           newElement: detachedInstanceElementData,
           withHistory: false
         });
+        selectElement(detachedElement.id);
         return {
           ...doReturn,
           detachedElement,
@@ -2647,7 +2657,7 @@ function formatComponentElementsId(elements, path) {
 
 // src/utils/switch-to-component.ts
 import { invalidateDocumentData, switchToDocument } from "@elementor/editor-documents";
-import { getCurrentDocumentContainer, selectElement } from "@elementor/editor-elements";
+import { getCurrentDocumentContainer, selectElement as selectElement2 } from "@elementor/editor-elements";
 import { __privateRunCommand as runCommand } from "@elementor/editor-v1-adapters";
 async function switchToComponent(componentId, componentInstanceId, element) {
   const selector = getSelector(element, componentInstanceId);
@@ -2661,7 +2671,7 @@ async function switchToComponent(componentId, componentInstanceId, element) {
   const currentDocumentContainer = getCurrentDocumentContainer();
   const topLevelElement = currentDocumentContainer?.children?.[0];
   if (topLevelElement) {
-    selectElement(topLevelElement.id);
+    selectElement2(topLevelElement.id);
     expandNavigator();
   }
 }