@arpproject/recrate 0.1.18 → 0.1.20

package/dist/crate-builder/editor-state.d.ts

@@ -39,6 +39,8 @@ export declare class EditorState {
      * Return the current entry
      */
     latest(): State;
+    canBack(): boolean;
+    canForward(): boolean;
     /**
      * Update the current entry
      *

package/dist/crate-builder/store.d.ts

@@ -1,8 +1,12 @@
+import { default as React, ReactNode } from 'react';
 import { EditorState } from './editor-state';
 interface Store {
     configuration: Record<string, any>;
     editorState: EditorState;
     setConfiguration: (config: Record<string, any>) => void;
 }
-export declare const useStateStore: import('zustand').UseBoundStore<import('zustand').StoreApi<Store>>;
+export declare const StateStoreProvider: ({ children }: {
+    children: ReactNode;
+}) => React.FunctionComponentElement<React.ProviderProps<import('zustand').StoreApi<Store> | null>>;
+export declare const useStateStore: () => Store;
 export {};

package/dist/recrate.es.js

@@ -58701,7 +58701,7 @@ function requireLodash() {
           copyObject(source, keys2(source), object4, customizer);
         });
         var at = flatRest(baseAt);
-        function create2(prototype, properties) {
+        function create(prototype, properties) {
           var result2 = baseCreate(prototype);
           return properties == null ? result2 : baseAssign(result2, properties);
         }
@@ -59448,7 +59448,7 @@ function requireLodash() {
         lodash2.conforms = conforms;
         lodash2.constant = constant;
         lodash2.countBy = countBy;
-        lodash2.create = create2;
+        lodash2.create = create;
         lodash2.curry = curry;
         lodash2.curryRight = curryRight;
         lodash2.debounce = debounce2;
@@ -67349,13 +67349,6 @@ function useStore(api2, selector = identity) {
   React__default.useDebugValue(slice2);
   return slice2;
 }
-const createImpl = (createState) => {
-  const api2 = createStore(createState);
-  const useBoundStore = (selector) => useStore(api2, selector);
-  Object.assign(useBoundStore, api2);
-  return useBoundStore;
-};
-const create = ((createState) => createState ? createImpl(createState) : createImpl);
 let EditorState$1 = class EditorState {
   constructor() {
     this.history = [];
@@ -67378,6 +67371,8 @@ let EditorState$1 = class EditorState {
    */
   push({ id: id2 }) {
     if (!id2) return;
+    const latest = this.latest();
+    if ((latest == null ? void 0 : latest.id) === id2) return;
     if (this.history.length - 1 > this.current) {
       this.history = this.history.slice(0, this.current + 1);
     }
@@ -67404,6 +67399,12 @@ let EditorState$1 = class EditorState {
   latest() {
     return this.history[this.current];
   }
+  canBack() {
+    return this.current > 0;
+  }
+  canForward() {
+    return this.current < this.history.length - 1;
+  }
   /**
    * Update the current entry
    *
@@ -67443,11 +67444,28 @@ let EditorState$1 = class EditorState {
     });
   }
 };
-const useStateStore = create((set2) => ({
+const createStateStore = () => createStore((set2) => ({
   configuration: {},
   editorState: new EditorState$1(),
   setConfiguration: (config2) => set2({ configuration: config2 })
 }));
+const defaultStore = createStateStore();
+const StateStoreContext = createContext(null);
+const StateStoreProvider = ({ children }) => {
+  const storeRef = useRef(null);
+  if (!storeRef.current) {
+    storeRef.current = createStateStore();
+  }
+  return React__default.createElement(
+    StateStoreContext.Provider,
+    { value: storeRef.current },
+    children
+  );
+};
+const useStateStore = () => {
+  const scopedStore = useContext(StateStoreContext);
+  return useStore(scopedStore ?? defaultStore);
+};
 const EntityId = ({ entity, onUpdate }) => {
   var _a2;
   const state = useStateStore();
@@ -77002,12 +77020,12 @@ function requireLeafletSrc() {
           toBack(layer2._container);
         }
       };
-      var create2 = Browser.vml ? vmlCreate : svgCreate;
+      var create = Browser.vml ? vmlCreate : svgCreate;
       var SVG = Renderer.extend({
         _initContainer: function() {
-          this._container = create2("svg");
+          this._container = create("svg");
           this._container.setAttribute("pointer-events", "none");
-          this._rootGroup = create2("g");
+          this._rootGroup = create("g");
           this._container.appendChild(this._rootGroup);
         },
         _destroyContainer: function() {
@@ -77034,7 +77052,7 @@ function requireLeafletSrc() {
         },
         // methods below are called by vector layers implementations
         _initPath: function(layer2) {
-          var path2 = layer2._path = create2("path");
+          var path2 = layer2._path = create("path");
           if (layer2.options.className) {
             addClass(path2, layer2.options.className);
           }
@@ -77169,7 +77187,7 @@ function requireLeafletSrc() {
       function rectangle(latLngBounds, options) {
         return new Rectangle(latLngBounds, options);
       }
-      SVG.create = create2;
+      SVG.create = create;
       SVG.pointsToPath = pointsToPath;
       GeoJSON.geometryToLayer = geometryToLayer;
       GeoJSON.coordsToLatLng = coordsToLatLng;
@@ -83341,8 +83359,8 @@ class StateField {
   way it is initialized. Can be useful when you need to provide a
   non-default starting value for the field.
   */
-  init(create2) {
-    return [this, initField.of({ field: this, create: create2 })];
+  init(create) {
+    return [this, initField.of({ field: this, create })];
   }
   /**
   State field instances can be used as
@@ -87542,9 +87560,9 @@ const viewPlugin = /* @__PURE__ */ Facet.define({
   }
 });
 class ViewPlugin {
-  constructor(id2, create2, domEventHandlers, domEventObservers, buildExtensions) {
+  constructor(id2, create, domEventHandlers, domEventObservers, buildExtensions) {
     this.id = id2;
-    this.create = create2;
+    this.create = create;
     this.domEventHandlers = domEventHandlers;
     this.domEventObservers = domEventObservers;
     this.baseExtensions = buildExtensions(this);
@@ -87560,9 +87578,9 @@ class ViewPlugin {
   Define a plugin from a constructor function that creates the
   plugin's value, given an editor view.
   */
-  static define(create2, spec) {
+  static define(create, spec) {
     const { eventHandlers, eventObservers, provide, decorations: deco } = spec || {};
-    return new ViewPlugin(nextPluginID++, create2, eventHandlers, eventObservers, (plugin) => {
+    return new ViewPlugin(nextPluginID++, create, eventHandlers, eventObservers, (plugin) => {
       let ext = [];
       if (deco)
         ext.push(decorations.of((view) => {
@@ -106644,15 +106662,19 @@ const RenderControls = ({
   const loadRootDataset = () => {
     onLoadEntity({ id: "./" });
   };
+  const canGoBack = state.editorState.canBack();
+  const canGoForward = state.editorState.canForward();
   const handleBack = () => {
-    state.editorState.back();
+    if (!canGoBack) return;
+    onBack();
     const latest = state.editorState.latest();
     if (latest == null ? void 0 : latest.id) {
       onLoadEntity({ id: latest.id, updateState: false });
     }
   };
   const handleForward = () => {
-    state.editorState.forward();
+    if (!canGoForward) return;
+    onForward();
     const latest = state.editorState.latest();
     if (latest == null ? void 0 : latest.id) {
       onLoadEntity({ id: latest.id, updateState: false });
@@ -106676,7 +106698,8 @@ const RenderControls = ({
         {
           onClick: handleBack,
           type: "primary",
-          icon: /* @__PURE__ */ jsxRuntimeExports.jsx(RefIcon$8, {})
+          icon: /* @__PURE__ */ jsxRuntimeExports.jsx(RefIcon$8, {}),
+          disabled: !canGoBack
         }
       ),
       /* @__PURE__ */ jsxRuntimeExports.jsx(
@@ -106693,7 +106716,8 @@ const RenderControls = ({
         {
           onClick: handleForward,
           type: "primary",
-          icon: /* @__PURE__ */ jsxRuntimeExports.jsx(RefIcon$7, {})
+          icon: /* @__PURE__ */ jsxRuntimeExports.jsx(RefIcon$7, {}),
+          disabled: !canGoForward
         }
       )
     ] }),
@@ -115836,7 +115860,7 @@ var Logger = (function() {
     }
   }, {
     key: "create",
-    value: function create2(moduleName) {
+    value: function create(moduleName) {
       return new Logger2(this.logger, _objectSpread$6(_objectSpread$6({}, {
         prefix: "".concat(this.prefix, ":").concat(moduleName, ":")
       }), this.options));
@@ -119521,7 +119545,7 @@ var EmotionCacheContext = /* @__PURE__ */ React.createContext(
   }) : null
 );
 var CacheProvider = EmotionCacheContext.Provider;
-const version = "0.1.18";
+const version = "0.1.19";
 const pkg = {
   version
 };
@@ -119530,6 +119554,9 @@ const ProfileManagerContext = React__default.createContext(null);
 const CrateManagerContext = React__default.createContext(null);
 const LookupsContext = React__default.createContext(null);
 function DescriboCrateBuilder(props) {
+  return /* @__PURE__ */ jsxRuntimeExports.jsx(StateStoreProvider, { children: /* @__PURE__ */ jsxRuntimeExports.jsx(DescriboCrateBuilderInner, { ...props }) });
+}
+function DescriboCrateBuilderInner(props) {
   const {
     crate,
     profile,
@@ -119568,6 +119595,7 @@ function DescriboCrateBuilder(props) {
   const state = useStateStore();
   const renderEntityRef = useRef(null);
   const keys2 = useRef({ cm: 0, pm: 0, lookups: 0 });
+  const lastHandledEntityIdRef = useRef(void 0);
   const configuration = useMemo$1(() => {
     const config2 = {
       enableContextEditor,
@@ -119612,6 +119640,7 @@ function DescriboCrateBuilder(props) {
     lookup
   ]);
   const init2 = useCallback(async () => {
+    var _a2, _b;
     instance.changeLanguage(language2);
     if (!crate || isEmpty(crate)) {
       setReady(false);
@@ -119647,23 +119676,39 @@ function DescriboCrateBuilder(props) {
     setCm(newCm);
     setPm(newPm);
     setError(false);
-    state.configuration = configuration;
+    state.setConfiguration(configuration);
     try {
-      const rootEntity = newCm.getEntity({ id: "./", link: false, materialise: false });
-      if (!isEmpty(rootEntity)) {
-        setContextEntity(rootEntity);
-        state.editorState.push({ id: rootEntity["@id"] });
-      } else {
+      const graph = Array.isArray(crate == null ? void 0 : crate["@graph"]) ? crate["@graph"] : [];
+      const validIds = new Set(
+        graph.filter((entry) => entry && typeof entry === "object" && typeof entry["@id"] === "string").map((entry) => String(entry["@id"]))
+      );
+      state.editorState.history = state.editorState.history.filter((entry) => validIds.has(entry.id));
+      state.editorState.current = state.editorState.history.length === 0 ? 0 : Math.min(state.editorState.current, state.editorState.history.length - 1);
+      const candidateIds = [(_a2 = state.editorState.latest()) == null ? void 0 : _a2.id, entityId, "./"];
+      let nextEntity = null;
+      for (const candidateId of candidateIds) {
+        if (!candidateId) continue;
+        const maybeEntity = newCm.getEntity({ id: candidateId, link: false, materialise: false });
+        if (!isEmpty(maybeEntity)) {
+          nextEntity = maybeEntity;
+          break;
+        }
+      }
+      if (!nextEntity) {
         setError(true);
         return;
       }
+      setContextEntity(nextEntity);
+      if (((_b = state.editorState.latest()) == null ? void 0 : _b.id) !== nextEntity["@id"]) {
+        state.editorState.push({ id: nextEntity["@id"] });
+      }
       setReady(true);
       onReady == null ? void 0 : onReady();
     } catch (error22) {
       setError(true);
       onError == null ? void 0 : onError({ error: "Failed to initialize entity" });
     }
-  }, [crate, profile, lookup, configuration, enableEntityTimestamps, language2, onError, onReady, state.editorState]);
+  }, [crate, profile, entityId, lookup, configuration, enableEntityTimestamps, language2, onError, onReady, state.editorState]);
   const handleSetCurrentEntity = useCallback((params) => {
     const { id: id2, updateState = true } = params;
     if (!id2 || !cm) return;
@@ -119714,14 +119759,23 @@ function DescriboCrateBuilder(props) {
     onError == null ? void 0 : onError({});
   };
   useEffect(() => {
-    state.editorState.reset();
     init2();
   }, [crate, profile, init2]);
   useEffect(() => {
-    if (entityId && entityId !== (contextEntity == null ? void 0 : contextEntity["@id"])) {
-      handleSetCurrentEntity({ id: entityId });
+    var _a2;
+    if (!entityId) {
+      lastHandledEntityIdRef.current = void 0;
+      return;
+    }
+    if (lastHandledEntityIdRef.current === entityId) {
+      return;
+    }
+    lastHandledEntityIdRef.current = entityId;
+    if (entityId !== (contextEntity == null ? void 0 : contextEntity["@id"])) {
+      const shouldPushToHistory = ((_a2 = state.editorState.latest()) == null ? void 0 : _a2.id) !== entityId;
+      handleSetCurrentEntity({ id: entityId, updateState: shouldPushToHistory });
     }
-  }, [entityId, contextEntity, handleSetCurrentEntity]);
+  }, [entityId, contextEntity, handleSetCurrentEntity, state.editorState]);
   const saveCrate = () => {
     if (!cm) return;
     if (purgeUnlinkedEntities) {

package/package.json

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