@fragmentsx/render-react 1.5.0 → 1.5.2

package/dist/hooks/fragment/useFragmentManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useFragmentManager.d.ts","sourceRoot":"","sources":["../../../src/hooks/fragment/useFragmentManager.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,kBAAkB,gBAChB,OAAO,GAAG,IAAI;;;;;CAyB5B,CAAC"}
+{"version":3,"file":"useFragmentManager.d.ts","sourceRoot":"","sources":["../../../src/hooks/fragment/useFragmentManager.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,kBAAkB,gBAChB,OAAO,GAAG,IAAI;;;;;CAiC5B,CAAC"}

package/dist/hooks/global/useGlobalManager.d.ts

@@ -1,6 +1,5 @@
 import { GraphState } from '@graph-state/core';
 export declare const useGlobalManager: (globalManager?: GraphState) => {
-    fragmentsGraph: any;
     manager: GraphState<import('@graph-state/core').SystemFields, string> | null;
     queryFragmentManager: (id: string) => any;
     queryArea: (id: string) => any;

package/dist/hooks/global/useGlobalManager.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useGlobalManager.d.ts","sourceRoot":"","sources":["../../../src/hooks/global/useGlobalManager.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAI/C,eAAO,MAAM,gBAAgB,mBAAoB,UAAU;;;+BAQvB,MAAM;oBAGjB,MAAM;;;CAc9B,CAAC"}
+{"version":3,"file":"useGlobalManager.d.ts","sourceRoot":"","sources":["../../../src/hooks/global/useGlobalManager.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAI/C,eAAO,MAAM,gBAAgB,mBAAoB,UAAU;;+BAIvB,MAAM;oBAGjB,MAAM;;;CAa9B,CAAC"}

package/dist/index.cjs.js

@@ -2196,30 +2196,25 @@ const useStyleSheet = (manager) => {
   };
 };
 const useGlobalManager = (globalManager) => {
-  var _a, _b;
+  var _a;
   const currentGlobalManager = react.useContext(GlobalManagerContext);
   const resultManager = globalManager ?? currentGlobalManager;
-  const [fragmentsGraph] = react$1.useGraph(
-    resultManager,
-    (_a = resultManager == null ? void 0 : resultManager.$fragments) == null ? void 0 : _a.key
-  );
   const queryFragmentManager = (id) => {
-    var _a2, _b2;
-    return (_b2 = (_a2 = resultManager == null ? void 0 : resultManager.$load) == null ? void 0 : _a2.loadFragment) == null ? void 0 : _b2.call(_a2, id);
+    var _a2, _b;
+    return (_b = (_a2 = resultManager == null ? void 0 : resultManager.$load) == null ? void 0 : _a2.loadFragment) == null ? void 0 : _b.call(_a2, id);
   };
   const queryArea = (id) => {
-    var _a2, _b2;
-    return (_b2 = (_a2 = resultManager == null ? void 0 : resultManager.$load) == null ? void 0 : _a2.loadArea) == null ? void 0 : _b2.call(_a2, id);
+    var _a2, _b;
+    return (_b = (_a2 = resultManager == null ? void 0 : resultManager.$load) == null ? void 0 : _a2.loadArea) == null ? void 0 : _b.call(_a2, id);
   };
   const setRenderTarget = (value) => {
     resultManager == null ? void 0 : resultManager.setRenderTarget(value);
   };
   return {
-    fragmentsGraph,
     manager: resultManager,
     queryFragmentManager,
     queryArea,
-    getFragmentManager: ((_b = resultManager == null ? void 0 : resultManager.$fragments) == null ? void 0 : _b.getManager) ?? utils.noop,
+    getFragmentManager: ((_a = resultManager == null ? void 0 : resultManager.$fragments) == null ? void 0 : _a.getManager) ?? utils.noop,
     setRenderTarget
   };
 };
@@ -2892,24 +2887,29 @@ const CssChunk = ({ linkKey }) => {
   return null;
 };
 const useFragmentManager = (fragmentId, inputGlobalManager) => {
-  var _a;
+  var _a, _b;
   const {
-    fragmentsGraph,
-    manager: gg,
+    manager: globalManager,
     getFragmentManager,
     queryFragmentManager
   } = useGlobalManager(inputGlobalManager);
+  react$1.useGraph(globalManager, (_a = globalManager == null ? void 0 : globalManager.$fragments) == null ? void 0 : _a.key, {
+    selector: (state) => {
+      var _a2;
+      return ((_a2 = state == null ? void 0 : state.managers) == null ? void 0 : _a2[fragmentId]) ?? null;
+    }
+  });
   const manager = getFragmentManager(fragmentId);
   const loading = !!fragmentId && !manager;
   react.useEffect(() => {
-    if (fragmentsGraph && !getFragmentManager(fragmentId) && !!fragmentId) {
+    if (globalManager && !manager && !!fragmentId) {
       queryFragmentManager(fragmentId);
     }
-  }, [fragmentId, fragmentsGraph]);
+  }, [fragmentId, globalManager]);
   return {
     loading,
     manager,
-    fragmentLayerKey: (_a = manager == null ? void 0 : manager.$fragment) == null ? void 0 : _a.root,
+    fragmentLayerKey: (_b = manager == null ? void 0 : manager.$fragment) == null ? void 0 : _b.root,
     queryFragmentManager
   };
 };
@@ -3380,17 +3380,13 @@ const useAsyncLoadArea = (globalManager, areaCode, skip) => {
   if (skip) return IDLE_STATE;
   return state;
 };
-const resolveSuspense = (options) => {
-  if ((options == null ? void 0 : options.suspense) !== void 0) return options.suspense;
-  if ((options == null ? void 0 : options.ssr) !== void 0) return options.ssr;
-  return false;
-};
 const useArea = (areaCode, options) => {
   const { manager: globalManager } = useGlobalManager(
     options == null ? void 0 : options.globalManager
   );
-  const suspense = resolveSuspense(options);
-  const skip = !globalManager || !(isBrowser || suspense);
+  const suspense = (options == null ? void 0 : options.suspense) ?? false;
+  const ssr = (options == null ? void 0 : options.ssr) ?? true;
+  const skip = !globalManager || !(isBrowser || ssr);
   const suspenseData = useSuspenseLoadArea(
     globalManager,
     areaCode,
@@ -3418,8 +3414,10 @@ const useArea = (areaCode, options) => {
   return asyncState;
 };
 const AreaInitial = (areaProps) => {
+  var _a;
   const { data: areaData } = useArea(areaProps.areaCode, {
     suspense: true,
+    ssr: (_a = areaProps.options) == null ? void 0 : _a.ssr,
     globalManager: areaProps.globalManager
   });
   const { manager: globalManager } = useGlobalManager(

package/dist/index.es.js

@@ -2194,30 +2194,25 @@ const useStyleSheet = (manager) => {
   };
 };
 const useGlobalManager = (globalManager) => {
-  var _a, _b;
+  var _a;
   const currentGlobalManager = useContext(GlobalManagerContext);
   const resultManager = globalManager ?? currentGlobalManager;
-  const [fragmentsGraph] = useGraph(
-    resultManager,
-    (_a = resultManager == null ? void 0 : resultManager.$fragments) == null ? void 0 : _a.key
-  );
   const queryFragmentManager = (id) => {
-    var _a2, _b2;
-    return (_b2 = (_a2 = resultManager == null ? void 0 : resultManager.$load) == null ? void 0 : _a2.loadFragment) == null ? void 0 : _b2.call(_a2, id);
+    var _a2, _b;
+    return (_b = (_a2 = resultManager == null ? void 0 : resultManager.$load) == null ? void 0 : _a2.loadFragment) == null ? void 0 : _b.call(_a2, id);
   };
   const queryArea = (id) => {
-    var _a2, _b2;
-    return (_b2 = (_a2 = resultManager == null ? void 0 : resultManager.$load) == null ? void 0 : _a2.loadArea) == null ? void 0 : _b2.call(_a2, id);
+    var _a2, _b;
+    return (_b = (_a2 = resultManager == null ? void 0 : resultManager.$load) == null ? void 0 : _a2.loadArea) == null ? void 0 : _b.call(_a2, id);
   };
   const setRenderTarget = (value) => {
     resultManager == null ? void 0 : resultManager.setRenderTarget(value);
   };
   return {
-    fragmentsGraph,
     manager: resultManager,
     queryFragmentManager,
     queryArea,
-    getFragmentManager: ((_b = resultManager == null ? void 0 : resultManager.$fragments) == null ? void 0 : _b.getManager) ?? noop,
+    getFragmentManager: ((_a = resultManager == null ? void 0 : resultManager.$fragments) == null ? void 0 : _a.getManager) ?? noop,
     setRenderTarget
   };
 };
@@ -2890,24 +2885,29 @@ const CssChunk = ({ linkKey }) => {
   return null;
 };
 const useFragmentManager = (fragmentId, inputGlobalManager) => {
-  var _a;
+  var _a, _b;
   const {
-    fragmentsGraph,
-    manager: gg,
+    manager: globalManager,
     getFragmentManager,
     queryFragmentManager
   } = useGlobalManager(inputGlobalManager);
+  useGraph(globalManager, (_a = globalManager == null ? void 0 : globalManager.$fragments) == null ? void 0 : _a.key, {
+    selector: (state) => {
+      var _a2;
+      return ((_a2 = state == null ? void 0 : state.managers) == null ? void 0 : _a2[fragmentId]) ?? null;
+    }
+  });
   const manager = getFragmentManager(fragmentId);
   const loading = !!fragmentId && !manager;
   useEffect(() => {
-    if (fragmentsGraph && !getFragmentManager(fragmentId) && !!fragmentId) {
+    if (globalManager && !manager && !!fragmentId) {
       queryFragmentManager(fragmentId);
     }
-  }, [fragmentId, fragmentsGraph]);
+  }, [fragmentId, globalManager]);
   return {
     loading,
     manager,
-    fragmentLayerKey: (_a = manager == null ? void 0 : manager.$fragment) == null ? void 0 : _a.root,
+    fragmentLayerKey: (_b = manager == null ? void 0 : manager.$fragment) == null ? void 0 : _b.root,
     queryFragmentManager
   };
 };
@@ -3378,17 +3378,13 @@ const useAsyncLoadArea = (globalManager, areaCode, skip) => {
   if (skip) return IDLE_STATE;
   return state;
 };
-const resolveSuspense = (options) => {
-  if ((options == null ? void 0 : options.suspense) !== void 0) return options.suspense;
-  if ((options == null ? void 0 : options.ssr) !== void 0) return options.ssr;
-  return false;
-};
 const useArea = (areaCode, options) => {
   const { manager: globalManager } = useGlobalManager(
     options == null ? void 0 : options.globalManager
   );
-  const suspense = resolveSuspense(options);
-  const skip = !globalManager || !(isBrowser || suspense);
+  const suspense = (options == null ? void 0 : options.suspense) ?? false;
+  const ssr = (options == null ? void 0 : options.ssr) ?? true;
+  const skip = !globalManager || !(isBrowser || ssr);
   const suspenseData = useSuspenseLoadArea(
     globalManager,
     areaCode,
@@ -3416,8 +3412,10 @@ const useArea = (areaCode, options) => {
   return asyncState;
 };
 const AreaInitial = (areaProps) => {
+  var _a;
   const { data: areaData } = useArea(areaProps.areaCode, {
     suspense: true,
+    ssr: (_a = areaProps.options) == null ? void 0 : _a.ssr,
     globalManager: areaProps.globalManager
   });
   const { manager: globalManager } = useGlobalManager(

package/dist/nodes/Area/Area.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Area.d.ts","sourceRoot":"","sources":["../../../src/nodes/Area/Area.tsx"],"names":[],"mappings":"AAUA,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE;QACR,GAAG,CAAC,EAAE,OAAO,CAAC;KACf,CAAC;CACH;AAoDD,eAAO,MAAM,IAAI,UAAW,SAAS,4CAYpC,CAAC"}
+{"version":3,"file":"Area.d.ts","sourceRoot":"","sources":["../../../src/nodes/Area/Area.tsx"],"names":[],"mappings":"AAUA,MAAM,WAAW,SAAS;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,KAAK,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAChC,OAAO,CAAC,EAAE;QACR,GAAG,CAAC,EAAE,OAAO,CAAC;KACf,CAAC;CACH;AAqDD,eAAO,MAAM,IAAI,UAAW,SAAS,4CAYpC,CAAC"}

package/dist/nodes/Area/hooks/useArea.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useArea.d.ts","sourceRoot":"","sources":["../../../../src/nodes/Area/hooks/useArea.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAY,MAAM,iBAAiB,CAAC;AAQ/E,eAAO,MAAM,OAAO,aACR,MAAM,YACN,cAAc,KACvB,aAuCF,CAAC"}
+{"version":3,"file":"useArea.d.ts","sourceRoot":"","sources":["../../../../src/nodes/Area/hooks/useArea.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,cAAc,EAAE,aAAa,EAAY,MAAM,iBAAiB,CAAC;AAE/E,eAAO,MAAM,OAAO,aACR,MAAM,YACN,cAAc,KACvB,aAwCF,CAAC"}

package/dist/nodes/Area/hooks/useArea.types.d.ts

@@ -3,7 +3,7 @@ export interface UseAreaOptions {
     suspense?: boolean;
     throwOnError?: boolean;
     globalManager?: unknown;
-    /** @deprecated Используйте suspense. ssr = suspense */
+    /** Загружать данные при SSR. @default true */
     ssr?: boolean;
 }
 export interface AreaData {

package/dist/nodes/Area/hooks/useArea.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useArea.types.d.ts","sourceRoot":"","sources":["../../../../src/nodes/Area/hooks/useArea.types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,uDAAuD;IACvD,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,QAAQ;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;CAChB"}
+{"version":3,"file":"useArea.types.d.ts","sourceRoot":"","sources":["../../../../src/nodes/Area/hooks/useArea.types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,qBAAqB;IACrB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,8CAA8C;IAC9C,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,MAAM,WAAW,QAAQ;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,KAAK,EAAE,OAAO,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,QAAQ,GAAG,IAAI,CAAC;IACtB,QAAQ,EAAE,OAAO,CAAC;IAClB,KAAK,EAAE,OAAO,CAAC;CAChB"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fragmentsx/render-react",
   "private": false,
-  "version": "1.5.0",
+  "version": "1.5.2",
   "type": "module",
   "files": [
     "dist"