@arcblock/ux 3.0.4 → 3.0.6

package/lib/Dialog/types.d.ts

@@ -0,0 +1,20 @@
+import type { ReactNode } from 'react';
+import type { ButtonProps } from '@mui/material';
+
+export interface OpenConfirmProps {
+  title: ReactNode;
+  content: ReactNode;
+  onConfirm?: (close: () => void) => void;
+  onCancel?: () => void;
+  showCancelButton?: true | false;
+  confirmButtonText?: string;
+  cancelButtonText?: string;
+  confirmButtonProps?: ButtonProps;
+  cancelButtonProps?: ButtonProps;
+}
+
+export type UpdateConfirmProps = Partial<Pick<OpenConfirmProps, 'title' | 'content'>>;
+
+export type OpenConfirm = (params: OpenConfirmProps) => void;
+export type CloseConfirm = () => void;
+export type UpdateConfirm = (params: UpdateConfirmProps) => void;

package/lib/Tag/index.d.ts

@@ -1,4 +1,5 @@
-export default TagComponent;
+import { default as PropTypes } from 'prop-types';
+export default Tag;
 export type TypographyProps = import('@mui/material/Typography').TypographyProps;
 export type TagOwnProps = {
     type?: "error" | "warning" | "success" | "primary" | "reverse";
@@ -9,9 +10,28 @@ export type TagOwnProps = {
 };
 export type TagProps = TypographyProps & TagOwnProps;
 /**
- * @type {React.ForwardRefExoticComponent<React.PropsWithoutRef<TagProps> & React.RefAttributes<HTMLSpanElement>>}
+ * @typedef {import('@mui/material/Typography').TypographyProps} TypographyProps
+ * @typedef {{
+ *  type?: 'error' | 'warning' | 'success' | 'primary' | 'reverse',
+ *  content?: string,
+ *  className?: string;
+ *  children: import('react').ReactNode,
+ *  style?: import('react').CSSProperties
+ * }} TagOwnProps
+ * @typedef { TypographyProps & TagOwnProps} TagProps
  */
-declare function TagComponent({ ref, ...props }: {
-    [x: string]: any;
-    ref: any;
-}): import("react/jsx-runtime").JSX.Element;
+/**
+ * @description
+ * @param {TagProps} props
+ * @return {import('react').ReactNode}
+ */
+declare function Tag(rawProps: any): import('react').ReactNode;
+declare namespace Tag {
+    namespace propTypes {
+        let children: PropTypes.Validator<any>;
+        let type: PropTypes.Requireable<string>;
+        let content: PropTypes.Requireable<string>;
+        let className: PropTypes.Requireable<string>;
+        let style: PropTypes.Requireable<NonNullable<string | object | null | undefined>>;
+    }
+}

package/lib/Tag/index.js

@@ -1,11 +1,11 @@
-import { jsx as p } from "react/jsx-runtime";
+import { jsx as h } from "react/jsx-runtime";
 import r from "prop-types";
-import { Typography as b, useTheme as w } from "@mui/material";
-import t from "lodash/isUndefined";
+import { Typography as u, useTheme as b } from "@mui/material";
+import n from "lodash/isUndefined";
 import { mergeProps as x } from "../Util/index.js";
 import e from "../Colors/themes/default.js";
-import { styled as T } from "../Theme/index.js";
-const c = {
+import { styled as w } from "../Theme/index.js";
+const i = {
   error: {
     color: e.common.white,
     backgroundColor: e.error.main
@@ -27,26 +27,23 @@ const c = {
     backgroundColor: "#222"
   }
 };
-function a(s) {
-  const o = Object.assign({}, s);
-  t(o.type) && (o.type = "primary"), t(o.content) && (o.content = ""), t(o.style) && (o.style = {}), t(o.className) && (o.className = "");
-  const l = x(o, a, ["style"]), { type: n, content: f, children: y, style: d, className: g, forwardedRef: u, ...h } = l, { palette: i } = w(), m = Object.assign({}, c[n] || c.primary, d);
-  return i[n] && Object.assign(m, {
-    color: i[n].contrastText || e.common.white,
-    backgroundColor: i[n].main
-  }), /* @__PURE__ */ p(j, { ref: u, component: "span", className: g, style: m, ...h, children: f || y });
+function a(m) {
+  const o = Object.assign({}, m);
+  n(o.type) && (o.type = "primary"), n(o.content) && (o.content = ""), n(o.style) && (o.style = {}), n(o.className) && (o.className = "");
+  const p = x(o, a, ["style"]), { type: t, content: l, children: y, style: f, className: g, ...d } = p, { palette: s } = b(), c = Object.assign({}, i[t] || i.primary, f);
+  return s[t] && Object.assign(c, {
+    color: s[t].contrastText || e.common.white,
+    backgroundColor: s[t].main
+  }), /* @__PURE__ */ h(j, { component: "span", className: g, style: c, ...d, children: l || y });
 }
 a.propTypes = {
   children: r.any.isRequired,
-  type: r.oneOf(Object.keys(c)),
+  type: r.oneOf(Object.keys(i)),
   content: r.string,
   className: r.string,
   style: r.oneOfType([r.object, r.string])
 };
-function v({ ref: s, ...o }) {
-  return /* @__PURE__ */ p(a, { ...o, forwardedRef: s });
-}
-const j = T(b)`
+const j = w(u)`
   && {
     display: inline-flex;
     justify-content: center;
@@ -60,5 +57,5 @@ const j = T(b)`
   }
 `;
 export {
-  v as default
+  a as default
 };

package/lib/global.d.ts

@@ -0,0 +1,28 @@
+declare module '@arcblock/did-motif';
+declare module 'd3-geo';
+declare module 'topojson-client';
+declare module 'versor';
+declare module 'axios/*';
+
+// ux svg 由 babel-plugin-inline-react-svg 处理
+declare module '*.svg?react' {
+  import React from 'react';
+  const SVG: React.FC<React.SVGProps<SVGSVGElement>>;
+  export default SVG;
+}
+
+declare module '*.png' {
+  export default string;
+}
+
+type Blocklet = import('./type').Blocklet;
+
+interface Window {
+  blocklet?: Blocklet;
+  env?: Blocklet;
+}
+
+declare module globalThis {
+  var blocklet: Blocklet;
+  var env: Blocklet;
+}

package/lib/type.d.ts

@@ -0,0 +1,44 @@
+import type { Theme } from '@mui/material';
+import type { LiteralUnion } from 'type-fest';
+
+export type $TSFixMe = any;
+export type Translations = Record<string, Record<string, any>>;
+export type Locale = LiteralUnion<'en' | 'zh', string>;
+
+// TODO: 以下为 blocklet 应用专属的全局对象类型，可以更加具体
+export type User = Record<string, any>;
+export type Session = Record<string, any>;
+export type Passport = Record<string, any>;
+export type Blocklet = {
+  appId: string;
+  appIds: string[];
+  appPid: string;
+  appName: string;
+  appDescription: string;
+  appLogo: string;
+  appLogoRect: string;
+  appUrl: string;
+  isComponent: boolean;
+  prefix: string;
+  groupPrefix: string;
+  pageGroup: string;
+  version: string;
+  mode: string;
+  tenantMode: 'single' | 'multiple';
+  theme: {
+    prefer?: 'light' | 'dark' | 'system';
+    light: Theme;
+    dark: Theme;
+  };
+  navigation: $TSFixMe[];
+  preferences: Record<string, any>;
+  languages: {
+    code: string;
+    name: string;
+  }[];
+  passportColor: string;
+  componentMountPoints: $TSFixMe[];
+  alsoKnownAs: string[];
+  trustedFactories: string[];
+  [x: string]: any;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "3.0.4",
+  "version": "3.0.6",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -60,16 +60,16 @@
     "react": ">=19.0.0",
     "react-router-dom": ">=6.22.3"
   },
-  "gitHead": "8078514c9bfa121870fa03bc9b9a0cd0bb026739",
+  "gitHead": "b985886f6650c3df0f48665c71d7a8ce0d9bdb93",
   "dependencies": {
-    "@arcblock/bridge": "3.0.4",
-    "@arcblock/did": "^1.20.14",
+    "@arcblock/bridge": "3.0.6",
+    "@arcblock/did": "^1.20.15",
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "3.0.4",
-    "@arcblock/nft-display": "3.0.4",
-    "@arcblock/react-hooks": "3.0.4",
+    "@arcblock/icons": "3.0.6",
+    "@arcblock/nft-display": "3.0.6",
+    "@arcblock/react-hooks": "3.0.6",
     "@blocklet/js-sdk": "^1.16.44",
-    "@blocklet/theme": "3.0.4",
+    "@blocklet/theme": "3.0.6",
     "@fontsource/roboto": "~5.1.1",
     "@fontsource/ubuntu-mono": "^5.2.6",
     "@iconify-icons/logos": "^1.2.36",
@@ -77,7 +77,7 @@
     "@iconify-icons/mdi": "^1.2.48",
     "@iconify-icons/tabler": "^1.2.95",
     "@iconify/react": "^5.2.1",
-    "@ocap/mcrypto": "^1.20.14",
+    "@ocap/mcrypto": "^1.20.15",
     "@solana/qr-code-styling": "^1.6.0",
     "@testing-library/react": "^14.3.1",
     "@types/dompurify": "^3.2.0",

package/src/Tag/index.jsx

@@ -61,7 +61,7 @@ function Tag(rawProps) {
     props.className = '';
   }
   const newProps = mergeProps(props, Tag, ['style']);
-  const { type, content, children, style, className, forwardedRef, ...rest } = newProps;
+  const { type, content, children, style, className, ...rest } = newProps;
 
   const { palette } = useTheme();
 
@@ -75,7 +75,7 @@ function Tag(rawProps) {
   }
 
   return (
-    <Span ref={forwardedRef} component="span" className={className} style={styles} {...rest}>
+    <Span component="span" className={className} style={styles} {...rest}>
       {content || children}
     </Span>
   );
@@ -89,14 +89,7 @@ Tag.propTypes = {
   style: PropTypes.oneOfType([PropTypes.object, PropTypes.string]),
 };
 
-/**
- * @type {React.ForwardRefExoticComponent<React.PropsWithoutRef<TagProps> & React.RefAttributes<HTMLSpanElement>>}
- */
-// eslint-disable-next-line react/prop-types
-function TagComponent({ ref, ...props }) {
-  return <Tag {...props} forwardedRef={ref} />;
-}
-export default TagComponent;
+export default Tag;
 
 const Span = styled(Typography)`
   && {

package/vite.config.mjs

@@ -14,7 +14,7 @@ export default defineConfig({
     dts(),
     noBundlePlugin({
       root: 'src',
-      copy: ['**/*.png', '**/*.gif', '**/*.jpg', '**/*.jpeg'],
+      copy: ['**/*.png', '**/*.gif', '**/*.jpg', '**/*.jpeg', '**/*.d.ts'],
     }),
   ],
   build: {