@lark-apaas/miaoda-core 0.1.0-alpha.10 → 0.1.0-alpha.2

package/lib/apis/hooks/useCurrentAppInfo.d.ts

@@ -0,0 +1 @@
+export * from '../../hooks/useCurrentAppInfo';

package/lib/apis/hooks/useCurrentAppInfo.js

@@ -0,0 +1 @@
+export * from "../../hooks/useCurrentAppInfo.js";

package/lib/components/AppContainer/index.js

@@ -13,7 +13,7 @@ registerDayjsPlugins();
 const isMiaodaPreview = window.IS_MIAODA_PREVIEW;
 const App = (props)=>{
     const { themeMeta = {} } = props;
-    const { rem } = findValueByPixel(themeMetaOptions.themeRadius, themeMeta.borderRadius) || {
+    const { rem } = findValueByPixel(`${themeMeta.borderRadius}`, themeMetaOptions.themeRadius) || {
         rem: '0.625'
     };
     const radiusToken = generateTailwindRadiusToken(Number(rem));

package/lib/components/SidebarNav/DrawerNav.d.ts

@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { BaseNavProps } from '../../types';
-export default function DrawerNav({ navList, className, activeClassName, }: BaseNavProps): React.JSX.Element;
+export default function DrawerNav({ navList, className, activeClassName }: BaseNavProps): React.JSX.Element;

package/lib/components/SidebarNav/DropdownNav.d.ts

@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { BaseNavProps } from '../../types';
-export default function DropdownNav({ navList, className, activeClassName, }: BaseNavProps): React.JSX.Element;
+export default function DropdownNav({ navList, className, activeClassName }: BaseNavProps): React.JSX.Element;

package/lib/components/SidebarNav/Sidebar.d.ts

@@ -1,3 +1,3 @@
 import * as React from 'react';
 import { NavProps } from '../../types';
-export default function SidebarNav({ activeClassName, className, navList, }: NavProps): React.JSX.Element;
+export default function SidebarNav({ activeClassName, className, navList }: NavProps): React.JSX.Element;

package/lib/components/TopNav/BottomNav.d.ts

@@ -8,5 +8,5 @@ interface BottomNavProps extends BaseNavProps {
     navList: NavItemProps[];
     maxBottomItems?: number;
 }
-export declare function BottomNav({ navList, className, maxBottomItems, }: BottomNavProps): React.JSX.Element;
+export declare function BottomNav({ navList, className, maxBottomItems }: BottomNavProps): React.JSX.Element;
 export {};

package/lib/components/TopNav/TitleBar.js

@@ -3,7 +3,7 @@ import { useMemo, useState } from "react";
 import { Link, matchPath, useLocation } from "react-router-dom";
 import { LogOut, MoreHorizontal, X } from "lucide-react";
 import { clsxWithTw } from "../../utils/utils.js";
-import { useAppInfo, useCurrentUserProfile, useLogout } from "../../hooks/index.js";
+import { useCurrentAppInfo, useCurrentUserProfile, useLogout } from "../../hooks/index.js";
 import { DropdownThemeClass, MaskThemeClass, TopHeaderThemeClass } from "../common/index.js";
 const TitleBar = ({ navList, className })=>{
     const { pathname } = useLocation();
@@ -17,7 +17,7 @@ const TitleBar = ({ navList, className })=>{
         navList,
         pathname
     ]);
-    const { appName, appLogo } = useAppInfo();
+    const { appName, appLogo } = useCurrentAppInfo();
     const { name: userName, avatar: userAvatar } = useCurrentUserProfile();
     const { handlerLogout } = useLogout();
     const [isMenuOpen, setIsMenuOpen] = useState(false);

package/lib/components/TopNav/TopNav.d.ts

@@ -7,4 +7,4 @@ import { BaseNavProps } from '../../types';
 export interface TopNavProps extends BaseNavProps {
     align?: 'left' | 'center' | 'right';
 }
-export declare function TopNav({ navList, align, className, activeClassName, }: TopNavProps): React.JSX.Element;
+export declare function TopNav({ navList, align, className, activeClassName }: TopNavProps): React.JSX.Element;

package/lib/components/TopNav/TopNav.js

@@ -3,13 +3,13 @@ import { useRef, useState } from "react";
 import { Menu, X } from "lucide-react";
 import { Link } from "react-router-dom";
 import { clsxWithTw } from "../../utils/utils.js";
-import { useAppInfo } from "../../hooks/useAppInfo.js";
+import { useCurrentAppInfo } from "../../hooks/useCurrentAppInfo.js";
 import { useCurrentUserProfile } from "../../hooks/useCurrentUserProfile.js";
 import { DropdownThemeClass, NavMenu, TopHeaderThemeClass, UserAvatarMenu } from "../common/index.js";
 function TopNav({ navList = [], align = 'left', className, activeClassName }) {
     const [isMenuOpen, setIsMenuOpen] = useState(false);
     const navRef = useRef(null);
-    const { appName, appLogo } = useAppInfo();
+    const { appName, appLogo } = useCurrentAppInfo();
     const { avatar: userAvatar } = useCurrentUserProfile();
     return /*#__PURE__*/ jsxs("header", {
         ref: navRef,

package/lib/components/User/UserWithAvatar.d.ts

@@ -1,3 +1,3 @@
 import * as React from 'react';
 import type { UserWithAvatarProps } from './type';
-export declare function UserWithAvatar({ data, size, mode, className, }: UserWithAvatarProps): React.JSX.Element;
+export declare function UserWithAvatar({ data, size, mode, className }: UserWithAvatarProps): React.JSX.Element;

package/lib/components/common/LogoInfo.js

@@ -1,10 +1,10 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import "react";
 import { Link } from "react-router-dom";
-import { useAppInfo } from "../../hooks/useAppInfo.js";
+import { useCurrentAppInfo } from "../../hooks/useCurrentAppInfo.js";
 import { clsxWithTw } from "../../utils/utils.js";
 function LogoInfo({ className, logoClassName }) {
-    const { name, avatar } = useAppInfo();
+    const { name, avatar } = useCurrentAppInfo();
     return /*#__PURE__*/ jsx("div", {
         className: clsxWithTw('overflow-hidden text-ellipsis whitespace-nowrap', className),
         children: /*#__PURE__*/ jsxs(Link, {

package/lib/components/common/UserAvatarLayout.d.ts

@@ -1,4 +1,4 @@
 import * as React from 'react';
-export default function UserAvatarLayout({ className, }: {
+export default function UserAvatarLayout({ className }: {
     className?: string;
 }): React.JSX.Element;

package/lib/components/theme/ThemeProvider.d.ts

@@ -1,10 +1,10 @@
 import * as React from 'react';
 import { type ReactNode } from 'react';
 import type { ITheme } from '../../types';
-import { IThemeTokenMeta } from './util';
+import { IThemeMeta } from './util';
 export interface IBaseThemeProviderProps {
     defaultTheme?: ITheme;
-    themeMeta?: Partial<IThemeTokenMeta>;
+    themeMeta?: Partial<IThemeMeta>;
 }
 interface ThemeProviderProps extends IBaseThemeProviderProps {
     children: ReactNode;

package/lib/components/theme/ThemeProvider.js

@@ -22,13 +22,13 @@ function ThemeProvider({ children, defaultTheme = 'light', themeMeta = {}, enabl
     useEffect(()=>{
         const root = window.document.documentElement;
         if (void 0 !== themeMeta.spacing) {
-            const { rem } = findValueByPixel(themeMetaOptions.themeSpaces, themeMeta.spacing) || {
+            const { rem } = findValueByPixel(`${themeMeta.spacing}`, themeMetaOptions.themeSpaces) || {
                 rem: '0.25'
             };
             root.style.setProperty('--spacing', `${rem}rem`);
         }
         if (void 0 !== themeMeta.borderRadius) {
-            const { rem } = findValueByPixel(themeMetaOptions.themeRadius, themeMeta.borderRadius) || {
+            const { rem } = findValueByPixel(`${themeMeta.borderRadius}`, themeMetaOptions.themeRadius) || {
                 rem: '0.625'
             };
             root.style.setProperty('--radius', `${rem}rem`);
@@ -44,7 +44,7 @@ function ThemeProvider({ children, defaultTheme = 'light', themeMeta = {}, enabl
         }
     };
     const antdTheme = useMemo(()=>{
-        const res = findValueByPixel(themeMetaOptions.themeSpaces, themeMeta.spacing) || {
+        const res = findValueByPixel(`${themeMeta.spacing}`, themeMetaOptions.themeSpaces) || {
             pixel: '36',
             rem: '0.25',
             size: {

package/lib/components/theme/constants.d.ts

@@ -41,7 +41,7 @@ type ThemeColorTokenMap = {
 };
 export declare const themeColorTokenMap: ThemeColorTokenMap;
 export declare function getKeyByColor(colorValue: string, theme: keyof ThemeColorTokenMap): string;
-export declare function findValueByPixel(themeSpaces: typeof themeMetaOptions.themeSpaces | typeof themeMetaOptions.themeRadius, pixelValue?: string | number): {
+export declare function findValueByPixel(pixelValue: string, themeSpaces: typeof themeMetaOptions.themeSpaces | typeof themeMetaOptions.themeRadius): {
     pixel: string;
     rem: string;
 };

package/lib/components/theme/constants.js

@@ -550,8 +550,7 @@ function getKeyByColor(colorValue, theme) {
     const colorMap = themeColorTokenMap[theme];
     return Object.keys(colorMap).find((key)=>colorMap[key] === colorValue) || '';
 }
-function findValueByPixel(themeSpaces, pixelValue) {
-    if (!pixelValue) return;
+function findValueByPixel(pixelValue, themeSpaces) {
     return themeSpaces.options.find((option)=>option.value.pixel === pixelValue)?.value;
 }
 export { findValueByPixel, getKeyByColor, themeColorTokenMap, themeMetaOptions, themeTailwindRadius };

package/lib/components/theme/util.d.ts

@@ -1,7 +1,7 @@
 import { type ThemeConfig } from 'antd';
 import { UIComponentConfig } from './ui-config';
 export type IThemeMode = 'dark' | 'light' | 'system';
-export interface IThemeTokenMeta {
+export interface IThemeMeta {
     /**
      * 品牌色
      */
@@ -16,5 +16,5 @@ export interface IThemeTokenMeta {
     spacing: number;
 }
 export declare const generateTailwindRadiusToken: (radiusRemValue: number) => UIComponentConfig;
-export declare function generateLightTheme(override?: Partial<IThemeTokenMeta>): ThemeConfig;
-export declare function generateDarkTheme(override?: Partial<IThemeTokenMeta>): ThemeConfig;
+export declare function generateLightTheme(override?: Partial<IThemeMeta>): ThemeConfig;
+export declare function generateDarkTheme(override?: Partial<IThemeMeta>): ThemeConfig;

package/lib/components/theme/util.js

@@ -169,7 +169,7 @@ function generateLightTheme(override) {
         token: {
             ...defaultLightTheme.token,
             ...generateColorPrimaryToken(override?.colorPrimary || lightColorPrimary, 'light'),
-            ...generateBorderRadiusTokenSyncTailwind(override?.borderRadius),
+            ...generateBorderRadiusTokenSyncTailwind(override?.borderRadius || 4),
             ...generateSpacingToken(override)
         }
     };
@@ -180,7 +180,7 @@ function generateDarkTheme(override) {
         token: {
             ...defaultDarkTheme.token,
             ...generateColorPrimaryToken(override?.colorPrimary || darkColorPrimary, 'dark'),
-            ...generateBorderRadiusTokenSyncTailwind(override?.borderRadius),
+            ...generateBorderRadiusTokenSyncTailwind(override?.borderRadius || 4),
             ...generateSpacingToken(override)
         }
     };

package/lib/hooks/index.d.ts

@@ -1,4 +1,4 @@
-export * from './useAppInfo';
+export * from './useCurrentAppInfo';
 export * from './useCurrentUserProfile';
 export * from './useIsMobile';
 export * from './useLogout';

package/lib/hooks/index.js

@@ -1,4 +1,4 @@
-export * from "./useAppInfo.js";
+export * from "./useCurrentAppInfo.js";
 export * from "./useCurrentUserProfile.js";
 export * from "./useIsMobile.js";
 export * from "./useLogout.js";

package/lib/hooks/{useAppInfo.d.ts → useCurrentAppInfo.d.ts}

@@ -1,4 +1,4 @@
-export declare const useAppInfo: () => {
+export declare const useCurrentAppInfo: () => {
     appName: string;
     appLogo: string;
     name?: string;

package/lib/hooks/{useAppInfo.js → useCurrentAppInfo.js}

@@ -1,6 +1,6 @@
 import { useEffect, useState } from "react";
 import { getAppInfo } from "../integrations/getAppInfo.js";
-const useAppInfo = ()=>{
+const useCurrentAppInfo = ()=>{
     const [appInfo, setAppInfo] = useState(()=>getAppInfo());
     useEffect(()=>{
         const handleMetaInfoChanged = ()=>{
@@ -17,4 +17,4 @@ const useAppInfo = ()=>{
         appLogo: appInfo.avatar
     };
 };
-export { useAppInfo };
+export { useCurrentAppInfo };

package/lib/tailwind-theme.css

@@ -1,8 +1,5 @@
-@layer tailwind-base {
-  @import "tailwindcss";
-}
-
-@layer antd;
+@import "tailwindcss";
+@layer theme;
 
 @layer base {
   :root {
@@ -420,6 +417,8 @@
   }
 }
 
+@layer components, utilities;
+
 @source inline("text-{xs,sm,base,lg,xl,2xl,3xl,4xl,5xl,6xl,7xl,8xl,9xl}");
 
 @source inline("{bg,text,border}-{blue,pink,neutral,red,orange,violet,lime,yellow,green,teal,cyan,indigo,purple,amber,emerald,slate}-{50,{100..900..100},950}");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/miaoda-core",
-  "version": "0.1.0-alpha.10",
+  "version": "0.1.0-alpha.2",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [
@@ -56,9 +56,25 @@
       "types": "./lib/apis/utils/*.d.ts"
     }
   },
+  "scripts": {
+    "tsc": "tsc --declaration",
+    "build": "rslib build",
+    "build:storybook": "storybook build",
+    "bump": "changeset version",
+    "change": "changeset",
+    "check": "biome check --write",
+    "dev": "rslib build --watch",
+    "format": "biome format --write",
+    "storybook": "storybook dev",
+    "test": "echo 0",
+    "lint": "eslint src --ext .js,.jsx,.ts,.tsx",
+    "lint:fix": "eslint src --ext .js,.jsx,.ts,.tsx --fix",
+    "prepublishOnly": "npm run build"
+  },
   "dependencies": {
     "@ant-design/colors": "^7.2.1",
     "@ant-design/cssinjs": "^1.24.0",
+    "@lark-apaas/miaoda-inspector": "0.1.0-alpha.1",
     "@data-loom/js": "0.2.3",
     "clsx": "~2.0.1",
     "dayjs": "^1.11.13",
@@ -68,15 +84,14 @@
     "sonner": "~2.0.0",
     "tailwind-merge": "~2.0.0",
     "tailwind-variants": "0.3.1",
-    "tailwindcss-animate": "^1.0.7",
-    "@lark-apaas/miaoda-inspector": "0.1.0-alpha.5"
+    "tailwindcss-animate": "^1.0.7"
   },
   "devDependencies": {
     "@biomejs/biome": "2.0.6",
     "@changesets/cli": "^2.29.5",
     "@rsbuild/core": "~1.4.13",
     "@rsbuild/plugin-react": "^1.3.4",
-    "@rslib/core": "^0.13.2",
+    "@rslib/core": "^0.12.0",
     "@storybook/addon-essentials": "^8.6.14",
     "@storybook/addon-interactions": "^8.6.14",
     "@storybook/addon-links": "^8.6.14",
@@ -93,7 +108,7 @@
     "antd": "^5.26.6",
     "eslint": "^8.57.0",
     "jsdom": "^26.1.0",
-    "lucide-react": "npm:@lark-apaas/lucide-react@0.1.0-alpha.5",
+    "lucide-react": "^0.541.0",
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "react-router-dom": "^6.26.2",
@@ -107,22 +122,9 @@
   },
   "peerDependencies": {
     "antd": ">=5.26.6",
+    "lucide-react": "^0.541.0",
     "react": ">=16.14.0",
     "react-dom": ">=16.14.0",
     "react-router-dom": ">=6.26.2"
-  },
-  "scripts": {
-    "tsc": "tsc --declaration",
-    "build": "rslib build",
-    "build:storybook": "storybook build",
-    "bump": "changeset version",
-    "change": "changeset",
-    "check": "biome check --write",
-    "dev": "rslib build --watch",
-    "format": "biome format --write",
-    "storybook": "storybook dev",
-    "test": "echo 0",
-    "lint": "eslint src --ext .js,.jsx,.ts,.tsx",
-    "lint:fix": "eslint src --ext .js,.jsx,.ts,.tsx --fix"
   }
-}
+}

package/lib/apis/hooks/useAppInfo.d.ts

@@ -1 +0,0 @@
-export * from '../../hooks/useAppInfo';

package/lib/apis/hooks/useAppInfo.js

@@ -1 +0,0 @@
-export * from "../../hooks/useAppInfo.js";