added a concept of shadow tranform to SchemeContainer but not using i…

…t yet
ishubin · Nov 30, 2024 · 6486618 · 6486618
1 parent 3bc3818
commit 6486618
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 1 deletion.
diff --git a/src/ui/components/editor/Component.js b/src/ui/components/editor/Component.js
@@ -89,6 +89,7 @@ export function loadAndMountExternalComponent(schemeContainer, userEventBus, ite
         rectItem.area.sx = scale;
         rectItem.area.sy = scale;
 
+
         rectItem.meta.componentItemIdsForInit = componentSchemeContainer.indexUserEvents(componentUserEventBus, compilerErrorCallback);
         rectItem.meta.componentSchemeContainer = componentSchemeContainer;
         rectItem.meta.componentUserEventBus = componentUserEventBus;
@@ -107,6 +108,12 @@ export function loadAndMountExternalComponent(schemeContainer, userEventBus, ite
 
         schemeContainer.indexUserEventsForItems(item._childItems, userEventBus, compilerErrorCallback);
 
+        const shadowTransform = myMath.standardTransformWithArea(
+            myMath.multiplyMatrices(schemeContainer.shadowTransform, rectItem.meta.transformMatrix),
+            rectItem.area
+        );
+        componentSchemeContainer.setShadowTransform(shadowTransform);
+
         EditorEventBus.item.changed.specific.$emit(schemeContainer.editorId, item.id);
     })
     .catch(err => {

diff --git a/src/ui/scheme/ItemMath.js b/src/ui/scheme/ItemMath.js
@@ -61,7 +61,8 @@ export function calculateScreenTransformForArea(area, width, height) {
     };
 }
 
-export function worldPointOnItem(x, y, item) {
+export function worldPointOnItem(x, y, item, transformMatrix) {
+    // if (transformMatrix)
     return myMath.worldPointInArea(x, y, item.area, (item.meta && item.meta.transformMatrix) ? item.meta.transformMatrix : null);
 }
 

diff --git a/src/ui/scheme/SchemeContainer.js b/src/ui/scheme/SchemeContainer.js
@@ -208,6 +208,10 @@ function _markTemplateRef(items, templateRef, templateRootId) {
     })
 }
 
+/**
+ *
+ * @returns {Item}
+ */
 export function createDefaultRectItem() {
     const item = utils.clone(defaultItem);
     item.shape = 'rect';
@@ -362,6 +366,12 @@ class SchemeContainer {
 
         this.svgOutlinePathCache = new ItemCache(getItemOutlineSVGPath);
 
+        // Shadow transform is used in external components and it represents the complete transformation of
+        // the component item root. This is needed to correctly convert child component items
+        // to the global world transform (e.g. when dragging items in view mode,
+        // or converting mouse coords to local item coords)
+        this.shadowTransform = myMath.identityMatrix();
+
         // stores all snapping rules for items (used when user drags an item)
         this.relativeSnappers = {
             horizontal: [],
@@ -380,6 +390,10 @@ class SchemeContainer {
         this.reindexItems();
     }
 
+    setShadowTransform(shadowTransform) {
+        this.shadowTransform = shadowTransform;
+    }
+
     hasDependencyOnItem(itemId, potentialDependencyItemId) {
         const dependencyIds = this.dependencyItemMap[itemId];
         if (!dependencyIds || dependencyIds.length === 0) {