From 828f4880b423411bb7f2fead918316e772d82614 Mon Sep 17 00:00:00 2001
From: uurha <uurha@users.noreply.github.com>
Date: Tue, 6 Aug 2024 20:04:37 +0000
Subject: [PATCH] Merge pull request #41 from
 techno-dwarf-works/feature/refactoring

Version 0.0.38
---
 Editor/Drawers/Container/ElementsContainer.cs | 6 +++++-
 package.json                                  | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Editor/Drawers/Container/ElementsContainer.cs b/Editor/Drawers/Container/ElementsContainer.cs
index 86becb8..7516b2c 100644
--- a/Editor/Drawers/Container/ElementsContainer.cs
+++ b/Editor/Drawers/Container/ElementsContainer.cs
@@ -121,7 +121,11 @@ private void OnGeometryChanged(VisualElement element)
             var propertyPath = SerializedProperty.propertyPath;
             var propertyFields = element.Query<PropertyField>().Where(field => field.bindingPath.CompareOrdinal(propertyPath)).Build();
             var parentField = propertyFields.First();
-            var labels = parentField.Query<Label>().Class(PropertyField.labelUssClassName).Where(field => field.parent.Equals(parentField));
+            var labels = parentField.Query<Label>().Class(PropertyField.labelUssClassName).Where(field =>
+            {
+                var firstAncestor = field.GetFirstAncestorOfType<PropertyField>();
+                return firstAncestor != null && firstAncestor.Equals(parentField);
+            });
             var label = labels.First();
             if (label != null)
             {
diff --git a/package.json b/package.json
index 361908d..9243a14 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.tdw.better.commons",
   "displayName": "Better Commons",
-  "version": "0.0.37",
+  "version": "0.0.38",
   "unity": "2021.3",
   "description": " ",
   "dependencies": {