fix kdtree update

Author: sprocketc

.clj-kondo/metosin/malli-types-cljs/config.edn

@@ -79,7 +79,6 @@
    [:copied-elements {:optional true} [:* Element]]
    [:kdtree {:optional true} any?]
    [:viewbox-kdtree {:optional true} any?]
-   [:snapping-points {:optional true} [:vector Vec2D]]
    [:re-pressed.core/keydown {:optional true} map?]])
 
 (def valid? (m/validator App))

src/renderer/app/db.cljs

@@ -8,6 +8,7 @@
    [renderer.frame.handlers :as frame.h]
    [renderer.notification.handlers :as notification.h]
    [renderer.notification.views :as notification.v]
+   [renderer.snap.handlers :as snap.h]
    [renderer.utils.vec :as vec]))
 
 (defn path
@@ -22,7 +23,10 @@
 (m/=> set-active [:-> App uuid? App])
 (defn set-active
   [db id]
-  (assoc db :active-document id))
+  (cond-> db
+    id
+    (-> (assoc :active-document id)
+        (snap.h/rebuild-tree))))
 
 (m/=> persisted-format [:function
                         [:-> App PersistedDocument]

src/renderer/document/handlers.cljs

@@ -42,9 +42,7 @@
         snap-active @(rf/subscribe [::snap.s/active])
         nearest-neighbor @(rf/subscribe [::snap.s/nearest-neighbor])
         snapped-el-id (-> nearest-neighbor meta :id)
-        snapped-el (when snapped-el-id @(rf/subscribe [::s/entity snapped-el-id]))
-        snapping-points @(rf/subscribe [::snap.s/points])
-        debug @(rf/subscribe [::app.s/debug-info])]
+        snapped-el (when snapped-el-id @(rf/subscribe [::s/entity snapped-el-id]))]
     [:svg#canvas {:on-pointer-up pointer-handler
                   :on-pointer-down pointer-handler
                   :on-pointer-move pointer-handler
@@ -72,11 +70,6 @@
         [tool.hierarchy/render (or primary-tool active-tool)]
         [hierarchy/render temp-element]])
 
-     (when debug
-       [into [:g]
-        (for [snapping-point snapping-points]
-          [overlay/point-of-interest snapping-point])])
-
      (when snap-active
        [:<>
         (when snapped-el

src/renderer/element/impl/container/canvas.cljs

@@ -58,31 +58,30 @@
           points (cond-> points
                    (contains? (-> db :snap :options) :grid)
                    (into (ruler.h/steps-intersections db)))]
-      (-> (assoc db
-                 :snapping-points points
-                 :kdtree (kdtree/build-tree points))
+      (-> (assoc db :kdtree (kdtree/build-tree points))
           (update-viewbox-tree)))
-    (dissoc db :kdtree :viewbox-kdtree :snapping-points)))
+    (dissoc db :kdtree :viewbox-kdtree)))
 
 (defn update-tree
   [db f points]
-  (cond-> db
-    (not-empty points)
-    (-> (update :snapping-points conj points
-                :kdtree f points)
-        (update-viewbox-tree))))
+  (if (:kdtree db)
+    (if (empty? points)
+      db
+      (-> (reduce #(update %1 :kdtree f %2) db points)
+          (update-viewbox-tree)))
+    (rebuild-tree db)))
 
 (m/=> insert-to-tree [:-> App [:set uuid?] App])
 (defn insert-to-tree
   [db ids]
-  (let [points (->> (element.h/entities db ids)
+  (let [points (->> (vals (element.h/entities db ids))
                     (element.h/snapping-points db))]
     (update-tree db kdtree/insert points)))
 
 (m/=> delete-from-tree [:-> App [:set uuid?] App])
 (defn delete-from-tree
   [db ids]
-  (let [points (->> (element.h/entities db ids)
+  (let [points (->> (vals (element.h/entities db ids))
                     (element.h/snapping-points db))]
     (update-tree db kdtree/delete points)))
 

src/renderer/snap/handlers.cljs

@@ -8,10 +8,6 @@
  ::snap
  :-> :snap)
 
-(rf/reg-sub
- ::points
- :-> :snapping-points)
-
 (rf/reg-sub
  ::active
  :<- [::snap]

src/renderer/snap/subs.cljs

@@ -264,7 +264,7 @@
                 (element.h/clear-hovered))
       (selectable? clicked-element)
       (-> (element.h/select (-> db :clicked-element :id) (pointer/shift? e))
-          (snap.h/rebuild-tree)))))
+          (snap.h/delete-from-tree #{(-> db :clicked-element :id)})))))
 
 (defmethod hierarchy/drag :transform
   [db e]