From f90fda2c903c54be36de0f68c2f040e2e2c8b38a Mon Sep 17 00:00:00 2001
From: "alonso.torres" <alonso.torres@kaleidos.net>
Date: Fri, 27 Jan 2023 11:26:35 +0100
Subject: [PATCH] :bug: Fix frame overlays in workspace

---
 .../src/app/main/ui/workspace/viewport.cljs   |  1 +
 .../ui/workspace/viewport/interactions.cljs   | 39 ++++++++++++++-----
 2 files changed, 31 insertions(+), 9 deletions(-)

diff --git a/frontend/src/app/main/ui/workspace/viewport.cljs b/frontend/src/app/main/ui/workspace/viewport.cljs
index a5bbbcb66..f54cc621a 100644
--- a/frontend/src/app/main/ui/workspace/viewport.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport.cljs
@@ -506,6 +506,7 @@
           (when show-prototypes?
             [:& interactions/interactions
              {:selected selected
+              :page-id page-id
               :zoom zoom
               :objects objects-modified
               :current-transform transform
diff --git a/frontend/src/app/main/ui/workspace/viewport/interactions.cljs b/frontend/src/app/main/ui/workspace/viewport/interactions.cljs
index e9a717124..de17f3fd2 100644
--- a/frontend/src/app/main/ui/workspace/viewport/interactions.cljs
+++ b/frontend/src/app/main/ui/workspace/viewport/interactions.cljs
@@ -9,11 +9,16 @@
   (:require
    [app.common.data :as d]
    [app.common.data.macros :as dm]
+   [app.common.geom.matrix :as gmt]
+   [app.common.geom.point :as gpt]
    [app.common.pages.helpers :as cph]
    [app.common.types.shape.interactions :as ctsi]
    [app.main.data.workspace :as dw]
    [app.main.refs :as refs]
+   [app.main.render :as render]
    [app.main.store :as st]
+   [app.main.ui.context :as muc]
+   [app.main.ui.shapes.embed :as embed]
    [app.main.ui.workspace.viewport.outline :refer [outline]]
    [app.util.dom :as dom]
    [cuerdas.core :as str]
@@ -214,7 +219,7 @@
 
 
 (mf/defc overlay-marker
-  [{:keys [index orig-shape dest-shape position objects hover-disabled?] :as props}]
+  [{:keys [page-id index orig-shape dest-shape position objects hover-disabled?] :as props}]
   (let [start-move-position
         (fn [_]
           (st/emit! (dw/start-move-overlay-pos index)))]
@@ -226,13 +231,28 @@
             width      (:width dest-shape)
             height     (:height dest-shape)
             dest-x     (:x dest-shape)
-            dest-y     (:y dest-shape)]
+            dest-y     (:y dest-shape)
+
+            shape-wrapper
+            (mf/use-memo
+             (mf/deps objects)
+             #(render/shape-wrapper-factory objects))
+
+            dest-shape-id (:id dest-shape)
+
+            thumbnail-data-ref (mf/use-memo (mf/deps page-id dest-shape-id) #(refs/thumbnail-frame-data page-id dest-shape-id))
+            thumbnail-data     (mf/deref thumbnail-data-ref)
+
+            dest-shape (cond-> dest-shape
+                         (some? thumbnail-data)
+                         (assoc :thumbnail thumbnail-data))]
         [:g {:on-mouse-down start-move-position
              :on-mouse-enter #(reset! hover-disabled? true)
              :on-mouse-leave #(reset! hover-disabled? false)}
-         [:use {:href (str "#thumbnail-container-" (:id dest-shape))
-                :x (- marker-x dest-x)
-                :y (- marker-y dest-y)}]
+         [:g {:transform (gmt/translate-matrix (gpt/point (- marker-x dest-x) (- marker-y dest-y))) }
+          [:& (mf/provider muc/render-thumbnails) {:value true}
+           [:& (mf/provider embed/context) {:value false}
+            [:& shape-wrapper {:shape dest-shape}]]]]
          [:path {:stroke "var(--color-primary)"
                  :fill "var(--color-black)"
                  :fill-opacity 0.5
@@ -251,7 +271,7 @@
                    :fill "var(--color-primary)"}]]))))
 
 (mf/defc interactions
-  [{:keys [current-transform objects zoom selected hover-disabled?] :as props}]
+  [{:keys [current-transform objects zoom selected hover-disabled? page-id] :as props}]
   (let [active-shapes (into []
                             (comp (filter #(seq (:interactions %))))
                             (vals objects))
@@ -323,13 +343,15 @@
                             (= (:overlay-pos-type interaction) :manual))
                    (if (and (some? move-overlay-to)
                             (= move-overlay-index index))
-                     [:& overlay-marker {:index index
+                     [:& overlay-marker {:page-id page-id
+                                         :index index
                                          :orig-shape shape
                                          :dest-shape dest-shape
                                          :position move-overlay-to
                                          :objects objects
                                          :hover-disabled? hover-disabled?}]
-                     [:& overlay-marker {:index index
+                     [:& overlay-marker {:page-id page-id
+                                         :index index
                                          :orig-shape shape
                                          :dest-shape dest-shape
                                          :position (:overlay-position interaction)
@@ -343,4 +365,3 @@
                                     :shape shape
                                     :selected selected
                                     :zoom zoom}])))]]))
-