Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: update react-select v5 #536

Merged
merged 9 commits into from
Mar 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 17 additions & 15 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,22 +54,24 @@
},
"pnpm": {
"overrides": {
"shelljs@<0.8.5": ">=0.8.5",
"qs@>=6.10.0 <6.10.3": ">=6.10.3",
"@sideway/formula@<3.0.1": ">=3.0.1",
"json5@<1.0.2": ">=1.0.2",
"minimist@>=1.0.0 <1.2.6": ">=1.2.6",
"loader-utils@<1.4.1": ">=1.4.1",
"loader-utils@>=2.0.0 <2.0.3": ">=2.0.3",
"loader-utils@>=2.0.0 <2.0.4": ">=2.0.4",
"loader-utils@>=1.0.0 <1.4.2": ">=1.4.2",
"ini@<1.3.6": ">=1.3.6",
"trim@<0.0.3": ">=0.0.3",
"xml2js@<0.5.0": ">=0.5.0",
"browserify-sign@>=2.6.0 <=4.2.1": ">=4.2.2",
"postcss@<8.4.31": ">=8.4.31",
"react-devtools-core@<4.28.4": ">=4.28.4",
"glob-parent@<5.1.2": ">=5.1.2",
"word-wrap@<1.2.4": ">=1.2.4",
"trim-newlines@<3.0.1": ">=3.0.1",
"shell-quote@<=1.7.2": ">=1.7.3",
"decode-uri-component@<0.2.1": ">=0.2.1",
"terser@>=5.0.0 <5.14.2": ">=5.14.2",
"terser@<4.8.1": ">=4.8.1",
"yaml@>=2.0.0-5 <2.2.2": ">=2.2.2"
"tough-cookie@<4.1.3": ">=4.1.3",
"@babel/traverse@<7.23.2": ">=7.23.2",
"follow-redirects@<1.15.4": ">=1.15.4",
"qs@>=6.9.0 <6.9.7": ">=6.9.7",
"semver@>=7.0.0 <7.5.2": ">=7.5.2",
"semver@<5.7.2": ">=5.7.2",
"semver@>=6.0.0 <6.3.1": ">=6.3.1",
"axios@>=0.8.1 <0.28.0": ">=0.28.0",
"axios@>=1.0.0 <1.6.0": ">=1.6.0",
"ip@=2.0.0": ">=2.0.1"
}
}
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file not shown.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 0 additions & 6 deletions packages/ui/__stories__/Icon.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import React from 'react'
import { Clipboard, FolderPlus } from 'react-feather'
import { Google } from '@icons-pack/react-simple-icons'
import { Meta, Story } from '@storybook/react'

import { Icon, IconProps } from '../src/Icon'
Expand Down Expand Up @@ -57,8 +56,3 @@ export const FeatherIcon = Template.bind({})
FeatherIcon.args = {
icon: FolderPlus,
}

export const SimpleIcon = Template.bind({})
SimpleIcon.args = {
icon: Google,
}
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ export const WithCustomAddButton = () => {
try {
await inputRef.current?.addItem()
await schema.validate(values, { abortEarly: false })
console.log('submit', values)
} catch (e) {
logger.log('submit', e)
}
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/__stories__/MultiSelectField.stories.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React, { ReactNode, useState } from 'react'
import { logger } from '@hazelcast/services'
import { Meta, Story } from '@storybook/react'
import { GroupedOptionsType } from 'react-select'
import { Form, Formik } from 'formik'

import { MultiSelectField, MultiSelectProps } from '../src/Select/MultiSelectField'
Expand All @@ -10,6 +9,7 @@ import { MultiSelectFieldFormik } from '../src/Select/MultiSelectFieldFormik'
import { LONG_MULTIPLE_WORD_TEXT, LONG_ONE_WORD_TEXT } from './constants'

import styles from '../src/Select/SelectField.module.scss'
import { GroupBase } from 'react-select'

const options: SelectFieldOption<string>[] = [
{ value: 'darth_vader', label: 'Darth Vader' },
Expand Down Expand Up @@ -137,7 +137,7 @@ WithLongTextOptions.args = {
],
}

const groupedOptions: GroupedOptionsType<SelectFieldOption<string>> = [
const groupedOptions: ReadonlyArray<GroupBase<SelectFieldOption<string>>> = [
{
label: 'Dark Side',
options: [
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/__stories__/SelectField.stories.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import React, { ReactNode, useState } from 'react'
import { logger } from '@hazelcast/services'
import { Meta, Story } from '@storybook/react'
import { Aperture } from 'react-feather'
import { GroupedOptionsType } from 'react-select'
import { Form, Formik } from 'formik'

import { SelectField, SelectFieldProps } from '../src/Select/SelectField'
Expand All @@ -11,6 +10,7 @@ import { SelectFieldFormik } from '../src/Select/SelectFieldFormik'
import { LONG_MULTIPLE_WORD_TEXT, LONG_ONE_WORD_TEXT } from './constants'

import styles from '../src/Select/SelectField.module.scss'
import { GroupBase } from 'react-select'

const options: SelectFieldOption<string>[] = [
{ value: 'darth_vader', label: 'Darth Vader' },
Expand Down Expand Up @@ -170,7 +170,7 @@ WithTooltipHidden.args = {
singleValueTooltipVisible: false,
}

const groupedOptions: GroupedOptionsType<SelectFieldOption<string>> = [
const groupedOptions: ReadonlyArray<GroupBase<SelectFieldOption<string>>> = [
{
label: 'Dark Side',
options: [
Expand Down
16 changes: 8 additions & 8 deletions packages/ui/__tests__/AutocompleteFieldFormik.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { createRef } from 'react'
import { Formik, Form, FormikProps } from 'formik'
import { mountAndCheckA11Y } from '@hazelcast/test-helpers'
import { act } from 'react-dom/test-utils'
import Select from 'react-select'
import Select, { SelectInstance } from 'react-select'

import { AutocompleteFieldFormik } from '../src/AutocompleteFieldFormik'
import { Error } from '../src/Error'
Expand Down Expand Up @@ -38,7 +38,7 @@ describe('AutocompleteFieldFormik', () => {
)

const wrapper = await mountAndCheckA11Y(<TestForm />)
const selectInstance = wrapper.find(Select).instance() as Select
const selectInstance = wrapper.find(Select)

expect(formikBag.current?.values).toEqual({
name: null,
Expand All @@ -47,7 +47,7 @@ describe('AutocompleteFieldFormik', () => {
// We need the `async` call here to wait for processing of the asynchronous 'change'
// eslint-disable-next-line @typescript-eslint/require-await
await act(async () => {
selectInstance.props.onChange?.(options[1], { action: 'select-option' })
selectInstance.props().onChange?.(options[1], { action: 'select-option' })
})
wrapper.update()

Expand All @@ -58,7 +58,7 @@ describe('AutocompleteFieldFormik', () => {
// We need the `async` call here to wait for processing of the asynchronous 'change'
// eslint-disable-next-line @typescript-eslint/require-await
await act(async () => {
selectInstance.props.onChange?.(options[0], { action: 'select-option' })
selectInstance.props().onChange?.(options[0], { action: 'select-option' })
})
wrapper.update()

Expand All @@ -83,14 +83,14 @@ describe('AutocompleteFieldFormik', () => {
)

const wrapper = await mountAndCheckA11Y(<TestForm />)
const selectInstance = wrapper.find(Select).instance() as Select
const selectInstance = wrapper.find(Select)

expect(wrapper.find(Error).prop('error')).toBe(undefined)

// We need the `async` call here to wait for processing of the asynchronous 'change'
// eslint-disable-next-line @typescript-eslint/require-await
await act(async () => {
selectInstance.props.onChange?.(options[1], { action: 'select-option' })
selectInstance.props().onChange?.(options[1], { action: 'select-option' })
})
wrapper.update()

Expand Down Expand Up @@ -123,12 +123,12 @@ describe('AutocompleteFieldFormik', () => {
)

const wrapper = await mountAndCheckA11Y(<TestForm />)
const selectInstance = wrapper.find(Select).instance() as Select
const selectInstance = wrapper.find(Select)

// We need the `async` call here to wait for processing of the asynchronous 'change'
// eslint-disable-next-line @typescript-eslint/require-await
await act(async () => {
selectInstance.props.onChange?.(options[1], { action: 'select-option' })
selectInstance.props().onChange?.(options[1], { action: 'select-option' })
})
wrapper.update()

Expand Down
4 changes: 2 additions & 2 deletions packages/ui/__tests__/EmptyState.test.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { mountAndCheckA11Y } from '@hazelcast/test-helpers'
import { Figma } from '@icons-pack/react-simple-icons'
import { SiFigma } from '@icons-pack/react-simple-icons'
import React from 'react'
import cn from 'classnames'

Expand All @@ -14,7 +14,7 @@ const title = 'Figma'
const description =
'Figma is a vector graphics editor and prototyping tool, with additional offline features enabled by desktop applications for macOS and Windows.'
// Icon
const icon = Figma
const icon = SiFigma
const iconLabel = 'Icon Figma'
// Action
const action = 'Cool!'
Expand Down
4 changes: 2 additions & 2 deletions packages/ui/__tests__/Pagination.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -458,11 +458,11 @@ describe('Pagination', () => {

expect(setPageSize).toHaveBeenCalledTimes(0)

const selectInstance = wrapper.find(Select).instance() as Select<SelectFieldOption<number>>
const selectInstance = wrapper.find(Select)
// We need the `async` call here to wait for processing of the asynchronous 'change'
// eslint-disable-next-line @typescript-eslint/require-await
await act(async () => {
selectInstance.props.onChange?.({ value: 10, label: '10' }, { action: 'select-option' })
selectInstance.props().onChange?.({ value: 10, label: '10' }, { action: 'select-option' })
})
wrapper.update()

Expand Down
6 changes: 3 additions & 3 deletions packages/ui/__tests__/Select/MultiSelectField.test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import { useUID } from 'react-uid'
import { mountAndCheckA11Y } from '@hazelcast/test-helpers'
import ReactSelect, { OptionsType } from 'react-select'
import ReactSelect, { Options } from 'react-select'
import ReactSelectCreatable from 'react-select/creatable'
import { X } from 'react-feather'

Expand All @@ -21,7 +21,7 @@ const selectId = 'selectId'
const selectName = 'selectName'
const selectLabel = 'selectLabel'

const options: OptionsType<SelectFieldOption<string>> = [
const options: Options<SelectFieldOption<string>> = [
{ value: 'darth_vader', label: 'Darth Vader' },
{ value: 'luke_skywalker', label: 'Luke Skywalker' },
{ value: 'obi', label: 'Obi-Wan Kenobi' },
Expand All @@ -33,7 +33,7 @@ const options: OptionsType<SelectFieldOption<string>> = [
const selectedOptions = [options[1]]
const selectedValues = selectedOptions.map(({ value }) => value)

describe('SelectField', () => {
describe('MultiSelectField', () => {
beforeEach(() => {
useUIDMock.mockImplementation(() => selectId)
})
Expand Down
16 changes: 8 additions & 8 deletions packages/ui/__tests__/Select/MultiSelectFieldFormik.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { createRef } from 'react'
import { Formik, Form, FormikProps } from 'formik'
import { mountAndCheckA11Y } from '@hazelcast/test-helpers'
import { act } from 'react-dom/test-utils'
import Select from 'react-select'
import ReactSelect from 'react-select'

import { MultiSelectFieldFormik } from '../../src/Select/MultiSelectFieldFormik'
import { SelectFieldOption } from '../../src/Select/helpers'
Expand Down Expand Up @@ -38,7 +38,7 @@ describe('MultiSelectFieldFormik', () => {
)

const wrapper = await mountAndCheckA11Y(<TestForm />)
const selectInstance = wrapper.find(Select).instance() as Select
const selectInstance = wrapper.find(ReactSelect)

expect(formikBag.current?.values).toEqual({
names: [],
Expand All @@ -47,7 +47,7 @@ describe('MultiSelectFieldFormik', () => {
// We need the `async` call here to wait for processing of the asynchronous 'change'
// eslint-disable-next-line @typescript-eslint/require-await
await act(async () => {
selectInstance.props.onChange?.([options[1]], { action: 'select-option' })
selectInstance.props().onChange?.([options[1]], { action: 'select-option' })
})
wrapper.update()

Expand All @@ -58,7 +58,7 @@ describe('MultiSelectFieldFormik', () => {
// We need the `async` call here to wait for processing of the asynchronous 'change'
// eslint-disable-next-line @typescript-eslint/require-await
await act(async () => {
selectInstance.props.onChange?.([options[1], options[0]], { action: 'select-option' })
selectInstance.props().onChange?.([options[1], options[0]], { action: 'select-option' })
})
wrapper.update()

Expand All @@ -83,14 +83,14 @@ describe('MultiSelectFieldFormik', () => {
)

const wrapper = await mountAndCheckA11Y(<TestForm />)
const selectInstance = wrapper.find(Select).instance() as Select
const selectInstance = wrapper.find(ReactSelect)

expect(wrapper.find(Error).prop('error')).toBe(undefined)

// We need the `async` call here to wait for processing of the asynchronous 'change'
// eslint-disable-next-line @typescript-eslint/require-await
await act(async () => {
selectInstance.props.onChange?.([options[1]], { action: 'select-option' })
selectInstance.props().onChange?.([options[1]], { action: 'select-option' })
})
wrapper.update()

Expand Down Expand Up @@ -123,7 +123,7 @@ describe('MultiSelectFieldFormik', () => {
)

const wrapper = await mountAndCheckA11Y(<TestForm />)
const selectInstance = wrapper.find(Select).instance() as Select
const selectInstance = wrapper.find(ReactSelect)

expect(formikBag.current?.values).toEqual({
names: [],
Expand All @@ -132,7 +132,7 @@ describe('MultiSelectFieldFormik', () => {
// We need the `async` call here to wait for processing of the asynchronous 'change'
// eslint-disable-next-line @typescript-eslint/require-await
await act(async () => {
selectInstance.props.onChange?.([options[1]], { action: 'select-option' })
selectInstance.props().onChange?.([options[1]], { action: 'select-option' })
})
wrapper.update()

Expand Down
4 changes: 2 additions & 2 deletions packages/ui/__tests__/Select/SelectField.test.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React from 'react'
import { useUID } from 'react-uid'
import { mountAndCheckA11Y } from '@hazelcast/test-helpers'
import ReactSelect, { OptionsType } from 'react-select'
import ReactSelect, { Options } from 'react-select'
import ReactSelectCreatable from 'react-select/creatable'

import { SelectField } from '../../src/Select/SelectField'
Expand All @@ -21,7 +21,7 @@ const selectId = 'selectId'
const selectName = 'selectName'
const selectLabel = 'selectLabel'

const options: OptionsType<SelectFieldOption<string>> = [
const options: Options<SelectFieldOption<string>> = [
{ value: 'darth_vader', label: 'Darth Vader' },
{ value: 'luke_skywalker', label: 'Luke Skywalker' },
{ value: 'obi', label: 'Obi-Wan Kenobi' },
Expand Down
18 changes: 9 additions & 9 deletions packages/ui/__tests__/Select/SelectFieldFormik.test.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@ import React, { createRef } from 'react'
import { Formik, Form, FormikProps } from 'formik'
import { mountAndCheckA11Y } from '@hazelcast/test-helpers'
import { act } from 'react-dom/test-utils'
import Select from 'react-select'
import ReactSelect, { SelectInstance } from 'react-select'

import { SelectField } from '../../src/Select/SelectField'
import { SelectFieldFormik } from '../../src/Select/SelectFieldFormik'
import { SelectFieldOption } from '../../src/Select/helpers'
import { Error } from '../../src/Error'
Expand Down Expand Up @@ -38,16 +39,15 @@ describe('SelectFieldFormik', () => {
)

const wrapper = await mountAndCheckA11Y(<TestForm />)
const selectInstance = wrapper.find(Select).instance() as Select
const selectInstance = wrapper.find(ReactSelect)

expect(formikBag.current?.values).toEqual({
name: null,
})

// We need the `async` call here to wait for processing of the asynchronous 'change'
// eslint-disable-next-line @typescript-eslint/require-await
await act(async () => {
selectInstance.props.onChange?.(options[1], { action: 'select-option' })
selectInstance.props().onChange?.(options[1], { action: 'select-option' })
})
wrapper.update()

Expand All @@ -58,7 +58,7 @@ describe('SelectFieldFormik', () => {
// We need the `async` call here to wait for processing of the asynchronous 'change'
// eslint-disable-next-line @typescript-eslint/require-await
await act(async () => {
selectInstance.props.onChange?.(options[0], { action: 'select-option' })
selectInstance.props().onChange?.(options[0], { action: 'select-option' })
})
wrapper.update()

Expand All @@ -83,14 +83,14 @@ describe('SelectFieldFormik', () => {
)

const wrapper = await mountAndCheckA11Y(<TestForm />)
const selectInstance = wrapper.find(Select).instance() as Select
const selectInstance = wrapper.find(ReactSelect)

expect(wrapper.find(Error).prop('error')).toBe(undefined)

// We need the `async` call here to wait for processing of the asynchronous 'change'
// eslint-disable-next-line @typescript-eslint/require-await
await act(async () => {
selectInstance.props.onChange?.(options[1], { action: 'select-option' })
selectInstance.props().onChange?.(options[1], { action: 'select-option' })
})
wrapper.update()

Expand All @@ -113,12 +113,12 @@ describe('SelectFieldFormik', () => {
)

const wrapper = await mountAndCheckA11Y(<TestForm />)
const selectInstance = wrapper.find(Select).instance() as Select
const selectInstance = wrapper.find(ReactSelect)

// We need the `async` call here to wait for processing of the asynchronous 'change'
// eslint-disable-next-line @typescript-eslint/require-await
await act(async () => {
selectInstance.props.onChange?.(options[1], { action: 'select-option' })
selectInstance.props().onChange?.(options[1], { action: 'select-option' })
})
wrapper.update()

Expand Down
Loading
Loading