Merge pull request #3597 from penpot/superalex-improve-selected-colors

✨ Improve selected colors

CHANGES.md

@@ -1,5 +1,11 @@
 # CHANGELOG
 
+## 1.19.4
+
+### :sparkles: New features
+
+- Improve selected colors [Taiga #5805]( https://tree.taiga.io/project/penpot/us/5805)
+
 ## 1.19.3
 
 ### :sparkles: New features

frontend/src/app/main/ui/workspace/sidebar/options/menus/color_selection.cljs

@@ -151,7 +151,7 @@
 (mf/defc color-selection-menu
   {::mf/wrap [#(mf/memo' % (mf/check-props ["shapes"]))]}
   [{:keys [shapes file-id shared-libs] :as props}]
-  (let [{:keys [all-colors grouped-colors library-colors colors]} (mf/with-memo [shapes file-id shared-libs]
+  (let [{:keys [ grouped-colors library-colors colors]} (mf/with-memo [shapes file-id shared-libs]
                                                           (prepare-colors shapes file-id shared-libs))
         expand-lib-color (mf/use-state false)
         expand-color     (mf/use-state false)
@@ -202,7 +202,6 @@
     (mf/with-effect [grouped-colors]
       (reset! grouped-colors* grouped-colors))
 
-    (when (> (count all-colors) 1)
     [:div.element-set
      [:div.element-set-title
       [:span (tr "workspace.options.selection-color")]]
@@ -253,4 +252,4 @@
                           :select-only select-only
                           :on-change #(on-change %1 color %2)
                           :on-open on-open
-                            :on-close on-close}]))]]])))
+                          :on-close on-close}]))]]]))

frontend/src/app/main/ui/workspace/sidebar/options/shapes/frame.cljs

@@ -71,11 +71,10 @@
      [:& 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}])
+                               :shared-libs shared-libs}]
      [:& shadow-menu {:ids ids
                       :values (select-keys shape [:shadow])}]
      [:& blur-menu {:ids ids

frontend/src/app/main/ui/workspace/sidebar/options/shapes/group.cljs

@@ -77,11 +77,10 @@
      (when-not (empty? stroke-ids)
        [:& stroke-menu {:type type :ids stroke-ids :values stroke-values}])
 
-     (when (> (count objects) 2)
      [:& color-selection-menu {:type type
                                :shapes (vals objects)
                                :file-id file-id
-                                 :shared-libs shared-libs}])
+                               :shared-libs shared-libs}]
 
      (when-not (empty? shadow-ids)
        [:& shadow-menu {:type type :ids shadow-ids :values shadow-values}])

version.txt

@@ -1 +1 @@
-1.19.3
+1.19.4