diff --git a/bun.lockb b/bun.lockb index af392d6..1d072a9 100755 Binary files a/bun.lockb and b/bun.lockb differ diff --git a/esbuild.config.js b/esbuild.config.js index 4c60cdc..364031f 100644 --- a/esbuild.config.js +++ b/esbuild.config.js @@ -31,7 +31,7 @@ const options = { }, plugins: [cleaner], legalComments: "none", - external: ["react", "react-dom", "@dreamworld/addon-redux"] + external: ["react", "react-dom", "@dreamworld/addon-redux", "tailwindcss-scoped-preflight"] }; build({ diff --git a/package.json b/package.json index 30d3849..4f56780 100644 --- a/package.json +++ b/package.json @@ -116,8 +116,9 @@ "sonner": "1.5.0", "storybook": "7.3.2", "storybook-addon-deep-controls": "0.2.1", - "tailwindcss": "3.4.1", + "tailwindcss": "3.4.6", "tailwindcss-animate": "1.0.6", + "tailwindcss-scoped-preflight": "3.4.3", "tsc-alias": "1.8.8", "vite": "4.5.2" }, @@ -127,5 +128,6 @@ }, "patchedDependencies": { "use-sync-external-store@1.2.0": "patches/use-sync-external-store@1.2.0.patch" - } + }, + "packageManager": "yarn@1.22.22+sha512.a6b2f7906b721bba3d67d4aff083df04dad64c399707841b7acf00f6b133b7ac24255f2652fa22ae3534329dc6180534e98d17432037ff6fd140556e2bb3137e" } diff --git a/src/index.tsx b/src/index.tsx index 0db4701..a237fb4 100644 --- a/src/index.tsx +++ b/src/index.tsx @@ -1,4 +1,5 @@ import { Provider } from "react-redux"; +import { twMerge } from "tailwind-merge"; import { default as Core, TooltipProvider } from "@/components"; import { store } from "@/store"; import { type ISTKProps } from "./types"; @@ -11,7 +12,12 @@ export const SeatToolkit = (props: ISTKProps) => { return ( - +
+ +
); diff --git a/src/styles/storybook.css b/src/styles/storybook.css index 53db733..51a0691 100644 --- a/src/styles/storybook.css +++ b/src/styles/storybook.css @@ -4,6 +4,7 @@ body, #storybook-root { min-height: 100% !important; height: 100% !important; + font-family: "Inter", sans-serif !important; } body { margin-right: 0px !important; diff --git a/src/types/styles.ts b/src/types/styles.ts index 92dc55c..f23bac7 100644 --- a/src/types/styles.ts +++ b/src/types/styles.ts @@ -87,6 +87,7 @@ export interface IStyles { }; }; core?: { + container?: IStyle; button?: IStyle; }; } diff --git a/tailwind.config.js b/tailwind.config.js index 9060891..c50ae17 100644 --- a/tailwind.config.js +++ b/tailwind.config.js @@ -1,4 +1,5 @@ import animate from "tailwindcss-animate"; +import { isolateInsideOfContainer, scopedPreflightStyles } from "tailwindcss-scoped-preflight"; export const screens = { xs: "400px", @@ -26,5 +27,10 @@ export default { } } }, - plugins: [animate] + plugins: [ + animate, + scopedPreflightStyles({ + isolationStrategy: isolateInsideOfContainer(".stk-core") + }) + ] };