From 4d5f552c044c17755fa8a4da7c458b201eca077d Mon Sep 17 00:00:00 2001 From: "t3-code[bot]" <269035359+t3-code[bot]@users.noreply.github.com> Date: Sat, 10 Oct 2026 15:03:38 +0000 Subject: [PATCH] fix(mobile): order native-stack patch hunks correctly Carries pingdotgg/t3code#17839 native-stack-hunk-order: the @react-navigation/native-stack 7.17.6 patch lists its hunks in line order, so pnpm 12 can install it and pnpm 11 places the axisBehavior and identifier properties in the right types. Drop this layer at the refresh after #17839 native-stack-hunk-order merges upstream. Co-authored-by: Mike Olson <1510193+mwolson@users.noreply.github.com> --- ...act-navigation%2Fnative-stack@7.17.6.patch | 20 +++++++++---------- pnpm-lock.yaml | 6 +++--- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/patches/@react-navigation%2Fnative-stack@7.17.6.patch b/patches/@react-navigation%2Fnative-stack@7.17.6.patch index ee4f4a0b5e32..0c7e911e7a3a 100644 --- a/patches/@react-navigation%2Fnative-stack@7.17.6.patch +++ b/patches/@react-navigation%2Fnative-stack@7.17.6.patch @@ -176,7 +176,11 @@ diff --git a/lib/typescript/src/types.d.ts b/lib/typescript/src/types.d.ts index 2f1351a89f0f2e67e854dc81e392198326b71834..ccf8556911fa1fa17588f06b56edb2151a712bf0 100644 --- a/lib/typescript/src/types.d.ts +++ b/lib/typescript/src/types.d.ts -@@ -1091,6 +1091,13 @@ export type NativeStackHeaderItemSpacing = { +@@ -864,1 +864,3 @@ + sharesBackground?: boolean; ++ /** Native bar axis preference on iOS 27.1 and later. */ ++ axisBehavior?: 'automatic' | 'horizontalOnly' | 'verticalPreferred'; +@@ -1091,6 +1093,13 @@ export type NativeStackHeaderItemSpacing = { */ export type NativeStackHeaderItemCustom = { type: 'custom'; @@ -190,15 +194,15 @@ index 2f1351a89f0f2e67e854dc81e392198326b71834..ccf8556911fa1fa17588f06b56edb215 /** * A React Element to display as the item. */ -@@ -864,1 +864,3 @@ - sharesBackground?: boolean; -+ /** Native bar axis preference on iOS 27.1 and later. */ -+ axisBehavior?: 'automatic' | 'horizontalOnly' | 'verticalPreferred'; diff --git a/src/types.tsx b/src/types.tsx index 7488b1cf20afe36b5c585fbfcd369471fdb6ab8d..f4bd78e48c687024ba84e998fac79e9eb16f1a80 100644 --- a/src/types.tsx +++ b/src/types.tsx -@@ -1156,6 +1156,13 @@ export type NativeStackHeaderItemSpacing = { +@@ -920,1 +920,3 @@ + sharesBackground?: boolean; ++ /** Native bar axis preference on iOS 27.1 and later. */ ++ axisBehavior?: 'automatic' | 'horizontalOnly' | 'verticalPreferred'; +@@ -1156,6 +1158,13 @@ export type NativeStackHeaderItemSpacing = { */ export type NativeStackHeaderItemCustom = { type: 'custom'; @@ -212,10 +216,6 @@ index 7488b1cf20afe36b5c585fbfcd369471fdb6ab8d..f4bd78e48c687024ba84e998fac79e9e /** * A React Element to display as the item. */ -@@ -920,1 +920,3 @@ - sharesBackground?: boolean; -+ /** Native bar axis preference on iOS 27.1 and later. */ -+ axisBehavior?: 'automatic' | 'horizontalOnly' | 'verticalPreferred'; diff --git a/src/views/useHeaderConfigProps.tsx b/src/views/useHeaderConfigProps.tsx index 3f3fff405048b3c2250afbe99dd7f35cecb9a6d5..bb062b898cfa77f8c02f951dc9d81b51672d7d0e 100644 --- a/src/views/useHeaderConfigProps.tsx diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 259543ade6fc..f9c1cd0e0de4 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -151,7 +151,7 @@ patchedDependencies: '@pierre/diffs@1.5.2': 298e94372dbd51846a4e26ece2ecc3e22eb1f94b0450b1f1a9c6fec127809be7 '@react-native-ai/apple@0.12.0': 2d09870c2848d185cb05b53ed823a46e12dba519324d8dd8e584e28731990f9d '@react-native-menu/menu@2.0.0': a4866ecfcd44f318043de839d20110c17e14909004900f002ffe12050376f2ba - '@react-navigation/native-stack@7.17.6': d2d52f3776e30765519748fd5e177592dc3b9cc778c52fb00e02674dfa9042c5 + '@react-navigation/native-stack@7.17.6': 1a228614e7b0b7b421838e622fa25a333be4ec3db49e1fe51f1fa9da7a9c8dde alchemy@2.0.0-beta.80: bea1b6c0c0b23157fd5f439a1d7feff430f28ac1621ba135d8a13eeec60ccacd dbus-next@0.10.2: cfff57561b0ee59b5addb3b2e6c6f20906e967507a530ab67e8db8108e520ba4 expo-audio@58.0.4: c20cb927d6848c53e7bf6ec14fe12f19daae9210165d2dbaf4e0f97ce31e8742 @@ -344,7 +344,7 @@ importers: version: 7.3.4(react-native@0.88.0-rc.3(@babel/core@7.29.7)(@react-native/metro-config@0.88.0-rc.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))(react@19.3.0) '@react-navigation/native-stack': specifier: 7.17.6 - version: 7.17.6(patch_hash=d2d52f3776e30765519748fd5e177592dc3b9cc778c52fb00e02674dfa9042c5)(6b53c4f789a319cd2c00cd296dcea732) + version: 7.17.6(patch_hash=1a228614e7b0b7b421838e622fa25a333be4ec3db49e1fe51f1fa9da7a9c8dde)(6b53c4f789a319cd2c00cd296dcea732) '@shikijs/core': specifier: 4.2.0 version: 4.2.0 @@ -16092,7 +16092,7 @@ snapshots: optionalDependencies: '@react-native-masked-view/masked-view': 0.3.2(react-native@0.88.0-rc.3(@babel/core@7.29.7)(@react-native/metro-config@0.88.0-rc.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))(react@19.3.0) - '@react-navigation/native-stack@7.17.6(patch_hash=d2d52f3776e30765519748fd5e177592dc3b9cc778c52fb00e02674dfa9042c5)(6b53c4f789a319cd2c00cd296dcea732)': + '@react-navigation/native-stack@7.17.6(patch_hash=1a228614e7b0b7b421838e622fa25a333be4ec3db49e1fe51f1fa9da7a9c8dde)(6b53c4f789a319cd2c00cd296dcea732)': dependencies: '@react-navigation/elements': 2.9.26(83de68753219ecf7f3321e065bd378be) '@react-navigation/native': 7.3.4(react-native@0.88.0-rc.3(@babel/core@7.29.7)(@react-native/metro-config@0.88.0-rc.3(@babel/core@7.29.7)(bufferutil@4.1.0)(utf-8-validate@6.0.6))(@types/react@19.3.0)(bufferutil@4.1.0)(react@19.3.0)(utf-8-validate@6.0.6))(react@19.3.0)