Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-02-03 04:49:03 -05:00
Code Issues Activity

Fix size manipulation on text edition tool.

Browse source
This commit is contained in:
Andrey Antukh 2017-01-11 20:24:04 +01:00
parent f26e1eb70f
commit 6345cfd91a
No known key found for this signature in database
GPG key ID: 4DFEBCB8316A8B95
1 changed files with 35 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
frontend/src/uxbox/main/ui/shapes/text.cljs
View file

@ -34,7 +34,7 @@
;; --- Text Component ;; --- Text Component
(declare text-shape) (declare text-shape-html)
(declare text-shape-wrapper) (declare text-shape-wrapper)
(declare text-shape-edit) (declare text-shape-edit)
@ -117,20 +117,14 @@
(let [{:keys [width height]} (geom/size shape) (let [{:keys [width height]} (geom/size shape)
style (make-style shape) style (make-style shape)
props {:x x1 :y y1 :width width :height height}] props {:x x1 :y y1 :width width :height height}]
(letfn [#_(on-blur [ev] (letfn [(on-input [ev]
(rlocks/release! :ui/text-edit)
(on-done))
(on-input [ev]
(let [content (dom/event->inner-text ev)] (let [content (dom/event->inner-text ev)]
(st/emit! (uds/update-text id {:content content}))))] (st/emit! (uds/update-text id {:content content}))))]
[:g
#_[:rect (merge props +select-rect-attrs+)]
[:foreignObject props [:foreignObject props
[:div {:style style} [:div {:style style
[:p {:ref "container" :ref "container"
;; :on-blur on-blur
:on-input on-input :on-input on-input
:contentEditable true}]]]]))) :contentEditable true}]])))
;; --- Text Shape Wrapper ;; --- Text Shape Wrapper
@ -146,7 +140,7 @@
[own] [own]
(let [[shape] (:rum/args own) (let [[shape] (:rum/args own)
dom (mx/ref-node own "fobject") dom (mx/ref-node own "fobject")
html (mx/render-static-html (text-shape shape))] html (mx/render-static-html (text-shape-html shape))]
(set! (.-innerHTML dom) html)) (set! (.-innerHTML dom) html))
own) own)
@ -156,7 +150,7 @@
[shape] (:rum/args own)] [shape] (:rum/args own)]
(when (not= shape old-shape) (when (not= shape old-shape)
(let [dom (mx/ref-node own "fobject") (let [dom (mx/ref-node own "fobject")
html (mx/render-static-html (text-shape shape))] html (mx/render-static-html (text-shape-html shape))]
(set! (.-innerHTML dom) html))) (set! (.-innerHTML dom) html)))
own)) own))
@ -178,10 +172,33 @@
:width width :width width
:height height}])) :height height}]))
;; --- Text Shape ;; --- Text Shape Html
(mx/defc text-shape (mx/defc text-shape-html
[{:keys [content] :as shape}] [{:keys [content] :as shape}]
(let [style (make-style shape)] (let [style (make-style shape)]
[:div {:style style} content]))
;; --- Text Shape Html
(mx/defc text-shape
{:mixins [mx/static]
:did-mount text-shape-wrapper-did-mount
:did-remount text-shape-wrapper-did-remount}
[{:keys [id content tmp-resize-xform tmp-displacement] :as shape}]
(let [xfmt (cond-> (gmt/matrix)
tmp-displacement (gmt/translate tmp-displacement)
tmp-resize-xform (gmt/multiply tmp-resize-xform))
{:keys [x1 y1 width height] :as shape} (-> (geom/transform shape xfmt)
(geom/size))
style (make-style shape)]
[:foreignObject {:x x1
:y y1
:id (str id)
:ref "fobject"
:width width
:height height}
[:div {:style style} [:div {:style style}
[:p content]])) [:p content]]]))