Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[android] Fixed menu list remained tappable after dismiss on android #115

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[android] Fixed menu list remained tappable after dismiss on android #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions src/components/holdItem/HoldItem.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,12 +329,10 @@ const HoldItemComponent = ({
disableMove
? 0
: isActive.value
? withSpring(tY, SPRING_CONFIGURATION)
: withTiming(-0.1, { duration: HOLD_ITEM_TRANSFORM_DURATION });
? withSpring(tY, SPRING_CONFIGURATION)
: withTiming(-0.1, { duration: HOLD_ITEM_TRANSFORM_DURATION });

return {
zIndex: 10,
position: 'absolute',
Comment on lines -336 to -337
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what does this do?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think because we have these styles already in the styles.holdItem

top: itemRectY.value,
left: itemRectX.value,
width: itemRectWidth.value,
Expand All @@ -352,6 +350,7 @@ const HoldItemComponent = ({
],
};
});

const portalContainerStyle = useMemo(
() => [styles.holdItem, animatedPortalStyle],
[animatedPortalStyle]
Expand Down
5 changes: 4 additions & 1 deletion src/components/holdItem/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
import { StyleSheet } from 'react-native';

const styles = StyleSheet.create({
holdItem: { zIndex: 10, position: 'absolute' },
holdItem: {
zIndex: 10,
position: 'absolute',
},
portalOverlay: {
...StyleSheet.absoluteFillObject,
zIndex: 15,
Expand Down
59 changes: 39 additions & 20 deletions src/components/menu/MenuList.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ const MenuListComponent = () => {
const { state, theme, menuProps } = useInternal();

const [itemList, setItemList] = React.useState<MenuItemProps[]>([]);
const [isVisible, setIsVisible] = React.useState<boolean>(state.value === CONTEXT_MENU_STATE.ACTIVE);

const menuHeight = useDerivedValue(() => {
const itemsWithSeparator = menuProps.value.items.filter(
Expand All @@ -64,16 +65,20 @@ const MenuListComponent = () => {
);

const _leftPosition = leftOrRight(menuProps);
const isMenuActive = state.value === CONTEXT_MENU_STATE.ACTIVE

const menuScaleAnimation = () =>
state.value === CONTEXT_MENU_STATE.ACTIVE
isMenuActive
? withSpring(1, SPRING_CONFIGURATION_MENU)
: withTiming(0, {
duration: HOLD_ITEM_TRANSFORM_DURATION,
});
duration: HOLD_ITEM_TRANSFORM_DURATION,
}, finished => {
if (finished && !isMenuActive)
runOnJS(setIsVisible)(false)
});

const opacityAnimation = () =>
withTiming(state.value === CONTEXT_MENU_STATE.ACTIVE ? 1 : 0, {
withTiming(isMenuActive ? 1 : 0, {
duration: HOLD_ITEM_TRANSFORM_DURATION,
});

Expand Down Expand Up @@ -101,8 +106,8 @@ const MenuListComponent = () => {
? 'rgba(255, 255, 255, .75)'
: 'rgba(255, 255, 255, .95)'
: IS_IOS
? 'rgba(0,0,0,0.5)'
: 'rgba(39, 39, 39, .8)',
? 'rgba(0,0,0,0.5)'
: 'rgba(39, 39, 39, .8)',
};
}, [theme]);

Expand All @@ -115,6 +120,15 @@ const MenuListComponent = () => {
prevList.value = items;
};

useAnimatedReaction(
() => state.value === CONTEXT_MENU_STATE.ACTIVE,
isMenuActive => {
if (isMenuActive)
runOnJS(setIsVisible)(true)
},
[state]
)

useAnimatedReaction(
() => menuProps.value.items,
_items => {
Expand All @@ -125,22 +139,27 @@ const MenuListComponent = () => {
[menuProps]
);

if (!isVisible)
return null
Comment on lines +142 to +143
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did not test it, but I guess that this will break the animation when closing the menu.
We might need to wait for the animation somehow and then remove it

Copy link
Contributor Author

@kesha-antonov kesha-antonov Jan 24, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It doesn't brake, you can check it
I set state in the animation callback when it's finished


return (
<AnimatedView
intensity={100}
animatedProps={animatedProps}
style={[styles.menuContainer, messageStyles]}
>
<Animated.View
style={[
StyleSheet.absoluteFillObject,
styles.menuInnerContainer,
animatedInnerContainerStyle,
]}
<Animated.View style={[styles.menuContainer, messageStyles]}>
<AnimatedView
intensity={100}
animatedProps={animatedProps}
style={StyleSheet.absoluteFillObject}
>
<MenuItems items={itemList} />
</Animated.View>
</AnimatedView>
<Animated.View
style={[
StyleSheet.absoluteFillObject,
styles.menuInnerContainer,
animatedInnerContainerStyle,
]}
>
Comment on lines +146 to +158
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what does this change do?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is applying the fix from this PR: https://github.com/enesozturk/react-native-hold-menu/pull/112/files

<MenuItems items={itemList} />
</Animated.View>
</AnimatedView>
</Animated.View>
);
};

Expand Down
1 change: 0 additions & 1 deletion src/components/menu/styles.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ const styles = StyleSheet.create({
justifyContent: 'flex-start',
alignItems: 'flex-start',
overflow: 'hidden',
zIndex: 15,
},
menuInnerContainer: {
display: 'flex',
Expand Down