@anjianshi/utils 3.0.5 → 3.0.6

package/env-react/emotion.d.ts

@@ -4,24 +4,18 @@
  *
  * 使用前提：
  * 1. 只支持浏览器渲染
- * 2. 安装 @emotion/serialize、@emotion/utils
- * 3. 调用 registerEmotionFunctions() 注册 @emotion/serialize 的 serializeStyles() 和 @emotion/utils 的 insertStyles() 函数
- * 4. 用 EmotionCacheProvider 包裹 App 根元素
+ * 2. 调用 getEmotionCacheProvider()，传入来自 @emotion/react 的 withEmotionCache 函数，
+ *    并用得到的 EmotionCacheProvider 组件包裹 App 根元素
  *
  * 来自：
  * https://github.com/emotion-js/emotion/issues/1853#issuecomment-623349622
  */
-import { type EmotionCache } from '@emotion/react';
-import type { CSSInterpolation, serializeStyles as serializeStylesT } from '@emotion/serialize';
-import type { insertStyles as insertStylesT } from '@emotion/utils';
+import type { EmotionCache, withEmotionCache as withEmotionCacheT } from '@emotion/react';
+import { type CSSInterpolation } from '@emotion/serialize';
 export declare const useEmotionCache: () => EmotionCache | undefined;
-export declare const EmotionCacheProvider: import("react").FC<{
+export declare function getEmotionCacheProvider(withEmotionCache: typeof withEmotionCacheT): import("react").FC<{
     children: React.ReactNode;
 } & import("react").RefAttributes<any>> | import("react").ForwardRefExoticComponent<{
     children: React.ReactNode;
 } & import("react").RefAttributes<any>>;
-declare let serializeStyles: typeof serializeStylesT | null;
-declare let insertStyles: typeof insertStylesT | null;
-export declare function registerEmotionFunctions(serializeStylesFn: typeof serializeStyles, insertStylesFn: typeof insertStyles): void;
 export declare function useEmotionClassName(): (...args: CSSInterpolation[]) => string;
-export {};

package/env-react/emotion.jsx

@@ -1,28 +1,12 @@
-/**
- * 通过 React Hook 把 emotion css 转换成 className
- * （不再需要 <ClassName>）
- *
- * 使用前提：
- * 1. 只支持浏览器渲染
- * 2. 安装 @emotion/serialize、@emotion/utils
- * 3. 调用 registerEmotionFunctions() 注册 @emotion/serialize 的 serializeStyles() 和 @emotion/utils 的 insertStyles() 函数
- * 4. 用 EmotionCacheProvider 包裹 App 根元素
- *
- * 来自：
- * https://github.com/emotion-js/emotion/issues/1853#issuecomment-623349622
- */
-import { withEmotionCache } from '@emotion/react';
+import { serializeStyles } from '@emotion/serialize';
+import { insertStyles } from '@emotion/utils';
 import { createContext, useContext, useCallback } from 'react';
 const CacheContext = createContext(undefined);
 export const useEmotionCache = () => useContext(CacheContext);
-export const EmotionCacheProvider = withEmotionCache(({ children }, cache) => {
-    return <CacheContext.Provider value={cache}>{children}</CacheContext.Provider>;
-});
-let serializeStyles = null;
-let insertStyles = null;
-export function registerEmotionFunctions(serializeStylesFn, insertStylesFn) {
-    serializeStyles = serializeStylesFn;
-    insertStyles = insertStylesFn;
+export function getEmotionCacheProvider(withEmotionCache) {
+    return withEmotionCache(({ children }, cache) => {
+        return <CacheContext.Provider value={cache}>{children}</CacheContext.Provider>;
+    });
 }
 export function useEmotionClassName() {
     const cache = useEmotionCache();
@@ -34,10 +18,6 @@ export function useEmotionClassName() {
             }
             throw new Error('No emotion cache found!');
         }
-        if (!serializeStyles || !insertStyles) {
-            console.error('useEmotionClassName: need register serializeStyles() and insertStyles() functions first.');
-            return 'emotion-functions-missing';
-        }
         const serialized = serializeStyles(args, cache.registered);
         insertStyles(cache, serialized, false);
         return cache.key + '-' + serialized.name;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@anjianshi/utils",
-  "version": "3.0.5",
+  "version": "3.0.6",
   "description": "Common JavaScript Utils",
   "homepage": "https://github.com/anjianshi/js-packages/utils",
   "bugs": {
@@ -31,11 +31,11 @@
     "redis": "^5.5.6",
     "typescript": "^5.8.3",
     "vconsole": "^3.15.1",
-    "@anjianshi/presets-eslint-react": "6.0.0",
-    "@anjianshi/presets-eslint-base": "6.0.0",
     "@anjianshi/presets-eslint-node": "6.0.0",
-    "@anjianshi/presets-eslint-typescript": "6.0.0",
     "@anjianshi/presets-prettier": "3.0.5",
+    "@anjianshi/presets-eslint-typescript": "6.0.0",
+    "@anjianshi/presets-eslint-react": "6.0.0",
+    "@anjianshi/presets-eslint-base": "6.0.0",
     "@anjianshi/presets-typescript": "3.2.5"
   },
   "peerDependencies": {