diff --git a/.maestro/tests/assorted/join-from-directory.yaml b/.maestro/tests/assorted/join-from-directory.yaml index df84972bf49..edeaae617dc 100644 --- a/.maestro/tests/assorted/join-from-directory.yaml +++ b/.maestro/tests/assorted/join-from-directory.yaml @@ -41,7 +41,6 @@ tags: - tapOn: id: 'directory-view-search' - inputText: join-from-directory -- pressKey: Enter - extendedWaitUntil: visible: id: 'directory-view-item-join-from-directory' @@ -103,7 +102,11 @@ tags: - tapOn: id: 'directory-view-search' - inputText: ${output.otherUser.username} -- pressKey: Enter +- runFlow: + when: + platform: iOS + commands: + - pressKey: enter - extendedWaitUntil: visible: id: 'directory-view-item-${output.otherUser.username}' @@ -147,7 +150,6 @@ tags: - tapOn: id: 'directory-view-search' - inputText: ${output.team} -- pressKey: Enter - extendedWaitUntil: visible: id: 'directory-view-item-${output.team}' diff --git a/app/containers/AudioPlayer/Seek.tsx b/app/containers/AudioPlayer/Seek.tsx index eecd5d444e0..7089e034893 100644 --- a/app/containers/AudioPlayer/Seek.tsx +++ b/app/containers/AudioPlayer/Seek.tsx @@ -1,10 +1,9 @@ import React from 'react'; import { type LayoutChangeEvent, View, TextInput, type TextInputProps, TouchableNativeFeedback } from 'react-native'; -import { PanGestureHandler, type PanGestureHandlerGestureEvent } from 'react-native-gesture-handler'; +import { Gesture, GestureDetector } from 'react-native-gesture-handler'; import Animated, { type SharedValue, runOnJS, - useAnimatedGestureHandler, useAnimatedProps, useAnimatedStyle, useDerivedValue, @@ -64,21 +63,21 @@ const Seek = ({ currentTime, duration, loaded = false, onChangeTime }: ISeek) => maxWidth.value = width; }; - const onGestureEvent = useAnimatedGestureHandler({ - onStart: (event, ctx) => { + const panGesture = Gesture.Pan() + .enabled(loaded) + .activeOffsetX([-ACTIVE_OFFSET_X, ACTIVE_OFFSET_X]) + .onStart(() => { isPanning.value = true; - ctx.offsetX = translateX.value; - }, - onActive: ({ translationX }, ctx) => { - translateX.value = clamp(ctx.offsetX + translationX, 0, maxWidth.value); + }) + .onUpdate(event => { + translateX.value = clamp(translateX.value + event.translationX, 0, maxWidth.value); scale.value = 1.3; - }, - onFinish() { + }) + .onEnd(() => { scale.value = 1; isPanning.value = false; runOnJS(onChangeTime)(Math.round(currentTime.value * 1000)); - } - }); + }); useDerivedValue(() => { if (isPanning.value) { @@ -118,9 +117,9 @@ const Seek = ({ currentTime, duration, loaded = false, onChangeTime }: ISeek) => - + - + diff --git a/app/containers/MessageComposer/__snapshots__/MessageComposer.test.tsx.snap b/app/containers/MessageComposer/__snapshots__/MessageComposer.test.tsx.snap index 8dd0f6b4152..13f39da2100 100644 --- a/app/containers/MessageComposer/__snapshots__/MessageComposer.test.tsx.snap +++ b/app/containers/MessageComposer/__snapshots__/MessageComposer.test.tsx.snap @@ -82,7 +82,7 @@ exports[`MessageComposer Audio tap record 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={259} + handlerTag={249} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -177,7 +177,7 @@ exports[`MessageComposer Audio tap record 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={260} + handlerTag={250} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -299,7 +299,7 @@ exports[`MessageComposer Quote Add quote \`abc\` 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={246} + handlerTag={236} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -415,7 +415,7 @@ exports[`MessageComposer Quote Add quote \`abc\` 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={247} + handlerTag={237} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -587,7 +587,7 @@ exports[`MessageComposer Quote Add quote \`abc\` 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={248} + handlerTag={238} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -744,7 +744,7 @@ exports[`MessageComposer Quote Add quote \`def\` 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={249} + handlerTag={239} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -860,7 +860,7 @@ exports[`MessageComposer Quote Add quote \`def\` 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={250} + handlerTag={240} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -1033,7 +1033,7 @@ exports[`MessageComposer Quote Add quote \`def\` 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={251} + handlerTag={241} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -1214,7 +1214,7 @@ exports[`MessageComposer Quote Add quote \`def\` 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={252} + handlerTag={242} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -1371,7 +1371,7 @@ exports[`MessageComposer Quote Remove a quote 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={253} + handlerTag={243} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -1487,7 +1487,7 @@ exports[`MessageComposer Quote Remove a quote 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={254} + handlerTag={244} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -1660,7 +1660,7 @@ exports[`MessageComposer Quote Remove a quote 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={255} + handlerTag={245} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -1841,7 +1841,7 @@ exports[`MessageComposer Quote Remove a quote 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={256} + handlerTag={246} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -2034,7 +2034,7 @@ exports[`MessageComposer Toolbar Markdown tap bold 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={46} + handlerTag={36} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -2110,7 +2110,7 @@ exports[`MessageComposer Toolbar Markdown tap bold 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={47} + handlerTag={37} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -2186,7 +2186,7 @@ exports[`MessageComposer Toolbar Markdown tap bold 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={48} + handlerTag={38} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -2262,7 +2262,7 @@ exports[`MessageComposer Toolbar Markdown tap bold 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={49} + handlerTag={39} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -2338,7 +2338,7 @@ exports[`MessageComposer Toolbar Markdown tap bold 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={50} + handlerTag={40} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -2414,7 +2414,7 @@ exports[`MessageComposer Toolbar Markdown tap bold 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={51} + handlerTag={41} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -2490,7 +2490,7 @@ exports[`MessageComposer Toolbar Markdown tap bold 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={45} + handlerTag={35} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -2647,7 +2647,7 @@ exports[`MessageComposer Toolbar Markdown tap code 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={124} + handlerTag={114} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -2723,7 +2723,7 @@ exports[`MessageComposer Toolbar Markdown tap code 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={125} + handlerTag={115} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -2799,7 +2799,7 @@ exports[`MessageComposer Toolbar Markdown tap code 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={126} + handlerTag={116} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -2875,7 +2875,7 @@ exports[`MessageComposer Toolbar Markdown tap code 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={127} + handlerTag={117} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -2951,7 +2951,7 @@ exports[`MessageComposer Toolbar Markdown tap code 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={128} + handlerTag={118} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -3027,7 +3027,7 @@ exports[`MessageComposer Toolbar Markdown tap code 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={129} + handlerTag={119} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -3103,7 +3103,7 @@ exports[`MessageComposer Toolbar Markdown tap code 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={123} + handlerTag={113} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -3260,7 +3260,7 @@ exports[`MessageComposer Toolbar Markdown tap code-block 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={150} + handlerTag={140} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -3336,7 +3336,7 @@ exports[`MessageComposer Toolbar Markdown tap code-block 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={151} + handlerTag={141} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -3412,7 +3412,7 @@ exports[`MessageComposer Toolbar Markdown tap code-block 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={152} + handlerTag={142} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -3488,7 +3488,7 @@ exports[`MessageComposer Toolbar Markdown tap code-block 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={153} + handlerTag={143} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -3564,7 +3564,7 @@ exports[`MessageComposer Toolbar Markdown tap code-block 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={154} + handlerTag={144} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -3640,7 +3640,7 @@ exports[`MessageComposer Toolbar Markdown tap code-block 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={155} + handlerTag={145} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -3716,7 +3716,7 @@ exports[`MessageComposer Toolbar Markdown tap code-block 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={149} + handlerTag={139} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -3873,7 +3873,7 @@ exports[`MessageComposer Toolbar Markdown tap italic 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={72} + handlerTag={62} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -3949,7 +3949,7 @@ exports[`MessageComposer Toolbar Markdown tap italic 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={73} + handlerTag={63} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -4025,7 +4025,7 @@ exports[`MessageComposer Toolbar Markdown tap italic 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={74} + handlerTag={64} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -4101,7 +4101,7 @@ exports[`MessageComposer Toolbar Markdown tap italic 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={75} + handlerTag={65} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -4177,7 +4177,7 @@ exports[`MessageComposer Toolbar Markdown tap italic 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={76} + handlerTag={66} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -4253,7 +4253,7 @@ exports[`MessageComposer Toolbar Markdown tap italic 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={77} + handlerTag={67} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -4329,7 +4329,7 @@ exports[`MessageComposer Toolbar Markdown tap italic 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={71} + handlerTag={61} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -4486,7 +4486,7 @@ exports[`MessageComposer Toolbar Markdown tap markdown 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={33} + handlerTag={23} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -4562,7 +4562,7 @@ exports[`MessageComposer Toolbar Markdown tap markdown 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={34} + handlerTag={24} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -4638,7 +4638,7 @@ exports[`MessageComposer Toolbar Markdown tap markdown 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={35} + handlerTag={25} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -4714,7 +4714,7 @@ exports[`MessageComposer Toolbar Markdown tap markdown 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={36} + handlerTag={26} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -4790,7 +4790,7 @@ exports[`MessageComposer Toolbar Markdown tap markdown 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={37} + handlerTag={27} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -4866,7 +4866,7 @@ exports[`MessageComposer Toolbar Markdown tap markdown 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={38} + handlerTag={28} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -4942,7 +4942,7 @@ exports[`MessageComposer Toolbar Markdown tap markdown 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={32} + handlerTag={22} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -5099,7 +5099,7 @@ exports[`MessageComposer Toolbar Markdown tap strike 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={98} + handlerTag={88} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -5175,7 +5175,7 @@ exports[`MessageComposer Toolbar Markdown tap strike 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={99} + handlerTag={89} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -5251,7 +5251,7 @@ exports[`MessageComposer Toolbar Markdown tap strike 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={100} + handlerTag={90} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -5327,7 +5327,7 @@ exports[`MessageComposer Toolbar Markdown tap strike 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={101} + handlerTag={91} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -5403,7 +5403,7 @@ exports[`MessageComposer Toolbar Markdown tap strike 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={102} + handlerTag={92} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -5479,7 +5479,7 @@ exports[`MessageComposer Toolbar Markdown tap strike 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={103} + handlerTag={93} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -5555,7 +5555,7 @@ exports[`MessageComposer Toolbar Markdown tap strike 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={97} + handlerTag={87} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -5712,7 +5712,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap bold 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={59} + handlerTag={49} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -5788,7 +5788,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap bold 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={60} + handlerTag={50} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -5864,7 +5864,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap bold 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={61} + handlerTag={51} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -5940,7 +5940,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap bold 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={62} + handlerTag={52} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -6016,7 +6016,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap bold 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={63} + handlerTag={53} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -6092,7 +6092,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap bold 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={64} + handlerTag={54} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -6168,7 +6168,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap bold 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={58} + handlerTag={48} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -6325,7 +6325,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap code 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={137} + handlerTag={127} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -6401,7 +6401,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap code 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={138} + handlerTag={128} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -6477,7 +6477,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap code 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={139} + handlerTag={129} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -6553,7 +6553,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap code 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={140} + handlerTag={130} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -6629,7 +6629,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap code 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={141} + handlerTag={131} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -6705,7 +6705,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap code 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={142} + handlerTag={132} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -6781,7 +6781,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap code 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={136} + handlerTag={126} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -6938,7 +6938,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap code-block 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={163} + handlerTag={153} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -7014,7 +7014,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap code-block 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={164} + handlerTag={154} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -7090,7 +7090,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap code-block 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={165} + handlerTag={155} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -7166,7 +7166,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap code-block 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={166} + handlerTag={156} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -7242,7 +7242,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap code-block 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={167} + handlerTag={157} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -7318,7 +7318,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap code-block 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={168} + handlerTag={158} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -7394,7 +7394,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap code-block 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={162} + handlerTag={152} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -7551,7 +7551,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap italic 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={85} + handlerTag={75} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -7627,7 +7627,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap italic 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={86} + handlerTag={76} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -7703,7 +7703,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap italic 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={87} + handlerTag={77} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -7779,7 +7779,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap italic 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={88} + handlerTag={78} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -7855,7 +7855,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap italic 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={89} + handlerTag={79} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -7931,7 +7931,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap italic 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={90} + handlerTag={80} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -8007,7 +8007,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap italic 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={84} + handlerTag={74} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -8164,7 +8164,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap strike 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={111} + handlerTag={101} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -8240,7 +8240,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap strike 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={112} + handlerTag={102} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -8316,7 +8316,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap strike 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={113} + handlerTag={103} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -8392,7 +8392,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap strike 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={114} + handlerTag={104} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -8468,7 +8468,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap strike 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={115} + handlerTag={105} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -8544,7 +8544,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap strike 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={116} + handlerTag={106} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -8620,7 +8620,7 @@ exports[`MessageComposer Toolbar Markdown type test and tap strike 1`] = ` borderless={true} collapsable={false} delayLongPress={600} - handlerTag={110} + handlerTag={100} handlerType="NativeViewGestureHandler" hitSlop={ { @@ -9664,77 +9664,78 @@ exports[`MessageComposer Toolbar tap emoji 1`] = ` } } > - - - -  - - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + testID="emoji-picker-tab-clock" + > +  + + - - - -  - - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + testID="emoji-picker-tab-emoji" + > +  + + - - - -  - - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + testID="emoji-picker-tab-leaf" + > +  + + - - - -  - - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + testID="emoji-picker-tab-burger" + > +  + + - - - -  - - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + testID="emoji-picker-tab-basketball" + > +  + + - - - -  - - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + testID="emoji-picker-tab-airplane" + > +  + + - - - -  - - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + testID="emoji-picker-tab-lamp-bulb" + > +  + + - - - -  - - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + testID="emoji-picker-tab-percentage" + > +  + + - - - -  - - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + testID="emoji-picker-tab-flag" + > +  + + - - - -  - - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + testID="emoji-picker-tab-rocket" + > +  + + { } return ( - setAlsoSendThreadToChannel(!alsoSendThreadToChannel)} testID='message-composer-send-to-channel'> @@ -81,7 +81,7 @@ export const SendThreadToChannel = (): React.ReactElement | null => { color={alsoSendThreadToChannel ? colors.buttonBackgroundPrimaryDefault : colors.fontDefault} /> {I18n.t('Message_composer_Send_to_channel')} - + ); }; diff --git a/app/containers/RoomHeader/RoomHeader.tsx b/app/containers/RoomHeader/RoomHeader.tsx index ec65eb792ea..07cf29eec1d 100644 --- a/app/containers/RoomHeader/RoomHeader.tsx +++ b/app/containers/RoomHeader/RoomHeader.tsx @@ -1,7 +1,7 @@ import React from 'react'; import { StyleSheet, Text, useWindowDimensions, View } from 'react-native'; -import { TouchableOpacity } from 'react-native-gesture-handler'; +import TouchableOpacity from '../TouchableOpacity'; import { useResponsiveLayout } from '../../lib/hooks/useResponsiveLayout/useResponsiveLayout'; import I18n from '../../i18n'; import sharedStyles from '../../views/Styles'; diff --git a/app/containers/RoomHeader/__snapshots__/RoomHeader.test.tsx.snap b/app/containers/RoomHeader/__snapshots__/RoomHeader.test.tsx.snap index f75b0a2470e..1c162ab3110 100644 --- a/app/containers/RoomHeader/__snapshots__/RoomHeader.test.tsx.snap +++ b/app/containers/RoomHeader/__snapshots__/RoomHeader.test.tsx.snap @@ -28,13 +28,27 @@ exports[`Story Snapshots: Icons should match snapshot 1`] = ` ] } > - - - -  - - - private channel - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + > +  + + + private channel + - + , - - - -  - - - public channel - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + > +  + + + public channel + - + , - - - -  - - - discussion - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + > +  + + + discussion + - + , - - - -  - - - omnichannel - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + > +  + + + omnichannel + - + , - - - -  - - - private team - - - - - - , - +  + + + private team + + + + + , + - - - -  - - - public team - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + > +  + + + public team + - + , - - - -  - - - group dm - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + > +  + + + group dm + - + , - - - -  - - - online dm - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + > +  + + + online dm + - + , - - - -  - - - away dm - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + > +  + + + away dm + - + , - - - -  - - - busy dm - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + > +  + + + busy dm + - + , - - - -  - - - loading dm - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + > +  + + + loading dm + - + , - - - -  - - - offline dm - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + > +  + + + offline dm + - + , ] @@ -1606,13 +1702,27 @@ exports[`Story Snapshots: Themes should match snapshot 1`] = ` ] } > - - - -  - - - title - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + > +  + - subtitle + title - + + subtitle + + , - - - -  - - - title - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + > +  + - subtitle + title - + + subtitle + + , - - - -  - - - title - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + > +  + - subtitle + title - + + subtitle + + , ] @@ -2100,13 +2220,27 @@ exports[`Story Snapshots: Thread should match snapshot 1`] = ` ] } > - - - - title - - - + + - + -  - - - parent title - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + > +  + + + parent title + - + , - - - - markdown preview #3 4 5 - - - - + + + -  - - - Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + > +  + + + Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries + - + , ] @@ -2455,13 +2591,27 @@ exports[`Story Snapshots: TitleSubtitle should match snapshot 1`] = ` ] } > - - - -  - - - title - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + > +  + + + title + - + , - - - -  - - - Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + > +  + + + Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries + - + , - - - -  - - - title - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + > +  + - subtitle + title - + + subtitle + + , - - - -  - - - title - - +  + + - Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries + title - + + Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries + + , - - - -  - - - Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + > +  + Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries - + + Lorem Ipsum is simply dummy text of the printing and typesetting industry. Lorem Ipsum has been the industrys standard dummy text ever since the 1500s, when an unknown printer took a galley of type and scrambled it to make a type specimen book. It has survived not only five centuries + + , ] @@ -3210,13 +3386,27 @@ exports[`Story Snapshots: Typing should match snapshot 1`] = ` ] } > - - - -  - - - title - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + > +  + - - user 1 - - - is typing - ... + title - + + + user 1 + + + is typing + ... + + , - - - -  - - - title - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + > +  + - - user 1 and user 2 - - - are typing - ... + title - + + + user 1 and user 2 + + + are typing + ... + + , - - - -  - - - title - - + ], + { + "fontFamily": "custom", + "fontStyle": "normal", + "fontWeight": "normal", + }, + {}, + ] + } + > +  + - - user 1, user 2, user 3, user 4, user 5 - - - are typing - ... + title - + + + user 1, user 2, user 3, user 4, user 5 + + + are typing + ... + + , ] diff --git a/app/containers/TabView/index.tsx b/app/containers/TabView/index.tsx index 6c6679ce7b4..0d902663445 100644 --- a/app/containers/TabView/index.tsx +++ b/app/containers/TabView/index.tsx @@ -1,8 +1,8 @@ import React, { useCallback, useState } from 'react'; import { View } from 'react-native'; import { TabView as ReanimatedTabView, type Route, type NavigationState } from 'reanimated-tab-view'; -import { TouchableOpacity } from 'react-native-gesture-handler'; +import TouchableOpacity from '../TouchableOpacity'; import styles from './styles'; import { useTheme } from '../../theme'; diff --git a/app/containers/TouchableOpacity/index.tsx b/app/containers/TouchableOpacity/index.tsx new file mode 100644 index 00000000000..719be8eba1a --- /dev/null +++ b/app/containers/TouchableOpacity/index.tsx @@ -0,0 +1,33 @@ +import React from 'react'; +import Animated, { useSharedValue, useAnimatedStyle } from 'react-native-reanimated'; +import { Pressable, type PressableProps, type StyleProp, type ViewStyle } from 'react-native'; + +const AnimatedPressable = Animated.createAnimatedComponent(Pressable); + +interface TouchableOpacityProps extends PressableProps { + style?: StyleProp; + opacity?: number; + activeOpacity?: number; +} + +function TouchableOpacity(props: TouchableOpacityProps): React.JSX.Element { + const opacity = useSharedValue(props.opacity || 1); + const animatedStyle = useAnimatedStyle(() => ({ + opacity: opacity.value + })); + + const onPressIn = () => { + opacity.value = props.activeOpacity || 0.2; + }; + const onPressOut = () => { + opacity.value = props.opacity || 1; + }; + + return ( + + {props.children} + + ); +} + +export default TouchableOpacity; diff --git a/app/containers/message/__snapshots__/Message.test.tsx.snap b/app/containers/message/__snapshots__/Message.test.tsx.snap index 3c91c75791c..ace68340f0f 100644 --- a/app/containers/message/__snapshots__/Message.test.tsx.snap +++ b/app/containers/message/__snapshots__/Message.test.tsx.snap @@ -109298,9 +109298,6 @@ exports[`Story Snapshots: WithAudio should match snapshot 1`] = ` { ); }); -const ThumbButton = isIOS ? TouchableOpacity : TouchableNativeFeedback; - const Thumb = ({ item, theme, isShareExtension, onPress, onRemove }: IThumb) => ( - onPress(item)} activeOpacity={0.7}> + onPress(item)} activeOpacity={0.7}> <> ) : null} - + ); const Thumbs = ({ attachments, theme, isShareExtension, onPress, onRemove }: IThumbs) => {