@arpproject/recrate 0.1.38 → 0.1.40

package/dist/crate-builder/RenderEntity/EntityProperty.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/crate-builder/RenderEntity/RenderLinkedItem.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/crate-builder/RenderEntity/ai-approval-navigation.d.ts

@@ -0,0 +1,7 @@
+export declare const CORE_AI_REVIEW_PROPERTY_ORDER: string[];
+export declare const getDisplayedAiReviewPropertyOrder: ({ renderTabs, tabs, untabbedProperties, }: {
+    renderTabs: boolean;
+    tabs: any[];
+    untabbedProperties: unknown[];
+}) => string[];
+export declare const orderAiApprovalsByDisplayedFields: (approvals: any[], displayedPropertyOrder: string[]) => any[];

package/dist/crate-builder/RenderEntity/ai-approval-navigation.spec.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/crate-builder/RenderEntity/profile-tabs.lib.d.ts

@@ -8,6 +8,7 @@ export declare const findAddedProfileTab: (tabs: any[], previousTabKeys: Set<str
 export declare const isAboutTab: (tab: any) => boolean;
 export declare const tabContainsProperty: (tab: any, property: string) => boolean;
 export declare const findTabForProperty: (tabs: any[], property: string) => any;
+export declare const addMissingReviewPropertiesToTabs: (tabs: any[], properties: string[]) => any[];
 export declare const clampLabelTabPaneWidth: (width: number) => number;
 export declare const readPendingAddedProfileTabKeys: (entityId: string) => string[] | null;
 export declare const writePendingAddedProfileTabKeys: (entityId: string, tabKeys: string[]) => void;

package/dist/recrate.es.js

@@ -59412,6 +59412,27 @@ const findTabForProperty = (tabs, property) => {
   const matchingTabs = tabs.filter((tab) => tabContainsProperty(tab, property));
   return matchingTabs.find((tab) => !isAboutTab(tab)) ?? matchingTabs[0] ?? tabs.find((tab) => ["overflow", "other"].includes(String((tab == null ? void 0 : tab.name) || "").toLowerCase()));
 };
+const addMissingReviewPropertiesToTabs = (tabs, properties) => {
+  const uniqueProperties = Array.from(new Set(
+    properties.filter((property) => typeof property === "string" && property.length > 0)
+  ));
+  if (!tabs.length || !uniqueProperties.length) return tabs;
+  const assignedProperties = new Set(
+    tabs.flatMap((tab) => Array.isArray(tab == null ? void 0 : tab.inputs) ? tab.inputs.flatMap((input) => [input == null ? void 0 : input.name, input == null ? void 0 : input.id]) : []).filter((property) => typeof property === "string" && property.length > 0)
+  );
+  const missingProperties = uniqueProperties.filter((property) => !assignedProperties.has(property));
+  if (!missingProperties.length) return tabs;
+  const fallbackTabIndex = tabs.findIndex((tab) => ["overflow", "other"].includes(String((tab == null ? void 0 : tab.name) || "").toLowerCase()));
+  const aboutTabIndex = tabs.findIndex(isAboutTab);
+  const targetTabIndex = fallbackTabIndex >= 0 ? fallbackTabIndex : aboutTabIndex >= 0 ? aboutTabIndex : 0;
+  return tabs.map((tab, index2) => index2 === targetTabIndex ? {
+    ...tab,
+    inputs: [
+      ...Array.isArray(tab == null ? void 0 : tab.inputs) ? tab.inputs : [],
+      ...missingProperties.map((property) => ({ name: property }))
+    ]
+  } : tab);
+};
 const clampLabelTabPaneWidth = (width) => Math.max(MIN_LABEL_TAB_PANE_WIDTH, Math.min(MAX_LABEL_TAB_PANE_WIDTH, Math.round(width)));
 const getPendingAddedProfileStorageKey = (entityId) => `recrate.pending-added-profile-tab.${entityId}`;
 const readPendingAddedProfileTabKeys = (entityId) => {
@@ -85864,7 +85885,7 @@ const RenderLinkedItem = ({
           {
             entityId: entity["@id"],
             rows: aiEntityDiffRows,
-            readonly: Boolean(((_b = state.configuration) == null ? void 0 : _b.readonly) || readonly),
+            readonly: Boolean((_b = state.configuration) == null ? void 0 : _b.readonly),
             onClose: () => setShowAiEntityDiff(false),
             onAccept: () => onAcceptAiEntityEdit == null ? void 0 : onAcceptAiEntityEdit(effectiveEntity),
             onReject: () => onRejectAiEntityEdit == null ? void 0 : onRejectAiEntityEdit(effectiveEntity)
@@ -85888,7 +85909,7 @@ const RenderLinkedItem = ({
             displayEntity: linkDisplayEntity,
             property,
             sourceEntityId: aiUnlinkSourceEntityId,
-            readonly: Boolean(((_d = state.configuration) == null ? void 0 : _d.readonly) || readonly),
+            readonly: Boolean((_d = state.configuration) == null ? void 0 : _d.readonly),
             onLoadEntity: handleLoadEntity,
             onAcceptUnlink: onAcceptAiEntityUnlink,
             onRejectUnlink: onRejectAiEntityUnlink
@@ -87829,6 +87850,67 @@ const EntityProperty = ({
       idx
     });
   }, [approvalContext, entity, hasCurrentPropertyValue, isAiDelete, onCreateProperty, onSaveProperty, previousValueDiffers, property, unapprovedApprovalRecord]);
+  const renderAiActions = (idx) => {
+    var _a3, _b2;
+    return showAiReview && idx === ((_a3 = renderedSimpleInstances[0]) == null ? void 0 : _a3.idx) && !((_b2 = state.configuration) == null ? void 0 : _b2.readonly) ? /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "recrate-ai-actions", children: [
+      showAiDiffToggle && /* @__PURE__ */ jsxRuntimeExports.jsx(Tooltip2, { title: showAiDiff ? t2("ai_hide_diff") : t2("ai_show_diff"), children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+        Button$1,
+        {
+          size: "middle",
+          className: "recrate-ai-action-diff",
+          icon: /* @__PURE__ */ jsxRuntimeExports.jsx(RefIcon$7, {}),
+          "aria-label": showAiDiff ? String(t2("ai_hide_ai_diff_aria")) : String(t2("ai_show_ai_diff_aria")),
+          "aria-pressed": showAiDiff,
+          onClick: () => setShowAiDiff((visible) => !visible)
+        }
+      ) }),
+      /* @__PURE__ */ jsxRuntimeExports.jsx(Tooltip2, { title: isAiDelete ? t2("ai_approve_deletion_tooltip") : t2("ai_approve_suggested_value_tooltip"), children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+        Button$1,
+        {
+          size: "middle",
+          className: "recrate-ai-action-approve",
+          onClick: handleApproveAiSuggestion,
+          children: isAiDelete ? t2("ai_delete") : t2("ai_accept")
+        }
+      ) }),
+      previousValueDiffers && /* @__PURE__ */ jsxRuntimeExports.jsx(Tooltip2, { title: t2("ai_restore_previous_value_tooltip"), children: /* @__PURE__ */ jsxRuntimeExports.jsx(
+        Button$1,
+        {
+          size: "middle",
+          className: "recrate-ai-action-reject",
+          onClick: () => handleRejectAiSuggestion(idx),
+          children: isAiDelete ? t2("ai_restore") : t2("ai_reject")
+        }
+      ) })
+    ] }) : null;
+  };
+  const renderPropertyValue = (instance2) => {
+    if (showAiDiff && showAiDiffToggle) {
+      return /* @__PURE__ */ jsxRuntimeExports.jsx(
+        AiFieldDiffView,
+        {
+          previousValue: unapprovedApprovalRecord == null ? void 0 : unapprovedApprovalRecord.previousValue,
+          currentValue: instance2.value,
+          operation: unapprovedApprovalRecord == null ? void 0 : unapprovedApprovalRecord.operation
+        }
+      );
+    }
+    if (propertyDefinition == null ? void 0 : propertyDefinition.readonly) {
+      return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: showAiReview ? "recrate-property-value-readonly recrate-ai-field-control" : "recrate-property-value-readonly", children: instance2.value });
+    }
+    return /* @__PURE__ */ jsxRuntimeExports.jsx(
+      EntityPropertyInstance,
+      {
+        className: "flex-grow",
+        property,
+        value: instance2.value,
+        idx: instance2.idx,
+        definition: propertyDefinition,
+        onSaveProperty: handleSaveProperty,
+        onCreateEntity
+      }
+    );
+  };
   return /* @__PURE__ */ jsxRuntimeExports.jsxs(
     "div",
     {
@@ -87862,59 +87944,11 @@ const EntityProperty = ({
         ] }),
         /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "w-2/3 xl:w-4/5 flex flex-col flex-grow recrate-property-value", children: [
           /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: "flex flex-col space-y-1", children: renderedSimpleInstances.map((instance2) => {
-            var _a3, _b2, _c, _d;
-            return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: (propertyDefinition == null ? void 0 : propertyDefinition.readonly) ? /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: showAiReview ? "recrate-property-value-readonly recrate-ai-field-control" : "recrate-property-value-readonly", children: instance2.value }) : /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: `flex flex-row gap-2 ${showAiReview ? "recrate-ai-field-row" : ""}`, children: [
-              /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: `flex-grow min-w-0 ${showAiReview ? "recrate-ai-field-control" : ""}`, children: showAiDiff && showAiDiffToggle ? /* @__PURE__ */ jsxRuntimeExports.jsx(
-                AiFieldDiffView,
-                {
-                  previousValue: unapprovedApprovalRecord == null ? void 0 : unapprovedApprovalRecord.previousValue,
-                  currentValue: instance2.value,
-                  operation: unapprovedApprovalRecord == null ? void 0 : unapprovedApprovalRecord.operation
-                }
-              ) : /* @__PURE__ */ jsxRuntimeExports.jsx(
-                EntityPropertyInstance,
-                {
-                  className: "flex-grow",
-                  property,
-                  value: instance2.value,
-                  idx: instance2.idx,
-                  definition: propertyDefinition,
-                  onSaveProperty: handleSaveProperty,
-                  onCreateEntity
-                }
-              ) }),
-              showAiReview && instance2.idx === ((_a3 = renderedSimpleInstances[0]) == null ? void 0 : _a3.idx) && !((_b2 = state.configuration) == null ? void 0 : _b2.readonly) && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "recrate-ai-actions", children: [
-                showAiDiffToggle && /* @__PURE__ */ jsxRuntimeExports.jsx(Tooltip2, { title: showAiDiff ? t2("ai_hide_diff") : t2("ai_show_diff"), children: /* @__PURE__ */ jsxRuntimeExports.jsx(
-                  Button$1,
-                  {
-                    size: "middle",
-                    className: "recrate-ai-action-diff",
-                    icon: /* @__PURE__ */ jsxRuntimeExports.jsx(RefIcon$7, {}),
-                    "aria-label": showAiDiff ? String(t2("ai_hide_ai_diff_aria")) : String(t2("ai_show_ai_diff_aria")),
-                    "aria-pressed": showAiDiff,
-                    onClick: () => setShowAiDiff((visible) => !visible)
-                  }
-                ) }),
-                /* @__PURE__ */ jsxRuntimeExports.jsx(Tooltip2, { title: isAiDelete ? t2("ai_approve_deletion_tooltip") : t2("ai_approve_suggested_value_tooltip"), children: /* @__PURE__ */ jsxRuntimeExports.jsx(
-                  Button$1,
-                  {
-                    size: "middle",
-                    className: "recrate-ai-action-approve",
-                    onClick: handleApproveAiSuggestion,
-                    children: isAiDelete ? t2("ai_delete") : t2("ai_accept")
-                  }
-                ) }),
-                previousValueDiffers && /* @__PURE__ */ jsxRuntimeExports.jsx(Tooltip2, { title: t2("ai_restore_previous_value_tooltip"), children: /* @__PURE__ */ jsxRuntimeExports.jsx(
-                  Button$1,
-                  {
-                    size: "middle",
-                    className: "recrate-ai-action-reject",
-                    onClick: () => handleRejectAiSuggestion(instance2.idx),
-                    children: isAiDelete ? t2("ai_restore") : t2("ai_reject")
-                  }
-                ) })
-              ] }),
-              isNotValue && !showAiReview && !((_c = state.configuration) == null ? void 0 : _c.readonly) && (instance2.value || instance2.value === false) && !((_d = instance2.value) == null ? void 0 : _d["@id"]) && /* @__PURE__ */ jsxRuntimeExports.jsx(
+            var _a3, _b2;
+            return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { children: /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: `flex flex-row gap-2 ${showAiReview ? "recrate-ai-field-row" : ""}`, children: [
+              /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: `flex-grow min-w-0 ${showAiReview ? "recrate-ai-field-control" : ""}`, children: renderPropertyValue(instance2) }),
+              renderAiActions(instance2.idx),
+              isNotValue && !(propertyDefinition == null ? void 0 : propertyDefinition.readonly) && !showAiReview && !((_a3 = state.configuration) == null ? void 0 : _a3.readonly) && (instance2.value || instance2.value === false) && !((_b2 = instance2.value) == null ? void 0 : _b2["@id"]) && /* @__PURE__ */ jsxRuntimeExports.jsx(
                 DeleteProperty,
                 {
                   type: "delete",
@@ -115888,6 +115922,61 @@ const useEntityScrollRestoration = ({
     };
   }, [activeTab, contextEntity == null ? void 0 : contextEntity["@id"], tabsLength, extraPropertiesLength]);
 };
+const CORE_AI_REVIEW_PROPERTY_ORDER = ["@id", "@type", "name"];
+const getFieldNames = (field) => {
+  if (typeof field === "string") return [field];
+  if (!field || typeof field !== "object") return [];
+  const { name: name2, id: id2 } = field;
+  return [name2, id2].filter((value) => typeof value === "string" && value.length > 0);
+};
+const addUniqueProperties = (order, seen, fields) => {
+  fields.flatMap(getFieldNames).forEach((property) => {
+    if (seen.has(property)) return;
+    seen.add(property);
+    order.push(property);
+  });
+};
+const getDisplayedAiReviewPropertyOrder = ({
+  renderTabs,
+  tabs,
+  untabbedProperties
+}) => {
+  const order = [];
+  const seen = /* @__PURE__ */ new Set();
+  if (!renderTabs) {
+    addUniqueProperties(order, seen, CORE_AI_REVIEW_PROPERTY_ORDER);
+    addUniqueProperties(order, seen, untabbedProperties);
+    return order;
+  }
+  let foundAboutTab = false;
+  tabs.forEach((tab) => {
+    if (isAboutTab(tab)) {
+      foundAboutTab = true;
+      addUniqueProperties(order, seen, CORE_AI_REVIEW_PROPERTY_ORDER);
+    }
+    addUniqueProperties(
+      order,
+      seen,
+      Array.isArray(tab == null ? void 0 : tab.inputs) ? tab.inputs : []
+    );
+  });
+  if (!foundAboutTab) {
+    addUniqueProperties(order, seen, CORE_AI_REVIEW_PROPERTY_ORDER);
+  }
+  return order;
+};
+const orderAiApprovalsByDisplayedFields = (approvals, displayedPropertyOrder) => {
+  const displayIndexByProperty = new Map(
+    displayedPropertyOrder.map((property, index2) => [property, index2])
+  );
+  return approvals.map((approvalRecord, originalIndex) => ({ approvalRecord, originalIndex })).sort((left, right) => {
+    var _a2, _b;
+    const leftIndex = displayIndexByProperty.get((_a2 = left.approvalRecord) == null ? void 0 : _a2.propertyName) ?? Number.POSITIVE_INFINITY;
+    const rightIndex = displayIndexByProperty.get((_b = right.approvalRecord) == null ? void 0 : _b.propertyName) ?? Number.POSITIVE_INFINITY;
+    if (leftIndex !== rightIndex) return leftIndex - rightIndex;
+    return left.originalIndex - right.originalIndex;
+  }).map(({ approvalRecord }) => approvalRecord);
+};
 var _baseDifference;
 var hasRequired_baseDifference;
 function require_baseDifference() {
@@ -116468,6 +116557,12 @@ function applyTabDataIndicators({
   return tabs;
 }
 const AI_SCROLL_RESTORE_SUPPRESSION_MS = 2500;
+const hasProfileLayouts = (layouts) => {
+  if (!layouts) return false;
+  if (Array.isArray(layouts)) return layouts.length > 0;
+  if (typeof layouts === "object") return Object.keys(layouts).length > 0;
+  return false;
+};
 const buildAiApprovalNavigationKey = (entityId, approvalRecord) => {
   const propertyName2 = String((approvalRecord == null ? void 0 : approvalRecord.propertyName) ?? "");
   const operation = String((approvalRecord == null ? void 0 : approvalRecord.operation) ?? "");
@@ -116481,7 +116576,7 @@ const buildAiApprovalNavigationKey = (entityId, approvalRecord) => {
   return `${entityId}:${propertyName2}:${operation}:${timestamp}:${previousValue}`;
 };
 const RenderEntity = forwardRef((props, ref) => {
-  var _a2, _b, _c, _d, _e2, _f, _g, _h, _i, _j, _k, _l;
+  var _a2, _b, _c, _d, _e2, _f, _g, _h, _i, _j, _k;
   const {
     entity,
     onLoadEntity,
@@ -116622,14 +116717,14 @@ const RenderEntity = forwardRef((props, ref) => {
     captureViewContext,
     debugScroll
   });
-  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 pendingAiApprovalRecords = 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(() => pendingAiApprovalRecords.map((approvalRecord) => approvalRecord == null ? void 0 : approvalRecord.propertyName).filter((property) => typeof property === "string" && property.length > 0), [pendingAiApprovalRecords]);
   const pendingDeletedEntityReviewProperties = useMemo$1(() => {
     const reverseDeletedEntityProperties = getPendingDeletedEntityReversePropertiesForSource(
       approvalContext == null ? void 0 : approvalContext.roCrateApproval,
       contextEntity == null ? void 0 : contextEntity["@id"]
     );
-    const removedReferenceDeletedEntityProperties = pendingAiApprovals.map((approvalRecord) => approvalRecord == null ? void 0 : approvalRecord.propertyName).filter((property) => typeof property === "string" && property.length > 0).filter((property) => getPendingDeletedEntitiesForRemovedReferences(
+    const removedReferenceDeletedEntityProperties = pendingAiApprovalRecords.map((approvalRecord) => approvalRecord == null ? void 0 : approvalRecord.propertyName).filter((property) => typeof property === "string" && property.length > 0).filter((property) => getPendingDeletedEntitiesForRemovedReferences(
       approvalContext == null ? void 0 : approvalContext.roCrateApproval,
       contextEntity == null ? void 0 : contextEntity["@id"],
       property,
@@ -116639,11 +116734,28 @@ const RenderEntity = forwardRef((props, ref) => {
       ...reverseDeletedEntityProperties,
       ...removedReferenceDeletedEntityProperties
     ]));
-  }, [approvalContext == null ? void 0 : approvalContext.roCrateApproval, contextEntity, pendingAiApprovals]);
+  }, [approvalContext == null ? void 0 : approvalContext.roCrateApproval, contextEntity, pendingAiApprovalRecords]);
   const approvedAiApprovals = useMemo$1(() => getApprovedEntityApprovalRecords(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 approvedAiApprovalProperties = useMemo$1(() => Array.from(new Set(
     approvedAiApprovals.map((approvalRecord) => approvalRecord == null ? void 0 : approvalRecord.propertyName).filter((property) => typeof property === "string" && property.length > 0)
   )), [approvedAiApprovals]);
+  const aiReviewPropertyNames = useMemo$1(() => Array.from(/* @__PURE__ */ new Set([
+    ...pendingAiApprovalProperties,
+    ...pendingDeletedEntityReviewProperties
+  ])), [pendingAiApprovalProperties, pendingDeletedEntityReviewProperties]);
+  const tabsWithAiReviewProperties = useMemo$1(() => addMissingReviewPropertiesToTabs(tabs, aiReviewPropertyNames), [aiReviewPropertyNames, tabs]);
+  const entityPropertyNames = useMemo$1(() => Array.from(/* @__PURE__ */ new Set([
+    ...Object.keys(contextEntity ?? {}),
+    ...pendingAiApprovalProperties,
+    ...pendingDeletedEntityReviewProperties,
+    ...approvedAiApprovalProperties
+  ])).sort(), [approvedAiApprovalProperties, contextEntity, pendingAiApprovalProperties, pendingDeletedEntityReviewProperties]);
+  const displayedAiReviewPropertyOrder = useMemo$1(() => getDisplayedAiReviewPropertyOrder({
+    renderTabs,
+    tabs: tabsWithAiReviewProperties,
+    untabbedProperties: entityPropertyNames
+  }), [entityPropertyNames, renderTabs, tabsWithAiReviewProperties]);
+  const pendingAiApprovals = useMemo$1(() => orderAiApprovalsByDisplayedFields(pendingAiApprovalRecords, displayedAiReviewPropertyOrder), [displayedAiReviewPropertyOrder, pendingAiApprovalRecords]);
   const selectedAiApproval = pendingAiApprovals[selectedAiApprovalIndex] ?? pendingAiApprovals[0];
   const selectedAiApprovalProperty = (selectedAiApproval == null ? void 0 : selectedAiApproval.propertyName) ?? pendingDeletedEntityReviewProperties[0];
   const pendingContextApprovalItems = useMemo$1(() => getPendingContextApprovalRecords(approvalContext == null ? void 0 : approvalContext.roCrateApproval), [approvalContext == null ? void 0 : approvalContext.roCrateApproval]);
@@ -117143,12 +117255,12 @@ const RenderEntity = forwardRef((props, ref) => {
     let attempts = 0;
     let timerId = 0;
     let rafId = 0;
-    const maxAttempts = 30;
+    const maxAttempts = 100;
     const attemptScroll = () => {
       attempts += 1;
       const propertyElement = findPropertyElement(property);
       const viewport = activeContentRef.current;
-      if (propertyElement && viewport) {
+      if (propertyElement && viewport && viewport.clientHeight > 0 && viewport.scrollHeight > 0) {
         const viewportRect = viewport.getBoundingClientRect();
         const propertyRect = propertyElement.getBoundingClientRect();
         const targetTop = viewport.scrollTop + propertyRect.top - viewportRect.top - 8;
@@ -117179,7 +117291,7 @@ const RenderEntity = forwardRef((props, ref) => {
     }
     suppressAiScrollRestore();
     pendingAiScrollPropertyRef.current = property;
-    const propertyTab = renderTabs ? findTabForProperty(tabs, property) : null;
+    const propertyTab = renderTabs ? findTabForProperty(tabsWithAiReviewProperties, property) : null;
     if ((propertyTab == null ? void 0 : propertyTab.name) && propertyTab.name !== activeTab) {
       captureViewContext(activeTab);
       setActiveTab(propertyTab.name);
@@ -117194,7 +117306,7 @@ const RenderEntity = forwardRef((props, ref) => {
     pendingAiApprovals,
     renderTabs,
     scrollToAiApprovalProperty,
-    tabs
+    tabsWithAiReviewProperties
   ]);
   const navigateToAiApproval = useCallback((index2) => {
     if (!pendingAiApprovals.length) return;
@@ -117206,9 +117318,9 @@ const RenderEntity = forwardRef((props, ref) => {
     navigateToAiApprovalProperty(property);
   }, [navigateToAiApprovalProperty, pendingAiApprovals]);
   useEffect(() => {
-    var _a3, _b2;
+    var _a3;
     const entityId = contextEntity == null ? void 0 : contextEntity["@id"];
-    const profileHasTabbedLayout = Boolean((_b2 = (_a3 = profileManager == null ? void 0 : profileManager.profile) == null ? void 0 : _a3.layouts) == null ? void 0 : _b2.length);
+    const profileHasTabbedLayout = hasProfileLayouts((_a3 = profileManager == null ? void 0 : profileManager.profile) == null ? void 0 : _a3.layouts);
     if (profileHasTabbedLayout && tabs.length === 0) {
       return;
     }
@@ -117218,7 +117330,8 @@ const RenderEntity = forwardRef((props, ref) => {
       lastAutoNavigatedAiApprovalRef.current = null;
       return;
     }
-    const autoNavigationKey = firstPendingApproval ? `${(profileManager == null ? void 0 : profileManager.$key) ?? 0}:${buildAiApprovalNavigationKey(entityId, firstPendingApproval)}` : `${(profileManager == null ? void 0 : profileManager.$key) ?? 0}:${entityId}:${firstPendingProperty}:deleted-entity-review`;
+    const displayedOrderKey = displayedAiReviewPropertyOrder.join("\0");
+    const autoNavigationKey = firstPendingApproval ? `${(profileManager == null ? void 0 : profileManager.$key) ?? 0}:${displayedOrderKey}:${buildAiApprovalNavigationKey(entityId, firstPendingApproval)}` : `${(profileManager == null ? void 0 : profileManager.$key) ?? 0}:${displayedOrderKey}:${entityId}:${firstPendingProperty}:deleted-entity-review`;
     if (lastAutoNavigatedAiApprovalRef.current === autoNavigationKey) return;
     lastAutoNavigatedAiApprovalRef.current = autoNavigationKey;
     if (firstPendingApproval) {
@@ -117232,14 +117345,15 @@ const RenderEntity = forwardRef((props, ref) => {
     navigateToAiApprovalProperty,
     pendingAiApprovals,
     pendingDeletedEntityReviewProperties,
+    displayedAiReviewPropertyOrder,
     profileManager == null ? void 0 : profileManager.$key,
-    (_d = (_c = profileManager == null ? void 0 : profileManager.profile) == null ? void 0 : _c.layouts) == null ? void 0 : _d.length,
+    (_c = profileManager == null ? void 0 : profileManager.profile) == null ? void 0 : _c.layouts,
     tabs.length
   ]);
   useEffect(() => {
     const pendingProperty = pendingAiScrollPropertyRef.current;
     if (!pendingProperty) return;
-    const propertyTab = renderTabs ? findTabForProperty(tabs, pendingProperty) : null;
+    const propertyTab = renderTabs ? findTabForProperty(tabsWithAiReviewProperties, pendingProperty) : null;
     if ((propertyTab == null ? void 0 : propertyTab.name) && propertyTab.name !== activeTab) {
       setActiveTab(propertyTab.name);
       saveTabToState(propertyTab.name);
@@ -117256,7 +117370,7 @@ const RenderEntity = forwardRef((props, ref) => {
       cancelScroll();
       window.clearTimeout(captureTimer);
     };
-  }, [activeTab, contextEntity == null ? void 0 : contextEntity["@id"], renderTabs, selectedAiApprovalIndex, tabs, scrollToAiApprovalProperty]);
+  }, [activeTab, contextEntity == null ? void 0 : contextEntity["@id"], renderTabs, selectedAiApprovalIndex, tabsWithAiReviewProperties, scrollToAiApprovalProperty]);
   const isEntityReference2 = (value) => Boolean(value && typeof value === "object" && typeof value["@id"] === "string");
   const restoreNonCoreApprovalValue = (approvalRecord) => {
     const property = approvalRecord == null ? void 0 : approvalRecord.propertyName;
@@ -117711,12 +117825,6 @@ const RenderEntity = forwardRef((props, ref) => {
   };
   const shouldRenderCoreField = (property, label) => matchesFieldFilter(property, label) && (!showAiEditedFields || fieldWasAiEdited(property));
   const shouldRenderField = (property, label) => matchesFieldFilter(property, label) && (!showAiEditedFields || fieldWasAiEdited(property)) && (fieldHasPendingAiApproval(property) || !hideEmptyFields || hasFieldValue(contextEntity == null ? void 0 : contextEntity[property]));
-  const entityPropertyNames = useMemo$1(() => Array.from(/* @__PURE__ */ new Set([
-    ...Object.keys(contextEntity ?? {}),
-    ...pendingAiApprovalProperties,
-    ...pendingDeletedEntityReviewProperties,
-    ...approvedAiApprovalProperties
-  ])).sort(), [approvedAiApprovalProperties, contextEntity, pendingAiApprovalProperties, pendingDeletedEntityReviewProperties]);
   const editorScrollClassName = `recrate-editor-scroll ${quickSettingsVisible ? "px-3 pb-3 pt-0" : "p-3"}`;
   const renderCoreEntityFields = (layout, options) => {
     var _a3;
@@ -117777,13 +117885,13 @@ const RenderEntity = forwardRef((props, ref) => {
   }
   return /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-row", children: [
     /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: "flex flex-col w-full", children: [
-      ((_e2 = state.configuration) == null ? void 0 : _e2.showControls) && /* @__PURE__ */ jsxRuntimeExports.jsx(
+      ((_d = state.configuration) == null ? void 0 : _d.showControls) && /* @__PURE__ */ jsxRuntimeExports.jsx(
         EntityEditorToolbar,
         {
           entity: contextEntity,
           quickSettingsVisible,
           reverseSidebarVisible,
-          enableReverseLinkBrowser: (_f = state.configuration) == null ? void 0 : _f.enableReverseLinkBrowser,
+          enableReverseLinkBrowser: (_e2 = state.configuration) == null ? void 0 : _e2.enableReverseLinkBrowser,
           onLoadEntity: handleLoadEntityWithContext,
           onBack: () => {
             captureCurrentViewContext(activeTab);
@@ -117809,7 +117917,7 @@ const RenderEntity = forwardRef((props, ref) => {
           activePropertyLabel: selectedAiApprovalProperty ? getFieldTitle(selectedAiApprovalProperty) : void 0,
           remainingEntityCount: pendingOtherAiApprovalEntities.length,
           remainingFieldCount: pendingOtherAiApprovalFieldCount,
-          readonly: (_g = state.configuration) == null ? void 0 : _g.readonly,
+          readonly: (_f = state.configuration) == null ? void 0 : _f.readonly,
           canGoPrevious: selectedAiApprovalIndex > 0,
           canGoNext: selectedAiApprovalIndex < pendingAiApprovals.length - 1,
           onPrevious: () => navigateToAiApproval(selectedAiApprovalIndex - 1),
@@ -117823,7 +117931,7 @@ const RenderEntity = forwardRef((props, ref) => {
         EntityEditorLayout,
         {
           renderTabs,
-          tabLocation: (_h = state.configuration) == null ? void 0 : _h.tabLocation,
+          tabLocation: (_g = state.configuration) == null ? void 0 : _g.tabLocation,
           iconView,
           tabPaneWidth,
           scrollViewportHeight,
@@ -117836,7 +117944,7 @@ const RenderEntity = forwardRef((props, ref) => {
           quickSettingsHeader: renderQuickSettingsHeader(),
           untabbedContent: renderUntabbedEntityFields(),
           untabbedTopContent: renderUntabbedEntityFields({ untabbedNameSavedClassName: "bg-green-200 rounded p-1 my-1" }),
-          tabbedRequiredWarning: !((_i = state.configuration) == null ? void 0 : _i.readonly) && ((_j = tabs.find((t22) => t22.name === activeTab)) == null ? void 0 : _j.missingRequiredData) && /* @__PURE__ */ jsxRuntimeExports.jsx(
+          tabbedRequiredWarning: !((_h = state.configuration) == null ? void 0 : _h.readonly) && ((_i = tabs.find((t22) => t22.name === activeTab)) == null ? void 0 : _i.missingRequiredData) && /* @__PURE__ */ jsxRuntimeExports.jsx(
             FloatingRequiredPropertiesWarning,
             {
               onClick: () => setHighlightRequiredProperties(!highlightRequiredProperties)
@@ -117844,9 +117952,9 @@ const RenderEntity = forwardRef((props, ref) => {
           ),
           tabbedAboutContent: activeTab === "about" && /* @__PURE__ */ jsxRuntimeExports.jsxs("div", { className: showFieldHelp ? "space-y-3" : "space-y-1", children: [
             renderCoreEntityFields("tabbed"),
-            renderEntityPropertyFields(((_k = tabs.find((tab) => tab.name === "about")) == null ? void 0 : _k.inputs) ?? [], "tabbed")
+            renderEntityPropertyFields(((_j = tabsWithAiReviewProperties.find((tab) => tab.name === "about")) == null ? void 0 : _j.inputs) ?? [], "tabbed")
           ] }),
-          tabbedOtherTabsContent: tabs.map((tab) => {
+          tabbedOtherTabsContent: tabsWithAiReviewProperties.map((tab) => {
             if (tab.name === activeTab && tab.name !== "about") {
               return /* @__PURE__ */ jsxRuntimeExports.jsx("div", { className: showFieldHelp ? "space-y-3" : "space-y-1", children: renderEntityPropertyFields(tab.inputs, "tabbed") }, tab.name);
             }
@@ -117865,7 +117973,7 @@ const RenderEntity = forwardRef((props, ref) => {
           onClose: handleCloseContextReviewDialog,
           onUpdateContext: handleUpdateContext,
           approvalRecord: currentContextApprovalItem == null ? void 0 : currentContextApprovalItem.approvalRecord,
-          readonly: (_l = state.configuration) == null ? void 0 : _l.readonly,
+          readonly: (_k = state.configuration) == null ? void 0 : _k.readonly,
           onAcceptAiContext: handleAcceptAiContext,
           onRejectAiContext: handleRejectAiContext
         }
@@ -126465,7 +126573,7 @@ var EmotionCacheContext = /* @__PURE__ */ React.createContext(
   }) : null
 );
 var CacheProvider = EmotionCacheContext.Provider;
-const version = "0.1.38";
+const version = "0.1.40";
 const pkg = {
   version
 };

package/package.json

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