mirror of
https://github.com/penpot/penpot.git
synced 2025-03-13 08:11:30 -05:00
Merge remote-tracking branch 'origin/staging' into develop
This commit is contained in:
commit
e362f423c0
3 changed files with 4 additions and 3 deletions
|
@ -34,6 +34,7 @@
|
||||||
### :bug: Bugs fixed
|
### :bug: Bugs fixed
|
||||||
|
|
||||||
- Navigate tracking event firing multiple times [Taiga #10415](https://tree.taiga.io/project/penpot/issue/10415)
|
- Navigate tracking event firing multiple times [Taiga #10415](https://tree.taiga.io/project/penpot/issue/10415)
|
||||||
|
- Fix problem with selection colors [Taiga #](https://tree.taiga.io/project/penpot/issue/10376)
|
||||||
|
|
||||||
## 2.5.1
|
## 2.5.1
|
||||||
|
|
||||||
|
|
|
@ -26,7 +26,7 @@
|
||||||
[rumext.v2 :as mf]))
|
[rumext.v2 :as mf]))
|
||||||
|
|
||||||
(mf/defc options*
|
(mf/defc options*
|
||||||
[{:keys [shape file-id shapes-with-children shared-libs] :as props}]
|
[{:keys [shape file-id shapes-with-children libraries] :as props}]
|
||||||
(let [shape-id (dm/get-prop shape :id)
|
(let [shape-id (dm/get-prop shape :id)
|
||||||
shape-type (dm/get-prop shape :type)
|
shape-type (dm/get-prop shape :type)
|
||||||
|
|
||||||
|
@ -125,7 +125,7 @@
|
||||||
[:> color-selection-menu* {:type shape-type
|
[:> color-selection-menu* {:type shape-type
|
||||||
:shapes shapes-with-children
|
:shapes shapes-with-children
|
||||||
:file-id file-id
|
:file-id file-id
|
||||||
:libraries shared-libs}]
|
:libraries libraries}]
|
||||||
[:> shadow-menu* {:ids ids :values (get shape :shadow)}]
|
[:> shadow-menu* {:ids ids :values (get shape :shadow)}]
|
||||||
[:& blur-menu {:ids ids
|
[:& blur-menu {:ids ids
|
||||||
:values (select-keys shape [:blur])}]
|
:values (select-keys shape [:blur])}]
|
||||||
|
|
|
@ -292,7 +292,7 @@
|
||||||
|
|
||||||
page-id (unchecked-get props "page-id")
|
page-id (unchecked-get props "page-id")
|
||||||
file-id (unchecked-get props "file-id")
|
file-id (unchecked-get props "file-id")
|
||||||
shared-libs (unchecked-get props "shared-libs")
|
shared-libs (unchecked-get props "libraries")
|
||||||
|
|
||||||
show-caps (some #(and (= :path (:type %)) (gsh/open-path? %)) shapes)
|
show-caps (some #(and (= :path (:type %)) (gsh/open-path? %)) shapes)
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue