From 79185b706d9c3d9b810c3bdffd7e7fb8d2176f7d Mon Sep 17 00:00:00 2001 From: Nathan Bierema Date: Fri, 24 Sep 2021 22:43:43 -0400 Subject: [PATCH] Updates --- .yarnrc.yml | 3 + packages/redux-devtools-ui/package.json | 1 - .../redux-devtools-ui/src/Form/widgets.tsx | 1 + .../redux-devtools-ui/src/Select/Select.tsx | 21 +- .../tests/__snapshots__/Select.test.tsx.snap | 459 +++++++++--------- yarn.lock | 19 +- 6 files changed, 257 insertions(+), 247 deletions(-) diff --git a/.yarnrc.yml b/.yarnrc.yml index 33ee450b..7c69a35b 100644 --- a/.yarnrc.yml +++ b/.yarnrc.yml @@ -37,3 +37,6 @@ packageExtensions: dependencies: '@types/node': '^14.17.15' 'sqlite3': '^5.0.2' + 'react-select@^5.0.0': + dependencies: + '@emotion/serialize': '^1.0.2' diff --git a/packages/redux-devtools-ui/package.json b/packages/redux-devtools-ui/package.json index f7c532e2..d79d6bb9 100644 --- a/packages/redux-devtools-ui/package.json +++ b/packages/redux-devtools-ui/package.json @@ -39,7 +39,6 @@ "@types/codemirror": "^5.60.2", "@types/json-schema": "^7.0.9", "@types/prop-types": "^15.7.4", - "@types/react-select": "^4.0.17", "@types/redux-devtools-themes": "^1.0.0", "@types/simple-element-resize-detector": "^1.3.0", "base16": "^1.0.0", diff --git a/packages/redux-devtools-ui/src/Form/widgets.tsx b/packages/redux-devtools-ui/src/Form/widgets.tsx index 87e69dfc..a524c46f 100644 --- a/packages/redux-devtools-ui/src/Form/widgets.tsx +++ b/packages/redux-devtools-ui/src/Form/widgets.tsx @@ -12,6 +12,7 @@ const SelectWidget: Widget = ({ defaultValue, tabIndex, onFocus, + 'aria-invalid': ariaInvalid, ...rest }) => ( diff --git a/packages/redux-devtools-ui/src/Select/Select.tsx b/packages/redux-devtools-ui/src/Select/Select.tsx index 838bde29..914e869f 100644 --- a/packages/redux-devtools-ui/src/Select/Select.tsx +++ b/packages/redux-devtools-ui/src/Select/Select.tsx @@ -1,17 +1,16 @@ import React, { PureComponent, Component, ReactElement } from 'react'; import PropTypes from 'prop-types'; import ReactSelect, { - GroupTypeBase, - NamedProps as ReactSelectProps, - OptionTypeBase, + GroupBase, + Props as ReactSelectProps, } from 'react-select'; import createThemedComponent from '../utils/createThemedComponent'; import { Theme } from '../themes/default'; export interface SelectProps< - Option extends OptionTypeBase, + Option, IsMulti extends boolean = false, - Group extends GroupTypeBase