CalvinBackup/penpot
1
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2026-03-05 17:51:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1473 from penpot/alotor/bugfixes_fixes

Browse Source 
Bugfixes
This commit is contained in:
Andrey Antukh
2022-01-14 13:33:23 +01:00
committed by GitHub
parent d9e6e9b017 5d8982c734
commit 13773d829a
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
frontend/src/app/main/ui/components/numeric_input.cljs
View File

@@ -171,13 +171,13 @@
handle-blur
(mf/use-callback
(mf/deps parse-value apply-value update-input on-blur)
(fn [_]
(let [new-value (or (parse-value) default-val)]
(if new-value
(apply-value new-value)
(update-input new-value)))
(when on-blur (on-blur))))
(mf/deps parse-value apply-value update-input on-blur)
(fn [_]
(let [new-value (or (parse-value) default-val)]
(if new-value
(apply-value new-value)
(update-input new-value)))
(when on-blur (on-blur))))
on-click
(mf/use-callback
@@ -203,8 +203,7 @@
(mf/deps value-str)
(fn []
(when-let [input-node (mf/ref-val ref)]
(when-not (dom/active? input-node)
(dom/set-value! input-node value-str)))))
(dom/set-value! input-node value-str))))
(mf/use-effect
(mf/deps handle-blur)

27
frontend/src/app/main/ui/workspace/viewport/utils.cljs
View File

@@ -49,17 +49,26 @@
[width height]
(if (or resize-x? resize-y?)
(let [pc (-> (gpt/point x y)
(gpt/transform transform)
(gpt/transform current-transform))
(let [pc (cond-> (gpt/point x y)
(some? transform)
(gpt/transform transform)
pw (-> (gpt/point (+ x width) y)
(gpt/transform transform)
(gpt/transform current-transform))
(some? current-transform)
(gpt/transform current-transform))
ph (-> (gpt/point x (+ y height))
(gpt/transform transform)
(gpt/transform current-transform))]
pw (cond-> (gpt/point (+ x width) y)
(some? transform)
(gpt/transform transform)
(some? current-transform)
(gpt/transform current-transform))
ph (cond-> (gpt/point x (+ y height))
(some? transform)
(gpt/transform transform)
(some? current-transform)
(gpt/transform current-transform))]
[(gpt/distance pc pw) (gpt/distance pc ph)])
[width height])]