From 74b1071d320998081b8ad0d30155867072d003a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=95=D0=B2=D0=B3=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=9F=D1=8F?= =?UTF-8?q?=D1=82=D0=BA=D0=BE=D0=B2?= <48599460+JackUait@users.noreply.github.com> Date: Mon, 11 Jul 2022 14:20:30 +0400 Subject: [PATCH] fix: warnings and mistakes in propTypes (#2911) --- packages/react-ui/components/Link/Link.tsx | 2 +- packages/react-ui/components/MenuItem/MenuItem.tsx | 2 +- packages/react-ui/components/Textarea/TextareaCounter.tsx | 7 ++++--- packages/react-ui/internal/icons/16px/index.tsx | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/react-ui/components/Link/Link.tsx b/packages/react-ui/components/Link/Link.tsx index 5704acb5cf..338440e528 100644 --- 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 { 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 index e1d7bef30c..27e8c790b6 100644 --- 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 { 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 index 73c1bfbb57..0f7c2817b5 100644 --- 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 HTMLElement).isRequired, }; diff --git a/packages/react-ui/internal/icons/16px/index.tsx b/packages/react-ui/internal/icons/16px/index.tsx index 4130e0d695..30e3c65038 100644 --- 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( 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, };