@arpproject/recrate 0.1.53 → 0.1.54

package/dist/crate-builder/RenderEntity/useEntityNavigationState.d.ts

@@ -11,12 +11,11 @@ interface UseEntityNavigationStateOptions {
     iconView: boolean;
     tabPaneWidth: number;
     onSaveCrate: (activeEntityId?: string) => void;
-    debugScroll?: (...args: any[]) => void;
 }
 interface CaptureViewContextOptions {
     updateActiveTab?: boolean;
 }
-declare const useEntityNavigationState: ({ activeTab, activeContentRef, contextEntity, state, restoreInProgressRef, showAddPanel, reverseSidebarVisible, highlightRequiredProperties, iconView, tabPaneWidth, onSaveCrate, debugScroll, }: UseEntityNavigationStateOptions) => {
+declare const useEntityNavigationState: ({ activeTab, activeContentRef, contextEntity, state, restoreInProgressRef, showAddPanel, reverseSidebarVisible, highlightRequiredProperties, iconView, tabPaneWidth, onSaveCrate, }: UseEntityNavigationStateOptions) => {
     captureCurrentViewContext: (tabName?: string) => void;
     captureViewContext: (tabName?: string, explicitScrollTop?: number, options?: CaptureViewContextOptions) => void;
     saveCratePreservingView: (activeEntityId?: string) => void;

package/dist/crate-builder/RenderEntity/useEntityScrollRestoration.d.ts

@@ -28,7 +28,6 @@ interface UseEntityScrollRestorationOptions {
         updateActiveTab?: boolean;
     }) => void;
     disabled?: boolean;
-    debugScroll?: (...args: any[]) => void;
 }
-declare const useEntityScrollRestoration: ({ activeTab, activeContentRef, contextEntity, renderTabs, tabsLength, extraPropertiesLength, scrollRestoreNonce, setScrollRestoreNonce, navigationRestoreReadyRef, pendingRestoredTabRef, restoreInProgressRef, pendingAddedPropertyRef, showAddPanel, reverseSidebarVisible, highlightRequiredProperties, iconView, tabPaneWidth, state, isAiScrollRestoreSuppressed, captureViewContext, disabled, debugScroll, }: UseEntityScrollRestorationOptions) => void;
+declare const useEntityScrollRestoration: ({ activeTab, activeContentRef, contextEntity, renderTabs, tabsLength, extraPropertiesLength, scrollRestoreNonce, setScrollRestoreNonce, navigationRestoreReadyRef, pendingRestoredTabRef, restoreInProgressRef, pendingAddedPropertyRef, showAddPanel, reverseSidebarVisible, highlightRequiredProperties, iconView, tabPaneWidth, state, isAiScrollRestoreSuppressed, captureViewContext, disabled, }: UseEntityScrollRestorationOptions) => void;
 export default useEntityScrollRestoration;

package/dist/recrate.es.js

@@ -94106,9 +94106,8 @@ const AutoComplete = ({ type: type4, onLinkEntity, onCreateEntity }) => {
   const inputValue = useRef("");
   const searchVersion = useRef(0);
   const promiseTimeout = 2500;
-  const querySearch = async (queryString) => {
+  const querySearch = async (queryString, version2 = ++searchVersion.current) => {
     var _a2;
-    const version2 = ++searchVersion.current;
     setLoading(true);
     const lookup = new Lookup({
       config: (_a2 = crateManager == null ? void 0 : crateManager.profile) == null ? void 0 : _a2.lookup,
@@ -94159,44 +94158,60 @@ const AutoComplete = ({ type: type4, onLinkEntity, onCreateEntity }) => {
     }
     const responses = await Promise.all(lookups);
     const newMatches = [];
+    const seenEntityIds = /* @__PURE__ */ new Set();
+    const globalEntityIds = new Set(
+      responses.filter((response) => response.endpoint === "global").flatMap((response) => response.documents ?? []).map((entity) => entity["@id"]).filter((id2) => id2 != null).map(String)
+    );
+    const uniqueEntities = (entities, source, limit) => {
+      const unique = [];
+      for (const entity of entities) {
+        const id2 = entity["@id"] == null ? null : String(entity["@id"]);
+        if (source === "internal" && id2 && globalEntityIds.has(id2)) continue;
+        if (id2 && seenEntityIds.has(id2)) continue;
+        if (id2) seenEntityIds.add(id2);
+        unique.push({ ...entity, type: source });
+        if (limit && unique.length === limit) break;
+      }
+      return unique;
+    };
+    const addMatchGroup = (label, entities) => {
+      if (entities.length) newMatches.push({ label, entities });
+    };
     responses.forEach((response) => {
       var _a3, _b, _c, _d, _e2, _f;
       if (response.endpoint === "internal" && ((_a3 = response.documents) == null ? void 0 : _a3.length)) {
-        newMatches.push({
-          label: t2("associate_existing_entity"),
-          entities: response.documents.map((e3) => ({ ...e3, type: "internal" })).slice(0, 5)
-        });
+        addMatchGroup(
+          t2("associate_existing_entity"),
+          uniqueEntities(response.documents, "internal", 5)
+        );
       } else if (response.endpoint === "global" && ((_b = response.documents) == null ? void 0 : _b.length)) {
-        newMatches.push({
-          label: t2("associate_global_entity"),
-          entities: response.documents.map((entity) => ({ ...entity, type: "global" }))
-        });
+        addMatchGroup(
+          t2("associate_global_entity"),
+          uniqueEntities(response.documents, "global")
+        );
       } else if (response.endpoint === "templates" && ((_c = response.documents) == null ? void 0 : _c.length)) {
-        newMatches.push({
-          label: t2("associate_entity_from_template"),
-          entities: response.documents.map((entity) => ({
-            ...entity,
-            type: "template"
-          }))
-        });
+        addMatchGroup(
+          t2("associate_entity_from_template"),
+          uniqueEntities(response.documents, "template")
+        );
       } else if (response.endpoint === "ror" && ((_d = response.documents) == null ? void 0 : _d.length)) {
-        newMatches.push({
-          label: t2("associate_organization_from_ror"),
-          entities: response.documents.map((entity) => ({ ...entity, type: "ror" }))
-        });
+        addMatchGroup(
+          t2("associate_organization_from_ror"),
+          uniqueEntities(response.documents, "ror")
+        );
       } else if (response.endpoint === "entities" && ((_e2 = response.documents) == null ? void 0 : _e2.length)) {
-        newMatches.push({
-          label: t2("associate_user_created_entity"),
-          entities: response.documents.map((entity) => ({ ...entity, type: "datapack" }))
-        });
+        addMatchGroup(
+          t2("associate_user_created_entity"),
+          uniqueEntities(response.documents, "datapack")
+        );
       } else if (response.endpoint === "datapacks" && ((_f = response.documents) == null ? void 0 : _f.length)) {
-        newMatches.push({
-          label: t2("associate_from_datapack"),
-          entities: response.documents.map((entity) => ({ ...entity, type: "datapack" }))
-        });
+        addMatchGroup(
+          t2("associate_from_datapack"),
+          uniqueEntities(response.documents, "datapack")
+        );
       }
     });
-    if (type4 !== "ANY") {
+    if (type4 !== "ANY" && newEntity.length) {
       newMatches.push({
         label: t2("create_new_entity"),
         entities: newEntity
@@ -94268,7 +94283,10 @@ const AutoComplete = ({ type: type4, onLinkEntity, onCreateEntity }) => {
   };
   const handleSearch = (value) => {
     inputValue.current = value;
-    debouncedQuerySearch(value);
+    const version2 = ++searchVersion.current;
+    setMatches([]);
+    setLoading(true);
+    debouncedQuerySearch(value, version2);
   };
   const handleInputKeyDown = (event) => {
     const name2 = inputValue.current;
@@ -94346,11 +94364,14 @@ const AutoComplete = ({ type: type4, onLinkEntity, onCreateEntity }) => {
         onInputKeyDown: handleInputKeyDown,
         onChange: handleSelect,
         notFoundContent: loading ? "Loading..." : "No results",
-        options: matches2.flatMap((group) => [
-          { label: /* @__PURE__ */ jsxRuntimeExports.jsx(Typography.Text, { strong: true, children: group.label }), options: group.entities.map((entity) => ({ label: renderOption({ entity }), value: entity["@id"], entity })) }
-        ]).flatMap((group) => [
-          { label: group.label, options: group.options }
-        ]),
+        options: matches2.map((group, groupIndex) => ({
+          label: /* @__PURE__ */ jsxRuntimeExports.jsx(Typography.Text, { strong: true, children: group.label }),
+          options: group.entities.map((entity, entityIndex) => ({
+            label: renderOption({ entity }),
+            value: `${groupIndex}:${entityIndex}:${String(entity["@id"])}`,
+            entity
+          }))
+        })),
         optionRender: (option) => option.label
       }
     )
@@ -124382,8 +124403,7 @@ const useEntityNavigationState = ({
   highlightRequiredProperties,
   iconView,
   tabPaneWidth,
-  onSaveCrate,
-  debugScroll = () => void 0
+  onSaveCrate
 }) => {
   const getVisibleContextMarkers = useCallback((selector, dataAttribute) => {
     const source = activeContentRef.current;
@@ -124391,39 +124411,20 @@ const useEntityNavigationState = ({
     return Array.from(source.querySelectorAll(selector)).map((node2) => node2.getAttribute(dataAttribute)).filter((value) => Boolean(value));
   }, [activeContentRef]);
   const captureViewContext = useCallback((tabName = activeTab, explicitScrollTop, options = {}) => {
-    var _a2, _b, _c, _d, _e2, _f, _g, _h;
+    var _a2, _b, _c, _d;
     const entityId = contextEntity == null ? void 0 : contextEntity["@id"];
     if (!entityId) return;
     const updateActiveTab = options.updateActiveTab !== false;
     if (restoreInProgressRef.current && typeof explicitScrollTop !== "number") {
-      debugScroll("capture.skipped-during-restore", {
-        entityId,
-        tabName,
-        latestId: (_a2 = state.editorState.latest()) == null ? void 0 : _a2.id
-      });
       return;
     }
     const previous = state.editorState.getNavigationState(entityId) ?? {};
-    const scrollTop = typeof explicitScrollTop === "number" ? explicitScrollTop : ((_b = activeContentRef.current) == null ? void 0 : _b.scrollTop) ?? ((_d = (_c = previous.tabStates) == null ? void 0 : _c[tabName]) == null ? void 0 : _d.scrollTop) ?? 0;
+    const scrollTop = typeof explicitScrollTop === "number" ? explicitScrollTop : ((_a2 = activeContentRef.current) == null ? void 0 : _a2.scrollTop) ?? ((_c = (_b = previous.tabStates) == null ? void 0 : _b[tabName]) == null ? void 0 : _c.scrollTop) ?? 0;
     const nextTabState = {
       scrollTop,
       expandedSections: getVisibleContextMarkers('[aria-expanded="true"],[data-expanded="true"]', "data-section-id"),
       selectedItems: getVisibleContextMarkers('[aria-selected="true"],[data-selected="true"]', "data-item-id")
     };
-    debugScroll("capture", {
-      entityId,
-      tabName,
-      latestId: (_e2 = state.editorState.latest()) == null ? void 0 : _e2.id,
-      explicitScrollTop,
-      scrollTop,
-      updateActiveTab,
-      previousScrollTop: ((_g = (_f = previous.tabStates) == null ? void 0 : _f[tabName]) == null ? void 0 : _g.scrollTop) ?? null,
-      viewport: activeContentRef.current ? {
-        clientHeight: activeContentRef.current.clientHeight,
-        scrollHeight: activeContentRef.current.scrollHeight,
-        currentScrollTop: activeContentRef.current.scrollTop
-      } : null
-    });
     const navigationState = {
       ...updateActiveTab ? { activeTab: tabName } : {},
       tabStates: { [tabName]: nextTabState },
@@ -124435,7 +124436,7 @@ const useEntityNavigationState = ({
         tabPaneWidth
       }
     };
-    if (((_h = state.editorState.latest()) == null ? void 0 : _h.id) === entityId) {
+    if (((_d = state.editorState.latest()) == null ? void 0 : _d.id) === entityId) {
       state.editorState.updateNavigationState(navigationState);
     } else {
       state.editorState.updateNavigationStateForId(entityId, navigationState);
@@ -124500,8 +124501,7 @@ const useEntityScrollRestoration = ({
   state,
   isAiScrollRestoreSuppressed,
   captureViewContext,
-  disabled: disabled2 = false,
-  debugScroll = () => void 0
+  disabled: disabled2 = false
 }) => {
   useEffect(() => {
     var _a2, _b, _c, _d;
@@ -124513,16 +124513,6 @@ const useEntityScrollRestoration = ({
     const viewport = activeContentRef.current;
     if (!viewport) return;
     const restoreTarget = ((_d = (_c = (_b = state.editorState.getNavigationState(contextEntity["@id"])) == null ? void 0 : _b.tabStates) == null ? void 0 : _c[activeTab]) == null ? void 0 : _d.scrollTop) ?? 0;
-    debugScroll("restore.start", {
-      entityId: contextEntity["@id"],
-      activeTab,
-      restoreTarget,
-      viewport: {
-        clientHeight: viewport.clientHeight,
-        scrollHeight: viewport.scrollHeight,
-        scrollTop: viewport.scrollTop
-      }
-    });
     let cancelled = false;
     let rafId = 0;
     let timerId = 0;
@@ -124544,32 +124534,9 @@ const useEntityScrollRestoration = ({
       viewport.scrollTo({ top: target, behavior: "auto" });
       const contentReady = restoreTarget <= maxScrollable || restoreTarget === 0;
       const done = contentReady && Math.abs(viewport.scrollTop - target) <= 1;
-      debugScroll("restore.attempt", {
-        entityId: contextEntity["@id"],
-        activeTab,
-        attempts,
-        restoreTarget,
-        maxScrollable,
-        target,
-        actualScrollTop: viewport.scrollTop,
-        clientHeight: viewport.clientHeight,
-        scrollHeight: viewport.scrollHeight,
-        contentReady,
-        done
-      });
       if (done || attempts >= maxAttempts) {
         restoreInProgressRef.current = false;
         viewport.style.scrollBehavior = previousInlineScrollBehavior;
-        debugScroll("restore.stop", {
-          entityId: contextEntity["@id"],
-          activeTab,
-          attempts,
-          restoreTarget,
-          finalScrollTop: viewport.scrollTop,
-          maxScrollable,
-          contentReady,
-          done
-        });
         return;
       }
       timerId = window.setTimeout(() => {
@@ -124599,11 +124566,6 @@ const useEntityScrollRestoration = ({
     if (((_a2 = pendingAddedPropertyRef.current) == null ? void 0 : _a2.entityId) === contextEntity["@id"]) return;
     if (isAiScrollRestoreSuppressed()) return;
     if (pendingTab) {
-      debugScroll("restore.pending-tab", {
-        entityId: contextEntity["@id"],
-        pendingTab,
-        activeTab
-      });
       if (activeTab !== pendingTab) {
         return;
       }
@@ -125440,7 +125402,6 @@ const RenderEntity = forwardRef((props, ref) => {
   const pendingAiScrollPropertyRef = useRef(null);
   const aiScrollRestoreSuppressedUntilRef = useRef(0);
   const lastAutoNavigatedAiApprovalRef = useRef(null);
-  const debugScroll = (...args) => console.log("[recrate-scroll-debug]", ...args);
   const {
     activeContentRef,
     contentContainerRef,
@@ -125485,8 +125446,7 @@ const RenderEntity = forwardRef((props, ref) => {
     highlightRequiredProperties,
     iconView,
     tabPaneWidth,
-    onSaveCrate,
-    debugScroll
+    onSaveCrate
   });
   useEntityScrollRestoration({
     activeTab,
@@ -125509,8 +125469,7 @@ const RenderEntity = forwardRef((props, ref) => {
     state,
     isAiScrollRestoreSuppressed,
     captureViewContext,
-    disabled: readonly,
-    debugScroll
+    disabled: readonly
   });
   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]);
@@ -125733,20 +125692,6 @@ const RenderEntity = forwardRef((props, ref) => {
         willScrollToAddedProperty = true;
       }
     }
-    debugScroll("init", {
-      entityId: entity2["@id"],
-      latestId: latestEntry == null ? void 0 : latestEntry.id,
-      isCurrentHistoryEntity,
-      renderTabs: layout.renderTabs,
-      tabNames,
-      restorableTabNames,
-      savedActiveTab,
-      savedTabStillValid,
-      currentTabStillValid,
-      restoredTab,
-      nextActiveTab,
-      navState
-    });
     pendingRestoredTabRef.current = willScrollToAddedProperty ? null : nextActiveTab;
     setActiveTab(nextActiveTab);
     if (typeof ((_b2 = navState == null ? void 0 : navState.uiState) == null ? void 0 : _b2.showAddPanel) === "boolean") setShowAddPanel(navState.uiState.showAddPanel);
@@ -125792,11 +125737,6 @@ const RenderEntity = forwardRef((props, ref) => {
     }
   }, [readonly, entity == null ? void 0 : entity["@id"]]);
   const handleLoadEntityWithContext = (params) => {
-    debugScroll("navigate", {
-      fromEntityId: contextEntity == null ? void 0 : contextEntity["@id"],
-      activeTab,
-      params
-    });
     captureCurrentViewContext(activeTab);
     onLoadEntity(params);
   };
@@ -135678,7 +135618,7 @@ var EmotionCacheContext = /* @__PURE__ */ React.createContext(
   }) : null
 );
 var CacheProvider = EmotionCacheContext.Provider;
-const version = "0.1.53";
+const version = "0.1.54";
 const pkg = {
   version
 };

package/package.json

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