mirror of
https://github.com/penpot/penpot.git
synced 2026-03-26 21:31:24 +01:00
Merge remote-tracking branch 'origin/staging' into develop
This commit is contained in:
@@ -970,7 +970,7 @@
|
||||
|
||||
:else
|
||||
(let [file-id (:current-file-id @st/state)
|
||||
library-id (uuid/uuid library-id)]
|
||||
library-id (uuid/parse library-id)]
|
||||
(->> st/stream
|
||||
(rx/filter (ptk/type? ::dwl/attach-library-finished))
|
||||
(rx/take 1)
|
||||
|
||||
@@ -160,7 +160,7 @@
|
||||
(u/display-not-valid :getShapeById shape-id)
|
||||
|
||||
:else
|
||||
(let [shape-id (uuid/uuid shape-id)
|
||||
(let [shape-id (uuid/parse shape-id)
|
||||
shape (u/locate-shape file-id id shape-id)]
|
||||
(when (some? shape)
|
||||
(shape/shape-proxy plugin-id file-id id shape-id)))))
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
|
||||
(defn parse-id
|
||||
[id]
|
||||
(when id (uuid/uuid id)))
|
||||
(when id (uuid/parse id)))
|
||||
|
||||
(defn parse-keyword
|
||||
[kw]
|
||||
|
||||
Reference in New Issue
Block a user