diff --git a/package.json b/package.json index d4cfb90..0e9771f 100644 --- a/package.json +++ b/package.json @@ -54,13 +54,13 @@ "@testing-library/user-event": "^14.0.0-beta", "@types/classnames": "^2.2.9", "@types/jest": "^29.5.14", - "@types/react": "^18.3.12", + "@types/react": "^19.0.0", "@types/react-dom": "^19.0.1", - "@umijs/fabric": "^2.0.8", + "@umijs/fabric": "^4.0.0", "coveralls": "^3.0.6", "cross-env": "^7.0.2", "dumi": "^2.1.14", - "eslint": "^7.0.0", + "eslint": "^8.0.0", "father": "^4.3.7", "gh-pages": "^6.2.0", "husky": "^9.1.7", diff --git a/src/BaseInput.tsx b/src/BaseInput.tsx index 96da424..bf8fcb7 100644 --- a/src/BaseInput.tsx +++ b/src/BaseInput.tsx @@ -53,11 +53,13 @@ const BaseInput = React.forwardRef((props, ref) => { const hasAffix = hasPrefixSuffix(props); - let element: ReactElement = cloneElement(inputElement, { + let element: ReactElement = cloneElement(inputElement as ReactElement, { value, className: - clsx(inputElement.props.className, !hasAffix && classNames?.variant) || - null, + clsx( + (inputElement as ReactElement).props?.className, + !hasAffix && classNames?.variant, + ) || null, }); // ======================== Ref ======================== // @@ -191,10 +193,11 @@ const BaseInput = React.forwardRef((props, ref) => { } // `className` and `style` are always on the root element - return React.cloneElement(element, { - className: clsx(element.props?.className, className) || null, + return React.cloneElement(element as ReactElement, { + className: + clsx((element as ReactElement).props?.className, className) || null, style: { - ...element.props?.style, + ...(element as ReactElement).props?.style, ...style, }, hidden,