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

Merge branch 'release-1.2.0' into develop

Browse source
This commit is contained in:
Andrey Antukh 2021-02-15 13:29:11 +01:00
commit 101027e6b8
7 changed files with 22 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

9
frontend/src/app/main/data/workspace/selection.cljs
View file

@ -164,11 +164,10 @@
(not= (:id common-frame-id) uuid/zero))
(-> (get objects common-frame-id)
:shapes)
(let [frames (cp/select-frames objects)]
(->> (if (seq frames)
frames
(cp/select-toplevel-shapes objects))
(map :id)))))
(->> (cp/select-toplevel-shapes objects
{:include-frames? true
:include-frame-children? false})
(map :id))))
is-not-blocked (fn [shape-id] (not (get-in state [:workspace-data
:pages-index page-id

3
frontend/src/app/main/refs.cljs
View file

@ -96,6 +96,9 @@
(def current-hover
(l/derived :hover workspace-local))
(def editors
(l/derived :editors workspace-local))
(def workspace-layout
(l/derived :workspace-layout st/state))

10
frontend/src/app/main/ui/shapes/text/styles.cljs
View file

@ -45,11 +45,11 @@
auto-height? (= grow-type :auto-height)
base #js {:display "inline-flex"
:flex-direction "column"
:justify-content "inherit"
:min-height (when-not (or auto-width? auto-height?) "100%")
:min-width (when-not auto-width? "100%")
:vertical-align "top"}]
:flexDirection "column"
:justifyContent "inherit"
:minHeight (when-not (or auto-width? auto-height?) "100%")
:minWidth (when-not auto-width? "100%")
:verticalAlign "top"}]
base)))
(defn generate-paragraph-styles

4
frontend/src/app/main/ui/workspace/sidebar/options/text.cljs
View file

@ -285,8 +285,8 @@
(let [ids [(:id shape)]
type (:type shape)
local (deref refs/workspace-local)
editor (get-in local [:editors (:id shape)])
editors (mf/deref refs/editors)
editor (get editors (:id shape))
measure-values (select-keys shape measure-attrs)