npm - @blocklet/ui-react - Versions diffs - 2.9.19 → 2.9.21 - Mend

@blocklet/ui-react 2.9.19 → 2.9.21

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.

Files changed (16) hide show

package/es/ComponentInstaller/index.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 export default ComponentInstaller;
-declare function ComponentInstaller({ warnIcon, did, noPermissionMute, onInstalled, onError, children, closeByOutSize, onClose, fallback, roles, }: {
+declare function ComponentInstaller({ warnIcon, did, noPermissionMute, onInstalled, onError, children, closeByOutSize, onClose, fallback, disabled, roles, }: {
     warnIcon: any;
     did: any;
     noPermissionMute: any;
@@ -9,10 +9,12 @@ declare function ComponentInstaller({ warnIcon, did, noPermissionMute, onInstall
     closeByOutSize: any;
     onClose: any;
     fallback: any;
+    disabled: any;
     roles?: string[] | undefined;
-}): import("react").JSX.Element;
+}): any;
 declare namespace ComponentInstaller {
     namespace propTypes {
+        let disabled: any;
         let warnIcon: any;
         let did: any;
         let noPermissionMute: any;
@@ -25,6 +27,8 @@ declare namespace ComponentInstaller {
         let roles: any;
     }
     namespace defaultProps {
+        let disabled_1: boolean;
+        export { disabled_1 as disabled };
         let warnIcon_1: null;
         export { warnIcon_1 as warnIcon };
         let noPermissionMute_1: boolean;

package/es/ComponentInstaller/index.js CHANGED Viewed

@@ -21,6 +21,7 @@ function ComponentInstaller({
   closeByOutSize,
   onClose,
   fallback,
+  disabled,
   roles = ["owner", "admin"]
 }) {
   const { locale } = useLocaleContext();
@@ -46,6 +47,9 @@ function ComponentInstaller({
     window.location.reload();
   };
   const size = 60;
+  if (disabled) {
+    return children;
+  }
   return /* @__PURE__ */ jsx(SessionPermission, { session: sessionCtx?.session, roles, children: ({ hasPermission }) => {
     if (installed) {
       return children;
@@ -274,6 +278,7 @@ function ComponentInstaller({
   } });
 }
 ComponentInstaller.propTypes = {
+  disabled: PropTypes.bool,
   warnIcon: PropTypes.node,
   did: PropTypes.string.isRequired,
   noPermissionMute: PropTypes.bool,
@@ -286,6 +291,7 @@ ComponentInstaller.propTypes = {
   roles: PropTypes.array
 };
 ComponentInstaller.defaultProps = {
+  disabled: false,
   warnIcon: null,
   noPermissionMute: false,
   onInstalled: null,

package/es/ComponentInstaller/use-component-installed.d.ts CHANGED Viewed

@@ -6,8 +6,8 @@ declare function useComponentInstalled({ did, onInstalled, onError }: {
 }): {
     optionalComponent: any;
     installed: any;
-    installUrl: string;
-    storeUrl: string;
+    installUrl: any;
+    storeUrl: any;
     installStatus: string;
     setInstallStatus: import("react").Dispatch<import("react").SetStateAction<string>>;
     installStatusDone: boolean;

package/es/ComponentInstaller/use-component-installed.js CHANGED Viewed

@@ -1,11 +1,14 @@
 import { AUTH_SERVICE_PREFIX } from '@arcblock/did-connect/lib/constant';
 import { useMemo, useRef, useState, useEffect } from 'react';
+import urlJoin from 'url-join';
 function useComponentInstalled({ did, onInstalled, onError }) {
-  const { optionalComponents, componentMountPoints } = window.blocklet;
+  const [installStatus, setInstallStatus] = useState('');
   const onInstalledRef = useRef({ onInstalled, onError });
   onInstalledRef.current = { onInstalled, onError };
+  const { optionalComponents, componentMountPoints } = window.blocklet;
   const optionalComponent = useMemo(() => {
     if (!optionalComponents || !optionalComponents.length) {
       return null;
@@ -22,9 +25,8 @@ function useComponentInstalled({ did, onInstalled, onError }) {
     return (componentMountPoints || []).find((item) => item.did === did);
   }, [optionalComponent, componentMountPoints, did]);
-  const installUrl = `${window.blocklet.appUrl}/${AUTH_SERVICE_PREFIX}/admin/components?install-component=${did}`;
-  const storeUrl = optionalComponent ? `${optionalComponent.meta.homepage}/blocklets/${did}` : '';
-  const [installStatus, setInstallStatus] = useState('');
+  const installUrl = urlJoin(window.blocklet.appUrl, AUTH_SERVICE_PREFIX, `/admin/components?install-component=${did}`);
+  const storeUrl = optionalComponent ? urlJoin(optionalComponent.meta.homepage, 'blocklets', did) : '';
   useEffect(() => {
     const handle = (event) => {

package/es/UserCenter/components/user-center.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import type { PaperProps } from '@mui/material';
-export default function UserCenter({ children, currentTab, contentProps, disableAutoRedirect, autoPopupSetting, hideFooter, headerProps, footerProps, }: {
+export default function UserCenter({ children, currentTab, contentProps, disableAutoRedirect, autoPopupSetting, hideFooter, headerProps, footerProps, userDid, }: {
     readonly children: any;
     readonly currentTab: string;
     readonly contentProps?: PaperProps;
@@ -9,4 +9,5 @@ export default function UserCenter({ children, currentTab, contentProps, disable
     readonly hideFooter?: boolean;
     readonly headerProps?: object;
     readonly footerProps?: object;
+    readonly userDid?: string;
 }): import("react").JSX.Element | null;

package/es/UserCenter/components/user-center.js CHANGED Viewed

@@ -28,7 +28,8 @@ export default function UserCenter({
   autoPopupSetting = false,
   hideFooter = false,
   headerProps = {},
-  footerProps = {}
+  footerProps = {},
+  userDid
 }) {
   const { locale } = useLocaleContext();
   const t = useMemoizedFn((key, data = {}) => {
@@ -37,6 +38,9 @@ export default function UserCenter({
   const sessionCtx = useContext(SessionContext);
   const session = sessionCtx?.session;
   const currentDid = useCreation(() => {
+    if (userDid) {
+      return userDid;
+    }
     const currentUrl = window.location.href;
     const query = getQuery(currentUrl);
     if (query?.did) {
@@ -46,7 +50,7 @@ export default function UserCenter({
       return query.did;
     }
     return session?.user?.did;
-  }, [session?.user?.did]);
+  }, [session?.user?.did, userDid]);
   const isMyself = useCreation(() => {
     if (session?.user) {
       return currentDid === session?.user?.did;
@@ -251,11 +255,11 @@ export default function UserCenter({
           ) : null,
           isMyself ? /* @__PURE__ */ jsxs(Fragment, { children: [
             /* @__PURE__ */ jsxs(Box, { children: [
-              /* @__PURE__ */ jsx(Typography, { variant: "h5", sx: { fontWeight: "bold", mb: 1.5 }, children: t("passport") }),
+              /* @__PURE__ */ jsx(Typography, { variant: "h6", sx: { fontWeight: 600, mb: 1.5 }, children: t("passport") }),
               /* @__PURE__ */ jsx(Passport, { user: userState.data })
             ] }),
             /* @__PURE__ */ jsxs(Box, { children: [
-              /* @__PURE__ */ jsx(Typography, { variant: "h5", sx: { fontWeight: "bold", mb: 1.5 }, children: t("userInfo") }),
+              /* @__PURE__ */ jsx(Typography, { variant: "h6", sx: { fontWeight: 600, mb: 1.5 }, children: t("userInfo") }),
               /* @__PURE__ */ jsx(
                 UserInfo,
                 {

package/lib/ComponentInstaller/index.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 export default ComponentInstaller;
-declare function ComponentInstaller({ warnIcon, did, noPermissionMute, onInstalled, onError, children, closeByOutSize, onClose, fallback, roles, }: {
+declare function ComponentInstaller({ warnIcon, did, noPermissionMute, onInstalled, onError, children, closeByOutSize, onClose, fallback, disabled, roles, }: {
     warnIcon: any;
     did: any;
     noPermissionMute: any;
@@ -9,10 +9,12 @@ declare function ComponentInstaller({ warnIcon, did, noPermissionMute, onInstall
     closeByOutSize: any;
     onClose: any;
     fallback: any;
+    disabled: any;
     roles?: string[] | undefined;
-}): import("react").JSX.Element;
+}): any;
 declare namespace ComponentInstaller {
     namespace propTypes {
+        let disabled: any;
         let warnIcon: any;
         let did: any;
         let noPermissionMute: any;
@@ -25,6 +27,8 @@ declare namespace ComponentInstaller {
         let roles: any;
     }
     namespace defaultProps {
+        let disabled_1: boolean;
+        export { disabled_1 as disabled };
         let warnIcon_1: null;
         export { warnIcon_1 as warnIcon };
         let noPermissionMute_1: boolean;

package/lib/ComponentInstaller/index.js CHANGED Viewed

@@ -28,6 +28,7 @@ function ComponentInstaller({
   closeByOutSize,
   onClose,
   fallback,
+  disabled,
   roles = ["owner", "admin"]
 }) {
   const {
@@ -63,6 +64,9 @@ function ComponentInstaller({
     window.location.reload();
   };
   const size = 60;
+  if (disabled) {
+    return children;
+  }
   return /* @__PURE__ */(0, _jsxRuntime.jsx)(_SessionPermission.default, {
     session: sessionCtx?.session,
     roles,
@@ -357,6 +361,7 @@ function ComponentInstaller({
   });
 }
 ComponentInstaller.propTypes = {
+  disabled: _propTypes.default.bool,
   warnIcon: _propTypes.default.node,
   did: _propTypes.default.string.isRequired,
   noPermissionMute: _propTypes.default.bool,
@@ -369,6 +374,7 @@ ComponentInstaller.propTypes = {
   roles: _propTypes.default.array
 };
 ComponentInstaller.defaultProps = {
+  disabled: false,
   warnIcon: null,
   noPermissionMute: false,
   onInstalled: null,

package/lib/ComponentInstaller/use-component-installed.d.ts CHANGED Viewed

@@ -6,8 +6,8 @@ declare function useComponentInstalled({ did, onInstalled, onError }: {
 }): {
     optionalComponent: any;
     installed: any;
-    installUrl: string;
-    storeUrl: string;
+    installUrl: any;
+    storeUrl: any;
     installStatus: string;
     setInstallStatus: import("react").Dispatch<import("react").SetStateAction<string>>;
     installStatusDone: boolean;

package/lib/ComponentInstaller/use-component-installed.js CHANGED Viewed

@@ -6,15 +6,14 @@ Object.defineProperty(exports, "__esModule", {
 var _constant = require("@arcblock/did-connect/lib/constant");
 var _react = require("react");
+var _urlJoin = _interopRequireDefault(require("url-join"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function useComponentInstalled({
   did,
   onInstalled,
   onError
 }) {
-  const {
-    optionalComponents,
-    componentMountPoints
-  } = window.blocklet;
+  const [installStatus, setInstallStatus] = (0, _react.useState)('');
   const onInstalledRef = (0, _react.useRef)({
     onInstalled,
     onError
@@ -23,6 +22,10 @@ function useComponentInstalled({
     onInstalled,
     onError
   };
+  const {
+    optionalComponents,
+    componentMountPoints
+  } = window.blocklet;
   const optionalComponent = (0, _react.useMemo)(() => {
     if (!optionalComponents || !optionalComponents.length) {
       return null;
@@ -37,9 +40,8 @@ function useComponentInstalled({
     }
     return (componentMountPoints || []).find(item => item.did === did);
   }, [optionalComponent, componentMountPoints, did]);
-  const installUrl = `${window.blocklet.appUrl}/${_constant.AUTH_SERVICE_PREFIX}/admin/components?install-component=${did}`;
-  const storeUrl = optionalComponent ? `${optionalComponent.meta.homepage}/blocklets/${did}` : '';
-  const [installStatus, setInstallStatus] = (0, _react.useState)('');
+  const installUrl = (0, _urlJoin.default)(window.blocklet.appUrl, _constant.AUTH_SERVICE_PREFIX, `/admin/components?install-component=${did}`);
+  const storeUrl = optionalComponent ? (0, _urlJoin.default)(optionalComponent.meta.homepage, 'blocklets', did) : '';
   (0, _react.useEffect)(() => {
     const handle = event => {
       if (event.origin !== window.blocklet.appUrl) {

package/lib/UserCenter/components/user-center.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import type { PaperProps } from '@mui/material';
-export default function UserCenter({ children, currentTab, contentProps, disableAutoRedirect, autoPopupSetting, hideFooter, headerProps, footerProps, }: {
+export default function UserCenter({ children, currentTab, contentProps, disableAutoRedirect, autoPopupSetting, hideFooter, headerProps, footerProps, userDid, }: {
     readonly children: any;
     readonly currentTab: string;
     readonly contentProps?: PaperProps;
@@ -9,4 +9,5 @@ export default function UserCenter({ children, currentTab, contentProps, disable
     readonly hideFooter?: boolean;
     readonly headerProps?: object;
     readonly footerProps?: object;
+    readonly userDid?: string;
 }): import("react").JSX.Element | null;

package/lib/UserCenter/components/user-center.js CHANGED Viewed

@@ -35,7 +35,8 @@ function UserCenter({
   autoPopupSetting = false,
   hideFooter = false,
   headerProps = {},
-  footerProps = {}
+  footerProps = {},
+  userDid
 }) {
   const {
     locale
@@ -46,6 +47,9 @@ function UserCenter({
   const sessionCtx = (0, _react.useContext)(_Session.SessionContext);
   const session = sessionCtx?.session;
   const currentDid = (0, _ahooks.useCreation)(() => {
+    if (userDid) {
+      return userDid;
+    }
     const currentUrl = window.location.href;
     const query = (0, _ufo.getQuery)(currentUrl);
     if (query?.did) {
@@ -55,7 +59,7 @@ function UserCenter({
       return query.did;
     }
     return session?.user?.did;
-  }, [session?.user?.did]);
+  }, [session?.user?.did, userDid]);
   const isMyself = (0, _ahooks.useCreation)(() => {
     if (session?.user) {
       return currentDid === session?.user?.did;
@@ -266,9 +270,9 @@ function UserCenter({
       }) : null, isMyself ? /* @__PURE__ */(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
         children: [/* @__PURE__ */(0, _jsxRuntime.jsxs)(_material.Box, {
           children: [/* @__PURE__ */(0, _jsxRuntime.jsx)(_material.Typography, {
-            variant: "h5",
+            variant: "h6",
             sx: {
-              fontWeight: "bold",
+              fontWeight: 600,
               mb: 1.5
             },
             children: t("passport")
@@ -277,9 +281,9 @@ function UserCenter({
           })]
         }), /* @__PURE__ */(0, _jsxRuntime.jsxs)(_material.Box, {
           children: [/* @__PURE__ */(0, _jsxRuntime.jsx)(_material.Typography, {
-            variant: "h5",
+            variant: "h6",
             sx: {
-              fontWeight: "bold",
+              fontWeight: 600,
               mb: 1.5
             },
             children: t("userInfo")

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@blocklet/ui-react",
-  "version": "2.9.19",
+  "version": "2.9.21",
   "description": "Some useful front-end web components that can be used in Blocklets.",
   "keywords": [
     "react",
@@ -63,8 +63,8 @@
   },
   "dependencies": {
     "@abtnode/constant": "1.16.23-beta-aeb9f5bd",
-    "@arcblock/did-connect": "^2.9.19",
-    "@arcblock/ux": "^2.9.19",
+    "@arcblock/did-connect": "^2.9.21",
+    "@arcblock/ux": "^2.9.21",
     "@blocklet/js-sdk": "1.16.23-beta-aeb9f5bd",
     "@emotion/react": "^11.10.4",
     "@emotion/styled": "^11.10.4",
@@ -80,7 +80,8 @@
     "lodash": "^4.17.21",
     "react-error-boundary": "^3.1.4",
     "react-placeholder": "^4.1.0",
-    "ufo": "^1.3.2"
+    "ufo": "^1.3.2",
+    "url-join": "^4.0.1"
   },
   "peerDependencies": {
     "react": ">=18.1.0"
@@ -98,5 +99,5 @@
     "jest": "^28.1.3",
     "unbuild": "^2.0.0"
   },
-  "gitHead": "409ab4e9bc7a641c7d3f64dfebe05d8ea3cfe2da"
+  "gitHead": "800e32d5197a96b1b0a7dcf08f0bf11132c301e9"
 }

package/src/ComponentInstaller/index.jsx CHANGED Viewed

@@ -21,6 +21,7 @@ function ComponentInstaller({
   closeByOutSize,
   onClose,
   fallback,
+  disabled,
   roles = ['owner', 'admin'],
 }) {
   const { locale } = useLocaleContext();
@@ -53,6 +54,10 @@ function ComponentInstaller({
   const size = 60;
+  if (disabled) {
+    return children;
+  }
   return (
     <SessionPermission session={sessionCtx?.session} roles={roles}>
       {({ hasPermission }) => {
@@ -279,6 +284,7 @@ function ComponentInstaller({
 }
 ComponentInstaller.propTypes = {
+  disabled: PropTypes.bool,
   warnIcon: PropTypes.node,
   did: PropTypes.string.isRequired,
   noPermissionMute: PropTypes.bool,
@@ -292,6 +298,7 @@ ComponentInstaller.propTypes = {
 };
 ComponentInstaller.defaultProps = {
+  disabled: false,
   warnIcon: null,
   noPermissionMute: false,
   onInstalled: null,

package/src/ComponentInstaller/use-component-installed.js CHANGED Viewed

@@ -1,11 +1,14 @@
 import { AUTH_SERVICE_PREFIX } from '@arcblock/did-connect/lib/constant';
 import { useMemo, useRef, useState, useEffect } from 'react';
+import urlJoin from 'url-join';
 function useComponentInstalled({ did, onInstalled, onError }) {
-  const { optionalComponents, componentMountPoints } = window.blocklet;
+  const [installStatus, setInstallStatus] = useState('');
   const onInstalledRef = useRef({ onInstalled, onError });
   onInstalledRef.current = { onInstalled, onError };
+  const { optionalComponents, componentMountPoints } = window.blocklet;
   const optionalComponent = useMemo(() => {
     if (!optionalComponents || !optionalComponents.length) {
       return null;
@@ -22,9 +25,8 @@ function useComponentInstalled({ did, onInstalled, onError }) {
     return (componentMountPoints || []).find((item) => item.did === did);
   }, [optionalComponent, componentMountPoints, did]);
-  const installUrl = `${window.blocklet.appUrl}/${AUTH_SERVICE_PREFIX}/admin/components?install-component=${did}`;
-  const storeUrl = optionalComponent ? `${optionalComponent.meta.homepage}/blocklets/${did}` : '';
-  const [installStatus, setInstallStatus] = useState('');
+  const installUrl = urlJoin(window.blocklet.appUrl, AUTH_SERVICE_PREFIX, `/admin/components?install-component=${did}`);
+  const storeUrl = optionalComponent ? urlJoin(optionalComponent.meta.homepage, 'blocklets', did) : '';
   useEffect(() => {
     const handle = (event) => {

package/src/UserCenter/components/user-center.tsx CHANGED Viewed

@@ -36,6 +36,7 @@ export default function UserCenter({
   hideFooter = false,
   headerProps = {},
   footerProps = {},
+  userDid,
 }: {
   readonly children: any;
   readonly currentTab: string;
@@ -45,6 +46,7 @@ export default function UserCenter({
   readonly hideFooter?: boolean;
   readonly headerProps?: object;
   readonly footerProps?: object;
+  readonly userDid?: string;
 }) {
   const { locale } = useLocaleContext();
   const t = useMemoizedFn((key, data = {}) => {
@@ -54,6 +56,10 @@ export default function UserCenter({
   const session = sessionCtx?.session;
   const currentDid = useCreation(() => {
+    if (userDid) {
+      return userDid;
+    }
     const currentUrl = window.location.href;
     const query = getQuery(currentUrl);
     if (query?.did) {
@@ -63,7 +69,7 @@ export default function UserCenter({
       return query.did;
     }
     return session?.user?.did;
-  }, [session?.user?.did]);
+  }, [session?.user?.did, userDid]);
   const isMyself = useCreation(() => {
     if (session?.user) {
@@ -284,13 +290,13 @@ export default function UserCenter({
         {isMyself ? (
           <>
             <Box>
-              <Typography variant="h5" sx={{ fontWeight: 'bold', mb: 1.5 }}>
+              <Typography variant="h6" sx={{ fontWeight: 600, mb: 1.5 }}>
                 {t('passport')}
               </Typography>
               <Passport user={userState.data} />
             </Box>
             <Box>
-              <Typography variant="h5" sx={{ fontWeight: 'bold', mb: 1.5 }}>
+              <Typography variant="h6" sx={{ fontWeight: 600, mb: 1.5 }}>
                 {t('userInfo')}
               </Typography>
               <UserInfo