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

Merge pull request #1017 from penpot/fix/style-block

Browse source 
✨ Move frame style block to workspace wrapper
This commit is contained in:
Andrey Antukh 2021-06-07 12:12:23 +02:00 • committed by GitHub
commit 71c4145ea2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
frontend/src/app/main/ui/shapes/frame.cljs
View file

@ -8,15 +8,11 @@
(:require (:require
[app.common.data :as d] [app.common.data :as d]
[app.main.ui.shapes.attrs :as attrs] [app.main.ui.shapes.attrs :as attrs]
[app.main.ui.shapes.text.fontfaces :as ff]
[app.util.object :as obj] [app.util.object :as obj]
[rumext.alpha :as mf])) [rumext.alpha :as mf]))
(def frame-default-props {:fill-color "#ffffff"}) (def frame-default-props {:fill-color "#ffffff"})
(defn is-text? [{type :type}]
(= :text type))
(defn frame-shape (defn frame-shape
[shape-wrapper] [shape-wrapper]
(mf/fnc frame-shape (mf/fnc frame-shape
@ -26,8 +22,6 @@
shape (unchecked-get props "shape") shape (unchecked-get props "shape")
{:keys [id width height]} shape {:keys [id width height]} shape
text-childs (->> childs (filterv is-text?))
props (-> (merge frame-default-props shape) props (-> (merge frame-default-props shape)
(attrs/extract-style-attrs) (attrs/extract-style-attrs)
(obj/merge! (obj/merge!
@ -37,7 +31,6 @@
:height height :height height
:className "frame-background"}))] :className "frame-background"}))]
[:* [:*
[:& ff/fontfaces-style {:shapes text-childs}]
[:> :rect props] [:> :rect props]
(for [[i item] (d/enumerate childs)] (for [[i item] (d/enumerate childs)]
[:& shape-wrapper {:frame shape [:& shape-wrapper {:frame shape

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

@ -10,6 +10,7 @@
[app.main.refs :as refs] [app.main.refs :as refs]
[app.main.ui.shapes.frame :as frame] [app.main.ui.shapes.frame :as frame]
[app.main.ui.shapes.shape :refer [shape-container]] [app.main.ui.shapes.shape :refer [shape-container]]
[app.main.ui.shapes.text.fontfaces :as ff]
[app.util.object :as obj] [app.util.object :as obj]
[app.util.timers :as ts] [app.util.timers :as ts]
[beicon.core :as rx] [beicon.core :as rx]
@ -92,11 +93,12 @@
(fn [node] (fn [node]
(ts/schedule-on-idle #(reset! rendered? (some? node)))))] (ts/schedule-on-idle #(reset! rendered? (some? node)))))]
(when (and shape (not (:hidden shape))) (when (some? shape)
[:g.frame-wrapper {:display (when (:hidden shape) "none")} [:g.frame-wrapper {:display (when (:hidden shape) "none")}
(when-not show-thumbnail? (when-not show-thumbnail?
[:> shape-container {:shape shape :ref on-dom} [:> shape-container {:shape shape :ref on-dom}
[:& ff/fontfaces-style {:shapes children}]
[:& frame-shape {:shape shape [:& frame-shape {:shape shape
:childs children}]]) :childs children}]])