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

🐛 Fix text edition.

Browse source
This commit is contained in:
Andrey Antukh 2020-04-13 14:07:05 +02:00
parent 26b2b89b69
commit 040dd73599
5 changed files with 44 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

4
frontend/src/uxbox/main/data/workspace.cljs
View file

@ -1832,7 +1832,7 @@
ptk/WatchEvent ptk/WatchEvent
(watch [_ state stream] (watch [_ state stream]
(->> stream (->> stream
(rx/filter #(= % :interrupt)) (rx/filter interrupt?)
(rx/take 1) (rx/take 1)
(rx/map (constantly clear-edition-mode)))))) (rx/map (constantly clear-edition-mode))))))
@ -2428,7 +2428,7 @@
"ctrl+t" #(st/emit! (select-for-drawing :text)) "ctrl+t" #(st/emit! (select-for-drawing :text))
"ctrl+c" #(st/emit! copy-selected) "ctrl+c" #(st/emit! copy-selected)
"ctrl+v" #(st/emit! paste) "ctrl+v" #(st/emit! paste)
"esc" #(st/emit! :interrupt deselect-all) "escape" #(st/emit! :interrupt deselect-all)
"del" #(st/emit! delete-selected) "del" #(st/emit! delete-selected)
"ctrl+up" #(st/emit! (vertical-order-selected :up)) "ctrl+up" #(st/emit! (vertical-order-selected :up))
"ctrl+down" #(st/emit! (vertical-order-selected :down)) "ctrl+down" #(st/emit! (vertical-order-selected :down))

67
frontend/src/uxbox/main/ui/shapes/common.cljs
View file

@ -60,44 +60,43 @@
(rx/of (dw/materialize-frame-displacement frame-id))))))) (rx/of (dw/materialize-frame-displacement frame-id)))))))
(defn on-mouse-down (defn on-mouse-down
([event shape] (on-mouse-down event shape nil)) [event {:keys [id type] :as shape}]
([event {:keys [id type] :as shape} kk-tmp] (let [selected @refs/selected-shapes
(let [selected @refs/selected-shapes selected? (contains? selected id)
selected? (contains? selected id) drawing? @refs/selected-drawing-tool
drawing? @refs/selected-drawing-tool button (.-which (.-nativeEvent event))]
button (.-which (.-nativeEvent event))] (when-not (:blocked shape)
(when-not (:blocked shape) (cond
(cond (not= 1 button)
(not= 1 button) nil
nil
drawing? drawing?
nil nil
(= type :frame) (= type :frame)
(when selected? (when selected?
(dom/stop-propagation event) (dom/stop-propagation event)
(st/emit! start-move-frame)) (st/emit! start-move-frame))
(and (not selected?) (empty? selected)) (and (not selected?) (empty? selected))
(do (do
(dom/stop-propagation event) (dom/stop-propagation event)
(st/emit! dw/deselect-all (st/emit! dw/deselect-all
(dw/select-shape id) (dw/select-shape id)
start-move-selected)) start-move-selected))
(and (not selected?) (not (empty? selected))) (and (not selected?) (not (empty? selected)))
(do (do
(dom/stop-propagation event) (dom/stop-propagation event)
(if (kbd/shift? event) (if (kbd/shift? event)
(st/emit! (dw/select-shape id)) (st/emit! (dw/select-shape id))
(st/emit! dw/deselect-all (st/emit! dw/deselect-all
(dw/select-shape id) (dw/select-shape id)
start-move-selected))) start-move-selected)))
:else :else
(do (do
(dom/stop-propagation event) (dom/stop-propagation event)
(st/emit! start-move-selected))))))) (st/emit! start-move-selected))))))
(defn on-context-menu (defn on-context-menu

2
frontend/src/uxbox/main/ui/shapes/icon.cljs
View file

@ -23,7 +23,7 @@
[{:keys [shape frame] :as props}] [{:keys [shape frame] :as props}]
(let [selected (mf/deref refs/selected-shapes) (let [selected (mf/deref refs/selected-shapes)
selected? (contains? selected (:id shape)) selected? (contains? selected (:id shape))
on-mouse-down #(common/on-mouse-down % shape selected)] on-mouse-down #(common/on-mouse-down % shape)]
[:g.shape {:class (when selected? "selected") [:g.shape {:class (when selected? "selected")
:on-mouse-down on-mouse-down} :on-mouse-down on-mouse-down}
[:& icon-shape {:shape (geom/transform-shape frame shape)}]])) [:& icon-shape {:shape (geom/transform-shape frame shape)}]]))

2
frontend/src/uxbox/main/ui/shapes/image.cljs
View file

@ -25,7 +25,7 @@
[{:keys [shape frame] :as props}] [{:keys [shape frame] :as props}]
(let [selected (mf/deref refs/selected-shapes) (let [selected (mf/deref refs/selected-shapes)
selected? (contains? selected (:id shape)) selected? (contains? selected (:id shape))
on-mouse-down #(common/on-mouse-down % shape selected)] on-mouse-down #(common/on-mouse-down % shape)]
[:g.shape {:class (when selected? "selected") [:g.shape {:class (when selected? "selected")
:on-mouse-down on-mouse-down} :on-mouse-down on-mouse-down}
[:& image-shape {:shape (geom/transform-shape frame shape)}]])) [:& image-shape {:shape (geom/transform-shape frame shape)}]]))

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

@ -23,12 +23,12 @@
;; --- Events ;; --- Events
(defn handle-mouse-down (defn handle-mouse-down
[event {:keys [id group] :as shape} selected] [event {:keys [id group] :as shape}]
(if (and (not (:blocked shape)) (if (and (not (:blocked shape))
(or @refs/selected-drawing-tool (or @refs/selected-drawing-tool
@refs/selected-edition)) @refs/selected-edition))
(dom/stop-propagation event) (dom/stop-propagation event)
(common/on-mouse-down event shape selected))) (common/on-mouse-down event shape)))
;; --- Text Wrapper ;; --- Text Wrapper
@ -45,12 +45,16 @@
selected? (and (contains? selected id) selected? (and (contains? selected id)
(= (count selected) 1)) (= (count selected) 1))
on-mouse-down #(common/on-mouse-down % shape) on-mouse-down #(handle-mouse-down % shape)
on-context-menu #(common/on-context-menu % shape) on-context-menu #(common/on-context-menu % shape)
on-double-click on-double-click
(fn [event] (fn [event]
(dom/stop-propagation event)
(dom/prevent-default event)
(when selected? (when selected?
(st/emit! (dw/start-edition-mode (:id shape)))))] (st/emit! (dw/start-edition-mode (:id shape)))))]
[:g.shape {:on-double-click on-double-click [:g.shape {:on-double-click on-double-click
:on-mouse-down on-mouse-down :on-mouse-down on-mouse-down
:on-context-menu on-context-menu} :on-context-menu on-context-menu}