@lobehub/ui 1.140.2 → 1.141.0

package/es/ConfigProvider/index.d.ts

@@ -1,6 +1,5 @@
 import { ElementType, ReactNode } from 'react';
 import { CDN, CdnApi } from "../utils/genCdnUrl";
-type CdnFn = ({ pkg, version, path }: CdnApi) => string;
 export interface Config {
     aAs?: ElementType;
     customCdnFn?: CdnFn;
@@ -13,5 +12,6 @@ declare const ConfigProvider: import("react").NamedExoticComponent<{
     children: ReactNode;
     config: Config;
 }>;
+export type CdnFn = ({ pkg, version, path }: CdnApi) => string;
 export declare const useCdnFn: () => CdnFn;
 export default ConfigProvider;

package/es/ConfigProvider/index.js

@@ -10,7 +10,10 @@ var ConfigProvider = /*#__PURE__*/memo(function (_ref) {
     children: children
   });
 });
-var fallback = function fallback(_ref2) {
+
+// useCdnFn
+
+var cdnFallback = function cdnFallback(_ref2) {
   var pkg = _ref2.pkg,
     version = _ref2.version,
     path = _ref2.path;
@@ -23,7 +26,7 @@ var fallback = function fallback(_ref2) {
 };
 export var useCdnFn = function useCdnFn() {
   var config = useContext(ConfigContext);
-  if (!config) return fallback;
+  if (!config) return cdnFallback;
   if ((config === null || config === void 0 ? void 0 : config.proxy) !== 'custom') return function (_ref3) {
     var pkg = _ref3.pkg,
       version = _ref3.version,
@@ -35,6 +38,22 @@ export var useCdnFn = function useCdnFn() {
       version: version
     });
   };
-  return (config === null || config === void 0 ? void 0 : config.customCdnFn) || fallback;
+  return (config === null || config === void 0 ? void 0 : config.customCdnFn) || cdnFallback;
 };
+
+// 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;
+// };
+//
+
 export default ConfigProvider;

package/es/FluentEmoji/index.js

@@ -4,6 +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 } from "../ConfigProvider";
 import Img from "../Img";
 import { useStyles } from "./style";
 import { genEmojiUrl } from "./utils";
@@ -21,6 +22,7 @@ var FluentEmoji = /*#__PURE__*/memo(function (_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     loadingFail = _useState2[0],
     setLoadingFail = _useState2[1];
+  var genCdnUrl = useCdnFn();
   var _useStyles = useStyles(),
     cx = _useStyles.cx,
     styles = _useStyles.styles;
@@ -45,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,2 +1,9 @@
 export type EmojiType = 'anim' | 'flat' | 'modern' | 'mono' | 'pure' | '3d';
-export declare const genEmojiUrl: (emoji: string, type: EmojiType) => string | null;
+export declare function isFlagEmoji(emoji: string): boolean;
+export declare function emojiToUnicode(emoji: string): string;
+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

@@ -1,17 +1,72 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-function isFlagEmoji(emoji) {
+export function isFlagEmoji(emoji) {
   var flagRegex = /(?:\uD83C[\uDDE6-\uDDFF]){2}/;
   return flagRegex.test(emoji);
 }
-function emojiToUnicode(emoji) {
+export function emojiToUnicode(emoji) {
   return _toConsumableArray(emoji).map(function (char) {
     var _char$codePointAt;
     return char === null || char === void 0 || (_char$codePointAt = char.codePointAt(0)) === null || _char$codePointAt === void 0 ? void 0 : _char$codePointAt.toString(16);
   }).join('-');
 }
+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) {
-  if (isFlagEmoji(emoji)) return "https://jsdelivr.lobehub-inc.cn/gh/RealityRipple/emoji/noto/".concat(emojiToUnicode(emoji), ".png");
-  if (type === 'pure') return null;
   var ext = ['anim', '3d'].includes(type) ? 'webp' : 'svg';
-  return "https://jsdelivr.lobehub-inc.cn/gh/lobehub/fluent-emoji/packages/".concat(type, "/assets/").concat(emojiToUnicode(emoji), ".").concat(ext);
+  switch (type) {
+    case 'pure':
+      {
+        return null;
+      }
+    case 'anim':
+      {
+        return {
+          path: "assets/".concat(emojiToUnicode(emoji), ".").concat(ext),
+          pkg: emojiAnimPkg(emoji),
+          version: '1.0.0'
+        };
+      }
+    case '3d':
+      {
+        return {
+          path: "assets/".concat(emojiToUnicode(emoji), ".").concat(ext),
+          pkg: '@lobehub/fluent-emoji-3d',
+          version: '1.1.0'
+        };
+      }
+    case 'flat':
+      {
+        return {
+          path: "assets/".concat(emojiToUnicode(emoji), ".").concat(ext),
+          pkg: '@lobehub/fluent-emoji-flat',
+          version: '1.1.0'
+        };
+      }
+    case 'modern':
+      {
+        return {
+          path: "assets/".concat(emojiToUnicode(emoji), ".").concat(ext),
+          pkg: '@lobehub/fluent-emoji-modern',
+          version: '1.0.0'
+        };
+      }
+    case 'mono':
+      {
+        return {
+          path: "assets/".concat(emojiToUnicode(emoji), ".").concat(ext),
+          pkg: '@lobehub/fluent-emoji-mono',
+          version: '1.1.0'
+        };
+      }
+  }
 };

package/es/utils/genCdnUrl.js

@@ -17,4 +17,26 @@ export var genCdnUrl = function genCdnUrl(_ref) {
         return urlJoin(ALIYUN_API, pkg, version, 'files', 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.2",
+  "version": "1.141.0",
   "description": "Lobe UI is an open-source UI component library for building AIGC web apps",
   "keywords": [
     "lobehub",