Penpot/penpot
0
Fork 0
mirror of https://github.com/penpot/penpot.git synced 2025-01-21 14:12:36 -05:00
Code Issues Activity

🐛 Fix logic in oassoc-in-before wher top items couldn't be move to bottom

Browse source
This commit is contained in:
Florian Schroedl 2024-10-08 17:09:58 +02:00
parent 07beef5727
commit a85a7d2b2f
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
common/src/app/common/data.cljc
View file

@ -93,16 +93,20 @@
(if-let [index (index-of (keys o) before-k)] (if-let [index (index-of (keys o) before-k)]
(let [new-v (if ks (let [new-v (if ks
(oassoc-in-before (get o k) before-ks ks v) (oassoc-in-before (get o k) before-ks ks v)
v)] v)
current-index (index-of (keys o) k)
new-index (if (and current-index (< current-index index))
(dec index)
index)]
(if (= k before-k) (if (= k before-k)
(-> (ordered-map) (-> (ordered-map)
(into (take index o)) (into (take new-index o))
(assoc k new-v) (assoc k new-v)
(into (drop (inc index) o))) (into (drop (inc new-index) o)))
(-> (ordered-map) (-> (ordered-map)
(into (take index o)) (into (take new-index (dissoc o k)))
(assoc k new-v) (assoc k new-v)
(into (drop index o))))) (into (drop new-index (dissoc o k))))))
(oassoc-in o (cons k ks) v))) (oassoc-in o (cons k ks) v)))
(defn vec2 (defn vec2