From cc2465416db07408dc819b36bce3a7ef796d0227 Mon Sep 17 00:00:00 2001
From: uurha <uurha.dev@gmail.com>
Date: Tue, 6 Aug 2024 21:45:05 +0200
Subject: [PATCH 1/2] Update label search for property field

---
 .../Editor/Drawers/Container/ElementsContainer.cs           | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Assets/BetterCommons/Editor/Drawers/Container/ElementsContainer.cs b/Assets/BetterCommons/Editor/Drawers/Container/ElementsContainer.cs
index 46ab05c..86becb8 100644
--- a/Assets/BetterCommons/Editor/Drawers/Container/ElementsContainer.cs
+++ b/Assets/BetterCommons/Editor/Drawers/Container/ElementsContainer.cs
@@ -119,8 +119,10 @@ private void ScheduleUpdateGeometry(GeometryChangedEvent changedEvent)
         private void OnGeometryChanged(VisualElement element)
         {
             var propertyPath = SerializedProperty.propertyPath;
-            var builder = element.Query<PropertyField>().Where(field => field.bindingPath.CompareOrdinal(propertyPath)).Build();
-            var label = builder.First().Query<Label>().Class(PropertyField.labelUssClassName).First();
+            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 label = labels.First();
             if (label != null)
             {
                 LabelContainer.Setup(label);

From 71b6a0f43ee6e2ec4fbcf21bdbe16e07f8d291b7 Mon Sep 17 00:00:00 2001
From: uurha <uurha.dev@gmail.com>
Date: Tue, 6 Aug 2024 21:45:14 +0200
Subject: [PATCH 2/2] Update package.json

---
 Assets/BetterCommons/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Assets/BetterCommons/package.json b/Assets/BetterCommons/package.json
index c8554a1..361908d 100644
--- a/Assets/BetterCommons/package.json
+++ b/Assets/BetterCommons/package.json
@@ -1,7 +1,7 @@
 {
   "name": "com.tdw.better.commons",
   "displayName": "Better Commons",
-  "version": "0.0.36",
+  "version": "0.0.37",
   "unity": "2021.3",
   "description": " ",
   "dependencies": {