From 1d2110b68c6b39ab7be5c1427bc560ed4605740a Mon Sep 17 00:00:00 2001
From: Eva Marco <evamarcod@gmail.com>
Date: Mon, 25 Mar 2024 14:37:48 +0100
Subject: [PATCH] :bug: Fix component layer color

---
 frontend/src/app/main/ui/viewer/inspect/left_sidebar.cljs  | 3 ++-
 frontend/src/app/main/ui/workspace/sidebar/layer_item.cljs | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/app/main/ui/viewer/inspect/left_sidebar.cljs b/frontend/src/app/main/ui/viewer/inspect/left_sidebar.cljs
index f546a9352..f6c234bd4 100644
--- a/frontend/src/app/main/ui/viewer/inspect/left_sidebar.cljs
+++ b/frontend/src/app/main/ui/viewer/inspect/left_sidebar.cljs
@@ -9,6 +9,7 @@
   (:require
    [app.common.data :as d]
    [app.common.data.macros :as dm]
+   [app.common.types.component :as ctk]
    [app.main.data.viewer :as dv]
    [app.main.store :as st]
    [app.main.ui.workspace.sidebar.layer-item :refer [layer-item-inner]]
@@ -30,7 +31,7 @@
         item-ref  (mf/use-ref nil)
         depth     (+ depth 1)
 
-        component-tree? (or component-child? (:component-root item))
+        component-tree? (or component-child? (ctk/instance-root? item) (ctk/instance-head? item))
 
         collapsed-iref
         (mf/use-memo
diff --git a/frontend/src/app/main/ui/workspace/sidebar/layer_item.cljs b/frontend/src/app/main/ui/workspace/sidebar/layer_item.cljs
index be6a1fffb..a2e008fa9 100644
--- a/frontend/src/app/main/ui/workspace/sidebar/layer_item.cljs
+++ b/frontend/src/app/main/ui/workspace/sidebar/layer_item.cljs
@@ -10,6 +10,7 @@
    [app.common.data :as d]
    [app.common.data.macros :as dm]
    [app.common.files.helpers :as cfh]
+   [app.common.types.component :as ctk]
    [app.common.types.container :as ctn]
    [app.common.types.shape.layout :as ctl]
    [app.common.uuid :as uuid]
@@ -61,7 +62,7 @@
             :class (stl/css-case
                     :layer-row true
                     :highlight highlighted?
-                    :component (some? (:component-id item))
+                    :component (ctk/instance-head? item)
                     :masked (:masked-group item)
                     :selected selected?
                     :type-frame (cfh/frame-shape? item)
@@ -321,7 +322,7 @@
 
         ref             (mf/use-ref)
         depth           (+ depth 1)
-        component-tree? (or component-child? (:component-root item))
+        component-tree? (or component-child? (ctk/instance-root? item) (ctk/instance-head? item))
 
         enable-drag      (mf/use-fn #(reset! drag-disabled* false))
         disable-drag     (mf/use-fn #(reset! drag-disabled* true))]