From e7b0e253d486cde6cf67b86608a39735ff535c02 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Thu, 16 Jan 2025 12:52:49 +0100
Subject: [PATCH] :sparkles: Use new convention for components for workspace
 right and left sidebar

---
 common/src/app/common/logic/libraries.cljc      |  1 -
 frontend/src/app/main/ui/workspace.cljs         | 16 ++++++++--------
 frontend/src/app/main/ui/workspace/sidebar.cljs |  7 +++----
 3 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/common/src/app/common/logic/libraries.cljc b/common/src/app/common/logic/libraries.cljc
index 7faf88d1f..e610eef24 100644
--- a/common/src/app/common/logic/libraries.cljc
+++ b/common/src/app/common/logic/libraries.cljc
@@ -79,7 +79,6 @@
   [component new-component-id library-data]
   (let [components-v2 (dm/get-in library-data [:options :components-v2])]
     (if components-v2
-
       (let [main-instance-page  (ctf/get-component-page library-data component)
             main-instance-shape (ctf/get-component-root library-data component)
             delta               (gpt/point (+ (:width main-instance-shape) 50) 0)
diff --git a/frontend/src/app/main/ui/workspace.cljs b/frontend/src/app/main/ui/workspace.cljs
index c05a86229..a169ae616 100644
--- a/frontend/src/app/main/ui/workspace.cljs
+++ b/frontend/src/app/main/ui/workspace.cljs
@@ -29,7 +29,7 @@
    [app.main.ui.workspace.nudge]
    [app.main.ui.workspace.palette :refer [palette]]
    [app.main.ui.workspace.plugins]
-   [app.main.ui.workspace.sidebar :refer [left-sidebar right-sidebar]]
+   [app.main.ui.workspace.sidebar :refer [left-sidebar* right-sidebar*]]
    [app.main.ui.workspace.sidebar.collapsable-button :refer [collapsed-button]]
    [app.main.ui.workspace.sidebar.history :refer [history-toolbox*]]
    [app.main.ui.workspace.tokens.modals]
@@ -111,14 +111,14 @@
        [:*
         (if (:collapse-left-sidebar layout)
           [:& collapsed-button]
-          [:& left-sidebar {:layout layout
+          [:> left-sidebar* {:layout layout
+                             :file file
+                             :page-id page-id}])
+        [:> right-sidebar* {:section options-mode
+                            :selected selected
+                            :layout layout
                             :file file
-                            :page-id page-id}])
-        [:& right-sidebar {:section options-mode
-                           :selected selected
-                           :layout layout
-                           :file file
-                           :page-id page-id}]])]))
+                            :page-id page-id}]])]))
 
 (mf/defc workspace-loader*
   {::mf/private true}
diff --git a/frontend/src/app/main/ui/workspace/sidebar.cljs b/frontend/src/app/main/ui/workspace/sidebar.cljs
index ac00afe8f..3a9584351 100644
--- a/frontend/src/app/main/ui/workspace/sidebar.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar.cljs
@@ -48,7 +48,7 @@
               :size "s"
               :aria-label (tr "workspace.sidebar.collapse")}]])
 
-(mf/defc left-sidebar
+(mf/defc left-sidebar*
   {::mf/wrap [mf/memo]
    ::mf/props :obj}
   [{:keys [layout file page-id] :as props}]
@@ -179,9 +179,8 @@
 
 ;; --- Right Sidebar (Component)
 
-(mf/defc right-sidebar
-  {::mf/wrap-props false
-   ::mf/wrap [mf/memo]}
+(mf/defc right-sidebar*
+  {::mf/wrap [mf/memo]}
   [{:keys [layout section file page-id] :as props}]
   (let [drawing-tool     (:tool (mf/deref refs/workspace-drawing))