From 61e83d7e01e652820c550bee6c1a39482611b56a Mon Sep 17 00:00:00 2001
From: Eva <eva.marco@kaleidos.net>
Date: Wed, 18 Jan 2023 17:36:27 +0100
Subject: [PATCH] :bug: Add selected colors on rightbar when selecting a board

---
 .../src/app/main/ui/workspace/sidebar/options.cljs    |  2 +-
 .../ui/workspace/sidebar/options/shapes/frame.cljs    | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/main/ui/workspace/sidebar/options.cljs b/frontend/src/app/main/ui/workspace/sidebar/options.cljs
index 00a136f1c..80d4fa796 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options.cljs
@@ -44,7 +44,7 @@
         shape (gsh/transform-shape shape modifiers)]
     [:*
      (case (:type shape)
-       :frame   [:& frame/options {:shape shape}]
+       :frame   [:& frame/options {:shape shape :shape-with-children shapes-with-children :file-id file-id :shared-libs shared-libs}]
        :group   [:& group/options {:shape shape :shape-with-children shapes-with-children :file-id file-id :shared-libs shared-libs}]
        :text    [:& text/options {:shape shape  :file-id file-id :shared-libs shared-libs}]
        :rect    [:& rect/options {:shape shape}]
diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/frame.cljs b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/frame.cljs
index 01b526220..0fe040b7b 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/options/shapes/frame.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/options/shapes/frame.cljs
@@ -6,9 +6,11 @@
 
 (ns app.main.ui.workspace.sidebar.options.shapes.frame
   (:require
+   [app.common.data :as d]
    [app.common.types.shape.layout :as ctl]
    [app.main.refs :as refs]
    [app.main.ui.workspace.sidebar.options.menus.blur :refer [blur-menu]]
+   [app.main.ui.workspace.sidebar.options.menus.color-selection :refer [color-selection-menu]]
    [app.main.ui.workspace.sidebar.options.menus.constraints :refer [constraint-attrs constraints-menu]]
    [app.main.ui.workspace.sidebar.options.menus.fill :refer [fill-attrs-shape fill-menu]]
    [app.main.ui.workspace.sidebar.options.menus.frame-grid :refer [frame-grid]]
@@ -21,10 +23,10 @@
    [rumext.v2 :as mf]))
 
 (mf/defc options
-  [{:keys [shape] :as props}]
+  [{:keys [shape file-id shape-with-children shared-libs] :as props}]
   (let [ids [(:id shape)]
         type (:type shape)
-
+        objects                 (->> shape-with-children (group-by :id) (d/mapm (fn [_ v] (first v))))
         stroke-values (select-keys shape stroke-attrs)
         layer-values (select-keys shape layer-attrs)
         measure-values (select-measure-keys shape)
@@ -63,6 +65,11 @@
      [:& stroke-menu {:ids ids
                       :type type
                       :values stroke-values}]
+          (when (> (count objects) 2)
+            [:& color-selection-menu {:type type
+                                      :shapes (vals objects)
+                                      :file-id file-id
+                                      :shared-libs shared-libs}])
      [:& shadow-menu {:ids ids
                       :values (select-keys shape [:shadow])}]
      [:& blur-menu {:ids ids