chore: align solid-js version

riccardoperra · Apr 9, 2023 · 7ceeed7 · 7ceeed7
1 parent 6785319
commit 7ceeed7
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 162 deletions.
diff --git a/packages/kit/package.json b/packages/kit/package.json
@@ -58,7 +58,7 @@
 		"jest-environment-jsdom": "^28.1.3",
 		"rollup": "^3.20.2",
 		"rollup-preset-solid": "^2.0.1",
-		"solid-js": "^1.6.15",
+		"solid-js": "^1.7.3",
 		"solid-testing-library": "^0.3.0",
 		"ts-node": "^10.9.1",
 		"typescript": "^4.9.5",

diff --git a/packages/kit/src/components/Button/ButtonIcon.tsx b/packages/kit/src/components/Button/ButtonIcon.tsx
@@ -2,11 +2,5 @@ import * as styles from "./Button.css";
 import { JSX, splitProps } from "solid-js";
 
 export function ButtonIcon(props: JSX.IntrinsicElements["span"]) {
-	const [local, others] = splitProps(props, ["class", "children"]);
-
-	return (
-		<span class={styles.buttonIcon} {...others}>
-			{local.children}
-		</span>
-	);
+	return <span class={styles.buttonIcon} {...props} />;
 }
diff --git a/packages/playground/package.json b/packages/playground/package.json
@@ -69,7 +69,6 @@
 	},
 	"packageManager": "[email protected]",
 	"dependencies": {
-		"@codeui/kit": "workspace:*",
 		"@kobalte/core": "^0.8.2",
 		"@kobalte/utils": "^0.6.1",
 		"@kobalte/vanilla-extract": "^0.3.0",

diff --git a/packages/playground/src/App.tsx b/packages/playground/src/App.tsx
@@ -1,7 +1,6 @@
 import type { Component } from "solid-js";
 import { createEffect, createSignal } from "solid-js";
 import { DialogDemo } from "./demo/Dialog";
-import { ButtonDemo } from "./demo/Button";
 import { TextInputDemo } from "./demo/TextInput";
 import { DemoSection } from "./ui/DemoSection";
 import { DropdownMenuDemo } from "./demo/DropdownMenu";
@@ -33,9 +32,7 @@ const App: Component = () => {
 				onChange={v => setTheme(v.currentTarget.value)}
 			/>
 
-			<DemoSection>
-				<ButtonDemo />
-			</DemoSection>
+			<DemoSection></DemoSection>
 			<DemoSection>
 				<TextInputDemo />
 			</DemoSection>

diff --git a/packages/playground/src/demo/Button.tsx b/packages/playground/src/demo/Button.tsx
@@ -1,4 +1,4 @@
-import { For, JSX } from "solid-js";
+import { For } from "solid-js";
 import { Button, ButtonProps, IconButton } from "@codeui/kit";
 import { DemoSectionRow } from "../ui/DemoSection";
 

diff --git a/packages/playground/src/demo/Popover.tsx b/packages/playground/src/demo/Popover.tsx
@@ -41,27 +41,6 @@ export function PopoverDemo() {
 						with SolidJS.
 					</PopoverContent>
 				</Popover>
-
-				<Popover isOpen={open()} onOpenChange={setOpen}>
-					<PopoverTrigger asChild>
-						<As component={Button} theme={"secondary"}>
-							Open (controlled)
-						</As>
-					</PopoverTrigger>
-					<PopoverContent title={"Title"}>About Kobalte A UI toolkit</PopoverContent>
-				</Popover>
-
-				<Popover placement={"bottom-start"}>
-					<PopoverTrigger asChild>
-						<As component={Button} theme={"secondary"}>
-							Custom position
-						</As>
-					</PopoverTrigger>
-					<PopoverContent title={"Title"}>
-						About Kobalte A UI toolkit for building accessible web apps and design systems
-						with SolidJS.
-					</PopoverContent>
-				</Popover>
 			</DemoSectionRow>
 		</div>
 	);

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/tsconfig.json b/tsconfig.json
@@ -30,6 +30,11 @@
 			"jest",
 			"@testing-library/jest-dom"
 		],
+		"paths": {
+			"@codeui/kit": [
+				"./packages/kit/src/index.tsx"
+			]
+		}
 	},
 	"exclude": [
 		"node_modules"