fix: dismiss keyboard on page change

react-navigation · Jan 3, 2020 · 2c31d17 · 2c31d17
1 parent 8f9a250
commit 2c31d17
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/packages/stack/src/views/Stack/Card.tsx b/packages/stack/src/views/Stack/Card.tsx
@@ -162,11 +162,11 @@ export default class Card extends React.Component<Props> {
 
     onTransitionStart?.({ closing: Boolean(closing) });
     animation(gesture, {
-      isInteraction: false,
       ...spec.config,
       velocity,
-      useNativeDriver: true,
       toValue,
+      useNativeDriver: true,
+      isInteraction: false,
     }).start(({ finished }) => {
       this.handleEndInteraction();
 

diff --git a/packages/stack/src/views/Stack/CardContainer.tsx b/packages/stack/src/views/Stack/CardContainer.tsx
@@ -89,6 +89,10 @@ export default function CardContainer({
   state,
   transitionSpec,
 }: Props) {
+  React.useEffect(() => {
+    onPageChangeConfirm?.();
+  }, [active, onPageChangeConfirm]);
+
   const handleOpen = () => {
     onTransitionEnd?.({ route: scene.route }, false);
     onOpenRoute({ route: scene.route });
@@ -100,7 +104,7 @@ export default function CardContainer({
   };
 
   const handleTransitionStart = ({ closing }: { closing: boolean }) => {
-    if (closing) {
+    if (active && closing) {
       onPageChangeConfirm?.();
     } else {
       onPageChangeCancel?.();