From 42dcb8b5a7daf9b5d24fbcb480bb7bc042f25445 Mon Sep 17 00:00:00 2001 From: Daniel Polo Date: Mon, 4 Aug 2025 16:27:58 -0700 Subject: [PATCH 1/3] Update dependencies and refactor styles in mini-apps-ui-kit-react - Upgraded Tailwind CSS to version 4.1.11 and integrated @tailwindcss/vite for improved build performance. - Refactored various components to use updated height and size classes for consistency. - Adjusted global styles to utilize @import for Tailwind CSS and organized font-face declarations. - Enhanced component styles for better responsiveness and accessibility. - Fixed minor issues in class names and structure across multiple components. --- packages/mini-apps-ui-kit-react/package.json | 7 +- .../src/components/BottomBar/BottomBar.tsx | 2 +- .../components/CircularIcon/CircularIcon.tsx | 10 +- .../CircularState/CircularState.tsx | 2 +- .../components/ColorPicker/ColorPicker.tsx | 2 +- .../src/components/Form/Form.tsx | 2 +- .../src/components/Input/Input.tsx | 12 +- .../src/components/ListItem/ListItem.tsx | 8 +- .../src/components/Marble/Marble.tsx | 2 +- .../src/components/OTPField/OTPField.tsx | 6 +- .../components/PhoneField/CountryListItem.tsx | 2 +- .../PhoneField/GroupedCountryList.tsx | 2 +- .../components/SearchField/SearchField.tsx | 2 +- .../src/components/Select/Select.tsx | 6 +- .../src/components/Skeleton/Skeleton.tsx | 10 +- .../src/components/Tabs/Tabs.tsx | 4 +- .../src/components/TextArea/TextArea.tsx | 2 +- .../src/components/Toast/Toast.tsx | 6 +- .../src/components/TopBar/TopBar.tsx | 2 +- .../src/lib/constants/dropdownStyles.ts | 2 +- .../stories/Drawer.stories.tsx | 4 +- .../stories/NumberPad.stories.tsx | 4 +- .../mini-apps-ui-kit-react/styles/globals.css | 165 +++--- .../mini-apps-ui-kit-react/vite.config.ts | 2 + pnpm-lock.yaml | 476 +++++++++++++++--- 25 files changed, 552 insertions(+), 190 deletions(-) diff --git a/packages/mini-apps-ui-kit-react/package.json b/packages/mini-apps-ui-kit-react/package.json index cd267ef9..4c9afb93 100644 --- a/packages/mini-apps-ui-kit-react/package.json +++ b/packages/mini-apps-ui-kit-react/package.json @@ -16,8 +16,8 @@ "storybook": "storybook dev -p 6006", "format": "prettier --write \"**/*.{ts,tsx,md}\"", "sb:move": "mv ./storybook-static ../../storybook-static", - "dev:sb": "concurrently \"tailwindcss -i ./styles/globals.css -o ./dist/globals.css --watch\" \"pnpm storybook\"", - "build:tailwind": "tailwindcss -i ./styles/globals.css -o ./dist/globals.css --minify", + "dev:sb": "concurrently \"npx @tailwindcss/cli -i ./styles/globals.css -o ./dist/globals.css --watch\" \"pnpm storybook\"", + "build:tailwind": "npx @tailwindcss/cli -i ./styles/globals.css -o ./dist/globals.css --minify", "build:sb": "pnpm build:tailwind && storybook build", "build": "tsc -b ./tsconfig.lib.json && vite build && pnpm build:tailwind", "lint": "eslint .", @@ -48,6 +48,7 @@ "@storybook/react-vite": "^8.4.7", "@storybook/test": "^8.4.7", "@storybook/theming": "^8.5.5", + "@tailwindcss/vite": "^4.1.11", "@types/glob": "^8.1.0", "@types/react": "^18.3.12", "@types/react-dom": "^18.3.1", @@ -65,7 +66,7 @@ "rollup-plugin-visualizer": "^6.0.3", "rollup-preserve-directives": "^1.1.3", "storybook": "^8.4.7", - "tailwindcss": "^3.4.15", + "tailwindcss": "^4.1.11", "tailwindcss-animate": "^1.0.7", "typescript": "~5.6.2", "typescript-eslint": "^8.11.0", diff --git a/packages/mini-apps-ui-kit-react/src/components/BottomBar/BottomBar.tsx b/packages/mini-apps-ui-kit-react/src/components/BottomBar/BottomBar.tsx index b266937b..970b5ec6 100644 --- a/packages/mini-apps-ui-kit-react/src/components/BottomBar/BottomBar.tsx +++ b/packages/mini-apps-ui-kit-react/src/components/BottomBar/BottomBar.tsx @@ -6,7 +6,7 @@ import { forwardRef } from "react"; const bottomBarVariants = cva("w-full gap-4", { variants: { direction: { - horizontal: "grid grid-cols-1 [&>*]:col-span-1 [&:has(>*:nth-child(2))]:grid-cols-2", + horizontal: "grid grid-cols-1 *:col-span-1 [&:has(>*:nth-child(2))]:grid-cols-2", vertical: "flex flex-col-reverse", }, }, diff --git a/packages/mini-apps-ui-kit-react/src/components/CircularIcon/CircularIcon.tsx b/packages/mini-apps-ui-kit-react/src/components/CircularIcon/CircularIcon.tsx index 03c78f02..fc084b0d 100644 --- a/packages/mini-apps-ui-kit-react/src/components/CircularIcon/CircularIcon.tsx +++ b/packages/mini-apps-ui-kit-react/src/components/CircularIcon/CircularIcon.tsx @@ -16,14 +16,14 @@ const sizeClasses: Record = { sm: "size-11", md: "size-12", lg: "size-16", - xl: "size-[5.5rem]", + xl: "size-22", }; const iconClasses: Record = { - xs: "size-[0.875rem]", - sm: "size-[1.5rem]", - md: "size-[1.625rem]", - lg: "size-[2.125rem]", + xs: "size-3.5", + sm: "size-6", + md: "size-6.5", + lg: "size-8.5", xl: "size-12", }; diff --git a/packages/mini-apps-ui-kit-react/src/components/CircularState/CircularState.tsx b/packages/mini-apps-ui-kit-react/src/components/CircularState/CircularState.tsx index f282e442..74286d46 100644 --- a/packages/mini-apps-ui-kit-react/src/components/CircularState/CircularState.tsx +++ b/packages/mini-apps-ui-kit-react/src/components/CircularState/CircularState.tsx @@ -34,7 +34,7 @@ function CircularState({ value, size, className, ...props }: CircularStateProps) "text-gray-0", size !== "xs" && "shadow-[inset_0_0_0_1px_rgba(255,255,255,0.3)]", iconClasses[value], - "bg-[radial-gradient(111.32%_111.8%_at_22.73%_0%,_rgba(255,255,255,0.2)_0%,_rgba(255,255,255,0)_100%)]", + "bg-[radial-gradient(111.32%_111.8%_at_22.73%_0%,rgba(255,255,255,0.2)_0%,rgba(255,255,255,0)_100%)]", className, )} size={size} diff --git a/packages/mini-apps-ui-kit-react/src/components/ColorPicker/ColorPicker.tsx b/packages/mini-apps-ui-kit-react/src/components/ColorPicker/ColorPicker.tsx index 72170191..84d6c69f 100644 --- a/packages/mini-apps-ui-kit-react/src/components/ColorPicker/ColorPicker.tsx +++ b/packages/mini-apps-ui-kit-react/src/components/ColorPicker/ColorPicker.tsx @@ -23,7 +23,7 @@ const ColorPickerItem = forwardRef( ( ({ children, label, description, startAdornment, endAdornment, disabled, ...props }, ref) => { return ( ); }, diff --git a/packages/mini-apps-ui-kit-react/src/components/Marble/Marble.tsx b/packages/mini-apps-ui-kit-react/src/components/Marble/Marble.tsx index 756fe8a9..8975308c 100644 --- a/packages/mini-apps-ui-kit-react/src/components/Marble/Marble.tsx +++ b/packages/mini-apps-ui-kit-react/src/components/Marble/Marble.tsx @@ -9,7 +9,7 @@ const Marble = forwardRef>((props, ref) ref={ref} alt="Marble" className={cn( - "rounded-full border-2 border-gray-100 p-[3px] aspect-square w-[7.5rem] object-cover", + "rounded-full border-2 border-gray-100 p-[3px] aspect-square w-30 object-cover", className, )} {...rest} diff --git a/packages/mini-apps-ui-kit-react/src/components/OTPField/OTPField.tsx b/packages/mini-apps-ui-kit-react/src/components/OTPField/OTPField.tsx index d68fd5c9..467b867c 100644 --- a/packages/mini-apps-ui-kit-react/src/components/OTPField/OTPField.tsx +++ b/packages/mini-apps-ui-kit-react/src/components/OTPField/OTPField.tsx @@ -16,7 +16,7 @@ import { typographyVariants } from "../Typography/Typography"; export const inputVariants = cva( cn( - "peer h-[3.5rem] w-full rounded-[0.625rem] border border-gray-100 bg-gray-100 px-4 outline-none transition duration-300", + "peer h-14 w-full rounded-[0.625rem] border border-gray-100 bg-gray-100 px-4 outline-none transition duration-300", "placeholder:text-gray-500", "focus:border-gray-300 focus:bg-gray-0 focus-visible:outline-none", "disabled:cursor-not-allowed disabled:opacity-50", @@ -121,7 +121,7 @@ const OTPField = React.forwardRef, OTPFieldPro inputMode={inputModeDictionary[mode]} pattern={pattern || patternDictionary[mode]} onChange={withHaptics(onChange)} - containerClassName="flex items-center gap-2 has-[:disabled]:opacity-50" + containerClassName="flex items-center gap-2 has-disabled:opacity-50" render={({ slots }) => ( <> {slots.map(({ isActive, char }, idx) => ( @@ -132,7 +132,7 @@ const OTPField = React.forwardRef, OTPFieldPro className={cn( inputVariants({ error }), typographyVariants({ variant: "body", level: 2 }), - "w-12 h-[4.25rem] rounded-lg flex items-center justify-center", + "w-12 h-17 rounded-lg flex items-center justify-center", (isActive || error) && "z-10 bg-gray-0", )} > diff --git a/packages/mini-apps-ui-kit-react/src/components/PhoneField/CountryListItem.tsx b/packages/mini-apps-ui-kit-react/src/components/PhoneField/CountryListItem.tsx index d961b502..309458c2 100644 --- a/packages/mini-apps-ui-kit-react/src/components/PhoneField/CountryListItem.tsx +++ b/packages/mini-apps-ui-kit-react/src/components/PhoneField/CountryListItem.tsx @@ -20,7 +20,7 @@ const CountryListItem = ({