fix: warnings and mistakes in propTypes (#2911)

skbkontur · Jul 11, 2022 · 74b1071 · 74b1071
1 parent a244b39
commit 74b1071
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/packages/react-ui/components/Link/Link.tsx b/packages/react-ui/components/Link/Link.tsx
@@ -77,7 +77,7 @@ export class Link extends React.Component<LinkProps, LinkState> {
 
     href: PropTypes.string,
 
-    icon: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
+    icon: PropTypes.node,
 
     use: PropTypes.oneOf(['default', 'success', 'danger', 'grayed']),
   };

diff --git a/packages/react-ui/components/MenuItem/MenuItem.tsx b/packages/react-ui/components/MenuItem/MenuItem.tsx
@@ -99,7 +99,7 @@ export class MenuItem extends React.Component<MenuItemProps> {
 
     href: PropTypes.string,
 
-    icon: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
+    icon: PropTypes.node,
 
     loose: PropTypes.bool,
 

diff --git a/packages/react-ui/components/Textarea/TextareaCounter.tsx b/packages/react-ui/components/Textarea/TextareaCounter.tsx
@@ -1,6 +1,7 @@
 import React, { SyntheticEvent, useContext, useCallback, useImperativeHandle, useState } from 'react';
 import propTypes from 'prop-types';
 
+import { safePropTypesInstanceOf } from '../../lib/SSRSafe';
 import { forwardRefAndName } from '../../lib/forwardRefAndName';
 import { HelpDotIcon } from '../../internal/icons/16px';
 import { ThemeContext } from '../../lib/theming/ThemeContext';
@@ -65,8 +66,8 @@ export const TextareaCounter = forwardRefAndName<TextareaCounterRef, TextareaCou
 
 TextareaCounter.propTypes = {
   length: propTypes.number.isRequired,
-  value: propTypes.oneOf([propTypes.string, propTypes.number]),
-  help: propTypes.oneOf([propTypes.node, propTypes.func]),
+  value: propTypes.oneOfType([propTypes.string, propTypes.number]),
+  help: propTypes.oneOfType([propTypes.node, propTypes.func]),
   onCloseHelp: propTypes.func.isRequired,
-  textarea: propTypes.node.isRequired,
+  textarea: safePropTypesInstanceOf(() => HTMLElement).isRequired,
 };
diff --git a/packages/react-ui/internal/icons/16px/index.tsx b/packages/react-ui/internal/icons/16px/index.tsx
@@ -30,7 +30,7 @@ const SvgIcon = forwardRefAndName<HTMLElement, SvgIconProps>(
 
 SvgIcon.propTypes = {
   color: propTypes.string,
-  size: propTypes.oneOf([propTypes.string, propTypes.number]),
+  size: propTypes.oneOfType([propTypes.string, propTypes.number]),
   style: propTypes.object,
   children: propTypes.node,
 };