fix: removing remaining redundant dev dependencies (#707)

versini-org · Sep 28, 2024 · 9a344ae · 9a344ae
1 parent b417963
commit 9a344ae
Show file tree

Hide file tree

Showing 6 changed files with 126 additions and 116 deletions.
diff --git a/packages/ui-menu/package.json b/packages/ui-menu/package.json
@@ -37,10 +37,6 @@
 		"react": "^18.3.1",
 		"react-dom": "^18.3.1"
 	},
-	"devDependencies": {
-		"@versini/ui-button": "workspace:../ui-button",
-		"@versini/ui-icons": "workspace:../ui-icons"
-	},
 	"dependencies": {
 		"@floating-ui/react": "0.26.24",
 		"@tailwindcss/typography": "0.5.15",

diff --git a/packages/ui-menu/src/components/Menu/Menu.tsx b/packages/ui-menu/src/components/Menu/Menu.tsx
@@ -102,11 +102,17 @@ export const MenuComponent = forwardRef<
 			getDisplayName(trigger) === "Button" ||
 			getDisplayName(trigger) === "ButtonIcon";
 
+		const uiButtonsExtraProps = noInternalClick
+			? {
+					noInternalClick,
+					focusMode,
+					mode,
+					spacing,
+				}
+			: {};
+
 		const triggerElement = React.cloneElement(trigger as React.ReactElement, {
-			mode,
-			focusMode,
-			spacing,
-			noInternalClick,
+			...uiButtonsExtraProps,
 			"aria-label": label,
 			"data-open": isOpen ? "" : undefined,
 			"data-focus-inside": hasFocusInside ? "" : undefined,

diff --git a/packages/ui-menu/src/components/Menu/__tests__/Menu.test.tsx b/packages/ui-menu/src/components/Menu/__tests__/Menu.test.tsx
@@ -1,7 +1,5 @@
 import { render, screen, waitFor } from "@testing-library/react";
 import userEvent from "@testing-library/user-event";
-import { Button, ButtonIcon } from "@versini/ui-button";
-import { IconSettings } from "@versini/ui-icons";
 
 import { Menu, MenuItem, MenuSeparator } from "../..";
 
@@ -12,8 +10,18 @@ const THIRD_MENU_ITEM = "Menu 3";
 const FOURTH_MENU_ITEM = "Menu 4";
 const FIFTH_MENU_ITEM = "Menu 5";
 
+const ButtonIcon = ({
+	children,
+	noInternalClick,
+	focusMode,
+	mode,
+	spacing,
+	...props
+}: any) => <button {...props}>{children}</button>;
+ButtonIcon.displayName = "ButtonIcon";
+
 const SimpleMenu = ({ ...props }) => (
-	<Menu trigger={<Button>Click Me</Button>} {...props}>
+	<Menu trigger={<button>Click Me</button>} {...props}>
 		<MenuItem label={FIRST_MENU_ITEM} />
 		<MenuItem label={SECOND_MENU_ITEM} />
 		<MenuItem label={THIRD_MENU_ITEM} disabled />
@@ -27,7 +35,9 @@ const SimpleMenuIcon = ({ ...props }) => (
 	<Menu
 		trigger={
 			<ButtonIcon>
-				<IconSettings />
+				<svg>
+					<path d="M8 256a56 56 0 1 1 112 0A56 56 0 1 1 8 256zm160 0a56 56 0 1 1 112 0 56 56 0 1 1 -112 0zm216-56a56 56 0 1 1 0 112 56 56 0 1 1 0-112z" />
+				</svg>
 			</ButtonIcon>
 		}
 		{...props}
@@ -160,7 +170,7 @@ describe("Menu behaviors", () => {
 		const onOpenChange = vi.fn();
 		const { user } = renderWithUserEvent(
 			<Menu
-				trigger={<Button>Click Me</Button>}
+				trigger={<button>Click Me</button>}
 				label={MENU_TRIGGER_LABEL}
 				onOpenChange={onOpenChange}
 			>
@@ -189,7 +199,7 @@ describe("Menu behaviors", () => {
 	it("should trigger the MenuItem onClick callback when a menuitem is selected", async () => {
 		const onClick = vi.fn();
 		const { user } = renderWithUserEvent(
-			<Menu trigger={<Button>Click Me</Button>} label={MENU_TRIGGER_LABEL}>
+			<Menu trigger={<button>Click Me</button>} label={MENU_TRIGGER_LABEL}>
 				<MenuItem label={FIRST_MENU_ITEM} onClick={onClick} />
 				<MenuItem label={SECOND_MENU_ITEM} />
 				<MenuItem label={THIRD_MENU_ITEM} disabled />
@@ -212,7 +222,7 @@ describe("Menu behaviors", () => {
 	it("should trigger the MenuItem onFocus callback when a menuitem is selected", async () => {
 		const onFocus = vi.fn();
 		const { user } = renderWithUserEvent(
-			<Menu trigger={<Button>Click Me</Button>} label={MENU_TRIGGER_LABEL}>
+			<Menu trigger={<button>Click Me</button>} label={MENU_TRIGGER_LABEL}>
 				<MenuItem label={FIRST_MENU_ITEM} onFocus={onFocus} />
 				<MenuItem label={SECOND_MENU_ITEM} />
 				<MenuItem label={THIRD_MENU_ITEM} disabled />

diff --git a/packages/ui-textinput/package.json b/packages/ui-textinput/package.json
@@ -14,9 +14,7 @@
 	"type": "module",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",
-	"files": [
-		"dist"
-	],
+	"files": ["dist"],
 	"scripts": {
 		"build:check": "tsc",
 		"build:js": "vite build",
@@ -37,18 +35,12 @@
 		"react": "^18.3.1",
 		"react-dom": "^18.3.1"
 	},
-	"devDependencies": {
-		"@versini/ui-button": "workspace:../ui-button",
-		"@versini/ui-icons": "workspace:../ui-icons"
-	},
 	"dependencies": {
 		"@tailwindcss/typography": "0.5.15",
 		"@versini/ui-hooks": "workspace:../ui-hooks",
 		"@versini/ui-private": "workspace:../ui-private",
 		"clsx": "2.1.1",
 		"tailwindcss": "3.4.13"
 	},
-	"sideEffects": [
-		"**/*.css"
-	]
+	"sideEffects": ["**/*.css"]
 }