A local-first personal finance app
[React Aria Button] Filter buttons (#3401)
Joel Jeremy Marquez8c8c248ef763
diff --git a/packages/desktop-client/src/components/filters/CompactFiltersButton.tsx b/packages/desktop-client/src/components/filters/CompactFiltersButton.tsxindex 7da1dc8fa7..a50c3162fc 100644--- a/packages/desktop-client/src/components/filters/CompactFiltersButton.tsx+++ b/packages/desktop-client/src/components/filters/CompactFiltersButton.tsx@@ -1,11 +1,11 @@import React from 'react';import { SvgFilter } from '../../icons/v1';-import { Button } from '../common/Button';+import { Button } from '../common/Button2';-export function CompactFiltersButton({ onClick }: { onClick: () => void }) {+export function CompactFiltersButton({ onPress }: { onPress: () => void }) {return (- <Button type="bare" onClick={onClick}>+ <Button variant="bare" onPress={onPress}><SvgFilter width={15} height={15} /></Button>);diff --git a/packages/desktop-client/src/components/filters/FilterExpression.tsx b/packages/desktop-client/src/components/filters/FilterExpression.tsxindex 34df7694a7..11062c175e 100644--- a/packages/desktop-client/src/components/filters/FilterExpression.tsx+++ b/packages/desktop-client/src/components/filters/FilterExpression.tsx@@ -7,7 +7,7 @@ import { type RuleConditionEntity } from 'loot-core/src/types/models';import { SvgDelete } from '../../icons/v0';import { type CSSProperties, theme } from '../../style';-import { Button } from '../common/Button';+import { Button } from '../common/Button2';import { Popover } from '../common/Popover';import { Text } from '../common/Text';import { View } from '../common/View';@@ -59,9 +59,9 @@ export function FilterExpression<T extends RuleConditionEntity>({><Buttonref={triggerRef}- type="bare"- disabled={customName != null}- onClick={() => setEditing(true)}+ variant="bare"+ isDisabled={customName != null}+ onPress={() => setEditing(true)}><div style={{ paddingBlock: 1, paddingLeft: 5, paddingRight: 2 }}>{customName ? (@@ -87,7 +87,7 @@ export function FilterExpression<T extends RuleConditionEntity>({)}</div></Button>- <Button type="bare" onClick={onDelete} aria-label={t('Delete filter')}>+ <Button variant="bare" onPress={onDelete} aria-label={t('Delete filter')}><SvgDeletestyle={{width: 8,diff --git a/packages/desktop-client/src/components/filters/FiltersButton.tsx b/packages/desktop-client/src/components/filters/FiltersButton.tsxindex 35be249868..595a4cb4fa 100644--- a/packages/desktop-client/src/components/filters/FiltersButton.tsx+++ b/packages/desktop-client/src/components/filters/FiltersButton.tsx@@ -1,14 +1,11 @@import React from 'react';-import { useTranslation } from 'react-i18next';import { SvgFilter } from '../../icons/v1/Filter';-import { Button } from '../common/Button';--export function FiltersButton({ onClick }: { onClick: () => void }) {- const { t } = useTranslation();+import { Button } from '../common/Button2';+export function FiltersButton({ onPress }: { onPress: () => void }) {return (- <Button type="bare" onClick={onClick} title={t('Filters')}>+ <Button variant="bare" onPress={onPress}><SvgFilter style={{ width: 12, height: 12, marginRight: 5 }} /> Filter</Button>);diff --git a/packages/desktop-client/src/components/filters/FiltersMenu.jsx b/packages/desktop-client/src/components/filters/FiltersMenu.jsxindex 8baacffe99..30642fb7d8 100644--- a/packages/desktop-client/src/components/filters/FiltersMenu.jsx+++ b/packages/desktop-client/src/components/filters/FiltersMenu.jsx@@ -1,4 +1,5 @@import React, { useState, useRef, useEffect, useReducer } from 'react';+import { Form } from 'react-aria-components';import { useHotkeys } from 'react-hotkeys-hook';import { Trans, useTranslation } from 'react-i18next';@@ -24,7 +25,7 @@ import { titleFirst } from 'loot-core/src/shared/util';import { useDateFormat } from '../../hooks/useDateFormat';import { styles, theme } from '../../style';-import { Button } from '../common/Button';+import { Button } from '../common/Button2';import { Menu } from '../common/Menu';import { Popover } from '../common/Popover';import { Select } from '../common/Select';@@ -141,8 +142,8 @@ function ConfigureField({<OpButtonkey="true"op="true"- selected={value === true}- onClick={() => {+ isSelected={value === true}+ onPress={() => {dispatch({ type: 'set-op', op: 'is' });dispatch({ type: 'set-value', value: true });}}@@ -150,8 +151,8 @@ function ConfigureField({<OpButtonkey="false"op="false"- selected={value === false}- onClick={() => {+ isSelected={value === false}+ onPress={() => {dispatch({ type: 'set-op', op: 'is' });dispatch({ type: 'set-value', value: false });}}@@ -169,8 +170,8 @@ function ConfigureField({<OpButtonkey={currOp}op={currOp}- selected={currOp === op}- onClick={() => dispatch({ type: 'set-op', op: currOp })}+ isSelected={currOp === op}+ onPress={() => dispatch({ type: 'set-op', op: currOp })}/>))}</Stack>@@ -184,8 +185,8 @@ function ConfigureField({<OpButtonkey={currOp}op={currOp}- selected={currOp === op}- onClick={() => dispatch({ type: 'set-op', op: currOp })}+ isSelected={currOp === op}+ onPress={() => dispatch({ type: 'set-op', op: currOp })}/>))}</Stack>@@ -193,7 +194,17 @@ function ConfigureField({)}</Stack>- <form action="#">+ <Form+ onSubmit={e => {+ e.preventDefault();+ onApply({+ field,+ op,+ value,+ options: subfieldToOptions(field, subfield),+ });+ }}+ >{type !== 'boolean' && (<GenericInputinputRef={inputRef}@@ -224,22 +235,11 @@ function ConfigureField({style={{ marginTop: 15 }}><View style={{ flex: 1 }} />- <Button- type="primary"- onClick={e => {- e.preventDefault();- onApply({- field,- op,- value,- options: subfieldToOptions(field, subfield),- });- }}- >+ <Button variant="primary" type="submit"><Trans>Apply</Trans></Button></Stack>- </form>+ </Form></FocusScope>);}@@ -347,10 +347,10 @@ export function FilterButton({ onApply, compact, hover, exclude }) {>{compact ? (<CompactFiltersButton- onClick={() => dispatch({ type: 'select-field' })}+ onPress={() => dispatch({ type: 'select-field' })}/>) : (- <FiltersButton onClick={() => dispatch({ type: 'select-field' })} />+ <FiltersButton onPress={() => dispatch({ type: 'select-field' })} />)}</Tooltip></View>diff --git a/packages/desktop-client/src/components/filters/NameFilter.tsx b/packages/desktop-client/src/components/filters/NameFilter.tsxindex b8ad19ac0f..77fb85132a 100644--- a/packages/desktop-client/src/components/filters/NameFilter.tsx+++ b/packages/desktop-client/src/components/filters/NameFilter.tsx@@ -1,8 +1,9 @@import React, { useRef, useEffect } from 'react';+import { Form } from 'react-aria-components';import { useTranslation } from 'react-i18next';import { theme } from '../../style';-import { Button } from '../common/Button';+import { Button } from '../common/Button2';import { Input } from '../common/Input';import { Stack } from '../common/Stack';import { Text } from '../common/Text';@@ -35,7 +36,12 @@ export function NameFilter({return (<>{menuItem !== 'update-filter' && (- <form>+ <Form+ onSubmit={e => {+ e.preventDefault();+ onAddUpdate();+ }}+ ><Stackdirection="row"justify="flex-end"@@ -55,18 +61,11 @@ export function NameFilter({onChangeValue={setName}/></FormField>- <Button- type="primary"- style={{ marginTop: 18 }}- onClick={e => {- e.preventDefault();- onAddUpdate();- }}- >+ <Button variant="primary" type="submit" style={{ marginTop: 18 }}>{adding ? t('Add') : t('Update')}</Button></Stack>- </form>+ </Form>)}{err && (<Stack direction="row" align="center" style={{ padding: 10 }}>diff --git a/packages/desktop-client/src/components/filters/OpButton.tsx b/packages/desktop-client/src/components/filters/OpButton.tsxindex f061cb0c81..606149badc 100644--- a/packages/desktop-client/src/components/filters/OpButton.tsx+++ b/packages/desktop-client/src/components/filters/OpButton.tsx@@ -1,34 +1,38 @@import React from 'react';+import { css } from 'glamor';+import { friendlyOp } from 'loot-core/src/shared/rules';import { type CSSProperties, theme } from '../../style';-import { Button } from '../common/Button';+import { Button } from '../common/Button2';type OpButtonProps = {op: string;- selected: boolean;- onClick: () => void;+ isSelected: boolean;+ onPress: () => void;style?: CSSProperties;};-export function OpButton({ op, selected, style, onClick }: OpButtonProps) {+export function OpButton({ op, isSelected, style, onPress }: OpButtonProps) {return (<Button- type="bare"- style={{- backgroundColor: theme.pillBackground,- marginBottom: 5,- ...style,- ...(selected && {- color: theme.buttonNormalSelectedText,- '&,:hover,:active': {- backgroundColor: theme.buttonNormalSelectedBackground,+ variant="bare"+ style={style}+ className={String(+ css({+ backgroundColor: theme.pillBackground,+ marginBottom: 5,+ ...(isSelected && {color: theme.buttonNormalSelectedText,- },+ '&,:hover,:active': {+ backgroundColor: theme.buttonNormalSelectedBackground,+ color: theme.buttonNormalSelectedText,+ },+ }),}),- }}- onClick={onClick}+ )}+ onPress={onPress}>{friendlyOp(op)}</Button>diff --git a/packages/desktop-client/src/components/filters/SavedFilterMenuButton.tsx b/packages/desktop-client/src/components/filters/SavedFilterMenuButton.tsxindex 3d4b3d701c..bd42f61ead 100644--- a/packages/desktop-client/src/components/filters/SavedFilterMenuButton.tsx+++ b/packages/desktop-client/src/components/filters/SavedFilterMenuButton.tsx@@ -6,7 +6,7 @@ import { type TransactionFilterEntity } from 'loot-core/types/models';import { type RuleConditionEntity } from 'loot-core/types/models/rule';import { SvgExpandArrow } from '../../icons/v0';-import { Button } from '../common/Button';+import { Button } from '../common/Button2';import { Popover } from '../common/Popover';import { Text } from '../common/Text';import { View } from '../common/View';@@ -163,9 +163,9 @@ export function SavedFilterMenuButton({{conditions.length > 0 && (<Buttonref={triggerRef}- type="bare"+ variant="bare"style={{ marginTop: 10 }}- onClick={() => {+ onPress={() => {setMenuOpen(true);}}>diff --git a/upcoming-release-notes/3401.md b/upcoming-release-notes/3401.mdnew file mode 100644index 0000000000..748b194dc5--- /dev/null+++ b/upcoming-release-notes/3401.md@@ -0,0 +1,6 @@+---+category: Maintenance+authors: [joel-jeremy]+---++Use react-aria-components' Button in filters.