@arpproject/recrate 0.1.32-test3 → 0.1.32-test4

package/dist/recrate.es.js

@@ -112476,6 +112476,7 @@ const DEFAULT_TAB_PANE_WIDTH = 240;
 const ICON_TAB_PANE_WIDTH = 80;
 const MIN_LABEL_TAB_PANE_WIDTH = 100;
 const MAX_LABEL_TAB_PANE_WIDTH = 250;
+const AI_SCROLL_RESTORE_SUPPRESSION_MS = 2500;
 const clampLabelTabPaneWidth = (width) => Math.max(MIN_LABEL_TAB_PANE_WIDTH, Math.min(MAX_LABEL_TAB_PANE_WIDTH, Math.round(width)));
 const readPendingAddedProfileTabKeys = (entityId) => {
   if (typeof window === "undefined") return null;
@@ -112510,6 +112511,18 @@ const clearPendingAddedProfileTabKeys = (entityId) => {
   } catch {
   }
 };
+const buildAiApprovalNavigationKey = (entityId, approvalRecord) => {
+  const propertyName2 = String((approvalRecord == null ? void 0 : approvalRecord.propertyName) ?? "");
+  const operation = String((approvalRecord == null ? void 0 : approvalRecord.operation) ?? "");
+  const timestamp = String((approvalRecord == null ? void 0 : approvalRecord.timestamp) ?? "");
+  let previousValue = "";
+  try {
+    previousValue = JSON.stringify((approvalRecord == null ? void 0 : approvalRecord.previousValue) ?? null);
+  } catch {
+    previousValue = String((approvalRecord == null ? void 0 : approvalRecord.previousValue) ?? "");
+  }
+  return `${entityId}:${propertyName2}:${operation}:${timestamp}:${previousValue}`;
+};
 const RenderEntity = forwardRef((props, ref) => {
   var _a2, _b, _c, _d, _e2, _f, _g, _h, _i, _j, _k, _l, _m, _n, _o, _p;
   const { entity, onLoadEntity, onSaveCrate, onSaveEntityTemplate, onWarning, onError, onAddNewProfileRequest, onRemoveProfile } = props;
@@ -112561,9 +112574,14 @@ const RenderEntity = forwardRef((props, ref) => {
   const pendingAddedProfileSelectionRef = useRef(null);
   const pendingAddedPropertyRef = useRef(null);
   const pendingAiScrollPropertyRef = useRef(null);
+  const aiScrollRestoreSuppressedUntilRef = useRef(0);
   const lastAutoNavigatedAiApprovalRef = useRef(null);
   const [tabRailScrollState, setTabRailScrollState] = useState({ canScrollUp: false, canScrollDown: false });
   const debugScroll = (...args) => console.log("[recrate-scroll-debug]", ...args);
+  const suppressAiScrollRestore = () => {
+    aiScrollRestoreSuppressedUntilRef.current = Date.now() + AI_SCROLL_RESTORE_SUPPRESSION_MS;
+  };
+  const isAiScrollRestoreSuppressed = () => Date.now() < aiScrollRestoreSuppressedUntilRef.current;
   const pendingAiApprovals = useMemo$1(() => getPendingEntityApprovalRecords(approvalContext == null ? void 0 : approvalContext.roCrateApproval, contextEntity == null ? void 0 : contextEntity["@id"]), [approvalContext == null ? void 0 : approvalContext.roCrateApproval, contextEntity == null ? void 0 : contextEntity["@id"]]);
   const pendingAiApprovalProperties = useMemo$1(() => pendingAiApprovals.map((approvalRecord) => approvalRecord == null ? void 0 : approvalRecord.propertyName).filter((property) => typeof property === "string" && property.length > 0), [pendingAiApprovals]);
   const pendingDeletedEntityReviewProperties = useMemo$1(() => getPendingDeletedEntityReversePropertiesForSource(
@@ -112924,6 +112942,7 @@ const RenderEntity = forwardRef((props, ref) => {
     if (!navigationRestoreReadyRef.current) return;
     if (!(contextEntity == null ? void 0 : contextEntity["@id"])) return;
     if (((_a3 = pendingAddedPropertyRef.current) == null ? void 0 : _a3.entityId) === contextEntity["@id"]) return;
+    if (isAiScrollRestoreSuppressed()) return;
     const viewport = activeContentRef.current;
     if (!viewport) return;
     const restoreTarget = ((_d2 = (_c2 = (_b2 = state.editorState.getNavigationState(contextEntity["@id"])) == null ? void 0 : _b2.tabStates) == null ? void 0 : _c2[activeTab]) == null ? void 0 : _d2.scrollTop) ?? 0;
@@ -112947,6 +112966,11 @@ const RenderEntity = forwardRef((props, ref) => {
     viewport.style.scrollBehavior = "auto";
     const attemptRestore = () => {
       if (cancelled) return;
+      if (isAiScrollRestoreSuppressed()) {
+        restoreInProgressRef.current = false;
+        viewport.style.scrollBehavior = previousInlineScrollBehavior;
+        return;
+      }
       attempts += 1;
       const maxScrollable = Math.max(0, viewport.scrollHeight - viewport.clientHeight);
       const target = Math.min(restoreTarget, maxScrollable);
@@ -112992,7 +113016,7 @@ const RenderEntity = forwardRef((props, ref) => {
       cancelled = true;
       restoreInProgressRef.current = false;
       viewport.style.scrollBehavior = previousInlineScrollBehavior;
-      if (navigationRestoreReadyRef.current) {
+      if (navigationRestoreReadyRef.current && !isAiScrollRestoreSuppressed()) {
         captureViewContext(activeTab, viewport.scrollTop);
       }
       viewport.removeEventListener("scroll", handleScroll);
@@ -113005,6 +113029,7 @@ const RenderEntity = forwardRef((props, ref) => {
     const pendingTab = pendingRestoredTabRef.current;
     if (!(contextEntity == null ? void 0 : contextEntity["@id"])) return;
     if (((_a3 = pendingAddedPropertyRef.current) == null ? void 0 : _a3.entityId) === contextEntity["@id"]) return;
+    if (isAiScrollRestoreSuppressed()) return;
     if (pendingTab) {
       debugScroll("restore.pending-tab", {
         entityId: contextEntity["@id"],
@@ -113580,6 +113605,7 @@ const RenderEntity = forwardRef((props, ref) => {
     if (!hasFieldValue(contextEntity == null ? void 0 : contextEntity[property]) && hideEmptyFields) {
       setHideEmptyFields(false);
     }
+    suppressAiScrollRestore();
     pendingAiScrollPropertyRef.current = property;
     const propertyTab = renderTabs ? findTabForProperty(tabs, property) : null;
     if ((propertyTab == null ? void 0 : propertyTab.name) && propertyTab.name !== activeTab) {
@@ -113599,18 +113625,18 @@ const RenderEntity = forwardRef((props, ref) => {
     tabs
   ]);
   useEffect(() => {
-    var _a3;
     const entityId = contextEntity == null ? void 0 : contextEntity["@id"];
-    const firstPendingProperty = (_a3 = pendingAiApprovals[0]) == null ? void 0 : _a3.propertyName;
+    const firstPendingApproval = pendingAiApprovals[0];
+    const firstPendingProperty = firstPendingApproval == null ? void 0 : firstPendingApproval.propertyName;
     if (!entityId || !firstPendingProperty) {
       lastAutoNavigatedAiApprovalRef.current = null;
       return;
     }
-    const autoNavigationKey = `${entityId}:${firstPendingProperty}`;
+    const autoNavigationKey = `${(profileManager == null ? void 0 : profileManager.$key) ?? 0}:${buildAiApprovalNavigationKey(entityId, firstPendingApproval)}`;
     if (lastAutoNavigatedAiApprovalRef.current === autoNavigationKey) return;
     lastAutoNavigatedAiApprovalRef.current = autoNavigationKey;
     navigateToAiApproval(0);
-  }, [contextEntity == null ? void 0 : contextEntity["@id"], navigateToAiApproval, pendingAiApprovals]);
+  }, [contextEntity == null ? void 0 : contextEntity["@id"], navigateToAiApproval, pendingAiApprovals, profileManager == null ? void 0 : profileManager.$key]);
   useEffect(() => {
     const pendingProperty = pendingAiScrollPropertyRef.current;
     if (!pendingProperty) return;
@@ -113621,8 +113647,16 @@ const RenderEntity = forwardRef((props, ref) => {
       return;
     }
     const cancelScroll = scrollToAiApprovalProperty(pendingProperty);
+    const captureTimer = window.setTimeout(() => {
+      if (activeContentRef.current) {
+        captureViewContext(activeTab, activeContentRef.current.scrollTop);
+      }
+    }, 350);
     pendingAiScrollPropertyRef.current = null;
-    return cancelScroll;
+    return () => {
+      cancelScroll();
+      window.clearTimeout(captureTimer);
+    };
   }, [activeTab, contextEntity == null ? void 0 : contextEntity["@id"], renderTabs, selectedAiApprovalIndex, tabs, scrollToAiApprovalProperty]);
   const isEntityReference2 = (value) => Boolean(value && typeof value === "object" && typeof value["@id"] === "string");
   const restoreNonCoreApprovalValue = (approvalRecord) => {
@@ -122793,7 +122827,7 @@ var EmotionCacheContext = /* @__PURE__ */ React.createContext(
   }) : null
 );
 var CacheProvider = EmotionCacheContext.Provider;
-const version = "0.1.32-test3";
+const version = "0.1.32-test4";
 const pkg = {
   version
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arpproject/recrate",
-  "version": "0.1.32-test3",
+  "version": "0.1.32-test4",
   "type": "module",
   "main": "./dist/recrate.es.js",
   "module": "./dist/recrate.es.js",