From 030075951927d65d3fd2442172a6eb84cda7c54c Mon Sep 17 00:00:00 2001
From: SahilCs15 <sahil.chalke@contentstack.com>
Date: Thu, 17 Jul 2025 14:05:57 +0530
Subject: [PATCH] fix: modified the way we were handling fieldlocation data
 fetch

---
 src/visualBuilder/components/FieldToolbar.tsx | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/src/visualBuilder/components/FieldToolbar.tsx b/src/visualBuilder/components/FieldToolbar.tsx
index c542c83a..29967560 100644
--- a/src/visualBuilder/components/FieldToolbar.tsx
+++ b/src/visualBuilder/components/FieldToolbar.tsx
@@ -392,17 +392,23 @@ function FieldToolbarComponent(
         };
     }, []);
 
+
+
     useEffect(() => {
-        const event = visualBuilderPostMessage?.on(
-            VisualBuilderPostMessageEvents.FIELD_LOCATION_DATA,
-            (data: { data: any }) => {
-                setFieldLocationData(data.data.fieldLocationData);
+        const fetchFieldLocationData = async () => {
+            try {
+                const event = await visualBuilderPostMessage?.send(VisualBuilderPostMessageEvents.FIELD_LOCATION_DATA, {
+                    domEditStack: getDOMEditStack(eventDetails.editableElement)
+                });
+               
+                setFieldLocationData(event)
+            } catch (error) {
+                console.error('Error fetching field location data:', error);
             }
-        );
-        return () => {
-            event?.unregister();
         };
-    }, []);
+
+        fetchFieldLocationData();
+    }, [eventDetails.editableElement]);
 
     const multipleFieldToolbarButtonClasses = classNames(
         "visual-builder__button visual-builder__button--secondary",