Skip to content

Commit 7ceeed7

Browse files
committed
chore: align solid-js version
1 parent 6785319 commit 7ceeed7

File tree

8 files changed

+18
-162
lines changed

8 files changed

+18
-162
lines changed

packages/kit/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@
5858
"jest-environment-jsdom": "^28.1.3",
5959
"rollup": "^3.20.2",
6060
"rollup-preset-solid": "^2.0.1",
61-
"solid-js": "^1.6.15",
61+
"solid-js": "^1.7.3",
6262
"solid-testing-library": "^0.3.0",
6363
"ts-node": "^10.9.1",
6464
"typescript": "^4.9.5",

packages/kit/src/components/Button/ButtonIcon.tsx

+1-7
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,5 @@ import * as styles from "./Button.css";
22
import { JSX, splitProps } from "solid-js";
33

44
export function ButtonIcon(props: JSX.IntrinsicElements["span"]) {
5-
const [local, others] = splitProps(props, ["class", "children"]);
6-
7-
return (
8-
<span class={styles.buttonIcon} {...others}>
9-
{local.children}
10-
</span>
11-
);
5+
return <span class={styles.buttonIcon} {...props} />;
126
}

packages/playground/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@
6969
},
7070
"packageManager": "[email protected]",
7171
"dependencies": {
72-
"@codeui/kit": "workspace:*",
7372
"@kobalte/core": "^0.8.2",
7473
"@kobalte/utils": "^0.6.1",
7574
"@kobalte/vanilla-extract": "^0.3.0",

packages/playground/src/App.tsx

+1-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import type { Component } from "solid-js";
22
import { createEffect, createSignal } from "solid-js";
33
import { DialogDemo } from "./demo/Dialog";
4-
import { ButtonDemo } from "./demo/Button";
54
import { TextInputDemo } from "./demo/TextInput";
65
import { DemoSection } from "./ui/DemoSection";
76
import { DropdownMenuDemo } from "./demo/DropdownMenu";
@@ -33,9 +32,7 @@ const App: Component = () => {
3332
onChange={v => setTheme(v.currentTarget.value)}
3433
/>
3534

36-
<DemoSection>
37-
<ButtonDemo />
38-
</DemoSection>
35+
<DemoSection></DemoSection>
3936
<DemoSection>
4037
<TextInputDemo />
4138
</DemoSection>

packages/playground/src/demo/Button.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { For, JSX } from "solid-js";
1+
import { For } from "solid-js";
22
import { Button, ButtonProps, IconButton } from "@codeui/kit";
33
import { DemoSectionRow } from "../ui/DemoSection";
44

packages/playground/src/demo/Popover.tsx

-21
Original file line numberDiff line numberDiff line change
@@ -41,27 +41,6 @@ export function PopoverDemo() {
4141
with SolidJS.
4242
</PopoverContent>
4343
</Popover>
44-
45-
<Popover isOpen={open()} onOpenChange={setOpen}>
46-
<PopoverTrigger asChild>
47-
<As component={Button} theme={"secondary"}>
48-
Open (controlled)
49-
</As>
50-
</PopoverTrigger>
51-
<PopoverContent title={"Title"}>About Kobalte A UI toolkit</PopoverContent>
52-
</Popover>
53-
54-
<Popover placement={"bottom-start"}>
55-
<PopoverTrigger asChild>
56-
<As component={Button} theme={"secondary"}>
57-
Custom position
58-
</As>
59-
</PopoverTrigger>
60-
<PopoverContent title={"Title"}>
61-
About Kobalte A UI toolkit for building accessible web apps and design systems
62-
with SolidJS.
63-
</PopoverContent>
64-
</Popover>
6544
</DemoSectionRow>
6645
</div>
6746
);

pnpm-lock.yaml

+9-127
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tsconfig.json

+5
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,11 @@
3030
"jest",
3131
"@testing-library/jest-dom"
3232
],
33+
"paths": {
34+
"@codeui/kit": [
35+
"./packages/kit/src/index.tsx"
36+
]
37+
}
3338
},
3439
"exclude": [
3540
"node_modules"

0 commit comments

Comments
 (0)