Merge pull request #369 from wwnorton/fix-react-types

fix: fix type react types mismatch

package.json

@@ -74,10 +74,6 @@
       "packages/*/src"
     ]
   },
-  "overrides": {
-    "@types/react": "^17",
-    "@types/react-dom": "^17"
-  },
   "devDependencies": {
     "@babel/preset-env": "^7.22.10",
     "@babel/preset-react": "^7.22.5",

packages/react/package.json

@@ -43,10 +43,6 @@
 		"build:main": "microbundle --jsx React.createElement --jsxFragment React.Fragment --format modern,es,cjs --globals @popperjs/core=Popper,react=React,react-dom=ReactDOM",
 		"build:umd": "microbundle --jsx React.createElement --jsxFragment React.Fragment --format umd --name NDSReact --external @popperjs/core,react,react-dom --globals @popperjs/core=Popper,react=React,react-dom=ReactDOM"
 	},
-	"overrides": {
-		"@types/react": "^17",
-		"@types/react-dom": "^17"
-	},
 	"dependencies": {
 		"@material/linear-progress": "^14.0.0",
 		"@popperjs/core": "^2.11.6",
@@ -59,10 +55,8 @@
 		"react-transition-group": "^4.4.5"
 	},
 	"devDependencies": {
+		"@types/react-is": "^18.3.0",
 		"@faker-js/faker": "^9.0.3",
-		"@types/react": "^17.0.53",
-		"@types/react-dom": "^17.0.19",
-		"@types/react-is": "^17.0.3",
 		"react-router-dom": "^5.3.4"
 	},
 	"peerDependencies": {

packages/react/src/components/Listbox/types.ts

@@ -22,10 +22,12 @@ export interface OptionProps extends OptionBase {
 
 export type ListboxBase = Omit<
 	React.ComponentPropsWithoutRef<'ul'>,
-	'role' | 'aria-multiselectable' | 'aria-orientation' | 'onChange'
+	'children' | 'role' | 'aria-multiselectable' | 'aria-orientation' | 'onChange'
 >;
 
 export interface ListboxProps extends ListboxBase {
+	children?: OptionProps[] | React.ReactNode;
+
 	/**
 	 * A list of options as either an array of `value` props, an array of `OptionProps`
 	 * objects, or an object with `label: value` entries. Array values will be

packages/react/src/components/Modal/types.ts

@@ -32,7 +32,7 @@ export interface ModalProps extends BaseDialogProps {
 	 * A list of actions or React Fragment that will be set inside an action bar
 	 * at the bottom of the Modal dialog.
 	 */
-	actions?: React.ReactElement<ButtonProps>[] | React.ReactFragment;
+	actions?: React.ReactElement | React.ReactElement<ButtonProps>[] | React.ReactFragment;
 	/**
 	 * Indicates whether the header should stick to the top of the screen. Only
 	 * has an effect when the modal's content is longer than the window height

packages/react/src/components/Popover/Popover.tsx

@@ -2,7 +2,7 @@ import React from 'react';
 import classNames from 'classnames';
 import { Button } from '../Button';
 import { Popper } from '../Popper';
-import { useForwardedRef, useId, usePopperTriggers } from '../../utilities';
+import { PopperTriggersClose, useForwardedRef, useId, usePopperTriggers } from '../../utilities';
 import { PopoverProps } from './types';
 
 /** A popover is a non-modal dialog that points to a reference element. */
@@ -63,7 +63,7 @@ export const Popover = React.forwardRef<HTMLElement, PopoverProps>(
 		const prevOpen = React.useRef(isOpen);
 
 		const close: PopoverProps['onRequestClose'] = React.useCallback(
-			(trigger) => {
+			(trigger: PopperTriggersClose) => {
 				focusReferenceOnClose.current = trigger !== 'click.external';
 				if (onRequestClose) onRequestClose(trigger);
 			},

packages/react/src/utilities/children/toElements.ts

@@ -9,7 +9,7 @@ import ReactIs from 'react-is';
  */
 export const toElements = <P extends Record<string, any> = any>(
 	/** A React node, such as `children` of any element. */
-	node: React.ReactNode,
+	node: P[] | React.ReactNode,
 	/** A list of required prop names. */
 	required: string[] = [],
 ): React.ReactElement<P>[] => {

packages/react/src/utilities/rovingTabindex/hook.tsx

@@ -80,7 +80,7 @@ export const useRovingTabindex = <Container extends HTMLElement | null, Child ex
 	);
 
 	const createRef = useCallback(
-		(i) => (el: Child | null) => {
+		(i: number) => (el: Child | null) => {
 			if (!el || !container) {
 				return;
 			}

website/package.json

@@ -36,10 +36,6 @@
       "last 1 safari version"
     ]
   },
-  "overrides": {
-    "@types/react": "^17",
-    "@types/react-dom": "^17"
-  },
   "dependencies": {
     "@docusaurus/core": "^3.1.1",
     "@docusaurus/module-type-aliases": "^3.1.1",
@@ -60,8 +56,6 @@
     "@docusaurus/module-type-aliases": "3.1.1",
     "@docusaurus/tsconfig": "^3.1.1",
     "@docusaurus/types": "3.1.1",
-    "@types/react": "^17.0.0",
-    "@types/react-dom": "^17.0.0",
     "gauge": "^3.0.2",
     "lunr": "^2.3.9",
     "react-docgen-typescript-plugin": "^1.0.5",