diff --git a/common/src/app/common/files/helpers.cljc b/common/src/app/common/files/helpers.cljc index 01507eea0..dce09d5dd 100644 --- a/common/src/app/common/files/helpers.cljc +++ b/common/src/app/common/files/helpers.cljc @@ -72,13 +72,6 @@ (and (some? shape) (= :bool (dm/get-prop shape :type)))) -(defn group-like-shape? - ([objects id] - (group-like-shape? (get objects id))) - ([shape] - (or ^boolean (group-shape? shape) - ^boolean (bool-shape? shape)))) - (defn text-shape? [shape] (and (some? shape) @@ -123,6 +116,14 @@ ([shape] (d/not-empty? (:shapes shape)))) +(defn group-like-shape? + ([objects id] + (group-like-shape? (get objects id))) + ([shape] + (or ^boolean (group-shape? shape) + ^boolean (bool-shape? shape) + ^boolean (and (svg-raw-shape? shape) (has-children? shape))))) + ;; ---- ACCESSORS (defn get-children-ids diff --git a/frontend/src/app/main/ui/workspace/sidebar/options/menus/svg_attrs.scss b/frontend/src/app/main/ui/workspace/sidebar/options/menus/svg_attrs.scss index 536f589c9..036c14ca1 100644 --- a/frontend/src/app/main/ui/workspace/sidebar/options/menus/svg_attrs.scss +++ b/frontend/src/app/main/ui/workspace/sidebar/options/menus/svg_attrs.scss @@ -64,6 +64,7 @@ font-size: $fs-10; text-transform: uppercase; margin-inline-start: $s-4; + color: $df-primary; } .attr-row {