From 4c6e0c16516a0c1d75467c7776aa238ad058859e Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Fri, 10 Jan 2025 14:56:27 +0100 Subject: [PATCH 1/2] :bug: Fix incorrect navegation event to component main instance when the main instance is located in the same file but a different page --- frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs b/frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs index 5fd0ab404..9b20a62b3 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs +++ b/frontend/src/app/main/ui/workspace/sidebar/assets/common.cljs @@ -399,7 +399,7 @@ #(st/emit! (dw/set-annotations-id-for-create id)) do-show-local-component - #(st/emit! (dwl/go-to-local-component component-id)) + #(st/emit! (dwl/go-to-local-component :id component-id)) ;; When the show-remote is after a restore, the component may still be deleted do-show-remote-component From c18a9e5e04bf0ebf9f066b35701995f0bfb81080 Mon Sep 17 00:00:00 2001 From: Andrey Antukh Date: Fri, 10 Jan 2025 15:10:29 +0100 Subject: [PATCH 2/2] :lipstick: Add minor cosmetic changes to components context menu --- .../app/main/ui/workspace/context_menu.cljs | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/frontend/src/app/main/ui/workspace/context_menu.cljs b/frontend/src/app/main/ui/workspace/context_menu.cljs index 8e160a564..c36ba6acb 100644 --- a/frontend/src/app/main/ui/workspace/context_menu.cljs +++ b/frontend/src/app/main/ui/workspace/context_menu.cljs @@ -15,7 +15,6 @@ [app.common.types.container :as ctn] [app.common.types.page :as ctp] [app.common.types.shape.layout :as ctl] - [app.common.uuid :as uuid] [app.main.data.event :as ev] [app.main.data.modal :as modal] [app.main.data.shortcuts :as scd] @@ -26,7 +25,6 @@ [app.main.data.workspace.shape-layout :as dwsl] [app.main.data.workspace.shapes :as dwsh] [app.main.data.workspace.shortcuts :as sc] - [app.main.features :as features] [app.main.refs :as refs] [app.main.store :as st] [app.main.ui.components.dropdown :refer [dropdown]] @@ -486,15 +484,13 @@ :on-click on-add-layout}]]))])) (mf/defc context-menu-component* - {::mf/props :obj - ::mf/private true} + {:mf/private true} [{:keys [shapes]}] - (let [components-v2 (features/use-feature "components/v2") - single? (= (count shapes) 1) + (let [single? (= (count shapes) 1) objects (deref refs/workspace-page-objects) can-make-component (every? true? (map #(ctn/valid-shape-for-component? objects %) shapes)) heads (filter ctk/instance-head? shapes) - components-menu-entries (cmm/generate-components-menu-entries heads components-v2) + components-menu-entries (cmm/generate-components-menu-entries heads true) do-add-component #(st/emit! (dwl/add-component)) do-add-multiple-components #(st/emit! (dwl/add-multiple-components))] [:* @@ -511,11 +507,12 @@ (when (seq components-menu-entries) [:* - [:> menu-separator* {}] - (for [entry components-menu-entries :when (not (nil? entry))] - [:> menu-entry* {:key (uuid/next) + [:> menu-separator*] + (for [entry (filter some? components-menu-entries)] + [:> menu-entry* {:key (:title entry) :title (:title entry) - :shortcut (when (contains? entry :shortcut) (sc/get-tooltip (:shortcut entry))) + :shortcut (when (contains? entry :shortcut) + (sc/get-tooltip (:shortcut entry))) :on-click (:action entry)}])])])) (mf/defc context-menu-delete*