Skip to content

Commit fe282c3

Browse files
author
sanguogege
committed
fix:some
1 parent fc5a4c9 commit fe282c3

File tree

6 files changed

+21
-22
lines changed

6 files changed

+21
-22
lines changed

apps/docs/src/components/toggle-group.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import { ToggleGroup } from "solid-element-ui";
22
import { TextAlignStart, TextAlignCenter, TextAlignEnd } from "lucide-solid";
33
const DemoCode = () => {
44
return (
5-
<div class="flex gap-2 p-4">
5+
<div class="flex p-4 bg-white dark:bg-zinc-950 border rounded-lg space-x-2 space-y-2 flex-wrap not-prose">
66
<ToggleGroup
77
type="single"
88
defaultValue="left"

apps/docs/src/components/tooltip.tsx

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
1-
import { Tooltip } from "solid-element-ui";
1+
import { Tooltip ,Button} from "solid-element-ui";
22
import { TrashIcon } from "lucide-solid";
33

44

55
const DemoCode = () => {
66
return (
7-
<div class="flex gap-2 p-4">
7+
<div class="flex items-center p-4 bg-white dark:bg-zinc-950 border rounded-lg space-x-2 space-y-2 flex-wrap not-prose">
88
<Tooltip content="删除此项" variant="danger" class="not-prose">
9-
<button class="p-2 text-red-500 hover:bg-red-50 rounded">
10-
<TrashIcon />
11-
</button>
9+
<Button color="danger" variant="outline">
10+
说出那话
11+
</Button>
1212
</Tooltip>
1313

1414
<Tooltip content="测此项" variant="default" class="not-prose">
15-
<p>这是测试</p>
15+
<p class="bg-red-600">这是测试</p>
1616
</Tooltip>
1717
</div>
1818
);

packages/ui/src/checkbox/checkbox.tsx

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ import { Check } from "lucide-solid";
55

66
// TODO 添加checkbox 的几种形状尺寸,看情况吧
77

8-
98

109
const checkboxStyles = tv(
1110
{

packages/ui/src/dropdown-menu/dropdown-menu.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ const menuStyles = tv(
1414
"data-[expanded]:animate-in data-[closed]:animate-out",
1515
],
1616
item: "relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none transition-colors data-[highlighted]:bg-zinc-100 data-[highlighted]:text-zinc-900 data-[disabled]:pointer-events-none data-[disabled]:opacity-50 dark:data-[highlighted]:bg-zinc-800 dark:data-[highlighted]:text-zinc-50",
17-
separator: "-mx-1 my-1 h-px bg-zinc-100 dark:bg-zinc-800",
17+
separator: "-mx-1 my-1 h-px border-zinc-200 dark:border-zinc-800",
1818
subIcon: "ml-auto h-4 w-4",
1919
},
2020
},

packages/ui/src/menubar/menubar.tsx

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,15 @@ const menubarStyles = tv(
1212
"flex cursor-default select-none items-center rounded-sm px-3 py-1.5 text-sm font-medium outline-none focus:bg-slate-100 data-[state=open]:bg-slate-100 dark:focus:bg-slate-800 dark:data-[state=open]:bg-slate-800",
1313
content: [
1414
"z-50 min-w-[12rem] overflow-hidden rounded-md border bg-white p-1 shadow-md dark:bg-slate-950 dark:border-slate-800 animate-in fade-in zoom-in-95",
15+
"border-zinc-200 dark:border-zinc-600",
1516
"data-[expanded]:animate-in data-[closed]:animate-out",
1617
],
17-
item: "relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none focus:bg-slate-100 data-[disabled]:opacity-50 dark:focus:bg-slate-800",
18-
separator: "-mx-1 my-1 h-px bg-slate-100 dark:bg-slate-800",
18+
item: [
19+
"relative flex cursor-default select-none items-center rounded-sm px-2 py-1.5 text-sm outline-none ",
20+
21+
"focus:bg-slate-100 data-[disabled]:opacity-50 dark:focus:bg-slate-800",
22+
],
23+
separator: "-mx-1 my-1 h-px border-zinc-200 dark:border-zinc-600",
1924
shortcut: "ml-auto text-xs tracking-widest text-slate-500",
2025
},
2126
},

packages/ui/src/tooltip/tooltip.tsx

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ import { Tooltip as KTooltip } from "@kobalte/core/tooltip";
22
import { splitProps, type JSX, type ComponentProps } from "solid-js";
33
import { tv, type VariantProps } from "tailwind-variants";
44

5-
// FIXME 为什么没有箭头
6-
75
const tooltipStyles = tv(
86
{
97
slots: {
108
content: [
11-
"z-50 overflow-hidden rounded-md px-3 py-1.5 text-xs shadow-md",
9+
"z-50 rounded-md px-4 py-1.5 text-xs shadow-md",
1210
"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",
1311
],
1412
arrow: "",
@@ -18,11 +16,11 @@ const tooltipStyles = tv(
1816
default: {
1917
content:
2018
"bg-slate-900 text-slate-50 dark:bg-slate-50 dark:text-slate-900",
21-
arrow: "text-slate-900 dark:text-slate-50",
19+
arrow: "fill-slate-900 dark:text-slate-50",
2220
},
2321
danger: {
2422
content: "bg-red-600 text-white",
25-
arrow: "text-red-600",
23+
arrow: "fill-red-600",
2624
},
2725
},
2826
},
@@ -56,8 +54,8 @@ export const Tooltip = (props: TooltipProps) => {
5654

5755
return (
5856
<KTooltip
59-
gutter={4} // 必须:给箭头留出空间
60-
openDelay={200} // 可选:稍微延迟显示,体验更好
57+
gutter={4}
58+
openDelay={200}
6159
{...others}
6260
>
6361
<KTooltip.Trigger class="block">
@@ -66,10 +64,7 @@ export const Tooltip = (props: TooltipProps) => {
6664

6765
<KTooltip.Portal>
6866
<KTooltip.Content class={styles.content()}>
69-
{/* size={8} 确保箭头有物理尺寸
70-
fill="currentColor" 配合 styles.arrow() 里的 text 颜色实现变体同步
71-
*/}
72-
<KTooltip.Arrow class={styles.arrow()} size={8} />
67+
<KTooltip.Arrow class={styles.arrow()} />
7368
{local.content}
7469
</KTooltip.Content>
7570
</KTooltip.Portal>

0 commit comments

Comments
 (0)