3pp-mirror/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-07-19 19:27:21 +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-06-27 09:28:54 +02:00
commit 07881eed65
18 changed files with 92 additions and 84 deletions
Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/app/main/repo.cljs
View file

@ -130,9 +130,7 @@
(defmethod query :exporter
[_ params]
(let [default {:wait false
:blob? false
:uri (str base-uri)}]
(let [default {:wait false :blob? false}]
(send-export (merge default params))))
(derive :upload-file-media-object ::multipart-upload)

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

@ -398,7 +398,9 @@
[:span (tr "labels.github-repo")]]
[:li {:on-click #(dom/open-new-window "https://penpot.app/terms.html")}
[:span (tr "auth.terms-of-service")]]
[:li.separator {:on-click #(st/emit! (rt/nav-new-window* {:rname :settings-feedback}))}
[:li.separator {:on-click #(st/emit! (when (contains? layout :collapse-left-sidebar) (dw/toggle-layout-flag :collapse-left-sidebar))
(-> (dw/toggle-layout-flag :shortcuts)
(vary-meta assoc ::ev/origin "workspace-header")))}
[:span (tr "label.shortcuts")]
[:span.shortcut (sc/get-tooltip :show-shortcuts)]]

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

@ -125,12 +125,11 @@
on-change
(mf/use-fn
(fn [new-color old-color]
(let [old-color (-> (or @prev-color* old-color)
(let [old-color (-> old-color
(dissoc :name)
(dissoc :path)
(d/without-nils))
shapes-by-color (get @grouped-colors* old-color)]
(reset! prev-color* new-color)
(st/emit! (dc/change-color-in-selected new-color shapes-by-color old-color)))))
on-open (mf/use-fn

12
frontend/src/app/main/ui/workspace/sidebar/options/rows/color_row.cljs
View file

@ -69,6 +69,8 @@
shared-libs (mf/deref refs/workspace-libraries)
hover-detach (mf/use-state false)
on-change-var (h/use-update-var {:fn on-change})
src-colors (if (= (:file-id color) current-file-id)
file-colors
(get-in shared-libs [(:file-id color) :data :colors]))
@ -83,18 +85,18 @@
(when on-detach (on-detach color)))
change-value (fn [new-value]
(when on-change (on-change (-> color
(assoc :color new-value)
(dissoc :gradient)))))
(when (:fn @on-change-var) ((:fn @on-change-var) (-> color
(assoc :color new-value)
(dissoc :gradient)))))
change-opacity (fn [new-opacity]
(when on-change (on-change (assoc color
(when (:fn @on-change-var) ((:fn @on-change-var) (assoc color
:opacity new-opacity
:id nil
:file-id nil))))
handle-pick-color (fn [color]
(when on-change (on-change (merge uc/empty-color color))))
(when (:fn @on-change-var) ((:fn @on-change-var) (merge uc/empty-color color))))
handle-select (fn []
(select-only color))

1
frontend/src/app/util/object.cljs
View file

@ -43,6 +43,7 @@
(rest keys)
(unchecked-get res key))))))
#_:clj-kondo/ignore
(defn without
[obj keys]
(let [keys (cond