A local-first personal finance app
:recycle: refactoring Select component to use existing Menu (#2905)
Matiss Janis Aboltinsf046d75b75b9
diff --git a/packages/desktop-client/e2e/page-models/rules-page.js b/packages/desktop-client/e2e/page-models/rules-page.jsindex b8cee63d34..051cbe2ca1 100644--- a/packages/desktop-client/e2e/page-models/rules-page.js+++ b/packages/desktop-client/e2e/page-models/rules-page.js@@ -44,7 +44,7 @@ export class RulesPage {.first().click();await this.page- .getByRole('option', { exact: true, name: data.conditionsOp })+ .getByRole('button', { exact: true, name: data.conditionsOp }).click();}@@ -97,13 +97,13 @@ export class RulesPage {if (field) {await row.getByRole('button').first().click();await this.page- .getByRole('option', { exact: true, name: field })+ .getByRole('button', { exact: true, name: field }).click();}if (op) {await row.getByRole('button', { name: 'is' }).click();- await this.page.getByRole('option', { name: op, exact: true }).click();+ await this.page.getByRole('button', { name: op, exact: true }).click();}if (value) {diff --git a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-1-chromium-linux.pngindex ad2651cca7..171ae0751a 100644Binary files a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-2-chromium-linux.pngindex 204d5eec9a..e2547a23cb 100644Binary files a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-3-chromium-linux.pngindex 0d6b88cd9b..3ca0d4d3af 100644Binary files a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-cash-flow-graph-and-checks-visuals-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-1-chromium-linux.pngindex 934081a34a..d6effa284d 100644Binary files a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-2-chromium-linux.pngindex cbbbf69947..a731be615c 100644Binary files a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-3-chromium-linux.pngindex 9ea699661a..67c540f9ac 100644Binary files a/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/reports.test.js-snapshots/Reports-loads-net-worth-graph-and-checks-visuals-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/settings.test.js-snapshots/Settings-checks-the-page-visuals-1-chromium-linux.png b/packages/desktop-client/e2e/settings.test.js-snapshots/Settings-checks-the-page-visuals-1-chromium-linux.pngindex 8e9bace13a..833c32d9a0 100644Binary files a/packages/desktop-client/e2e/settings.test.js-snapshots/Settings-checks-the-page-visuals-1-chromium-linux.png and b/packages/desktop-client/e2e/settings.test.js-snapshots/Settings-checks-the-page-visuals-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/settings.test.js-snapshots/Settings-checks-the-page-visuals-2-chromium-linux.png b/packages/desktop-client/e2e/settings.test.js-snapshots/Settings-checks-the-page-visuals-2-chromium-linux.pngindex 69b37d5cf8..1f904d3812 100644Binary files a/packages/desktop-client/e2e/settings.test.js-snapshots/Settings-checks-the-page-visuals-2-chromium-linux.png and b/packages/desktop-client/e2e/settings.test.js-snapshots/Settings-checks-the-page-visuals-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/settings.test.js-snapshots/Settings-checks-the-page-visuals-3-chromium-linux.png b/packages/desktop-client/e2e/settings.test.js-snapshots/Settings-checks-the-page-visuals-3-chromium-linux.pngindex a9ca0788bf..0774a4ed58 100644Binary files a/packages/desktop-client/e2e/settings.test.js-snapshots/Settings-checks-the-page-visuals-3-chromium-linux.png and b/packages/desktop-client/e2e/settings.test.js-snapshots/Settings-checks-the-page-visuals-3-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-date-1-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-date-1-chromium-linux.pngindex 13966675b6..d4e06b7190 100644Binary files a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-date-1-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-date-1-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-date-2-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-date-2-chromium-linux.pngindex 3198001481..41217fa688 100644Binary files a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-date-2-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-date-2-chromium-linux.png differdiff --git a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-date-3-chromium-linux.png b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-date-3-chromium-linux.pngindex 3cba6b6a6e..114182fbba 100644Binary files a/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-date-3-chromium-linux.png and b/packages/desktop-client/e2e/transactions.test.js-snapshots/Transactions-filters-transactions-by-date-3-chromium-linux.png differdiff --git a/packages/desktop-client/package.json b/packages/desktop-client/package.jsonindex 543b53b061..9dcbf85b9a 100644--- a/packages/desktop-client/package.json+++ b/packages/desktop-client/package.json@@ -8,7 +8,6 @@"devDependencies": {"@juggle/resize-observer": "^3.4.0","@playwright/test": "1.41.1",- "@reach/listbox": "^0.18.0","@react-aria/focus": "^3.16.0","@react-aria/listbox": "^3.11.3","@react-aria/utils": "^3.23.0",diff --git a/packages/desktop-client/src/components/common/Popover.tsx b/packages/desktop-client/src/components/common/Popover.tsxindex 2eb575e00e..6ac4382ee1 100644--- a/packages/desktop-client/src/components/common/Popover.tsx+++ b/packages/desktop-client/src/components/common/Popover.tsx@@ -23,14 +23,6 @@ export const Popover = ({...style,})}`}shouldCloseOnInteractOutside={element => {- // Disable closing the popover when a reach listbox is clicked (Select component)- if (- element.getAttribute('data-reach-listbox-list') !== null ||- element.getAttribute('data-reach-listbox-option') !== null- ) {- return false;- }-if (shouldCloseOnInteractOutside) {return shouldCloseOnInteractOutside(element);}diff --git a/packages/desktop-client/src/components/common/Select.tsx b/packages/desktop-client/src/components/common/Select.tsxindex 06c26d712e..38a5be4550 100644--- a/packages/desktop-client/src/components/common/Select.tsx+++ b/packages/desktop-client/src/components/common/Select.tsx@@ -1,26 +1,28 @@-import {- ListboxInput,- ListboxButton,- ListboxPopover,- ListboxList,- ListboxOption,-} from '@reach/listbox';-import { css } from 'glamor';+import { useRef, useState } from 'react';import { SvgExpandArrow } from '../../icons/v0';-import { theme, styles, type CSSProperties } from '../../style';+import { type CSSProperties } from '../../style';++import { Button } from './Button';+import { Menu } from './Menu';+import { Popover } from './Popover';+import { View } from './View';++function isValueOption<Value extends string>(+ option: [Value, string] | typeof Menu.line,+): option is [Value, string] {+ return option !== Menu.line;+}type SelectProps<Value extends string> = {bare?: boolean;- options: Array<[Value, string]>;+ options: Array<[Value, string] | typeof Menu.line>;value: Value;defaultLabel?: string;onChange?: (newValue: Value) => void;- style?: CSSProperties;- wrapperStyle?: CSSProperties;- line?: number;disabled?: boolean;disabledKeys?: Value[];+ buttonStyle?: CSSProperties;};/**@@ -29,7 +31,6 @@ type SelectProps<Value extends string> = {* @param {string} [defaultLabel] - The label to display when the selected value is not in the options.* @param {function} [onChange] - A callback function invoked when the selected value changes.* @param {CSSProperties} [style] - Custom styles to apply to the selected button.- * @param {CSSProperties} [wrapperStyle] - Custom style to apply to the select wrapper.* @param {string[]} [disabledKeys] - An array of option values to disable.** @example@@ -37,128 +38,96 @@ type SelectProps<Value extends string> = {* // <Select options={[['1', 'Option 1'], ['2', 'Option 2']]} value="1" onChange={handleOnChange} />* // <Select options={[['1', 'Option 1'], ['2', 'Option 2']]} value="3" defaultLabel="Select an option" onChange={handleOnChange} />*/-export function Select<Value extends string>({bare,options,value,defaultLabel = '',onChange,- style,- wrapperStyle,- line,- disabled,+ disabled = false,disabledKeys = [],+ buttonStyle = {},}: SelectProps<Value>) {- const arrowSize = 7;- const minHeight = style?.minHeight ? style.minHeight : '18px';- const targetOption = options.filter(option => option[0] === value);+ const targetOption = options+ .filter(isValueOption)+ .find(option => option[0] === value);++ const triggerRef = useRef(null);+ const [isOpen, setIsOpen] = useState(false);+return (- <ListboxInput- value={value}- onChange={onChange}- disabled={disabled}- style={{- color: bare ? 'inherit' : theme.formInputText,- backgroundColor: bare ? 'transparent' : theme.cardBackground,- borderRadius: styles.menuBorderRadius,- border: bare ? 'none' : '1px solid ' + theme.formInputBorder,- lineHeight: '1em',- ...wrapperStyle,- }}- >- <ListboxButton- className={`${css([- { borderWidth: 0, padding: 5, borderRadius: 4 },- style,- ])}`}- arrow={+ <>+ <Button+ ref={triggerRef}+ type={bare ? 'bare' : 'normal'}+ disabled={disabled}+ onClick={() => {+ setIsOpen(true);+ }}+ style={buttonStyle}+ hoveredStyle={{+ backgroundColor: bare ? 'transparent' : undefined,+ ...buttonStyle,+ }}+ >+ <View+ style={{+ flexDirection: 'row',+ alignItems: 'center',+ justifyContent: 'space-between',+ gap: 5,+ width: '100%',+ }}+ >+ <span+ style={{+ textAlign: 'left',+ overflow: 'hidden',+ textOverflow: 'ellipsis',+ whiteSpace: 'nowrap',+ width: 'calc(100% - 7px)',+ }}+ >+ {targetOption ? targetOption[1] : defaultLabel}+ </span><SvgExpandArrowstyle={{- width: arrowSize,- height: arrowSize,+ width: 7,+ height: 7,color: 'inherit',}}/>- }+ </View>+ </Button>++ <Popover+ triggerRef={triggerRef}+ placement="bottom start"+ isOpen={isOpen}+ onOpenChange={() => setIsOpen(false)}>- <span- style={{- display: 'flex',- overflow: 'hidden',- textOverflow: 'ellipsis',- whiteSpace: 'nowrap',- maxWidth: `calc(100% - ${arrowSize + 5}px)`,- alignItems: 'center',- minHeight,+ <Menu+ onMenuSelect={item => {+ onChange?.(item);+ setIsOpen(false);}}- >- {targetOption.length !== 0 ? targetOption[0][1] : defaultLabel}- </span>- </ListboxButton>- <ListboxPopover- style={{- zIndex: 100000,- outline: 0,- borderRadius: styles.menuBorderRadius,- backgroundColor: theme.menuBackground,- color: theme.menuItemText,- boxShadow: styles.cardShadow,- border: '1px solid ' + theme.menuBorder,- }}- className={`${css({- '[data-reach-listbox-option]': {- background: theme.menuItemBackground,- color: theme.menuItemText,- },- '[data-reach-listbox-option][data-current-nav]': {- background: theme.menuItemBackgroundHover,- color: theme.menuItemTextHover,- },- })}`}- >- {!line ? (- <ListboxList style={{ maxHeight: 250, overflowY: 'auto' }}>- {options.map(([value, label]) => (- <ListboxOption- key={value}- value={value}- disabled={disabledKeys.includes(value)}- >- {label}- </ListboxOption>- ))}- </ListboxList>- ) : (- <ListboxList style={{ maxHeight: 250, overflowY: 'auto' }}>- {options.slice(0, line).map(([value, label]) => (- <ListboxOption- key={value}- value={value}- disabled={disabledKeys.includes(value)}- >- {label}- </ListboxOption>- ))}- <div- style={{- padding: '2px',- marginTop: 5,- borderTop: '1px solid ' + theme.menuBorder,- }}- />- {options.slice(line, options.length).map(([value, label]) => (- <ListboxOption- key={value}- value={value}- disabled={disabledKeys.includes(value)}- >- {label}- </ListboxOption>- ))}- </ListboxList>- )}- </ListboxPopover>- </ListboxInput>+ items={options.map(item =>+ item === Menu.line+ ? Menu.line+ : {+ name: item[0],+ text: item[1],+ disabled: disabledKeys.includes(item[0]),+ },+ )}+ getItemStyle={option => {+ if (targetOption && targetOption[0] === option.name) {+ return { fontWeight: 'bold' };+ }+ return {};+ }}+ />+ </Popover>+ </>);}diff --git a/packages/desktop-client/src/components/filters/FiltersMenu.jsx b/packages/desktop-client/src/components/filters/FiltersMenu.jsxindex 1a94aff794..4f9b16cd0d 100644--- a/packages/desktop-client/src/components/filters/FiltersMenu.jsx+++ b/packages/desktop-client/src/components/filters/FiltersMenu.jsx@@ -87,7 +87,6 @@ function ConfigureField({<Stack direction="row" align="flex-start">{field === 'amount' || field === 'date' ? (<Select- bareoptions={field === 'amount'? [@@ -111,7 +110,6 @@ function ConfigureField({dispatch({ type: 'set-op', op: 'is' });}}}- style={{ borderWidth: 1 }}/>) : (titleFirst(mapField(field))diff --git a/packages/desktop-client/src/components/modals/EditRule.jsx b/packages/desktop-client/src/components/modals/EditRule.jsxindex 44617a9886..86044e64c7 100644--- a/packages/desktop-client/src/components/modals/EditRule.jsx+++ b/packages/desktop-client/src/components/modals/EditRule.jsx@@ -1,4 +1,10 @@-import React, { useState, useEffect, useRef, useCallback } from 'react';+import React, {+ useState,+ useEffect,+ useRef,+ useCallback,+ useMemo,+} from 'react';import { useDispatch } from 'react-redux';import { v4 as uuid } from 'uuid';@@ -35,6 +41,7 @@ import { SvgDelete, SvgAdd, SvgSubtract } from '../../icons/v0';import { SvgInformationOutline } from '../../icons/v1';import { styles, theme } from '../../style';import { Button } from '../common/Button';+import { Menu } from '../common/Menu';import { Modal } from '../common/Modal';import { Select } from '../common/Select';import { Stack } from '../common/Stack';@@ -82,12 +89,13 @@ function getTransactionFields(conditions, actions) {export function FieldSelect({ fields, style, value, onChange }) {return (- <View style={{ color: theme.pageTextPositive, ...style }}>+ <View style={style}><Selectbareoptions={fields}value={value}onChange={value => onChange('field', value)}+ buttonStyle={{ color: theme.pageTextPositive }}/></View>);@@ -97,34 +105,36 @@ export function OpSelect({ops,type,style,- wrapperStyle,value,formatOp = friendlyOp,onChange,}) {- let line;- // We don't support the `contains, `doesNotContain`, `matches` operators for the id type for- // rules yet- // TODO: Add matches op support for payees, accounts, categories.- if (type === 'id') {- ops = ops.filter(- op => op !== 'contains' && op !== 'matches' && op !== 'doesNotContain',- );- line = ops.length / 2;- }- if (type === 'string') {- line = ops.length / 2;- }+ const opOptions = useMemo(() => {+ const options = ops+ // We don't support the `contains`, `doesNotContain`, `matches` operators+ // for the id type rules yet+ // TODO: Add matches op support for payees, accounts, categories.+ .filter(op =>+ type === 'id'+ ? !['contains', 'matches', 'doesNotContain'].includes(op)+ : true,+ )+ .map(op => [op, formatOp(op, type)]);++ if (type === 'string' || type === 'id') {+ options.splice(options.length / 2, 0, Menu.line);+ }++ return options;+ }, [ops, type]);return (<Selectbare- options={ops.map(op => [op, formatOp(op, type)])}+ options={opOptions}value={value}onChange={value => onChange('op', value)}- line={line}- style={{ minHeight: '1px', ...style }}- wrapperStyle={wrapperStyle}+ buttonStyle={style}/>);}diff --git a/packages/desktop-client/src/components/modals/ImportTransactions.jsx b/packages/desktop-client/src/components/modals/ImportTransactions.jsxindex 26abe34e46..cfe9133c77 100644--- a/packages/desktop-client/src/components/modals/ImportTransactions.jsx+++ b/packages/desktop-client/src/components/modals/ImportTransactions.jsx@@ -487,9 +487,8 @@ function SelectField({]),]}value={value === null ? 'choose-field' : value}- style={{ width: '100%' }}- wrapperStyle={style}- onChange={value => onChange(value)}+ onChange={onChange}+ buttonStyle={style}/>);}@@ -520,8 +519,7 @@ function DateFormatSelect({f.label.replace(/ /g, delimiter),])}value={parseDateFormat || ''}- onChange={value => onChange(value)}- style={{ width: '100%' }}+ onChange={onChange}/></View>);diff --git a/packages/desktop-client/src/components/reports/ReportSidebar.tsx b/packages/desktop-client/src/components/reports/ReportSidebar.tsxindex f449f5e593..b55ac86456 100644--- a/packages/desktop-client/src/components/reports/ReportSidebar.tsx+++ b/packages/desktop-client/src/components/reports/ReportSidebar.tsx@@ -1,4 +1,4 @@-import React, { useRef, useState } from 'react';+import React, { useMemo, useRef, useState, type ComponentProps } from 'react';import * as monthUtils from 'loot-core/src/shared/months';import { type CategoryEntity } from 'loot-core/types/models/category';@@ -131,6 +131,19 @@ export function ReportSidebar({setBalanceType(cond);};+ const rangeOptions = useMemo(() => {+ const options: ComponentProps<typeof Select>['options'] =+ ReportOptions.dateRange+ .filter(f => f[customReportItems.interval as keyof dateRangeProps])+ .map(option => [option.description, option.description]);++ // Append separator if necessary+ if (dateRangeLine > 0) {+ options.splice(dateRangeLine, 0, Menu.line);+ }+ return options;+ }, [customReportItems, dateRangeLine]);+return (<Viewstyle={{@@ -419,15 +432,8 @@ export function ReportSidebar({</Text><Selectvalue={customReportItems.dateRange}- onChange={e => {- onSelectRange(e);- }}- options={ReportOptions.dateRange- .filter(- f => f[customReportItems.interval as keyof dateRangeProps],- )- .map(option => [option.description, option.description])}- line={dateRangeLine > 0 ? dateRangeLine : undefined}+ onChange={onSelectRange}+ options={rangeOptions}/></View>) : (diff --git a/packages/desktop-client/src/components/select/RecurringSchedulePicker.jsx b/packages/desktop-client/src/components/select/RecurringSchedulePicker.jsxindex 4c29f179bb..27df5bf616 100644--- a/packages/desktop-client/src/components/select/RecurringSchedulePicker.jsx+++ b/packages/desktop-client/src/components/select/RecurringSchedulePicker.jsx@@ -9,6 +9,7 @@ import { SvgAdd, SvgSubtract } from '../../icons/v0';import { theme } from '../../style';import { Button } from '../common/Button';import { Input } from '../common/Input';+import { Menu } from '../common/Menu';import { Popover } from '../common/Popover';import { Select } from '../common/Select';import { Stack } from '../common/Stack';@@ -218,7 +219,7 @@ function MonthlyPatterns({ config, dispatch }) {<Selectoptions={[[-1, 'Last'],- ['-', '---'],+ Menu.line,...DAY_OF_MONTH_OPTIONS.map(opt => [opt, opt]),]}value={recurrence.value}@@ -226,20 +227,18 @@ function MonthlyPatterns({ config, dispatch }) {updateRecurrence(recurrence, 'value', parsePatternValue(value))}disabledKeys={['-']}- wrapperStyle={{ flex: 1, marginRight: 10 }}- style={{ minHeight: '1px', width: '100%' }}+ buttonStyle={{ flex: 1, marginRight: 10 }}/><Selectoptions={[['day', 'Day'],- ['-', '---'],+ Menu.line,...DAY_OF_WEEK_OPTIONS.map(opt => [opt.id, opt.name]),]}value={recurrence.type}onChange={value => updateRecurrence(recurrence, 'type', value)}disabledKeys={['-']}- wrapperStyle={{ flex: 1, marginRight: 10 }}- style={{ minHeight: '1px', width: '100%' }}+ buttonStyle={{ flex: 1, marginRight: 10 }}/><Buttontype="bare"@@ -321,7 +320,6 @@ function RecurringScheduleTooltip({ config: currentConfig, onClose, onSave }) {/><Selectid="repeat_end_dropdown"- bareoptions={[['never', 'indefinitely'],['after_n_occurrences', 'for'],@@ -329,10 +327,6 @@ function RecurringScheduleTooltip({ config: currentConfig, onClose, onSave }) {]}value={config.endMode}onChange={value => updateField('endMode', value)}- style={{- border: '1px solid ' + theme.formInputBorder,- height: 27.5,- }}/>{config.endMode === 'after_n_occurrences' && (<>@@ -375,11 +369,10 @@ function RecurringScheduleTooltip({ config: currentConfig, onClose, onSave }) {defaultValue={config.interval || 1}/><Select- bareoptions={FREQUENCY_OPTIONS.map(opt => [opt.id, opt.name])}value={config.frequency}onChange={value => updateField('frequency', value)}- style={{ border: '1px solid ' + theme.formInputBorder, height: 27.5 }}+ buttonStyle={{ marginRight: 5 }}/>{config.frequency === 'monthly' &&(config.patterns == null || config.patterns.length === 0) ? (@@ -437,11 +430,6 @@ function RecurringScheduleTooltip({ config: currentConfig, onClose, onSave }) {value={state.config.weekendSolveMode}onChange={value => dispatch({ type: 'set-weekend-solve', value })}disabled={!skipWeekend}- style={{- backgroundColor: theme.tableBackground,- minHeight: '1px',- width: '5rem',- }}/><labelhtmlFor="solve_dropdown"diff --git a/packages/desktop-client/src/components/settings/Format.tsx b/packages/desktop-client/src/components/settings/Format.tsxindex 0dc2fbf038..a64613b34f 100644--- a/packages/desktop-client/src/components/settings/Format.tsx+++ b/packages/desktop-client/src/components/settings/Format.tsx@@ -88,12 +88,11 @@ export function FormatSettings() {barekey={String(hideFraction)} // needed because label does not updatevalue={numberFormat}- onChange={format => setNumberFormatPref(format)}+ onChange={setNumberFormatPref}options={numberFormats.map(f => [f.value,hideFraction ? f.labelNoFraction : f.label,])}- style={{ padding: '2px 10px', fontSize: 15 }}/></Button>@@ -112,9 +111,8 @@ export function FormatSettings() {<Selectbarevalue={dateFormat}- onChange={format => setDateFormatPref(format)}+ onChange={setDateFormatPref}options={dateFormats.map(f => [f.value, f.label])}- style={{ padding: '2px 10px', fontSize: 15 }}/></Button></Column>@@ -124,9 +122,8 @@ export function FormatSettings() {<Selectbarevalue={firstDayOfWeekIdx}- onChange={idx => setFirstDayOfWeekIdxPref(idx)}+ onChange={setFirstDayOfWeekIdxPref}options={daysOfWeek.map(f => [f.value, f.label])}- style={{ padding: '2px 10px', fontSize: 15 }}/></Button></Column>diff --git a/packages/desktop-client/src/components/settings/Themes.tsx b/packages/desktop-client/src/components/settings/Themes.tsxindex 7966b546a3..494d7fc39e 100644--- a/packages/desktop-client/src/components/settings/Themes.tsx+++ b/packages/desktop-client/src/components/settings/Themes.tsx@@ -18,12 +18,9 @@ export function ThemeSettings() {<Button bounce={false} style={{ padding: 0 }}><Select<Theme>bare- onChange={value => {- switchTheme(value);- }}+ onChange={switchTheme}value={theme}options={themeOptions}- style={{ padding: '2px 10px', fontSize: 15 }}/></Button>}diff --git a/packages/desktop-client/src/index.tsx b/packages/desktop-client/src/index.tsxindex 810e515c87..3d6a2d3e51 100644--- a/packages/desktop-client/src/index.tsx+++ b/packages/desktop-client/src/index.tsx@@ -3,9 +3,6 @@// environment (not electron)import './browser-preload';-// A hack for now: this makes sure it's appended before glamor-import '@reach/listbox/styles.css';-import './fonts.scss';import React from 'react';diff --git a/upcoming-release-notes/2905.md b/upcoming-release-notes/2905.mdnew file mode 100644index 0000000000..792baadea9--- /dev/null+++ b/upcoming-release-notes/2905.md@@ -0,0 +1,6 @@+---+category: Maintenance+authors: [MatissJanis]+---++Refactor `Select` component to stop using `@reach/listbox` dependency.diff --git a/yarn.lock b/yarn.lockindex 3827e0d886..f2f8d29142 100644--- a/yarn.lock+++ b/yarn.lock@@ -61,7 +61,6 @@ __metadata:dependencies:"@juggle/resize-observer": "npm:^3.4.0""@playwright/test": "npm:1.41.1"- "@reach/listbox": "npm:^0.18.0""@react-aria/focus": "npm:^3.16.0""@react-aria/listbox": "npm:^3.11.3""@react-aria/utils": "npm:^3.23.0"@@ -2804,128 +2803,6 @@ __metadata:languageName: nodelinkType: hard-"@reach/auto-id@npm:0.18.0":- version: 0.18.0- resolution: "@reach/auto-id@npm:0.18.0"- dependencies:- "@reach/utils": "npm:0.18.0"- peerDependencies:- react: ^16.8.0 || 17.x- react-dom: ^16.8.0 || 17.x- checksum: 545ff94eb4898ad0e1359e604deeebbabc753e004ca3ed5a817272e61422413faf4f68268ba41b61432c157999f3be0d18cf2c52c7d57ae2b988a88a602e4a0c- languageName: node- linkType: hard--"@reach/descendants@npm:0.18.0":- version: 0.18.0- resolution: "@reach/descendants@npm:0.18.0"- dependencies:- "@reach/utils": "npm:0.18.0"- peerDependencies:- react: ^16.8.0 || 17.x- react-dom: ^16.8.0 || 17.x- checksum: dbf784cebe0e8cf003d9ce3c8a5fb88d6cb089819ee6149ccb46e6655ce2505e5524d5e95e25e22df974351315d037c08d73149b8748cb8c040dd7d5b6545750- languageName: node- linkType: hard--"@reach/listbox@npm:^0.18.0":- version: 0.18.0- resolution: "@reach/listbox@npm:0.18.0"- dependencies:- "@reach/auto-id": "npm:0.18.0"- "@reach/descendants": "npm:0.18.0"- "@reach/machine": "npm:0.18.0"- "@reach/polymorphic": "npm:0.18.0"- "@reach/popover": "npm:0.18.0"- "@reach/utils": "npm:0.18.0"- tiny-invariant: "npm:^1.2.0"- peerDependencies:- react: ^16.8.0 || 17.x- react-dom: ^16.8.0 || 17.x- checksum: 3de1bd2288840a8153bf93f05047f3ae5daccadc661cf9e29fd912dfe4d248a2733942fd7d9ec807b8b70f7367ce51f55cc4e5cfb2db1683e7f1ed1c1e740790- languageName: node- linkType: hard--"@reach/machine@npm:0.18.0":- version: 0.18.0- resolution: "@reach/machine@npm:0.18.0"- dependencies:- "@reach/utils": "npm:0.18.0"- "@xstate/fsm": "npm:1.4.0"- peerDependencies:- react: ^16.8.0 || 17.x- react-dom: ^16.8.0 || 17.x- checksum: bb81de49b4a98515ac05b55809394ddd548c3c680f7ad83b1f82ca9dc38bce0433e3b2702d5e7b721e26e29cac2b17203a44c7335339c09d03fce5c7d942b3e8- languageName: node- linkType: hard--"@reach/observe-rect@npm:1.2.0":- version: 1.2.0- resolution: "@reach/observe-rect@npm:1.2.0"- checksum: 7dd903eeaad0e22c6d973bd26265d91eadba56ab5134701ceb3e85214db75339fae94aa7e8b88a65e8daa64bc7cf1b915d4ffcdfd324466b561dc6adc3c6e070- languageName: node- linkType: hard--"@reach/polymorphic@npm:0.18.0":- version: 0.18.0- resolution: "@reach/polymorphic@npm:0.18.0"- peerDependencies:- react: ^16.8.0 || 17.x- checksum: 68b432dd9c3750213f0b0748eb81c3cf78b4cbc18274aa0ff9b77519f9fdf62f1c598bcd5c3893a0283be1cc7fb610e6b44edf3aff3f4fe0232c49653334246a- languageName: node- linkType: hard--"@reach/popover@npm:0.18.0":- version: 0.18.0- resolution: "@reach/popover@npm:0.18.0"- dependencies:- "@reach/polymorphic": "npm:0.18.0"- "@reach/portal": "npm:0.18.0"- "@reach/rect": "npm:0.18.0"- "@reach/utils": "npm:0.18.0"- tabbable: "npm:^5.3.3"- peerDependencies:- react: ^16.8.0 || 17.x- react-dom: ^16.8.0 || 17.x- checksum: 44cbf56a8dc14a9e8d260915afb8f74cd1bf176a9659d78c91f63df99a914920ad886d9e568794785ad5b3257dfd7058b1b35d13f02f6937f872ff1c6aaaed98- languageName: node- linkType: hard--"@reach/portal@npm:0.18.0":- version: 0.18.0- resolution: "@reach/portal@npm:0.18.0"- dependencies:- "@reach/utils": "npm:0.18.0"- peerDependencies:- react: ^16.8.0 || 17.x- react-dom: ^16.8.0 || 17.x- checksum: ec4714fae246141f76532beebe68945cdea83c4f425e9dff0db336b820f6e2c67447aaed9f85848f999712d83d6063dcc867a4e2ca12f7a0a8f4faef04ca71a2- languageName: node- linkType: hard--"@reach/rect@npm:0.18.0":- version: 0.18.0- resolution: "@reach/rect@npm:0.18.0"- dependencies:- "@reach/observe-rect": "npm:1.2.0"- "@reach/utils": "npm:0.18.0"- peerDependencies:- react: ^16.8.0 || 17.x- react-dom: ^16.8.0 || 17.x- checksum: 4d5c0f277cf8a11eed82cf299d9e30b58b85172f8928d92b7f20a249d702ee5b4ee73b1ada78fb328fc0806a55d01129b40a2cc73085584fe1ec1fdbeeb8776f- languageName: node- linkType: hard--"@reach/utils@npm:0.18.0":- version: 0.18.0- resolution: "@reach/utils@npm:0.18.0"- peerDependencies:- react: ^16.8.0 || 17.x- react-dom: ^16.8.0 || 17.x- checksum: 7686b0cba3653fcddfc49b7887a77c438c1f3d4da35fda0694f771f64669a615129edebf7c62fb2e960c39cb23ab1518a10bb3e818330d57df976de77ada4e5b- languageName: node- linkType: hard-"@react-aria/breadcrumbs@npm:^3.5.13":version: 3.5.13resolution: "@react-aria/breadcrumbs@npm:3.5.13"@@ -6476,13 +6353,6 @@ __metadata:languageName: nodelinkType: hard-"@xstate/fsm@npm:1.4.0":- version: 1.4.0- resolution: "@xstate/fsm@npm:1.4.0"- checksum: 56472c06cc52f9ad23d857e6288d96b9d8269d7a66a07544acd3a3d335e13c053401d356636e562a65745b54fd5d12ba115b42a0f55c96063849b80f08917bf0- languageName: node- linkType: hard-"@xtuc/ieee754@npm:^1.2.0":version: 1.2.0resolution: "@xtuc/ieee754@npm:1.2.0"@@ -17538,13 +17408,6 @@ __metadata:languageName: nodelinkType: hard-"tabbable@npm:^5.3.3":- version: 5.3.3- resolution: "tabbable@npm:5.3.3"- checksum: 5da150c9ac7aaed95f901623214794ffac9472a86009a1762c7b436249d33b157b7d86d93610986090d0fb1ef152f5dec2c201552e0b67ca895ba00c145a51c5- languageName: node- linkType: hard-"tapable@npm:^2.1.1, tapable@npm:^2.2.0":version: 2.2.1resolution: "tapable@npm:2.2.1"@@ -17754,7 +17617,7 @@ __metadata:languageName: nodelinkType: hard-"tiny-invariant@npm:^1.2.0, tiny-invariant@npm:^1.3.1":+"tiny-invariant@npm:^1.3.1":version: 1.3.1resolution: "tiny-invariant@npm:1.3.1"checksum: 872dbd1ff20a21303a2fd20ce3a15602cfa7fcf9b228bd694a52e2938224313b5385a1078cb667ed7375d1612194feaca81c4ecbe93121ca1baebe344de4f84c