Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-03-12 15:51:37 -05:00
Code Issues Activity

♻️ Enhance some fragments of code

Browse source
This commit is contained in:
Andrés Moya 2020-04-01 08:47:19 +02:00
parent 637f0934f9
commit ec3be76782
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -935,10 +935,9 @@
(defn extract-numeric-suffix (defn extract-numeric-suffix
[basename] [basename]
(let [result (re-find #"(.*)-([0-9]+)$" basename)] (if-let [[match p1 p2] (re-find #"(.*)-([0-9]+)$" basename)]
(if result [p1 (+ 1 (d/parse-integer p2))]
[(get result 1) (+ 1 (js/parseInt (get result 2)))] [basename 1]))
[basename 1])))
(defn impl-generate-unique-name (defn impl-generate-unique-name
"A unique name generator" "A unique name generator"
@ -2073,7 +2072,7 @@
(let [result (prepare-change id existing-objs delta) (let [result (prepare-change id existing-objs delta)
result (if (vector? result) result [result])] result (if (vector? result) result [result])]
(recur (recur
(reduce conj existing-objs (map (fn [item] {(:id item) (:obj item)}) result)) (reduce #(assoc %1 (:id %2) (:obj %2)) existing-objs result)
(into chgs result) (into chgs result)
(first ids) (first ids)
(rest ids))))))) (rest ids)))))))
@ -2119,10 +2118,10 @@
ptk/WatchEvent ptk/WatchEvent
(watch [_ state stream] (watch [_ state stream]
(let [selected-objs (map #(get objects %) selected) (let [selected-objs (map #(get objects %) selected)
orig-pos (geom/selection-rect selected-objs) wrapper (geom/selection-rect selected-objs)
orig-pos (gpt/point (:x1 wrapper) (:y1 wrapper))
mouse-pos @ms/mouse-position mouse-pos @ms/mouse-position
delta {:x (- (:x mouse-pos) (:x orig-pos)) delta (gpt/subtract mouse-pos orig-pos)
:y (- (:y mouse-pos) (:y orig-pos))}
rchanges (prepare-changes state delta) rchanges (prepare-changes state delta)
uchanges (map (fn [ch] uchanges (map (fn [ch]
@ -2153,7 +2152,7 @@
ptk/UpdateEvent ptk/UpdateEvent
(update [_ state] (update [_ state]
(assoc-in state [:workspace-local :selected] (assoc-in state [:workspace-local :selected]
(map #(get-in % [:obj :id]) rchanges))))) (into #{} (map #(get-in % [:obj :id])) rchanges)))))
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Page Changes Reactions ;; Page Changes Reactions