@arcblock/ux 2.12.53 → 2.12.54

package/lib/BlockletContext/index.d.ts

@@ -1,6 +1,12 @@
 import type { Blocklet } from '../type';
-declare const BlockletContext: import("react").Context<Blocklet | null>;
-declare const Consumer: import("react").Consumer<Blocklet | null>;
+declare const BlockletContext: import("react").Context<{
+    blocklet: Blocklet | null;
+    masterBlocklet: Blocklet | null;
+}>;
+declare const Consumer: import("react").Consumer<{
+    blocklet: Blocklet | null;
+    masterBlocklet: Blocklet | null;
+}>;
 declare function BlockletProvider({ children, baseUrl, loading, }: {
     children?: React.ReactNode;
     /**
@@ -11,5 +17,6 @@ declare function BlockletProvider({ children, baseUrl, loading, }: {
 }): import("react/jsx-runtime").JSX.Element;
 declare function useBlockletContext(): {
     blocklet: Blocklet | null;
+    masterBlocklet: Blocklet | null;
 };
 export { BlockletContext, BlockletProvider, Consumer as BlockletConsumer, useBlockletContext };

package/lib/BlockletContext/index.js

@@ -1,8 +1,11 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { useMemoizedFn, useAsyncEffect } from 'ahooks';
 import { createContext, useContext, useState } from 'react';
-import { getBlockletData } from '../Util/federated';
-const BlockletContext = /*#__PURE__*/createContext(null);
+import { getBlockletData, getFederatedEnabled, getMaster } from '../Util/federated';
+const BlockletContext = /*#__PURE__*/createContext({
+  blocklet: null,
+  masterBlocklet: null
+});
 const {
   Provider,
   Consumer
@@ -13,6 +16,7 @@ function BlockletProvider({
   loading = null
 }) {
   const [blockletData, setBlockletData] = useState(null);
+  const [masterBlockletData, setMasterBlockletData] = useState(null);
   const getBlockleDataWithCache = useMemoizedFn(async () => {
     if (!baseUrl || window.location.href.startsWith(baseUrl)) {
       throw new Error('no blocklet data');
@@ -21,25 +25,43 @@ function BlockletProvider({
     return jsonData;
   });
   useAsyncEffect(async () => {
+    let result = null;
+    let resultMaster = null;
     try {
-      const data = await getBlockleDataWithCache();
-      setBlockletData(data);
+      result = await getBlockleDataWithCache();
     } catch {
       // NOTICE: 如果获取指定 blockletData 失败，则使用 window.blocklet
       const data = globalThis.blocklet || globalThis.env;
-      setBlockletData(data);
+      result = data;
     }
+    if (result) {
+      if (getFederatedEnabled(result)) {
+        const masterSite = getMaster(result);
+        if (masterSite) {
+          resultMaster = await getBlockletData(masterSite.appUrl);
+        }
+      }
+    }
+    setBlockletData(result);
+    setMasterBlockletData(resultMaster);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [baseUrl]);
   return /*#__PURE__*/_jsx(Provider, {
-    value: blockletData,
+    value: {
+      blocklet: blockletData,
+      masterBlocklet: masterBlockletData
+    },
     children: blockletData ? children : loading || null
   });
 }
 function useBlockletContext() {
-  const blocklet = useContext(BlockletContext);
+  const {
+    blocklet,
+    masterBlocklet
+  } = useContext(BlockletContext);
   return {
-    blocklet
+    blocklet,
+    masterBlocklet
   };
 }
 export { BlockletContext, BlockletProvider, Consumer as BlockletConsumer, useBlockletContext };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "2.12.53",
+  "version": "2.12.54",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -69,12 +69,12 @@
     "react": ">=18.2.0",
     "react-router-dom": ">=6.22.3"
   },
-  "gitHead": "454c63f6d9b58724fa0176ac74de2f306b53207c",
+  "gitHead": "fa8ee46123aa7dc5b6a79a9c75d08cb43857ad2c",
   "dependencies": {
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.12.53",
-    "@arcblock/nft-display": "^2.12.53",
-    "@arcblock/react-hooks": "^2.12.53",
+    "@arcblock/icons": "^2.12.54",
+    "@arcblock/nft-display": "^2.12.54",
+    "@arcblock/react-hooks": "^2.12.54",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@fontsource/inter": "^5.0.16",
     "@fontsource/ubuntu-mono": "^5.0.18",

package/src/BlockletContext/index.tsx

@@ -1,9 +1,15 @@
 import { useMemoizedFn, useAsyncEffect } from 'ahooks';
 import { createContext, useContext, useState } from 'react';
 import type { Blocklet } from '../type';
-import { getBlockletData } from '../Util/federated';
+import { getBlockletData, getFederatedEnabled, getMaster } from '../Util/federated';
 
-const BlockletContext = createContext<Blocklet | null>(null);
+const BlockletContext = createContext<{
+  blocklet: Blocklet | null;
+  masterBlocklet: Blocklet | null;
+}>({
+  blocklet: null,
+  masterBlocklet: null,
+});
 
 const { Provider, Consumer } = BlockletContext;
 
@@ -20,6 +26,7 @@ function BlockletProvider({
   loading?: React.ReactNode;
 }) {
   const [blockletData, setBlockletData] = useState<Blocklet | null>(null);
+  const [masterBlockletData, setMasterBlockletData] = useState<Blocklet | null>(null);
   const getBlockleDataWithCache = useMemoizedFn(async () => {
     if (!baseUrl || window.location.href.startsWith(baseUrl)) {
       throw new Error('no blocklet data');
@@ -29,22 +36,37 @@ function BlockletProvider({
   });
 
   useAsyncEffect(async () => {
+    let result = null;
+    let resultMaster = null;
     try {
-      const data = await getBlockleDataWithCache();
-      setBlockletData(data);
+      result = await getBlockleDataWithCache();
     } catch {
       // NOTICE: 如果获取指定 blockletData 失败，则使用 window.blocklet
       const data = globalThis.blocklet || globalThis.env;
-      setBlockletData(data);
+      result = data;
     }
+    if (result) {
+      if (getFederatedEnabled(result)) {
+        const masterSite = getMaster(result);
+        if (masterSite) {
+          resultMaster = await getBlockletData(masterSite.appUrl);
+        }
+      }
+    }
+    setBlockletData(result);
+    setMasterBlockletData(resultMaster);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [baseUrl]);
-  return <Provider value={blockletData}>{blockletData ? children : loading || null}</Provider>;
+  return (
+    <Provider value={{ blocklet: blockletData, masterBlocklet: masterBlockletData }}>
+      {blockletData ? children : loading || null}
+    </Provider>
+  );
 }
 
 function useBlockletContext() {
-  const blocklet = useContext(BlockletContext);
-  return { blocklet };
+  const { blocklet, masterBlocklet } = useContext(BlockletContext);
+  return { blocklet, masterBlocklet };
 }
 
 export { BlockletContext, BlockletProvider, Consumer as BlockletConsumer, useBlockletContext };