@remotion/studio 4.0.432 → 4.0.433

package/dist/components/Timeline/use-sequence-props-subscription.js

@@ -43,6 +43,14 @@ const useSequencePropsSubscription = (sequence, originalLocation) => {
     currentLocationLine.current = locationLine;
     const currentLocationColumn = (0, react_1.useRef)(locationColumn);
     currentLocationColumn.current = locationColumn;
+    const nodePathRef = (0, react_1.useRef)(null);
+    const isMountedRef = (0, react_1.useRef)(true);
+    (0, react_1.useEffect)(() => {
+        isMountedRef.current = true;
+        return () => {
+            isMountedRef.current = false;
+        };
+    }, []);
     (0, react_1.useEffect)(() => {
         if (!clientId ||
             !locationSource ||
@@ -67,25 +75,36 @@ const useSequencePropsSubscription = (sequence, originalLocation) => {
                 return;
             }
             if (result.canUpdate) {
+                nodePathRef.current = result.nodePath;
                 setPropStatusesForSequence(result.props);
             }
             else {
+                nodePathRef.current = null;
                 setPropStatusesForSequence(null);
             }
         })
-            .catch(() => {
+            .catch((err) => {
+            nodePathRef.current = null;
+            remotion_1.Internals.Log.error(err);
             setPropStatusesForSequence(null);
         });
         return () => {
-            setPropStatusesForSequence(null);
-            (0, call_api_1.callApi)('/api/unsubscribe-from-sequence-props', {
-                fileName: locationSource,
-                line: locationLine,
-                column: locationColumn,
-                clientId,
-            }).catch(() => {
-                // Ignore unsubscribe errors
-            });
+            const currentNodePath = nodePathRef.current;
+            // Only clear props on true unmount, not on re-subscribe due to
+            // line number changes — avoids flicker while re-subscribing.
+            if (!isMountedRef.current) {
+                setPropStatusesForSequence(null);
+            }
+            nodePathRef.current = null;
+            if (currentNodePath) {
+                (0, call_api_1.callApi)('/api/unsubscribe-from-sequence-props', {
+                    fileName: locationSource,
+                    nodePath: currentNodePath,
+                    clientId,
+                }).catch(() => {
+                    // Ignore unsubscribe errors
+                });
+            }
         };
     }, [
         clientId,
@@ -104,8 +123,8 @@ const useSequencePropsSubscription = (sequence, originalLocation) => {
                 return;
             }
             if (event.fileName !== currentLocationSource.current ||
-                event.line !== currentLocationLine.current ||
-                event.column !== currentLocationColumn.current) {
+                !nodePathRef.current ||
+                JSON.stringify(event.nodePath) !== JSON.stringify(nodePathRef.current)) {
                 return;
             }
             if (event.result.canUpdate) {
@@ -126,5 +145,6 @@ const useSequencePropsSubscription = (sequence, originalLocation) => {
         subscribeToEvent,
         setPropStatusesForSequence,
     ]);
+    return nodePathRef.current;
 };
 exports.useSequencePropsSubscription = useSequencePropsSubscription;