From 70fa169d0d9477924916c767cab85d7708217696 Mon Sep 17 00:00:00 2001
From: "alonso.torres" <alonso.torres@kaleidos.net>
Date: Tue, 31 Jan 2023 13:59:14 +0100
Subject: [PATCH] :bug: Fix problem with selection on nested boards

---
 common/src/app/common/pages/helpers.cljc    | 14 ++++++++
 common/src/app/common/types/shape_tree.cljc | 37 ++++++++-------------
 2 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/common/src/app/common/pages/helpers.cljc b/common/src/app/common/pages/helpers.cljc
index 973c1a714b..f3f6f0dbb5 100644
--- a/common/src/app/common/pages/helpers.cljc
+++ b/common/src/app/common/pages/helpers.cljc
@@ -109,6 +109,20 @@
         (recur (conj result parent-id) parent-id)
         result))))
 
+(defn get-parent-ids-with-index
+  "Returns a tuple with the list of parents and a map with the position within each parent"
+  [objects shape-id]
+  (loop [parent-list []
+         parent-indices {}
+         current shape-id]
+    (let [parent-id (dm/get-in objects [current :parent-id])
+          parent (get objects parent-id)]
+      (if (and (some? parent) (not= parent-id current))
+        (let [parent-list (conj parent-list parent-id)
+              parent-indices (assoc parent-indices parent-id (d/index-of (:shapes parent) current))]
+          (recur parent-list parent-indices parent-id))
+        [parent-list parent-indices]))))
+
 (defn get-siblings-ids
   [objects id]
   (let [parent (get-parent objects id)]
diff --git a/common/src/app/common/types/shape_tree.cljc b/common/src/app/common/types/shape_tree.cljc
index aebcb9d1c0..7051ef2ce2 100644
--- a/common/src/app/common/types/shape_tree.cljc
+++ b/common/src/app/common/types/shape_tree.cljc
@@ -132,43 +132,34 @@
 (defn get-base
   [objects id-a id-b]
 
-  (let [parents-a (reverse (cons id-a (cph/get-parent-ids objects id-a)))
-        parents-b (reverse (cons id-b (cph/get-parent-ids objects id-b)))
+  (let [[parents-a parents-a-index] (cph/get-parent-ids-with-index objects id-a)
+        [parents-b parents-b-index] (cph/get-parent-ids-with-index objects id-b)
 
-        [base base-child-a base-child-b]
-        (loop [parents-a (rest parents-a)
-               parents-b (rest parents-b)
-               base uuid/zero]
-          (cond
-            (not= (first parents-a) (first parents-b))
-            [base (first parents-a) (first parents-b)]
+        parents-a (cons id-a parents-a)
+        parents-b (into #{id-b} parents-b)
 
-            (or (empty? parents-a) (empty? parents-b))
-            [uuid/zero (first parents-a) (first parents-b)]
+        ;; Search for the common frame in order
+        base (or (d/seek parents-b parents-a) uuid/zero)
 
-            :else
-            (recur (rest parents-a) (rest parents-b) (first parents-a))))
+        idx-a (get parents-a-index base)
+        idx-b (get parents-b-index base)]
 
-        index-base-a (when base-child-a (cph/get-position-on-parent objects base-child-a))
-        index-base-b (when base-child-b (cph/get-position-on-parent objects base-child-b))]
-
-    [base index-base-a index-base-b]))
+    [base idx-a idx-b]))
 
 (defn is-shape-over-shape?
   [objects base-shape-id over-shape-id]
 
   (let [[base index-a index-b] (get-base objects base-shape-id over-shape-id)]
     (cond
+      ;; The base the base shape, so the other item is bellow
       (= base base-shape-id)
-      (let [object (get objects base-shape-id)]
-        (or (cph/frame-shape? object)
-            (cph/root-frame? object)))
+      false
 
+      ;; The base is the testing over, so it's over
       (= base over-shape-id)
-      (let [object (get objects over-shape-id)]
-        (or (not (cph/frame-shape? object))
-            (not (cph/root-frame? object))))
+      true
 
+      ;; Check which index is lower
       :else
       (< index-a index-b))))