A local-first personal finance app
Fix bulk edit field modal in desktop (#2031)
Joel Jeremy Marquez79aa07ff1ac1
diff --git a/packages/desktop-client/src/components/autocomplete/AccountAutocomplete.tsx b/packages/desktop-client/src/components/autocomplete/AccountAutocomplete.tsxindex d23aec146e..949dd3d876 100644--- a/packages/desktop-client/src/components/autocomplete/AccountAutocomplete.tsx+++ b/packages/desktop-client/src/components/autocomplete/AccountAutocomplete.tsx@@ -5,6 +5,7 @@ import { css } from 'glamor';import { useCachedAccounts } from 'loot-core/src/client/data-hooks/accounts';import { type AccountEntity } from 'loot-core/src/types/models';+import { useResponsive } from '../../ResponsiveProvider';import { type CSSProperties, theme } from '../../style';import View from '../common/View';@@ -168,6 +169,7 @@ export function AccountItem({embedded,...props}: AccountItemProps) {+ const { isNarrowWidth } = useResponsive();return (<div// List each account up to a max@@ -196,7 +198,7 @@ export function AccountItem({className={`${className} ${css([{backgroundColor: highlighted- ? embedded+ ? embedded && isNarrowWidth? theme.menuItemBackgroundHover: theme.menuAutoCompleteBackgroundHover: 'transparent',diff --git a/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx b/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsxindex 1ed1009f97..59c71f81c1 100644--- a/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx+++ b/packages/desktop-client/src/components/autocomplete/CategoryAutocomplete.tsx@@ -15,6 +15,7 @@ import {} from 'loot-core/src/types/models';import Split from '../../icons/v0/Split';+import { useResponsive } from '../../ResponsiveProvider';import { type CSSProperties, theme } from '../../style';import Text from '../common/Text';import View from '../common/View';@@ -220,6 +221,7 @@ export function SplitTransactionButton({style,...props}: SplitTransactionButtonProps) {+ const { isNarrowWidth } = useResponsive();return (<View// Downshift calls `setTimeout(..., 250)` in the `onMouseMove`@@ -246,7 +248,7 @@ export function SplitTransactionButton({role="button"style={{backgroundColor: highlighted- ? embedded+ ? embedded && isNarrowWidth? theme.menuItemBackgroundHover: theme.menuAutoCompleteBackgroundHover: 'transparent',@@ -299,6 +301,7 @@ export function CategoryItem({embedded,...props}: CategoryItemProps) {+ const { isNarrowWidth } = useResponsive();return (<div// See comment above.@@ -306,7 +309,7 @@ export function CategoryItem({className={`${className} ${css([{backgroundColor: highlighted- ? embedded+ ? embedded && isNarrowWidth? theme.menuItemBackgroundHover: theme.menuAutoCompleteBackgroundHover: 'transparent',diff --git a/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsx b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsxindex 708d9dcb22..740cd93eb4 100644--- a/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsx+++ b/packages/desktop-client/src/components/autocomplete/PayeeAutocomplete.tsx@@ -21,6 +21,7 @@ import {} from 'loot-core/src/types/models';import Add from '../../icons/v1/Add';+import { useResponsive } from '../../ResponsiveProvider';import { type CSSProperties, theme } from '../../style';import Button from '../common/Button';import View from '../common/View';@@ -373,19 +374,21 @@ export function CreatePayeeButton({style,...props}: CreatePayeeButtonProps) {+ const { isNarrowWidth } = useResponsive();return (<Viewdata-testid="create-payee-button"style={{display: 'block',flexShrink: 0,- color: embedded ? theme.menuItemText : theme.noticeTextMenu,+ color:+ embedded && isNarrowWidth ? theme.menuItemText : theme.noticeTextMenu,borderRadius: embedded ? 4 : 0,fontSize: 11,fontWeight: 500,padding: '6px 9px',backgroundColor: highlighted- ? embedded+ ? embedded && isNarrowWidth? theme.menuItemBackgroundHover: theme.menuAutoCompleteBackgroundHover: 'transparent',@@ -462,6 +465,7 @@ export function PayeeItem({embedded,...props}: PayeeItemProps) {+ const { isNarrowWidth } = useResponsive();return (<div// Downshift calls `setTimeout(..., 250)` in the `onMouseMove`@@ -489,7 +493,7 @@ export function PayeeItem({className={`${className} ${css([{backgroundColor: highlighted- ? embedded+ ? embedded && isNarrowWidth? theme.menuItemBackgroundHover: theme.menuAutoCompleteBackgroundHover: 'transparent',diff --git a/packages/desktop-client/src/components/modals/EditField.js b/packages/desktop-client/src/components/modals/EditField.jsindex cc54d60bcf..e5a3dd365b 100644--- a/packages/desktop-client/src/components/modals/EditField.js+++ b/packages/desktop-client/src/components/modals/EditField.js@@ -108,28 +108,30 @@ export default function EditField({ modalProps, name, onSubmit }) {onSelect(value);}}}- renderAccountItemGroupHeader={props => (- <AccountItemGroupHeader- {...props}- style={{- ...styles.largeText,- color: theme.menuItemTextHeader,- paddingTop: 10,- paddingBottom: 10,- }}- />- )}- renderAccountItem={props => (- <AccountItem- {...props}- style={{- ...itemStyle,- color: theme.menuItemText,- borderRadius: 0,- borderTop: `1px solid ${theme.pillBorder}`,- }}- />- )}+ {...(isNarrowWidth && {+ renderAccountItemGroupHeader: props => (+ <AccountItemGroupHeader+ {...props}+ style={{+ ...styles.largeText,+ color: theme.menuItemTextHeader,+ paddingTop: 10,+ paddingBottom: 10,+ }}+ />+ ),+ renderAccountItem: props => (+ <AccountItem+ {...props}+ style={{+ ...itemStyle,+ color: theme.menuItemText,+ borderRadius: 0,+ borderTop: `1px solid ${theme.pillBorder}`,+ }}+ />+ ),+ })}{...autocompleteProps}/>);@@ -155,35 +157,37 @@ export default function EditField({ modalProps, name, onSubmit }) {onSelect(value);}}isCreatable- renderCreatePayeeButton={props => (- <CreatePayeeButton- {...props}- Icon={CreatePayeeIcon}- style={itemStyle}- />- )}- renderPayeeItemGroupHeader={props => (- <PayeeItemGroupHeader- {...props}- style={{- ...styles.largeText,- color: theme.menuItemTextHeader,- paddingTop: 10,- paddingBottom: 10,- }}- />- )}- renderPayeeItem={props => (- <PayeeItem- {...props}- style={{- ...itemStyle,- color: theme.menuItemText,- borderRadius: 0,- borderTop: `1px solid ${theme.pillBorder}`,- }}- />- )}+ {...(isNarrowWidth && {+ renderCreatePayeeButton: props => (+ <CreatePayeeButton+ {...props}+ Icon={CreatePayeeIcon}+ style={itemStyle}+ />+ ),+ renderPayeeItemGroupHeader: props => (+ <PayeeItemGroupHeader+ {...props}+ style={{+ ...styles.largeText,+ color: theme.menuItemTextHeader,+ paddingTop: 10,+ paddingBottom: 10,+ }}+ />+ ),+ renderPayeeItem: props => (+ <PayeeItem+ {...props}+ style={{+ ...itemStyle,+ color: theme.menuItemText,+ borderRadius: 0,+ borderTop: `1px solid ${theme.pillBorder}`,+ }}+ />+ ),+ })}{...autocompleteProps}/>);@@ -214,28 +218,30 @@ export default function EditField({ modalProps, name, onSubmit }) {onSelect={value => {onSelect(value);}}- renderCategoryItemGroupHeader={props => (- <CategoryItemGroupHeader- {...props}- style={{- ...styles.largeText,- color: theme.menuItemTextHeader,- paddingTop: 10,- paddingBottom: 10,- }}- />- )}- renderCategoryItem={props => (- <CategoryItem- {...props}- style={{- ...itemStyle,- color: theme.menuItemText,- borderRadius: 0,- borderTop: `1px solid ${theme.pillBorder}`,- }}- />- )}+ {...(isNarrowWidth && {+ renderCategoryItemGroupHeader: props => (+ <CategoryItemGroupHeader+ {...props}+ style={{+ ...styles.largeText,+ color: theme.menuItemTextHeader,+ paddingTop: 10,+ paddingBottom: 10,+ }}+ />+ ),+ renderCategoryItem: props => (+ <CategoryItem+ {...props}+ style={{+ ...itemStyle,+ color: theme.menuItemText,+ borderRadius: 0,+ borderTop: `1px solid ${theme.pillBorder}`,+ }}+ />+ ),+ })}{...autocompleteProps}/>);diff --git a/upcoming-release-notes/2031.md b/upcoming-release-notes/2031.mdnew file mode 100644index 0000000000..cd7fa53c60--- /dev/null+++ b/upcoming-release-notes/2031.md@@ -0,0 +1,6 @@+---+category: Bugfix+authors: [joel-jeremy]+---++Fix bulk edit field modal in desktop