From db24639445fe4685b540a920cc18ced65efeefc4 Mon Sep 17 00:00:00 2001
From: Satyajit Sahoo <satyajit.happy@gmail.com>
Date: Tue, 10 Nov 2020 21:10:31 +0100
Subject: [PATCH] chore: sync latest stack

---
 packages/stack/package.json                   |   2 +-
 packages/stack/scripts/stack.patch            | Bin 25231 -> 31351 bytes
 .../NestedNavigator.test.tsx.snap             | 158 ++++++++++++++----
 .../StackNavigator.test.tsx.snap              |  38 +++--
 .../vendor/views/Header/HeaderContainer.tsx   |  16 +-
 .../src/vendor/views/Stack/CardContainer.tsx  |   9 +-
 .../src/vendor/views/Stack/CardStack.tsx      |   7 +-
 yarn.lock                                     |   8 +-
 8 files changed, 174 insertions(+), 64 deletions(-)

diff --git a/packages/stack/package.json b/packages/stack/package.json
index 30cbe2c0..2ef6a661 100644
--- a/packages/stack/package.json
+++ b/packages/stack/package.json
@@ -45,7 +45,7 @@
   "devDependencies": {
     "@react-native-community/bob": "^0.16.2",
     "@react-native-community/masked-view": "0.1.10",
-    "@react-navigation/stack": "^5.12.3",
+    "@react-navigation/stack": "^5.12.6",
     "@types/color": "^3.0.1",
     "@types/react": "^16.9.53",
     "@types/react-native": "^0.63.30",
diff --git a/packages/stack/scripts/stack.patch b/packages/stack/scripts/stack.patch
index a3988b88b2be5359435af0132e631418752c3253..219b4962df5f87cbdbd030e4aa11fe15459892f0 100644
GIT binary patch
delta 7149
zcmeHMUrZcD7@y%!xjl-vv{3%oHiMTMle>f6`@?b6mh0V7AXqtj1VJct4;I+;*d@CQ
z$DiU|OnfnoO7=}-Q+@G4jUoGJj4zs0Ur3)!G{$I5AGHrn)Hi2#_qZ!}U}^x<=7!9C
z-+c3Z-^}+LZf0lZop0cu58=DrXWL_mse~%YJW}N8j%8k)k>rjYp?2@0|IAK}@-kk=
z!?GThL0-0-@pcCST3ZLAb~Ln5wJXzwT#TDR;jrBU0DzID85RH<vo@Rwtuh)gvpW$5
zl8aJ>C8@*|8cvjCT3Jk{q-2q9rbu$Mf^z>yi}&u{%J}a_<Y?>vhClfYSA%6B03M`4
z;qUmn<YG!tREGH;R#aA1AFHw1>>l!0XZKu7%uDHn%Bf3Agp<cfEzYU)NsAwrq?E;H
z(!*SGMBvj?bVF1URZb9j*{~L7c&sz=s(=@{bVOPbXB5Lx!fdeFD2ke*Th`aTtly1%
zzTk!%t+Ontbh6%!4a(MZj=eB&ePMNN{pQB&@0qwlydW9LVUm3O?_)thq{8&FwPHa%
z7wOM5or{&Sduor@J>#J3Pn@i8sBdg+Jk`|L+|u&w6n!$uP2ZT4$%vy;N|Ga~C4PKP
z7G@HQ+_WIhjjH^Lnh@6bDf&b*^Qi7ser7UnKD@e!l^XH_!(X4w^P=H!Xm(cN)zK;1
zp-jtCDixO$K@}u%te|ylLc!<{sQki!I4j{UmoeBwi$qNs;pL2inIZ?HW1K8=;v64Y
zy_VvVd}>IHNUAC=5KZE4S`y<jPh5=(m?zOVdmfmOI>UoG<^_|XfzxF0hC#z&kz3#?
z${CJhp@F{*xWFZF1&n|jU=3`755VW(3vd_w1pWYj!y4EEpMx&whZkTE?1uwz5XRvv
z@T%#vA~&O_bA6Z;j$>Ldq00$bOiAJ#mgX!lo1cHv>Zr>nrhf}FTkXLj^u)w}uwn0b
zE62YB#s9*T@jqbL$vS~>CNyl(tVxX}1Q*8n0MjZgHu1+5a?~J3$f9A3W=)D)aDt{S
zro@)i%>xKD&2b%B@~}m-CN<3gw2mgwGzZXT%|A4{#}1L94`A4&hhCQd{|+7EeLE=Q
zzb`y{H<E(^PBi%*=-ua*z|h*eDC563Hb>D?#{Vc#-n);d2Y*-<OT;2LQfsd*ika-a
z2<PiKlSK5gB!0{oHn_0%XM-VIdo#{P!fl8!n1(HyH7S<h^k2UWGPw(Z;!gv^FF52c
zgQsWyO}HMnEXV)2h#jnc@?hNAC(z3h68Urr-`^olMfhm~Nwa8HNb%Y)j`N$hsLkkD
zUD0F2=C^cS=<jBNTlXug@{-(}g*IR1)I-(1wI!N9p?A5^@6sPrRKV@^BbPVOrLVN2
zN?WJ96S;gruYTvui%|R3(XCCQ4@-D+x1GyN$$<39wg)gTvPR_7-gXuYhA3*c{mt5T
z^qBs&GhWbS8T98}7+#k<7Ao>0ODU+uS$o6ohZ{q`*ZWtgQEbPk=5|$CDQR=tzXgwX
zk-%A>JBXinw41$s+U0tOw$(Xd3x(Vv<O&7!rXUAx3|4UA%Tqnu)dDGh$f){#`bVK3
zO7;7DcWvo${&@aMWl>x{?aoE2wEmktUl#j+Ub_{wYne+0Fd7I?ww=;HyYy*kgR}W=
zbJL-3M}5VkF}-ImQ_)hWwKKVdAI4aQv4_LR)9Gee<mxm)v?GLK!U8Xnn^Q&0dRw)(
uVh-(Lz^~o!`>lp0czc7|z5X|9`~*cmtG_nzRjDz*G}!v+n000FbkjfTVAh8K

delta 1129
zcmZ`(OKTHR7-g(9CZ*U#ORdoIfhaVu&Yf2#)1s+ZtF^6_Kuayyxk+xw(8-L>Oj@##
z7FU7`#k&#gLUGfL8}C9~h;*UruI<KO;7Sk|iZgjlC2@6`?{Ut#=lkyb{J}l_%u#-9
ze~?cJ3Lr(}GaAoRI}h~N*iaZ%HBqLA`4N^l|Gh5^cZy$(Utq?>+(3`i@nndDL`~*>
zoKbc*{wx|rNkM{yAWQ5(guXLEQh|i1sO(6Y;dXO5NQsJ^%=j@?^p9LF1^`p>cyK@*
z)+)rS5C;qk7d>N}fLnA3v0QK~cFin7fk26PxL6@2C_8o){A$=X$PQEt;$Wv(se@;O
zi~ZIrsoG9G-9lc%TVxm9nnQwuA~sFXiG>R$$u}wVCZO&RpE_mXfIiit*Mpv_j{t@T
zJGQfxj-?uUuaPpYnVuWub<e30JsnH@Cj<5k3udj7V;iL;=w)oWL<idf<95EKaw-tp
zyx`5211)t|G$`1%Nw75?gNJlza)w@4U-uZzaQ0#tRW&IX%?R7b9&=&1HDZx|(@xW=
z=}4IAG`yK!?;gBJXXZyb#YoZwsWJH4{OYMrxV>#69asp9`8G1$TN`Ja3txK4`FLxP
zPArCUkgOrKq5tLLJ{QRbyM!cqdHH<|@p3ZjfANU@UdCKR33dtz^sqk6>MQ+RRBmh;
zlCtdaov+<wbD`cq89U4`b-w|T{#iY-=#nP;1iqVlYX{wkm*~;m7#%-pTl>!J`TE=5
z4Ws|uw__4}x1n^)X)-*y7p3XV6DDOe-xFWfxl9rvNMt(CYQ@A}*><Yz!R9O%X}m;1
qr62T1k%l*tz^>v?y><1|SB1ghsK5(+3bp?u0<WRwALD*8GWr+UCO|6y

diff --git a/packages/stack/src/navigators/__tests__/__snapshots__/NestedNavigator.test.tsx.snap b/packages/stack/src/navigators/__tests__/__snapshots__/NestedNavigator.test.tsx.snap
index 7a08583d..87cced32 100644
--- a/packages/stack/src/navigators/__tests__/__snapshots__/NestedNavigator.test.tsx.snap
+++ b/packages/stack/src/navigators/__tests__/__snapshots__/NestedNavigator.test.tsx.snap
@@ -155,13 +155,18 @@ exports[`Nested navigators renders succesfully as direct child 1`] = `
         onTransitionStart={[Function]}
         pointerEvents="box-none"
         style={
-          Object {
-            "bottom": 0,
-            "left": 0,
-            "position": "absolute",
-            "right": 0,
-            "top": 0,
-          }
+          Array [
+            Object {
+              "overflow": undefined,
+            },
+            Object {
+              "bottom": 0,
+              "left": 0,
+              "position": "absolute",
+              "right": 0,
+              "top": 0,
+            },
+          ]
         }
         transitionSpec={
           Object {
@@ -283,6 +288,112 @@ exports[`Nested navigators renders succesfully as direct child 1`] = `
                         }
                       }
                     >
+                      <View
+                        pointerEvents="box-none"
+                        style={
+                          Object {
+                            "zIndex": 1,
+                          }
+                        }
+                      >
+                        <View
+                          accessibilityElementsHidden={false}
+                          importantForAccessibility="auto"
+                          onLayout={[Function]}
+                          pointerEvents="box-none"
+                          style={null}
+                        >
+                          <View
+                            pointerEvents="box-none"
+                            style={
+                              Object {
+                                "bottom": 0,
+                                "left": 0,
+                                "opacity": 1,
+                                "position": "absolute",
+                                "right": 0,
+                                "top": 0,
+                                "zIndex": 0,
+                              }
+                            }
+                          >
+                            <View
+                              style={
+                                Object {
+                                  "backgroundColor": "#fff",
+                                  "borderBottomColor": "#a7a7aa",
+                                  "flex": 1,
+                                  "shadowColor": "#a7a7aa",
+                                  "shadowOffset": Object {
+                                    "height": 0.5,
+                                    "width": 0,
+                                  },
+                                  "shadowOpacity": 0.85,
+                                  "shadowRadius": 0,
+                                }
+                              }
+                            />
+                          </View>
+                          <View
+                            pointerEvents="box-none"
+                            style={
+                              Object {
+                                "height": 44,
+                                "maxHeight": undefined,
+                                "minHeight": undefined,
+                                "opacity": undefined,
+                                "transform": undefined,
+                              }
+                            }
+                          >
+                            <View
+                              pointerEvents="none"
+                              style={
+                                Object {
+                                  "height": 0,
+                                }
+                              }
+                            />
+                            <View
+                              pointerEvents="box-none"
+                              style={
+                                Object {
+                                  "alignItems": "center",
+                                  "flex": 1,
+                                  "flexDirection": "row",
+                                  "justifyContent": "center",
+                                }
+                              }
+                            >
+                              <View
+                                pointerEvents="box-none"
+                                style={
+                                  Object {
+                                    "marginHorizontal": 16,
+                                    "opacity": 1,
+                                  }
+                                }
+                              >
+                                <Text
+                                  accessibilityRole="header"
+                                  aria-level="1"
+                                  numberOfLines={1}
+                                  onLayout={[Function]}
+                                  style={
+                                    Object {
+                                      "color": "rgba(0, 0, 0, 0.9)",
+                                      "fontSize": 17,
+                                      "fontWeight": "600",
+                                    }
+                                  }
+                                >
+                                  Home
+                                </Text>
+                              </View>
+                            </View>
+                          </View>
+                        </View>
+                      </View>
                       <View
                         onLayout={[Function]}
                         style={
@@ -324,13 +435,18 @@ exports[`Nested navigators renders succesfully as direct child 1`] = `
                             onTransitionStart={[Function]}
                             pointerEvents="box-none"
                             style={
-                              Object {
-                                "bottom": 0,
-                                "left": 0,
-                                "position": "absolute",
-                                "right": 0,
-                                "top": 0,
-                              }
+                              Array [
+                                Object {
+                                  "overflow": undefined,
+                                },
+                                Object {
+                                  "bottom": 0,
+                                  "left": 0,
+                                  "position": "absolute",
+                                  "right": 0,
+                                  "top": 0,
+                                },
+                              ]
                             }
                             transitionSpec={
                               Object {
@@ -365,7 +481,6 @@ exports[`Nested navigators renders succesfully as direct child 1`] = `
                               style={
                                 Object {
                                   "flex": 1,
-                                  "marginTop": 0,
                                 }
                               }
                             >
@@ -454,19 +569,6 @@ exports[`Nested navigators renders succesfully as direct child 1`] = `
                           </View>
                         </View>
                       </View>
-                      <View
-                        pointerEvents="box-none"
-                        style={
-                          Object {
-                            "height": 44,
-                            "left": 0,
-                            "position": "absolute",
-                            "right": 0,
-                            "top": 0,
-                            "zIndex": 1,
-                          }
-                        }
-                      />
                     </View>
                   </View>
                 </View>
diff --git a/packages/stack/src/navigators/__tests__/__snapshots__/StackNavigator.test.tsx.snap b/packages/stack/src/navigators/__tests__/__snapshots__/StackNavigator.test.tsx.snap
index 68fbd641..79eee638 100644
--- a/packages/stack/src/navigators/__tests__/__snapshots__/StackNavigator.test.tsx.snap
+++ b/packages/stack/src/navigators/__tests__/__snapshots__/StackNavigator.test.tsx.snap
@@ -172,13 +172,18 @@ exports[`StackNavigator applies correct values when headerRight is present 1`] =
         onTransitionStart={[Function]}
         pointerEvents="box-none"
         style={
-          Object {
-            "bottom": 0,
-            "left": 0,
-            "position": "absolute",
-            "right": 0,
-            "top": 0,
-          }
+          Array [
+            Object {
+              "overflow": undefined,
+            },
+            Object {
+              "bottom": 0,
+              "left": 0,
+              "position": "absolute",
+              "right": 0,
+              "top": 0,
+            },
+          ]
         }
         transitionSpec={
           Object {
@@ -460,13 +465,18 @@ exports[`StackNavigator renders successfully 1`] = `
         onTransitionStart={[Function]}
         pointerEvents="box-none"
         style={
-          Object {
-            "bottom": 0,
-            "left": 0,
-            "position": "absolute",
-            "right": 0,
-            "top": 0,
-          }
+          Array [
+            Object {
+              "overflow": undefined,
+            },
+            Object {
+              "bottom": 0,
+              "left": 0,
+              "position": "absolute",
+              "right": 0,
+              "top": 0,
+            },
+          ]
         }
         transitionSpec={
           Object {
diff --git a/packages/stack/src/vendor/views/Header/HeaderContainer.tsx b/packages/stack/src/vendor/views/Header/HeaderContainer.tsx
index 12d9389c..b724ea86 100644
--- a/packages/stack/src/vendor/views/Header/HeaderContainer.tsx
+++ b/packages/stack/src/vendor/views/Header/HeaderContainer.tsx
@@ -10,7 +10,6 @@ import {
   forNoAnimation,
   forSlideRight,
 } from '../../TransitionConfigs/HeaderStyleInterpolators';
-import HeaderShownContext from '../../utils/HeaderShownContext';
 import PreviousSceneContext from '../../utils/PreviousSceneContext';
 import type {
   Layout,
@@ -52,7 +51,6 @@ export default function HeaderContainer({
   style,
 }: Props) {
   const focusedRoute = getFocusedRoute();
-  const isParentHeaderShown = React.useContext(HeaderShownContext);
   const parentPreviousScene = React.useContext(PreviousSceneContext);
 
   return (
@@ -62,11 +60,8 @@ export default function HeaderContainer({
           return null;
         }
 
-        const {
-          header,
-          headerShown = isParentHeaderShown === false,
-          headerTransparent,
-        } = scene.descriptor.options || {};
+        const { header, headerShown = true, headerTransparent } =
+          scene.descriptor.options || {};
 
         if (!headerShown) {
           return null;
@@ -81,11 +76,10 @@ export default function HeaderContainer({
         const previousScene = self[i - 1];
         const nextScene = self[i + 1];
 
-        const {
-          headerShown: previousHeaderShown = isParentHeaderShown === false,
-        } = previousScene?.descriptor.options || {};
+        const { headerShown: previousHeaderShown = true } =
+          previousScene?.descriptor.options || {};
 
-        const { headerShown: nextHeaderShown = isParentHeaderShown === false } =
+        const { headerShown: nextHeaderShown = true } =
           nextScene?.descriptor.options || {};
 
         const isHeaderStatic =
diff --git a/packages/stack/src/vendor/views/Stack/CardContainer.tsx b/packages/stack/src/vendor/views/Stack/CardContainer.tsx
index aa1c9ead..8790e8ef 100644
--- a/packages/stack/src/vendor/views/Stack/CardContainer.tsx
+++ b/packages/stack/src/vendor/views/Stack/CardContainer.tsx
@@ -217,7 +217,14 @@ function CardContainer({
       pageOverflowEnabled={headerMode === 'screen' && mode === 'card'}
       containerStyle={hasAbsoluteHeader ? { marginTop: headerHeight } : null}
       contentStyle={[{ backgroundColor: colors.background }, cardStyle]}
-      style={StyleSheet.absoluteFill}
+      style={[
+        {
+          // This is necessary to avoid unfocused larger pages increasing scroll area
+          // The issue can be seen on the web when a smaller screen is pushed over a larger one
+          overflow: active ? undefined : 'hidden',
+        },
+        StyleSheet.absoluteFill,
+      ]}
     >
       <View style={styles.container}>
         <View style={styles.scene}>
diff --git a/packages/stack/src/vendor/views/Stack/CardStack.tsx b/packages/stack/src/vendor/views/Stack/CardStack.tsx
index a3aa7c95..1b77ad7a 100755
--- a/packages/stack/src/vendor/views/Stack/CardStack.tsx
+++ b/packages/stack/src/vendor/views/Stack/CardStack.tsx
@@ -444,10 +444,7 @@ export default class CardStack extends React.Component<Props, State> {
         ? this.state.scenes.slice(-2).some((scene) => {
             const { descriptor } = scene;
             const options = descriptor ? descriptor.options : {};
-            const {
-              headerTransparent,
-              headerShown = isParentHeaderShown === false,
-            } = options;
+            const { headerTransparent, headerShown = true } = options;
 
             if (headerTransparent || headerShown === false) {
               return true;
@@ -539,7 +536,7 @@ export default class CardStack extends React.Component<Props, State> {
 
             const {
               safeAreaInsets,
-              headerShown = isParentHeaderShown === false,
+              headerShown = true,
               headerTransparent,
               cardShadowEnabled,
               cardOverlayEnabled,
diff --git a/yarn.lock b/yarn.lock
index 515d82b6..ef9c4603 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4179,10 +4179,10 @@
   resolved "https://registry.yarnpkg.com/@react-native-community/masked-view/-/masked-view-0.1.10.tgz#5dda643e19e587793bc2034dd9bf7398ad43d401"
   integrity sha512-rk4sWFsmtOw8oyx8SD3KSvawwaK7gRBSEIy2TAwURyGt+3TizssXP1r8nx3zY+R7v2vYYHXZ+k2/GULAT/bcaQ==
 
-"@react-navigation/stack@^5.12.3":
-  version "5.12.3"
-  resolved "https://registry.yarnpkg.com/@react-navigation/stack/-/stack-5.12.3.tgz#a9ad55b9ab8c2337a6298e92d5c38dc376cdfe83"
-  integrity sha512-qJBX6+3JKFi252b/98eijCM2yB+t5GVvZjod3lWpl+44By5EAo4gMGlAVTXbLBLqDEE+LDtHRFE3AMt1IjLVmw==
+"@react-navigation/stack@^5.12.6":
+  version "5.12.6"
+  resolved "https://registry.yarnpkg.com/@react-navigation/stack/-/stack-5.12.6.tgz#a6f2caf66da78ad2afa80f7a960c36db6b83bcff"
+  integrity sha512-pf9AigAIVtCQuCpZAZqBux4kNqQwj98ngvd6JEryFrqTQ1CYsUH6jfpQE7SKyHggVRFSQVMf24aCgwtRixBvjw==
   dependencies:
     color "^3.1.3"
     react-native-iphone-x-helper "^1.3.0"