diff --git a/.eslintrc.cjs b/.eslintrc.cjs index 7d7a177d..b13edb48 100644 --- a/.eslintrc.cjs +++ b/.eslintrc.cjs @@ -48,6 +48,13 @@ module.exports = { 'plugin:@typescript-eslint/strict', 'prettier' ] + }, + { + files: ['**/components/ui/**'], + rules: { + 'unicorn/prefer-export-from': 'off', + 'unicorn/prevent-abbreviations': 'off' + } } ], parserOptions: { @@ -62,7 +69,7 @@ module.exports = { es2020: true }, rules: { - 'sort-keys': 'off', + 'sort-keys': 'error', '@typescript-eslint/ban-ts-comment': [ 'error', { diff --git a/components.json b/components.json index b4b4758a..4398a0f7 100644 --- a/components.json +++ b/components.json @@ -1,17 +1,17 @@ { - "$schema": "https://next.shadcn-svelte.com/schema.json", - "style": "new-york", - "tailwind": { - "config": "tailwind.config.js", - "css": "src/app.postcss", - "baseColor": "slate" - }, - "aliases": { - "components": "$lib/components", - "utils": "$lib/utils", - "ui": "$lib/components/ui", - "hooks": "$lib/hooks" - }, - "typescript": true, - "registry": "https://next.shadcn-svelte.com/registry" + "$schema": "https://next.shadcn-svelte.com/schema.json", + "style": "new-york", + "tailwind": { + "config": "tailwind.config.js", + "css": "src/app.postcss", + "baseColor": "slate" + }, + "aliases": { + "components": "$lib/components", + "utils": "$lib/utils", + "ui": "$lib/components/ui", + "hooks": "$lib/hooks" + }, + "typescript": true, + "registry": "https://next.shadcn-svelte.com/registry" } diff --git a/src/lib/components/ui/tooltip/index.ts b/src/lib/components/ui/tooltip/index.ts index e9e1fd73..eae8afaf 100644 --- a/src/lib/components/ui/tooltip/index.ts +++ b/src/lib/components/ui/tooltip/index.ts @@ -1,18 +1,18 @@ -import { Tooltip as TooltipPrimitive } from "bits-ui"; -import Content from "./tooltip-content.svelte"; +import { Tooltip as TooltipPrimitive } from 'bits-ui'; +import Content from './tooltip-content.svelte'; const Root = TooltipPrimitive.Root; const Trigger = TooltipPrimitive.Trigger; const Provider = TooltipPrimitive.Provider; export { - Root, - Trigger, - Content, - Provider, - // - Root as Tooltip, - Content as TooltipContent, - Trigger as TooltipTrigger, - Provider as TooltipProvider, + Content, + Provider, + Root, + // + Root as Tooltip, + Content as TooltipContent, + Provider as TooltipProvider, + Trigger as TooltipTrigger, + Trigger }; diff --git a/src/lib/components/ui/tooltip/tooltip-content.svelte b/src/lib/components/ui/tooltip/tooltip-content.svelte index dc7251ce..8402ed93 100644 --- a/src/lib/components/ui/tooltip/tooltip-content.svelte +++ b/src/lib/components/ui/tooltip/tooltip-content.svelte @@ -1,21 +1,20 @@ + bind:ref + {sideOffset} + class={cn( + 'z-50 overflow-hidden rounded-md bg-primary px-3 py-1.5 text-xs text-primary-foreground animate-in fade-in-0 zoom-in-95 data-[state=closed]:animate-out data-[state=closed]:fade-out-0 data-[state=closed]:zoom-out-95 data-[side=bottom]:slide-in-from-top-2 data-[side=left]:slide-in-from-right-2 data-[side=right]:slide-in-from-left-2 data-[side=top]:slide-in-from-bottom-2', + className + )} + {...restProps} />