@arcblock/ux 2.13.54 → 2.13.55

package/lib/Theme/theme-provider.js

@@ -6,9 +6,9 @@ import { ThemeProvider as MuiThemeProvider, useTheme } from '@mui/material/style
 import StyledEngineProvider from '@mui/material/StyledEngineProvider';
 import CssBaseline from '@mui/material/CssBaseline';
 import set from 'lodash/set';
-import { BLOCKLET_THEME_PREFER_KEY } from '@blocklet/theme';
+import { BLOCKLET_THEME_PREFER_KEY, getDefaultThemePrefer, isValidThemeMode } from '@blocklet/theme';
 import useLocationState from '../hooks/use-location-state';
-import { createTheme, getDefaultThemePrefer, isTheme, isUxTheme, isValidThemeMode, lazyCreateDefaultTheme } from './theme';
+import { createTheme, isTheme, isUxTheme, lazyCreateDefaultTheme } from './theme';
 const defaultTheme = createTheme();
 
 /** 颜色模式上下文类型 */

package/lib/Theme/theme.d.ts

@@ -15,12 +15,6 @@ export declare function collectFontFamilies(obj?: {
     fontFamily?: string;
 }, fontSet?: Set<string>): Set<string>;
 export declare function loadFonts(fonts: string[]): Promise<boolean>;
-export declare function isValidThemeMode(mode: any): mode is PaletteMode;
-export declare function getDefaultThemePrefer(meta?: {
-    theme: {
-        prefer: 'light' | 'dark' | 'system';
-    };
-}): PaletteMode;
 export declare function createDefaultThemeOptions(mode?: PaletteMode): ThemeOptions;
 export interface UxThemeOptions extends ThemeOptions {
     disableBlockletTheme?: boolean;

package/lib/Theme/theme.js

@@ -4,7 +4,7 @@
 import { createTheme as _createTheme, responsiveFontSizes } from '@mui/material/styles';
 import { deepmerge } from '@mui/utils';
 import webfontloader from 'webfontloader';
-import { BLOCKLET_THEME_LIGHT, BLOCKLET_THEME_DARK, DEFAULT_FONTS, BLOCKLET_THEME_PREFER_KEY } from '@blocklet/theme';
+import { BLOCKLET_THEME_LIGHT, BLOCKLET_THEME_DARK, DEFAULT_FONTS, getDefaultThemePrefer } from '@blocklet/theme';
 import { cleanedObj, deepmergeAll } from '../Util';
 
 // 默认只加载最基本的 roboto latin 字体
@@ -71,44 +71,6 @@ export function loadFonts(fonts) {
   });
 }
 
-// 获取默认主题偏好
-export function isValidThemeMode(mode) {
-  return mode === 'light' || mode === 'dark';
-}
-export function getDefaultThemePrefer(meta) {
-  // 跟随 url theme 参数
-  const urlParams = new URLSearchParams(window.location.search);
-  const urlPrefer = urlParams.get('theme');
-  if (isValidThemeMode(urlPrefer)) {
-    return urlPrefer;
-  }
-
-  // 跟随 session theme
-  const sessionPrefer = sessionStorage.getItem(BLOCKLET_THEME_PREFER_KEY);
-  if (isValidThemeMode(sessionPrefer)) {
-    return sessionPrefer;
-  }
-
-  // 跟随 blocklet theme mode
-  const prefer = Object.assign({}, window.blocklet, meta).theme?.prefer;
-  if (prefer === 'light' || prefer === 'dark') {
-    return prefer;
-  }
-  if (prefer === 'system') {
-    // 跟随本地缓存
-    const localPrefer = localStorage.getItem(BLOCKLET_THEME_PREFER_KEY);
-    if (isValidThemeMode(localPrefer)) {
-      return localPrefer;
-    }
-
-    // 跟随系统
-    return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
-  }
-
-  // fallback
-  return 'light';
-}
-
 // 创建默认主题配置
 export function createDefaultThemeOptions(mode = 'light') {
   if (mode === 'dark') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcblock/ux",
-  "version": "2.13.54",
+  "version": "2.13.55",
   "description": "Common used react components for arcblock products",
   "keywords": [
     "react",
@@ -71,14 +71,14 @@
     "react": ">=18.2.0",
     "react-router-dom": ">=6.22.3"
   },
-  "gitHead": "6515646bea775127c4c85c737b6233823a0062ec",
+  "gitHead": "fd8de005ce497660cbf1ea7378cf0d725b45fe87",
   "dependencies": {
     "@arcblock/did-motif": "^1.1.13",
-    "@arcblock/icons": "^2.13.54",
-    "@arcblock/nft-display": "^2.13.54",
-    "@arcblock/react-hooks": "^2.13.54",
+    "@arcblock/icons": "^2.13.55",
+    "@arcblock/nft-display": "^2.13.55",
+    "@arcblock/react-hooks": "^2.13.55",
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
-    "@blocklet/theme": "^2.13.54",
+    "@blocklet/theme": "^2.13.55",
     "@fontsource/roboto": "~5.1.1",
     "@fontsource/ubuntu-mono": "^5.0.18",
     "@iconify-icons/logos": "^1.2.36",

package/src/Theme/theme-provider.tsx

@@ -5,19 +5,10 @@ import { ThemeProvider as MuiThemeProvider, Theme, ThemeOptions, useTheme } from
 import StyledEngineProvider from '@mui/material/StyledEngineProvider';
 import CssBaseline from '@mui/material/CssBaseline';
 import set from 'lodash/set';
-import { BLOCKLET_THEME_PREFER_KEY } from '@blocklet/theme';
+import { BLOCKLET_THEME_PREFER_KEY, getDefaultThemePrefer, isValidThemeMode } from '@blocklet/theme';
 
 import useLocationState from '../hooks/use-location-state';
-
-import {
-  createTheme,
-  getDefaultThemePrefer,
-  isTheme,
-  isUxTheme,
-  isValidThemeMode,
-  lazyCreateDefaultTheme,
-  type UxThemeOptions,
-} from './theme';
+import { createTheme, isTheme, isUxTheme, lazyCreateDefaultTheme, type UxThemeOptions } from './theme';
 
 const defaultTheme = createTheme();
 

package/src/Theme/theme.ts

@@ -4,7 +4,7 @@ import type { PaletteMode, Theme } from '@mui/material';
 import { createTheme as _createTheme, responsiveFontSizes, type ThemeOptions } from '@mui/material/styles';
 import { deepmerge } from '@mui/utils';
 import webfontloader from 'webfontloader';
-import { BLOCKLET_THEME_LIGHT, BLOCKLET_THEME_DARK, DEFAULT_FONTS, BLOCKLET_THEME_PREFER_KEY } from '@blocklet/theme';
+import { BLOCKLET_THEME_LIGHT, BLOCKLET_THEME_DARK, DEFAULT_FONTS, getDefaultThemePrefer } from '@blocklet/theme';
 import { cleanedObj, deepmergeAll } from '../Util';
 
 // 默认只加载最基本的 roboto latin 字体
@@ -80,46 +80,6 @@ export function loadFonts(fonts: string[]) {
   });
 }
 
-// 获取默认主题偏好
-export function isValidThemeMode(mode: any): mode is PaletteMode {
-  return mode === 'light' || mode === 'dark';
-}
-
-export function getDefaultThemePrefer(meta?: { theme: { prefer: 'light' | 'dark' | 'system' } }): PaletteMode {
-  // 跟随 url theme 参数
-  const urlParams = new URLSearchParams(window.location.search);
-  const urlPrefer = urlParams.get('theme');
-  if (isValidThemeMode(urlPrefer)) {
-    return urlPrefer;
-  }
-
-  // 跟随 session theme
-  const sessionPrefer = sessionStorage.getItem(BLOCKLET_THEME_PREFER_KEY);
-  if (isValidThemeMode(sessionPrefer)) {
-    return sessionPrefer;
-  }
-
-  // 跟随 blocklet theme mode
-  const prefer = Object.assign({}, window.blocklet, meta).theme?.prefer;
-  if (prefer === 'light' || prefer === 'dark') {
-    return prefer;
-  }
-
-  if (prefer === 'system') {
-    // 跟随本地缓存
-    const localPrefer = localStorage.getItem(BLOCKLET_THEME_PREFER_KEY);
-    if (isValidThemeMode(localPrefer)) {
-      return localPrefer;
-    }
-
-    // 跟随系统
-    return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light';
-  }
-
-  // fallback
-  return 'light';
-}
-
 // 创建默认主题配置
 export function createDefaultThemeOptions(mode: PaletteMode = 'light') {
   if (mode === 'dark') {