diff --git a/frontend/src/app/main/ui/workspace.cljs b/frontend/src/app/main/ui/workspace.cljs index 9b6ea62c6..843f110a2 100644 --- a/frontend/src/app/main/ui/workspace.cljs +++ b/frontend/src/app/main/ui/workspace.cljs @@ -59,10 +59,8 @@ file (obj/get props "file") layout (obj/get props "layout")] [:* - ;; TODO: left-sidebar option is obsolete because left-sidebar now - ;; is always visible. (when (:colorpalette layout) - [:& colorpalette {:left-sidebar? true}]) + [:& colorpalette]) [:section.workspace-content [:section.workspace-viewport diff --git a/frontend/src/app/main/ui/workspace/colorpalette.cljs b/frontend/src/app/main/ui/workspace/colorpalette.cljs index d9d4df230..102beadca 100644 --- a/frontend/src/app/main/ui/workspace/colorpalette.cljs +++ b/frontend/src/app/main/ui/workspace/colorpalette.cljs @@ -60,7 +60,7 @@ [:& cb/color-name {:color color :size size}]])) (mf/defc palette - [{:keys [left-sidebar? current-colors recent-colors file-colors shared-libs selected size]}] + [{:keys [current-colors recent-colors file-colors shared-libs selected size]}] (let [state (mf/use-state {:show-menu false }) width (:width @state 0) @@ -120,7 +120,7 @@ (fn [] (events/unlistenByKey key1)))) - [:div.color-palette {:class (when left-sidebar? "left-sidebar-open")} + [:div.color-palette.left-sidebar-open [:& dropdown {:show (:show-menu @state) :on-close #(swap! state assoc :show-menu false)} [:ul.workspace-context-menu.palette-menu @@ -192,7 +192,7 @@ (vals)))) (mf/defc colorpalette - [{:keys [left-sidebar?]}] + [] (let [team-id (mf/use-ctx ctx/current-team-id) recent-colors (mf/deref refs/workspace-recent-colors) file-colors (mf/deref refs/workspace-file-colors) @@ -225,8 +225,7 @@ (reset! current-library-colors (into [] (->> (vals file-colors) (sort-by :name))))))) - [:& palette {:left-sidebar? left-sidebar? - :current-colors @current-library-colors + [:& palette {:current-colors @current-library-colors :recent-colors recent-colors :file-colors file-colors :shared-libs shared-libs