🐛 Fix lazy load intersection on dragging at the beginning

frontend/src/app/main/data/workspace/transforms.cljs

@@ -621,7 +621,7 @@
       (->> stream
            (rx/filter (ptk/type? ::dws/duplicate-selected))
            (rx/take 1)
-           (rx/map #(start-move from-position nil true))))))
+           (rx/map #(start-move from-position))))))
 
 (defn get-drop-cell
   [target-frame objects position]
@@ -641,9 +641,8 @@
         (dom/set-property! node "transform" (gmt/translate-matrix move-vector))))))
 
 (defn start-move
-  ([from-position] (start-move from-position nil false))
-  ([from-position ids] (start-move from-position ids false))
-  ([from-position ids from-duplicate?]
+  ([from-position] (start-move from-position nil))
+  ([from-position ids]
    (ptk/reify ::start-move
      ptk/UpdateEvent
      (update [_ state]
@@ -751,47 +750,38 @@
                       (rx/share))]
 
              (if (features/active-feature? state "render-wasm/v1")
-               (let [duplicate-stopper
-                     (->> ms/mouse-position-alt
-                          (rx/mapcat
-                           (fn [alt?]
-                             (if (and alt? (not from-duplicate?))
-                               (rx/of true)
-                               (rx/empty)))))]
-                 (rx/merge
-                  (->> modifiers-stream
-                       (rx/take-until duplicate-stopper)
-                       (rx/map
-                        (fn [[modifiers snap-ignore-axis]]
-                          (dwm/set-wasm-modifiers modifiers :snap-ignore-axis snap-ignore-axis))))
+               (rx/merge
+                (->> modifiers-stream
+                     (rx/map
+                      (fn [[modifiers snap-ignore-axis]]
+                        (dwm/set-wasm-modifiers modifiers :snap-ignore-axis snap-ignore-axis))))
 
-                  (->> move-stream
-                       (rx/with-latest-from ms/mouse-position-alt)
-                       (rx/filter (fn [[_ alt?]] alt?))
-                       (rx/take 1)
-                       (rx/mapcat
-                        (fn [[_ alt?]]
-                          (if (and (not from-duplicate?) alt?)
-                            (rx/of (start-move-duplicate from-position)
-                                   (dws/duplicate-selected false true))
-                            (rx/empty)))))
+                (->> move-stream
+                     (rx/with-latest-from ms/mouse-position-alt)
+                     (rx/filter (fn [[_ alt?]] alt?))
+                     (rx/take 1)
+                     (rx/mapcat
+                      (fn [[_ alt?]]
+                        (if (and (not duplicate-move-started?) alt?)
+                          (rx/of (start-move-duplicate from-position)
+                                 (dws/duplicate-selected false true))
+                          (rx/empty)))))
 
-                  ;; Last event will write the modifiers creating the changes
-                  (->> move-stream
-                       (rx/last)
-                       (rx/take-until duplicate-stopper)
-                       (rx/with-latest-from modifiers-stream)
-                       (rx/mapcat
-                        (fn [[[_ target-frame drop-index drop-cell] [modifiers snap-ignore-axis]]]
-                          (let [undo-id (js/Symbol)]
-                            (rx/of
-                             (dwu/start-undo-transaction undo-id)
-                             (dwm/apply-wasm-modifiers modifiers
-                                                       :snap-ignore-axis snap-ignore-axis
-                                                       :undo-transation? false)
-                             (move-shapes-to-frame ids target-frame drop-index drop-cell)
-                             (finish-transform)
-                             (dwu/commit-undo-transaction undo-id))))))))
+                ;; Last event will write the modifiers creating the changes
+                (->> move-stream
+                     (rx/last)
+                     (rx/with-latest-from modifiers-stream)
+                     (rx/mapcat
+                      (fn [[[_ target-frame drop-index drop-cell] [modifiers snap-ignore-axis]]]
+                        (let [undo-id (js/Symbol)]
+                          (rx/of
+                           (dwu/start-undo-transaction undo-id)
+                           (dwm/apply-wasm-modifiers modifiers
+                                                     :snap-ignore-axis snap-ignore-axis
+                                                     :undo-transation? false)
+                           (move-shapes-to-frame ids target-frame drop-index drop-cell)
+                           (finish-transform)
+                           (dwu/commit-undo-transaction undo-id)))))))
 
                (rx/merge
                 (->> modifiers-stream

frontend/src/app/main/ui/workspace/sidebar/layer_item.cljs

@@ -302,7 +302,7 @@
 
         on-drop
         (mf/use-fn
-         (mf/deps id index objects expanded? selected)
+         (mf/deps id objects expanded? selected)
          (fn [side _data]
            (let [single? (= (count selected) 1)
                  same?   (and single? (= (first selected) id))]
@@ -323,14 +323,18 @@
 
                      [parent-id _] (ctn/find-valid-parent-and-frame-ids parent-id objects (map #(get objects %) selected) false files)
 
-                     parent    (get objects parent-id)
+                     parent        (get objects parent-id)
+                     current-index (d/index-of (:shapes parent) id)
 
                      to-index  (cond
                                  (= side :center) 0
                                  (and expanded? (= side :bot) (d/not-empty? (:shapes shape))) (count (:shapes parent))
-                                 (= side :top) (inc index)
-                                 :else index)]
-                 (st/emit! (dw/relocate-selected-shapes parent-id to-index)))))))
+                                 ;; target not found in parent (while lazy loading)
+                                 (neg? current-index) nil
+                                 (= side :top) (inc current-index)
+                                 :else current-index)]
+                 (when (some? to-index)
+                   (st/emit! (dw/relocate-selected-shapes parent-id to-index))))))))
 
         on-hold
         (mf/use-fn
@@ -419,11 +423,7 @@
                 current @children-count*
                 new-count (min total (max current chunk-size min-count))]
             (reset! children-count* new-count))
-          (reset! children-count* 0)))
-      (fn []
-        (when-let [obs ^js @observer-var]
-          (.disconnect obs)
-          (reset! observer-var nil))))
+          (reset! children-count* 0))))
 
     ;; Re-observe sentinel whenever children-count changes (sentinel moves)
     ;; and (shapes item) to reconnect observer after shape changes
@@ -504,4 +504,4 @@
                 :component-child? component-tree?}])))
         (when (< children-count (count (:shapes item)))
           [:div {:ref lazy-ref
-                 :style {:min-height 1}}])])]))
+                 :class (stl/css :lazy-load-sentinel)}])])]))

frontend/src/app/main/ui/workspace/sidebar/layer_item.scss

@@ -270,3 +270,7 @@
 .filtered {
   min-width: deprecated.$s-12;
 }
+.lazy-load-sentinel {
+  min-height: 1px;
+  pointer-events: none;
+}

frontend/src/app/main/ui/workspace/sidebar/layers.cljs

@@ -522,8 +522,7 @@
          [:& filters-tree {:objects filtered-objects
                            :key (dm/str (:id page))
                            :parent-size size-parent}]
-         [:div {:ref lazy-load-ref
-                :style {:min-height 16}}]]
+         [:div {:ref lazy-load-ref}]]
         [:div {:on-scroll on-scroll
                :class (stl/css :tool-window-content)
                :data-scroll-container true