mirror of
https://github.com/penpot/penpot.git
synced 2025-07-24 03:37:37 +02:00
Merge remote-tracking branch 'origin/staging' into develop
This commit is contained in:
commit
19bac6bd10
21 changed files with 57 additions and 228 deletions
|
@ -476,9 +476,14 @@
|
|||
component-id
|
||||
position
|
||||
page
|
||||
libraries)]
|
||||
(rx/of (dch/commit-changes changes)
|
||||
(dws/select-shapes (d/ordered-set (:id new-shape))))))))
|
||||
libraries)
|
||||
undo-id (js/Symbol)]
|
||||
(rx/of (dwu/start-undo-transaction undo-id)
|
||||
(dch/commit-changes changes)
|
||||
(ptk/data-event :layout/update [(:id new-shape)])
|
||||
(dws/select-shapes (d/ordered-set (:id new-shape)))
|
||||
|
||||
(dwu/commit-undo-transaction undo-id))))))
|
||||
|
||||
(defn detach-component
|
||||
"Remove all references to components in the shape with the given id,
|
||||
|
|
|
@ -280,10 +280,11 @@
|
|||
(let [{:keys [backend family variants]} (get @fontsdb font-id)]
|
||||
(cond
|
||||
(= :google backend)
|
||||
(-> (generate-gfonts-url
|
||||
{:family family
|
||||
:variants [{:id font-variant-id}]})
|
||||
(http/fetch-text))
|
||||
(let [variant (d/seek #(= (:id %) font-variant-id) variants)]
|
||||
(-> (generate-gfonts-url
|
||||
{:family family
|
||||
:variants [{:id variant}]})
|
||||
(http/fetch-text)))
|
||||
|
||||
(= :custom backend)
|
||||
(let [variant (d/seek #(= (:id %) font-variant-id) variants)
|
||||
|
|
|
@ -626,7 +626,6 @@
|
|||
|
||||
(def valid-webhook-mtypes
|
||||
[{:label "application/json" :value "application/json"}
|
||||
{:label "application/x-www-form-urlencoded" :value "application/x-www-form-urlencoded"}
|
||||
{:label "application/transit+json" :value "application/transit+json"}])
|
||||
|
||||
(defn- extract-status
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue