mirror of
https://github.com/EthanShoeDev/fressh.git
synced 2026-01-11 06:12:51 +00:00
small bug fix
This commit is contained in:
@@ -467,6 +467,9 @@ type KeyboardToolbarButtonProps =
|
|||||||
| KeyboardToolbarModifierButtonProps
|
| KeyboardToolbarModifierButtonProps
|
||||||
| KeyboardToolbarInstantButtonProps;
|
| KeyboardToolbarInstantButtonProps;
|
||||||
|
|
||||||
|
const propsToKey = (props: KeyboardToolbarButtonProps) =>
|
||||||
|
'label' in props ? props.label : props.iconName;
|
||||||
|
|
||||||
function KeyboardToolbarButton({
|
function KeyboardToolbarButton({
|
||||||
style,
|
style,
|
||||||
...props
|
...props
|
||||||
@@ -487,7 +490,8 @@ function KeyboardToolbarButton({
|
|||||||
);
|
);
|
||||||
|
|
||||||
const modifierActive =
|
const modifierActive =
|
||||||
props.type === 'modifier' && modifierKeysActive.includes(props);
|
props.type === 'modifier' &&
|
||||||
|
!!modifierKeysActive.find((m) => propsToKey(m) === propsToKey(props));
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Pressable
|
<Pressable
|
||||||
@@ -505,8 +509,10 @@ function KeyboardToolbarButton({
|
|||||||
onPress={() => {
|
onPress={() => {
|
||||||
if (props.type === 'modifier') {
|
if (props.type === 'modifier') {
|
||||||
setModifierKeysActive((modifierKeysActive) =>
|
setModifierKeysActive((modifierKeysActive) =>
|
||||||
modifierKeysActive.includes(props)
|
modifierKeysActive.find((m) => propsToKey(m) === propsToKey(props))
|
||||||
? modifierKeysActive.filter((m) => m !== props)
|
? modifierKeysActive.filter(
|
||||||
|
(m) => propsToKey(m) !== propsToKey(props),
|
||||||
|
)
|
||||||
: [...modifierKeysActive, props],
|
: [...modifierKeysActive, props],
|
||||||
);
|
);
|
||||||
return;
|
return;
|
||||||
|
|||||||
Reference in New Issue
Block a user