microphone stuck fixes (keybase#23883)

* WIP * WIP * WIP
lynsei · Apr 23, 2020 · cc8e3ff · cc8e3ff
1 parent f8a8b32
commit cc8e3ff
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/shared/chat/audio/audio-recorder.native.tsx b/shared/chat/audio/audio-recorder.native.tsx
@@ -105,7 +105,13 @@ const AudioRecorder = (props: Props) => {
       />
       {!visible ? null : (
         <Gateway into="convOverlay">
-          <Kb.Box2 direction="vertical" fullHeight={true} fullWidth={true} style={styles.container}>
+          <Kb.Box2
+            direction="vertical"
+            fullHeight={true}
+            fullWidth={true}
+            style={styles.container}
+            pointerEvents="box-none"
+          >
             <AudioButton
               ampScale={ampScale}
               closeDown={closingDown}
@@ -222,6 +228,7 @@ const AudioButton = (props: ButtonProps) => {
   return (
     <>
       <Kb.NativeAnimated.View
+        pointerEvents="box-none"
         style={{
           backgroundColor: Styles.globalColors.white,
           borderRadius: outerSize / 2,
@@ -415,6 +422,7 @@ const AudioSlideToCancel = (props: CancelProps) => {
     </Kb.NativeAnimated.View>
   ) : (
     <Kb.NativeAnimated.View
+      pointerEvents="box-none"
       style={{
         bottom: 35,
         opacity: props.translate,
@@ -432,7 +440,9 @@ const AudioSlideToCancel = (props: CancelProps) => {
     >
       <Kb.Box2 direction="horizontal" gap="tiny" centerChildren={true}>
         <Kb.Icon sizeType="Tiny" type="iconfont-arrow-left" />
-        <Kb.Text type="BodySmall">Slide to cancel</Kb.Text>
+        <Kb.Text type="BodySmall" onClick={props.onCancel}>
+          Slide to cancel
+        </Kb.Text>
       </Kb.Box2>
     </Kb.NativeAnimated.View>
   )

diff --git a/shared/chat/audio/audio-starter.native.tsx b/shared/chat/audio/audio-starter.native.tsx
@@ -90,6 +90,7 @@ const AudioStarter = (props: AudioStarterProps) => {
         <Tooltip shouldBeVisible={showToolTip} />
       </Gateway>
       <Kb.TapGestureHandler
+        shouldCancelWhenOutside={false}
         onHandlerStateChange={({nativeEvent}) => {
           if (!props.recording && nativeEvent.state === Kb.GestureState.BEGAN) {
             tapLive.current = true
@@ -131,6 +132,7 @@ const AudioStarter = (props: AudioStarterProps) => {
         simultaneousHandlers={panRef}
       >
         <Kb.PanGestureHandler
+          shouldCancelWhenOutside={false}
           minDeltaX={0}
           minDeltaY={0}
           onGestureEvent={({nativeEvent}) => {

diff --git a/shared/common-adapters/box.d.ts b/shared/common-adapters/box.d.ts
@@ -34,7 +34,7 @@ export type Box2Props = {
   onMouseUp?: (syntheticEvent: React.SyntheticEvent) => void // desktop only
   onMouseOver?: (syntheticEvent: React.SyntheticEvent) => void // desktop only
   onCopyCapture?: (syntheticEvent: React.SyntheticEvent) => void // desktop only
-  pointerEvents?: 'none'
+  pointerEvents?: 'none' | 'box-none'
   style?: StylesCrossPlatform
   gap?: keyof typeof globalMargins
   gapStart?: boolean