From 5820f73b6ea6991ffa163ada52b5a069924aedb7 Mon Sep 17 00:00:00 2001
From: "alonso.torres" <alonso.torres@kaleidos.net>
Date: Wed, 31 Aug 2022 16:29:38 +0200
Subject: [PATCH] :bug: Fix problem when hovering over nested frames

---
 CHANGES.md                               | 5 +++++
 common/src/app/common/pages/helpers.cljc | 6 +++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index fe57da669..630895b8d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,5 +1,10 @@
 # CHANGELOG
 
+## 1.15.3-beta
+
+### :bug: Bugs fixed
+
+- Fix problem when hovering over nested frames [Taiga #4018] https://tree.taiga.io/project/penpot/issue/4018
 ## 1.15.2-beta
 
 ### :bug: Bugs fixed
diff --git a/common/src/app/common/pages/helpers.cljc b/common/src/app/common/pages/helpers.cljc
index c7214af10..d31fe916f 100644
--- a/common/src/app/common/pages/helpers.cljc
+++ b/common/src/app/common/pages/helpers.cljc
@@ -44,6 +44,10 @@
   [{:keys [type]}]
   (= type :group))
 
+(defn bool-shape?
+  [{:keys [type]}]
+  (= type :bool))
+
 (defn text-shape?
   [{:keys [type]}]
   (= type :text))
@@ -268,7 +272,7 @@
                  (= id-a id-b)
                  0
 
-                 (is-shape-over-shape? objects id-a id-b options)
+                 (is-shape-over-shape? objects id-a id-b {:top-frames? true})
                  1
 
                  :else