@fragmentsx/render-react 1.5.1 → 1.5.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +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"}
1
+ {"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"}
@@ -1,6 +1,5 @@
1
1
  import { GraphState } from '@graph-state/core';
2
2
  export declare const useGlobalManager: (globalManager?: GraphState) => {
3
- fragmentsGraph: any;
4
3
  manager: GraphState<import('@graph-state/core').SystemFields, string> | null;
5
4
  queryFragmentManager: (id: string) => any;
6
5
  queryArea: (id: string) => any;
@@ -1 +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"}
1
+ {"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 CHANGED
@@ -2196,30 +2196,25 @@ const useStyleSheet = (manager) => {
2196
2196
  };
2197
2197
  };
2198
2198
  const useGlobalManager = (globalManager) => {
2199
- var _a, _b;
2199
+ var _a;
2200
2200
  const currentGlobalManager = react.useContext(GlobalManagerContext);
2201
2201
  const resultManager = globalManager ?? currentGlobalManager;
2202
- const [fragmentsGraph] = react$1.useGraph(
2203
- resultManager,
2204
- (_a = resultManager == null ? void 0 : resultManager.$fragments) == null ? void 0 : _a.key
2205
- );
2206
2202
  const queryFragmentManager = (id) => {
2207
- var _a2, _b2;
2208
- return (_b2 = (_a2 = resultManager == null ? void 0 : resultManager.$load) == null ? void 0 : _a2.loadFragment) == null ? void 0 : _b2.call(_a2, id);
2203
+ var _a2, _b;
2204
+ return (_b = (_a2 = resultManager == null ? void 0 : resultManager.$load) == null ? void 0 : _a2.loadFragment) == null ? void 0 : _b.call(_a2, id);
2209
2205
  };
2210
2206
  const queryArea = (id) => {
2211
- var _a2, _b2;
2212
- return (_b2 = (_a2 = resultManager == null ? void 0 : resultManager.$load) == null ? void 0 : _a2.loadArea) == null ? void 0 : _b2.call(_a2, id);
2207
+ var _a2, _b;
2208
+ return (_b = (_a2 = resultManager == null ? void 0 : resultManager.$load) == null ? void 0 : _a2.loadArea) == null ? void 0 : _b.call(_a2, id);
2213
2209
  };
2214
2210
  const setRenderTarget = (value) => {
2215
2211
  resultManager == null ? void 0 : resultManager.setRenderTarget(value);
2216
2212
  };
2217
2213
  return {
2218
- fragmentsGraph,
2219
2214
  manager: resultManager,
2220
2215
  queryFragmentManager,
2221
2216
  queryArea,
2222
- getFragmentManager: ((_b = resultManager == null ? void 0 : resultManager.$fragments) == null ? void 0 : _b.getManager) ?? utils.noop,
2217
+ getFragmentManager: ((_a = resultManager == null ? void 0 : resultManager.$fragments) == null ? void 0 : _a.getManager) ?? utils.noop,
2223
2218
  setRenderTarget
2224
2219
  };
2225
2220
  };
@@ -2892,24 +2887,29 @@ const CssChunk = ({ linkKey }) => {
2892
2887
  return null;
2893
2888
  };
2894
2889
  const useFragmentManager = (fragmentId, inputGlobalManager) => {
2895
- var _a;
2890
+ var _a, _b;
2896
2891
  const {
2897
- fragmentsGraph,
2898
- manager: gg,
2892
+ manager: globalManager,
2899
2893
  getFragmentManager,
2900
2894
  queryFragmentManager
2901
2895
  } = useGlobalManager(inputGlobalManager);
2896
+ react$1.useGraph(globalManager, (_a = globalManager == null ? void 0 : globalManager.$fragments) == null ? void 0 : _a.key, {
2897
+ selector: (state) => {
2898
+ var _a2;
2899
+ return ((_a2 = state == null ? void 0 : state.managers) == null ? void 0 : _a2[fragmentId]) ?? null;
2900
+ }
2901
+ });
2902
2902
  const manager = getFragmentManager(fragmentId);
2903
2903
  const loading = !!fragmentId && !manager;
2904
2904
  react.useEffect(() => {
2905
- if (fragmentsGraph && !getFragmentManager(fragmentId) && !!fragmentId) {
2905
+ if (globalManager && !manager && !!fragmentId) {
2906
2906
  queryFragmentManager(fragmentId);
2907
2907
  }
2908
- }, [fragmentId, fragmentsGraph]);
2908
+ }, [fragmentId, globalManager]);
2909
2909
  return {
2910
2910
  loading,
2911
2911
  manager,
2912
- fragmentLayerKey: (_a = manager == null ? void 0 : manager.$fragment) == null ? void 0 : _a.root,
2912
+ fragmentLayerKey: (_b = manager == null ? void 0 : manager.$fragment) == null ? void 0 : _b.root,
2913
2913
  queryFragmentManager
2914
2914
  };
2915
2915
  };
package/dist/index.es.js CHANGED
@@ -2194,30 +2194,25 @@ const useStyleSheet = (manager) => {
2194
2194
  };
2195
2195
  };
2196
2196
  const useGlobalManager = (globalManager) => {
2197
- var _a, _b;
2197
+ var _a;
2198
2198
  const currentGlobalManager = useContext(GlobalManagerContext);
2199
2199
  const resultManager = globalManager ?? currentGlobalManager;
2200
- const [fragmentsGraph] = useGraph(
2201
- resultManager,
2202
- (_a = resultManager == null ? void 0 : resultManager.$fragments) == null ? void 0 : _a.key
2203
- );
2204
2200
  const queryFragmentManager = (id) => {
2205
- var _a2, _b2;
2206
- return (_b2 = (_a2 = resultManager == null ? void 0 : resultManager.$load) == null ? void 0 : _a2.loadFragment) == null ? void 0 : _b2.call(_a2, id);
2201
+ var _a2, _b;
2202
+ return (_b = (_a2 = resultManager == null ? void 0 : resultManager.$load) == null ? void 0 : _a2.loadFragment) == null ? void 0 : _b.call(_a2, id);
2207
2203
  };
2208
2204
  const queryArea = (id) => {
2209
- var _a2, _b2;
2210
- return (_b2 = (_a2 = resultManager == null ? void 0 : resultManager.$load) == null ? void 0 : _a2.loadArea) == null ? void 0 : _b2.call(_a2, id);
2205
+ var _a2, _b;
2206
+ return (_b = (_a2 = resultManager == null ? void 0 : resultManager.$load) == null ? void 0 : _a2.loadArea) == null ? void 0 : _b.call(_a2, id);
2211
2207
  };
2212
2208
  const setRenderTarget = (value) => {
2213
2209
  resultManager == null ? void 0 : resultManager.setRenderTarget(value);
2214
2210
  };
2215
2211
  return {
2216
- fragmentsGraph,
2217
2212
  manager: resultManager,
2218
2213
  queryFragmentManager,
2219
2214
  queryArea,
2220
- getFragmentManager: ((_b = resultManager == null ? void 0 : resultManager.$fragments) == null ? void 0 : _b.getManager) ?? noop,
2215
+ getFragmentManager: ((_a = resultManager == null ? void 0 : resultManager.$fragments) == null ? void 0 : _a.getManager) ?? noop,
2221
2216
  setRenderTarget
2222
2217
  };
2223
2218
  };
@@ -2890,24 +2885,29 @@ const CssChunk = ({ linkKey }) => {
2890
2885
  return null;
2891
2886
  };
2892
2887
  const useFragmentManager = (fragmentId, inputGlobalManager) => {
2893
- var _a;
2888
+ var _a, _b;
2894
2889
  const {
2895
- fragmentsGraph,
2896
- manager: gg,
2890
+ manager: globalManager,
2897
2891
  getFragmentManager,
2898
2892
  queryFragmentManager
2899
2893
  } = useGlobalManager(inputGlobalManager);
2894
+ useGraph(globalManager, (_a = globalManager == null ? void 0 : globalManager.$fragments) == null ? void 0 : _a.key, {
2895
+ selector: (state) => {
2896
+ var _a2;
2897
+ return ((_a2 = state == null ? void 0 : state.managers) == null ? void 0 : _a2[fragmentId]) ?? null;
2898
+ }
2899
+ });
2900
2900
  const manager = getFragmentManager(fragmentId);
2901
2901
  const loading = !!fragmentId && !manager;
2902
2902
  useEffect(() => {
2903
- if (fragmentsGraph && !getFragmentManager(fragmentId) && !!fragmentId) {
2903
+ if (globalManager && !manager && !!fragmentId) {
2904
2904
  queryFragmentManager(fragmentId);
2905
2905
  }
2906
- }, [fragmentId, fragmentsGraph]);
2906
+ }, [fragmentId, globalManager]);
2907
2907
  return {
2908
2908
  loading,
2909
2909
  manager,
2910
- fragmentLayerKey: (_a = manager == null ? void 0 : manager.$fragment) == null ? void 0 : _a.root,
2910
+ fragmentLayerKey: (_b = manager == null ? void 0 : manager.$fragment) == null ? void 0 : _b.root,
2911
2911
  queryFragmentManager
2912
2912
  };
2913
2913
  };
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@fragmentsx/render-react",
3
3
  "private": false,
4
- "version": "1.5.1",
4
+ "version": "1.5.2",
5
5
  "type": "module",
6
6
  "files": [
7
7
  "dist"
@@ -27,8 +27,8 @@
27
27
  "@graph-state/core": "^0.13.2",
28
28
  "@graph-state/react": "^0.8.3",
29
29
  "react-use-measure": "^2.1.7",
30
- "@fragmentsx/definition": "0.2.2",
31
30
  "@fragmentsx/client-core": "0.4.0",
31
+ "@fragmentsx/definition": "0.2.2",
32
32
  "@fragmentsx/utils": "0.2.0"
33
33
  },
34
34
  "devDependencies": {