From 978b309b04ec084b39b9377adf9fedd510da0847 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Tue, 20 Sep 2022 08:58:57 +0200 Subject: [PATCH] :bug: Fix issues introduced in previous merge --- frontend/src/app/main/data/workspace.cljs | 2 +- frontend/src/app/main/data/workspace/libraries_helpers.cljs | 1 - frontend/src/app/main/data/workspace/shapes.cljs | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/frontend/src/app/main/data/workspace.cljs b/frontend/src/app/main/data/workspace.cljs index 38b3d0040..9bfffe9a9 100644 --- a/frontend/src/app/main/data/workspace.cljs +++ b/frontend/src/app/main/data/workspace.cljs @@ -1487,7 +1487,7 @@ page-id (:current-page-id state) frame-id (-> (wsh/lookup-page-objects state page-id) (ctst/top-nested-frame @ms/mouse-position)) - shape (cp/setup-rect-selrect + shape (cts/setup-rect-selrect {:id id :type :text :name "Text" diff --git a/frontend/src/app/main/data/workspace/libraries_helpers.cljs b/frontend/src/app/main/data/workspace/libraries_helpers.cljs index eb63e0c26..b5ba25207 100644 --- a/frontend/src/app/main/data/workspace/libraries_helpers.cljs +++ b/frontend/src/app/main/data/workspace/libraries_helpers.cljs @@ -103,7 +103,6 @@ (gpt/point (+ (:width main-instance-shape) 50) 0)) component-root (ctk/get-component-root component) - frame-id (ctst/top-nested-frame objects (gpt/add orig-pos delta)) [new-component-shape new-component-shapes _] (ctst/clone-object component-root diff --git a/frontend/src/app/main/data/workspace/shapes.cljs b/frontend/src/app/main/data/workspace/shapes.cljs index eaba882d4..68971f877 100644 --- a/frontend/src/app/main/data/workspace/shapes.cljs +++ b/frontend/src/app/main/data/workspace/shapes.cljs @@ -285,7 +285,7 @@ page-id (:current-page-id state) frame-id (-> (wsh/lookup-page-objects state page-id) (ctst/top-nested-frame {:x frame-x :y frame-y})) - shape (-> (cp/make-minimal-shape type) + shape (-> (cts/make-minimal-shape type) (merge data) (merge {:x x :y y}) (assoc :frame-id frame-id)