@lobehub/ui 1.140.3 → 1.141.0

package/es/ConfigProvider/index.d.ts

@@ -1,12 +1,10 @@
 import { ElementType, ReactNode } from 'react';
-import { CDN, CdnApi, JsdelivrApi, JsdelivrCDN } from "../utils/genCdnUrl";
+import { CDN, CdnApi } from "../utils/genCdnUrl";
 export interface Config {
     aAs?: ElementType;
     customCdnFn?: CdnFn;
-    customJsdelivrFn?: JsdelivrFn;
     imgAs?: ElementType;
     imgUnoptimized?: boolean;
-    jsdelivrProxy?: JsdelivrCDN | 'custom';
     proxy?: CDN | 'custom';
 }
 export declare const ConfigContext: import("react").Context<Config | null>;
@@ -16,6 +14,4 @@ declare const ConfigProvider: import("react").NamedExoticComponent<{
 }>;
 export type CdnFn = ({ pkg, version, path }: CdnApi) => string;
 export declare const useCdnFn: () => CdnFn;
-export type JsdelivrFn = ({ repo, path }: JsdelivrApi) => string;
-export declare const useJsdelivrFn: () => JsdelivrFn;
 export default ConfigProvider;

package/es/ConfigProvider/index.js

@@ -1,5 +1,5 @@
 import { createContext, memo, useContext } from 'react';
-import { genCdnUrl, genJsdelivrUrl } from "../utils/genCdnUrl";
+import { genCdnUrl } from "../utils/genCdnUrl";
 import { jsx as _jsx } from "react/jsx-runtime";
 export var ConfigContext = /*#__PURE__*/createContext(null);
 var ConfigProvider = /*#__PURE__*/memo(function (_ref) {
@@ -42,28 +42,18 @@ export var useCdnFn = function useCdnFn() {
 };
 
 // useJsdelivrFn
+// export type JsdelivrFn = ({ repo, path }: JsdelivrApi) => string;
+//
+// const JsdelivrFallback: JsdelivrFn = ({ repo, path }) =>
+//   genJsdelivrUrl({ path, proxy: 'lobehub', repo });
+//
+// export const useJsdelivrFn = (): JsdelivrFn => {
+//   const config = useContext(ConfigContext);
+//   if (!config) return JsdelivrFallback;
+//   if (config?.proxy !== 'custom')
+//     return ({ repo, path }) => genJsdelivrUrl({ path, proxy: config.proxy as any, repo });
+//   return config?.customJsdelivrFn || JsdelivrFallback;
+// };
+//
 
-var JsdelivrFallback = function JsdelivrFallback(_ref4) {
-  var repo = _ref4.repo,
-    path = _ref4.path;
-  return genJsdelivrUrl({
-    path: path,
-    proxy: 'lobehub',
-    repo: repo
-  });
-};
-export var useJsdelivrFn = function useJsdelivrFn() {
-  var config = useContext(ConfigContext);
-  if (!config) return JsdelivrFallback;
-  if ((config === null || config === void 0 ? void 0 : config.proxy) !== 'custom') return function (_ref5) {
-    var repo = _ref5.repo,
-      path = _ref5.path;
-    return genJsdelivrUrl({
-      path: path,
-      proxy: config.proxy,
-      repo: repo
-    });
-  };
-  return (config === null || config === void 0 ? void 0 : config.customJsdelivrFn) || JsdelivrFallback;
-};
 export default ConfigProvider;

package/es/FluentEmoji/index.js

@@ -4,7 +4,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { memo, useMemo, useState } from 'react';
 import { Center } from 'react-layout-kit';
-import { useCdnFn, useJsdelivrFn } from "../ConfigProvider";
+import { useCdnFn } from "../ConfigProvider";
 import Img from "../Img";
 import { useStyles } from "./style";
 import { genEmojiUrl } from "./utils";
@@ -22,18 +22,13 @@ var FluentEmoji = /*#__PURE__*/memo(function (_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     loadingFail = _useState2[0],
     setLoadingFail = _useState2[1];
-  var genJsdelivrUrl = useJsdelivrFn();
   var genCdnUrl = useCdnFn();
   var _useStyles = useStyles(),
     cx = _useStyles.cx,
     styles = _useStyles.styles;
   var emojiUrl = useMemo(function () {
-    return genEmojiUrl(emoji, type, {
-      genCdnUrl: genCdnUrl,
-      genJsdelivrUrl: genJsdelivrUrl
-    });
-  }, [type, emoji, genJsdelivrUrl, genCdnUrl]);
-  console.log(emojiUrl);
+    return genEmojiUrl(emoji, type);
+  }, [type, emoji]);
   if (type === 'pure' || !emojiUrl || loadingFail) return /*#__PURE__*/_jsx(Center, {
     className: cx(styles.container, className),
     flex: 'none',
@@ -52,7 +47,7 @@ var FluentEmoji = /*#__PURE__*/memo(function (_ref) {
     onError: function onError() {
       return setLoadingFail(true);
     },
-    src: emojiUrl,
+    src: genCdnUrl(emojiUrl),
     style: _objectSpread({
       flex: 'none'
     }, style),

package/es/FluentEmoji/utils.d.ts

@@ -1,8 +1,9 @@
-import { CdnFn, JsdelivrFn } from "../ConfigProvider";
 export type EmojiType = 'anim' | 'flat' | 'modern' | 'mono' | 'pure' | '3d';
 export declare function isFlagEmoji(emoji: string): boolean;
 export declare function emojiToUnicode(emoji: string): string;
-export declare const genEmojiUrl: (emoji: string, type: EmojiType, { genCdnUrl, genJsdelivrUrl }: {
-    genCdnUrl: CdnFn;
-    genJsdelivrUrl: JsdelivrFn;
-}) => string | null;
+export declare function emojiAnimPkg(emoji: string): "@lobehub/fluent-emoji-anim-1" | "@lobehub/fluent-emoji-anim-2" | "@lobehub/fluent-emoji-anim-3" | "@lobehub/fluent-emoji-anim-4";
+export declare const genEmojiUrl: (emoji: string, type: EmojiType) => {
+    path: string;
+    pkg: string;
+    version: string;
+} | null;

package/es/FluentEmoji/utils.js

@@ -9,9 +9,19 @@ export function emojiToUnicode(emoji) {
     return char === null || char === void 0 || (_char$codePointAt = char.codePointAt(0)) === null || _char$codePointAt === void 0 ? void 0 : _char$codePointAt.toString(16);
   }).join('-');
 }
-export var genEmojiUrl = function genEmojiUrl(emoji, type, _ref) {
-  var genCdnUrl = _ref.genCdnUrl,
-    genJsdelivrUrl = _ref.genJsdelivrUrl;
+export function emojiAnimPkg(emoji) {
+  var mainPart = emojiToUnicode(emoji).split('-')[0];
+  if (mainPart < '1f469') {
+    return '@lobehub/fluent-emoji-anim-1';
+  } else if (mainPart >= '1f469' && mainPart < '1f620') {
+    return '@lobehub/fluent-emoji-anim-2';
+  } else if (mainPart >= '1f620' && mainPart < '1f9a0') {
+    return '@lobehub/fluent-emoji-anim-3';
+  } else {
+    return '@lobehub/fluent-emoji-anim-4';
+  }
+}
+export var genEmojiUrl = function genEmojiUrl(emoji, type) {
   var ext = ['anim', '3d'].includes(type) ? 'webp' : 'svg';
   switch (type) {
     case 'pure':
@@ -20,42 +30,43 @@ export var genEmojiUrl = function genEmojiUrl(emoji, type, _ref) {
       }
     case 'anim':
       {
-        return genJsdelivrUrl({
-          path: "packages/".concat(type, "/assets/").concat(emojiToUnicode(emoji), ".").concat(ext),
-          repo: 'lobehub/fluent-emoji'
-        });
+        return {
+          path: "assets/".concat(emojiToUnicode(emoji), ".").concat(ext),
+          pkg: emojiAnimPkg(emoji),
+          version: '1.0.0'
+        };
       }
     case '3d':
       {
-        return genCdnUrl({
+        return {
           path: "assets/".concat(emojiToUnicode(emoji), ".").concat(ext),
           pkg: '@lobehub/fluent-emoji-3d',
           version: '1.1.0'
-        });
+        };
       }
     case 'flat':
       {
-        return genCdnUrl({
+        return {
           path: "assets/".concat(emojiToUnicode(emoji), ".").concat(ext),
           pkg: '@lobehub/fluent-emoji-flat',
           version: '1.1.0'
-        });
+        };
       }
     case 'modern':
       {
-        return genCdnUrl({
+        return {
           path: "assets/".concat(emojiToUnicode(emoji), ".").concat(ext),
           pkg: '@lobehub/fluent-emoji-modern',
           version: '1.0.0'
-        });
+        };
       }
     case 'mono':
       {
-        return genCdnUrl({
+        return {
           path: "assets/".concat(emojiToUnicode(emoji), ".").concat(ext),
           pkg: '@lobehub/fluent-emoji-mono',
           version: '1.1.0'
-        });
+        };
       }
   }
 };

package/es/utils/genCdnUrl.d.ts

@@ -6,10 +6,3 @@ export interface CdnApi {
     version?: string;
 }
 export declare const genCdnUrl: ({ pkg, version, path, proxy }: CdnApi) => string;
-export type JsdelivrCDN = 'jsdelivr' | 'lobehub';
-export interface JsdelivrApi {
-    path: string;
-    proxy?: JsdelivrCDN;
-    repo: string;
-}
-export declare const genJsdelivrUrl: ({ path, proxy, repo }: JsdelivrApi) => string;

package/es/utils/genCdnUrl.js

@@ -18,20 +18,25 @@ export var genCdnUrl = function genCdnUrl(_ref) {
       }
   }
 };
-var JSDELIVR_API = 'https://fastly.jsdelivr.net';
-var LOBEHUB_API = 'https://jsdelivr.lobeobjects.space';
-export var genJsdelivrUrl = function genJsdelivrUrl(_ref2) {
-  var path = _ref2.path,
-    proxy = _ref2.proxy,
-    repo = _ref2.repo;
-  switch (proxy) {
-    case 'jsdelivr':
-      {
-        return urlJoin(JSDELIVR_API, 'gh', repo, path);
-      }
-    default:
-      {
-        return urlJoin(LOBEHUB_API, 'gh', repo, path);
-      }
-  }
-};
+
+// export type JsdelivrCDN = 'jsdelivr' | 'lobehub';
+//
+// const JSDELIVR_API = 'https://fastly.jsdelivr.net';
+// const LOBEHUB_API = 'https://jsdelivr.lobeobjects.space';
+//
+// export interface JsdelivrApi {
+//   path: string;
+//   proxy?: JsdelivrCDN;
+//   repo: string;
+// }
+//
+// export const genJsdelivrUrl = ({ path, proxy, repo }: JsdelivrApi): string => {
+//   switch (proxy) {
+//     case 'jsdelivr': {
+//       return urlJoin(JSDELIVR_API, 'gh', repo, path);
+//     }
+//     default: {
+//       return urlJoin(LOBEHUB_API, 'gh', repo, path);
+//     }
+//   }
+// };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lobehub/ui",
-  "version": "1.140.3",
+  "version": "1.141.0",
   "description": "Lobe UI is an open-source UI component library for building AIGC web apps",
   "keywords": [
     "lobehub",