mirror of
https://github.com/actualbudget/actual.git
synced 2026-03-11 12:43:09 -05:00
[Mobile] Fix budget list on mobile auto selecting a budget file under the Switch budget file menu (#3574)
* Fix budget list on mobile * Releast notes
This commit is contained in:
committed by
GitHub
parent
0a0e26372b
commit
33a7524cd7
@@ -78,24 +78,8 @@ function FileMenu({
|
||||
const { t } = useTranslation();
|
||||
|
||||
const items = [{ name: 'delete', text: t('Delete') }];
|
||||
const { isNarrowWidth } = useResponsive();
|
||||
|
||||
const defaultMenuItemStyle = isNarrowWidth
|
||||
? {
|
||||
...styles.mobileMenuItem,
|
||||
color: theme.menuItemText,
|
||||
borderRadius: 0,
|
||||
borderTop: `1px solid ${theme.pillBorder}`,
|
||||
}
|
||||
: {};
|
||||
|
||||
return (
|
||||
<Menu
|
||||
getItemStyle={() => defaultMenuItemStyle}
|
||||
onMenuSelect={onMenuSelect}
|
||||
items={items}
|
||||
/>
|
||||
);
|
||||
return <Menu onMenuSelect={onMenuSelect} items={items} />;
|
||||
}
|
||||
|
||||
function FileMenuButton({ onDelete }: { onDelete: () => void }) {
|
||||
@@ -202,50 +186,60 @@ function FileItem({
|
||||
}
|
||||
|
||||
return (
|
||||
<View
|
||||
onClick={() => _onSelect(file)}
|
||||
title={getFileDescription(file, t) || ''}
|
||||
<Button
|
||||
onPress={() => _onSelect(file)}
|
||||
style={{
|
||||
flexDirection: 'row',
|
||||
justifyContent: 'space-between',
|
||||
alignItems: 'center',
|
||||
...styles.shadow,
|
||||
margin: 10,
|
||||
padding: '12px 15px',
|
||||
backgroundColor: theme.buttonNormalBackground,
|
||||
borderRadius: 6,
|
||||
flexShrink: 0,
|
||||
cursor: 'pointer',
|
||||
':hover': {
|
||||
backgroundColor: theme.menuItemBackgroundHover,
|
||||
},
|
||||
borderRadius: 6,
|
||||
borderColor: 'transparent',
|
||||
}}
|
||||
>
|
||||
<View style={{ alignItems: 'flex-start' }}>
|
||||
<Text style={{ fontSize: 16, fontWeight: 700 }}>{file.name}</Text>
|
||||
|
||||
<FileState file={file} />
|
||||
</View>
|
||||
|
||||
<View
|
||||
style={{ flex: '0 0 auto', flexDirection: 'row', alignItems: 'center' }}
|
||||
style={{
|
||||
flexDirection: 'row',
|
||||
flex: 1,
|
||||
justifyContent: 'space-between',
|
||||
alignItems: 'center',
|
||||
}}
|
||||
>
|
||||
{file.encryptKeyId && (
|
||||
<SvgKey
|
||||
style={{
|
||||
width: 13,
|
||||
height: 13,
|
||||
marginRight: 8,
|
||||
color: file.hasKey
|
||||
? theme.formLabelText
|
||||
: theme.buttonNormalDisabledText,
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
<View
|
||||
title={getFileDescription(file, t) || ''}
|
||||
style={{ alignItems: 'flex-start' }}
|
||||
>
|
||||
<Text style={{ fontSize: 16, fontWeight: 700 }}>{file.name}</Text>
|
||||
|
||||
{!quickSwitchMode && <FileMenuButton onDelete={() => onDelete(file)} />}
|
||||
<FileState file={file} />
|
||||
</View>
|
||||
|
||||
<View
|
||||
style={{
|
||||
flex: '0 0 auto',
|
||||
flexDirection: 'row',
|
||||
alignItems: 'center',
|
||||
}}
|
||||
>
|
||||
{file.encryptKeyId && (
|
||||
<SvgKey
|
||||
style={{
|
||||
width: 13,
|
||||
height: 13,
|
||||
marginRight: 8,
|
||||
color: file.hasKey
|
||||
? theme.formLabelText
|
||||
: theme.buttonNormalDisabledText,
|
||||
}}
|
||||
/>
|
||||
)}
|
||||
|
||||
{!quickSwitchMode && (
|
||||
<FileMenuButton onDelete={() => onDelete(file)} />
|
||||
)}
|
||||
</View>
|
||||
</View>
|
||||
</View>
|
||||
</Button>
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
6
upcoming-release-notes/3574.md
Normal file
6
upcoming-release-notes/3574.md
Normal file
@@ -0,0 +1,6 @@
|
||||
---
|
||||
category: Bugfix
|
||||
authors: [joel-jeremy]
|
||||
---
|
||||
|
||||
[Mobile] Fix budget list on mobile auto selecting a budget file under the Switch budget file menu
|
||||
Reference in New Issue
Block a user