3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-05-30 12:36:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/staging' into develop

Browse source
This commit is contained in:
Alejandro Alonso 2022-08-30 13:31:11 +02:00
commit 28a721ce9c
8 changed files with 74 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -13,7 +13,6 @@
[app.main.data.modal :as md]
[app.main.data.workspace.changes :as dch]
[app.main.data.workspace.layout :as layout]
[app.main.data.workspace.libraries :as dwl]
[app.main.data.workspace.state-helpers :as wsh]
[app.main.data.workspace.texts :as dwt]
[app.util.color :as uc]
@ -430,8 +429,7 @@
ptk/WatchEvent
(watch [_ state _]
(when-let [color (some-> state :colorpicker get-color-from-colorpicker-state)]
(on-change color)
(rx/of (dwl/add-recent-color color))))))
(on-change color)))))
(defn initialize-colorpicker
[on-change]

5
frontend/src/app/main/ui/dashboard/file_menu.cljs
View file

@ -6,7 +6,6 @@
(ns app.main.ui.dashboard.file-menu
(:require
[app.common.data :as d]
[app.main.data.dashboard :as dd]
[app.main.data.events :as ev]
[app.main.data.messages :as dm]
@ -175,8 +174,8 @@
(->> (rx/from files)
(rx/flat-map
(fn [file]
(->> (rp/query :file-libraries {:file-id (:id file)})
(rx/map #(assoc file :has-libraries? (d/not-empty? %))))))
(->> (rp/command :has-file-libraries {:file-id (:id file)})
(rx/map #(assoc file :has-libraries? %)))))
(rx/reduce conj [])
(rx/subs
(fn [files]

17
frontend/src/app/main/ui/workspace/colorpicker.cljs
View file

@ -94,7 +94,16 @@
(mf/use-fn #(st/emit! (dc/activate-colorpicker-gradient :linear-gradient)))
on-activate-radial-gradient
(mf/use-fn #(st/emit! (dc/activate-colorpicker-gradient :radial-gradient)))]
(mf/use-fn #(st/emit! (dc/activate-colorpicker-gradient :radial-gradient)))
on-finish-drag
(mf/use-fn
(mf/deps state)
(fn []
(let [color (dc/get-color-from-colorpicker-state state)]
(st/emit!
(dwl/add-recent-color color)
(dwu/commit-undo-transaction)))))]
;; Initialize colorpicker state
(mf/with-effect []
@ -186,21 +195,21 @@
:disable-opacity disable-opacity
:on-change handle-change-color
:on-start-drag #(st/emit! (dwu/start-undo-transaction))
:on-finish-drag #(st/emit! (dwu/commit-undo-transaction))}]
:on-finish-drag on-finish-drag}]
:harmony
[:& harmony-selector
{:color current-color
:disable-opacity disable-opacity
:on-change handle-change-color
:on-start-drag #(st/emit! (dwu/start-undo-transaction))
:on-finish-drag #(st/emit! (dwu/commit-undo-transaction))}]
:on-finish-drag on-finish-drag}]
:hsva
[:& hsva-selector
{:color current-color
:disable-opacity disable-opacity
:on-change handle-change-color
:on-start-drag #(st/emit! (dwu/start-undo-transaction))
:on-finish-drag #(st/emit! (dwu/commit-undo-transaction))}]
:on-finish-drag on-finish-drag}]
nil))
[:& color-inputs

8
frontend/src/app/main/ui/workspace/header.cljs
View file

@ -6,7 +6,6 @@
(ns app.main.ui.workspace.header
(:require
[app.common.data :as d]
[app.config :as cf]
[app.main.data.events :as ev]
[app.main.data.exports :as de]
@ -32,7 +31,6 @@
[potok.core :as ptk]
[rumext.alpha :as mf]))
(def workspace-persistence-ref
(l/derived :workspace-persistence st/state))
@ -168,8 +166,8 @@
(->> (rx/of file)
(rx/flat-map
(fn [file]
(->> (rp/query :file-libraries {:file-id (:id file)})
(rx/map #(assoc file :has-libraries? (d/not-empty? %))))))
(->> (rp/command :has-file-libraries {:file-id (:id file)})
(rx/map #(assoc file :has-libraries? %)))))
(rx/reduce conj [])
(rx/subs
(fn [files]
@ -341,7 +339,7 @@
(if (contains? layout :textpalette)
(tr "workspace.header.menu.hide-textpalette")
(tr "workspace.header.menu.show-textpalette"))]
[:span.shortcut (sc/get-tooltip :toggle-textpalette)]]
[:span.shortcut (sc/get-tooltip :toggle-textpalette)]]
[:li {:on-click #(st/emit! (toggle-flag :display-artboard-names))}
[:span