fixed zooming back from component

ishubin · Dec 2, 2024 · 53eab26 · 53eab26
1 parent f8fb294
commit 53eab26
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 3 deletions.
diff --git a/src/ui/components/editor/Component.js b/src/ui/components/editor/Component.js
@@ -49,6 +49,8 @@ export function loadAndMountExternalComponent(schemeContainer, userEventBus, ite
         const componentSchemeContainer = new SchemeContainer(scheme, schemeContainer.editorId, VIEW_MODE, $store.state.apiClient, {
             onSchemeChangeCommitted: () => {}
         });
+        // linking to the same screen transform so that it is possible to zoom to items inside of component
+        componentSchemeContainer.screenTransform = schemeContainer.screenTransform;
         componentSchemeContainer.prepareFrameAnimationsForItems();
 
         const componentUserEventBus = new UserEventBus(schemeContainer.editorId);

diff --git a/src/ui/scheme/SchemeContainer.js b/src/ui/scheme/SchemeContainer.js
@@ -11,7 +11,6 @@ import myMath from '../myMath.js';
 import utils from '../utils.js';
 import shortid from 'shortid';
 import Shape from '../components/editor/items/shapes/Shape.js';
-import {generateComponentGoBackButton} from '../components/editor/items/shapes/Component.vue';
 import { traverseItems, defaultItemDefinition, defaultItem, findFirstItemBreadthFirst} from './Item';
 import { enrichItemWithDefaults } from './ItemFixer';
 import { enrichSchemeWithDefaults } from './Scheme';

diff --git a/src/ui/userevents/functions/DestroyComponentFunction.js b/src/ui/userevents/functions/DestroyComponentFunction.js
@@ -16,11 +16,12 @@ export default {
 
     execute(item, args, schemeContainer, userEventBus, resultCallback) {
         try {
+            // Cleaning up the overlay layer with the custom component background
+            // and the "go back" button
             traverseItems(item._childItems, subItem => {
                 userEventBus.clearEventsForItem(subItem.id);
             });
             item._childItems = [];
-            schemeContainer.reindexItems();
             userEventBus.emitItemEvent(item.id, COMPONENT_DESTROYED);
             EditorEventBus.item.changed.specific.$emit(schemeContainer.editorId, item.id);
         }

diff --git a/src/ui/userevents/functions/ZoomToItFunction.js b/src/ui/userevents/functions/ZoomToItFunction.js
@@ -10,9 +10,12 @@ import EditorEventBus from '../../components/editor/EditorEventBus';
 /**
  * Recreating item transform because in some weird cases when some of ancestors were moved,
  * the transforms in item metas are not properly recalculated.
+ * @param {Item} item
+ * @param {SchemeContainer} schemeContainer
+ * @returns
  */
 function createItemTransform(item, schemeContainer) {
-    let transform = myMath.identityMatrix();
+    let transform = schemeContainer.shadowTransform ? schemeContainer.shadowTransform : myMath.identityMatrix();
 
     if (item.meta.ancestorIds) {
         for (let i = 0; i < item.meta.ancestorIds.length; i++) {