3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-06-25 04:56:59 +02:00
Code Issues Projects Releases Packages Wiki Activity

✨ Disable new fills in UI when the cap is reached

Browse source
This commit is contained in:
Belén Albeza 2025-05-23 15:34:10 +02:00
parent 827d39a406
commit 170d35dde2
5 changed files with 247 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

1
frontend/src/app/main/data/workspace/colors.cljs
View file

@ -222,7 +222,6 @@
(update :fills #(into [attrs] %))))
undo-id
(js/Symbol)]
(rx/concat
(rx/of (dwu/start-undo-transaction undo-id))
(transform-fill state ids color change-fn options)

2
frontend/src/app/main/ui/shapes/attrs.cljs
View file

@ -66,6 +66,8 @@
([attrs fill-data render-id index type]
(add-fill! attrs fill-data render-id index type "none"))
([attrs fill-data render-id index type fill-default]
;; TODO: check for MAX-FILLS
(js/console.log "add_fill!" (clj->js fill-data))
(let [index (if (some? index) (dm/str "-" index) "")]
(cond
(contains? fill-data :fill-image)

16
frontend/src/app/main/ui/workspace/sidebar/options/menus/fill.cljs
View file

@ -10,6 +10,7 @@
[app.common.colors :as clr]
[app.common.data :as d]
[app.common.types.color :as ctc]
[app.common.types.shape :as shp]
[app.common.types.shape.attrs :refer [default-color]]
[app.main.data.workspace.colors :as dc]
[app.main.store :as st]
@ -54,7 +55,7 @@
values (d/without-nils values)
fills (:fills values)
has-fills? (or (= :multiple fills) (some? (seq fills)))
can-add-fills? (and (not (= :multiple fills)) (< (count fills) shp/MAX-FILLS))
state* (mf/use-state has-fills?)
open? (deref state*)
@ -73,12 +74,12 @@
(mf/use-fn
(mf/deps ids fills)
(fn [_]
(st/emit! (dc/add-fill ids {:color default-color
:opacity 1}))
(when (or (= :multiple fills)
(not (some? (seq fills))))
(open-content))))
(when can-add-fills?
(st/emit! (dc/add-fill ids {:color default-color
:opacity 1}))
(when (or (= :multiple fills)
(not (some? (seq fills))))
(open-content)))))
on-change
(fn [index]
@ -151,6 +152,7 @@
:aria-label (tr "workspace.options.fill.add-fill")
:on-click on-add
:data-testid "add-fill"
:disabled (not can-add-fills?)
:icon "add"}])]]
(when open?