From 5cec5e80843214420707534815bdf5ed935cb2c8 Mon Sep 17 00:00:00 2001 From: xmflsct Date: Tue, 6 Feb 2024 22:09:36 +0100 Subject: [PATCH 1/2] Clean up --- .../expo-av-npm-13.0.2-7a651776f1.patch | 13 - ...s-context-menu-npm-1.15.1-0034bfa5ba.patch | 14 - ...os-context-menu-npm-2.3.2-9099ed7858.patch | 64 +++ .../react-native-npm-0.72.0-66f5fd62b3.patch | 74 --- ...reanimated-zoom-npm-0.3.3-bbb8d84109.patch | 38 -- ios/Podfile.lock | 489 +++++++++--------- package.json | 29 +- yarn.lock | 295 ++++++++--- 8 files changed, 543 insertions(+), 473 deletions(-) delete mode 100644 .yarn/patches/expo-av-npm-13.0.2-7a651776f1.patch delete mode 100644 .yarn/patches/react-native-ios-context-menu-npm-1.15.1-0034bfa5ba.patch create mode 100644 .yarn/patches/react-native-ios-context-menu-npm-2.3.2-9099ed7858.patch delete mode 100644 .yarn/patches/react-native-npm-0.72.0-66f5fd62b3.patch delete mode 100644 .yarn/patches/react-native-reanimated-zoom-npm-0.3.3-bbb8d84109.patch diff --git a/.yarn/patches/expo-av-npm-13.0.2-7a651776f1.patch b/.yarn/patches/expo-av-npm-13.0.2-7a651776f1.patch deleted file mode 100644 index 701d035e4..000000000 --- a/.yarn/patches/expo-av-npm-13.0.2-7a651776f1.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/ios/EXAV/EXAudioSessionManager.m b/ios/EXAV/EXAudioSessionManager.m -index 81dce13366c3947b12c863f7b39c0237882a6c36..fa27e0a354d48a994ca46e19642a5e224d42d9a8 100644 ---- a/ios/EXAV/EXAudioSessionManager.m -+++ b/ios/EXAV/EXAudioSessionManager.m -@@ -170,7 +170,7 @@ - (void)moduleDidBackground:(id)backgroundingModule - [_foregroundedModules compact]; - - // Any possible failures are silent -- [self _updateSessionConfiguration]; -+ // [self _updateSessionConfiguration]; - } - - - (void)moduleDidForeground:(id)module diff --git a/.yarn/patches/react-native-ios-context-menu-npm-1.15.1-0034bfa5ba.patch b/.yarn/patches/react-native-ios-context-menu-npm-1.15.1-0034bfa5ba.patch deleted file mode 100644 index 5e62a4013..000000000 --- a/.yarn/patches/react-native-ios-context-menu-npm-1.15.1-0034bfa5ba.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff --git a/src/functions/Helpers.ts b/src/functions/Helpers.ts -index e04486540494891ab07ec130b686dc4acddf2d0c..265e6ac11439276a1c52c222dfc4c50daf1689ae 100644 ---- a/src/functions/Helpers.ts -+++ b/src/functions/Helpers.ts -@@ -77,7 +77,8 @@ export function getNativeNodeHandle(nativeRef: React.Component){ - const nodeHandle = findNodeHandle(nativeRef); - - if(nodeHandle == null){ -- throw new Error('Unable to get the node handle for the native ref.'); -+ return 0 -+ // throw new Error('Unable to get the node handle for the native ref.'); - }; - - return nodeHandle; diff --git a/.yarn/patches/react-native-ios-context-menu-npm-2.3.2-9099ed7858.patch b/.yarn/patches/react-native-ios-context-menu-npm-2.3.2-9099ed7858.patch new file mode 100644 index 000000000..678272c90 --- /dev/null +++ b/.yarn/patches/react-native-ios-context-menu-npm-2.3.2-9099ed7858.patch @@ -0,0 +1,64 @@ +diff --git a/ios/Sources/Common/AutoLayoutWrapperView.swift b/ios/Sources/Common/AutoLayoutWrapperView.swift +index e2b9be9c129c66eed3eaebb4e33f5456ce98f5da..ef6a0087f524c8d228b7fee31e54fc3dba769ffa 100644 +--- a/ios/Sources/Common/AutoLayoutWrapperView.swift ++++ b/ios/Sources/Common/AutoLayoutWrapperView.swift +@@ -18,7 +18,11 @@ class AutoLayoutWrapperView: UIView { + + override func addSubview(_ view: UIView) { + if let detachedView = view as? RNIDetachedView { +- detachedView.updateBounds(newSize: self.bounds.size); ++ do { ++ try detachedView.updateBounds(newSize: self.bounds.size); ++ } catch { ++ print("Error: \(error)"); ++ }; + }; + + super.addSubview(view); +@@ -37,7 +41,11 @@ class AutoLayoutWrapperView: UIView { + func updateSizeOfSubviews(newSize: CGSize? = nil){ + self.subviews.forEach { + guard let detachedView = $0 as? RNIDetachedView else { return }; +- detachedView.updateBounds(newSize: newSize ?? self.bounds.size); ++ do { ++ try detachedView.updateBounds(newSize: newSize ?? self.bounds.size); ++ } catch { ++ print("Error: \(error)"); ++ }; + }; + }; + }; +diff --git a/ios/Sources/RNIContextMenuView/RNIContextMenuPreviewController.swift b/ios/Sources/RNIContextMenuView/RNIContextMenuPreviewController.swift +index 2b4dc6287c68c88d6652b963ac2cc5f59251ffa9..7c8472e90dac8359f6b40ce2c096323fcf388249 100644 +--- a/ios/Sources/RNIContextMenuView/RNIContextMenuPreviewController.swift ++++ b/ios/Sources/RNIContextMenuView/RNIContextMenuPreviewController.swift +@@ -63,7 +63,11 @@ class RNIContextMenuPreviewController: UIViewController { + case .STRETCH: + guard let menuCustomPreviewView = self.menuCustomPreviewView else { return }; + +- menuCustomPreviewView.updateBounds(newSize: self.view.bounds.size); ++ do { ++ try menuCustomPreviewView.updateBounds(newSize: self.view.bounds.size); ++ } catch { ++ print("Error: \(error)"); ++ }; + self.preferredContentSize = .zero; + + case .INHERIT: +diff --git a/ios/Sources/RNIContextMenuView/RNIContextMenuView.swift b/ios/Sources/RNIContextMenuView/RNIContextMenuView.swift +index affabcdee8303681f1438c6cfdb9d90d6a105ba6..7c470229e06250f4bd80d3133e381b91ff4f61c5 100644 +--- a/ios/Sources/RNIContextMenuView/RNIContextMenuView.swift ++++ b/ios/Sources/RNIContextMenuView/RNIContextMenuView.swift +@@ -307,7 +307,11 @@ public class RNIContextMenuView: + .init(with: detachedView) + ); + +- detachedView.detach(); ++ do { ++ try detachedView.detach(); ++ } catch { ++ print("Error: \(error)"); ++ }; + }; + + #if DEBUG diff --git a/.yarn/patches/react-native-npm-0.72.0-66f5fd62b3.patch b/.yarn/patches/react-native-npm-0.72.0-66f5fd62b3.patch deleted file mode 100644 index 63f2ae62e..000000000 --- a/.yarn/patches/react-native-npm-0.72.0-66f5fd62b3.patch +++ /dev/null @@ -1,74 +0,0 @@ -diff --git a/Libraries/Utilities/setAndForwardRef.js b/Libraries/Utilities/setAndForwardRef.js -new file mode 100644 -index 0000000000000000000000000000000000000000..e67b530b9a933b68e219e2b8cec2a66dc8f51323 ---- /dev/null -+++ b/Libraries/Utilities/setAndForwardRef.js -@@ -0,0 +1,68 @@ -+/** -+ * Copyright (c) Meta Platforms, Inc. and affiliates. -+ * -+ * This source code is licensed under the MIT license found in the -+ * LICENSE file in the root directory of this source tree. -+ * -+ * @format -+ * @flow -+ */ -+ -+'use strict' -+ -+import type { ElementRef, Ref } from 'react' -+ -+type Args = $ReadOnly<{| -+ getForwardedRef: () => ?Ref, -+ setLocalRef: (ref: ElementRef) => mixed -+|}> -+ -+/** -+ * This is a helper function for when a component needs to be able to forward a ref -+ * to a child component, but still needs to have access to that component as part of -+ * its implementation. -+ * -+ * Its main use case is in wrappers for native components. -+ * -+ * Usage: -+ * -+ * class MyView extends React.Component { -+ * _nativeRef = null; -+ * -+ * _setNativeRef = setAndForwardRef({ -+ * getForwardedRef: () => this.props.forwardedRef, -+ * setLocalRef: ref => { -+ * this._nativeRef = ref; -+ * }, -+ * }); -+ * -+ * render() { -+ * return ; -+ * } -+ * } -+ * -+ * const MyViewWithRef = React.forwardRef((props, ref) => ( -+ * -+ * )); -+ * -+ * module.exports = MyViewWithRef; -+ */ -+ -+function setAndForwardRef({ getForwardedRef, setLocalRef }: Args): (ref: ElementRef) => void { -+ return function forwardRef(ref: ElementRef) { -+ const forwardedRef = getForwardedRef() -+ -+ setLocalRef(ref) -+ -+ // Forward to user ref prop (if one has been specified) -+ if (typeof forwardedRef === 'function') { -+ // Handle function-based refs. String-based refs are handled as functions. -+ forwardedRef(ref) -+ } else if (typeof forwardedRef === 'object' && forwardedRef != null) { -+ // Handle createRef-based refs -+ forwardedRef.current = ref -+ } -+ } -+} -+ -+module.exports = setAndForwardRef diff --git a/.yarn/patches/react-native-reanimated-zoom-npm-0.3.3-bbb8d84109.patch b/.yarn/patches/react-native-reanimated-zoom-npm-0.3.3-bbb8d84109.patch deleted file mode 100644 index ced945300..000000000 --- a/.yarn/patches/react-native-reanimated-zoom-npm-0.3.3-bbb8d84109.patch +++ /dev/null @@ -1,38 +0,0 @@ -diff --git a/src/zoom.tsx b/src/zoom.tsx -index 70ce1c8d6a43e711f06b93d1eda3b44a3ad9a659..cdc2713470f2d332b8bf3e9c97e38fd9b78281df 100644 ---- a/src/zoom.tsx -+++ b/src/zoom.tsx -@@ -4,6 +4,7 @@ import Animated, { - useSharedValue, - useAnimatedStyle, - useDerivedValue, -+ withDecay, - withTiming, - cancelAnimation, - runOnJS, -@@ -120,11 +121,22 @@ export function Zoom(props: Props) { - } - } - }) -- .onEnd(() => { -+ .onEnd((event) => { - if (isPinching.value || !isZoomed.value) return; - -- panTranslateX.value = 0; -- panTranslateY.value = 0; -+ const maxTranslateX = (viewWidth.value / 2) * scale.value - viewWidth.value / 2; -+ const minTranslateX = -maxTranslateX; -+ translationX.value = withDecay({ -+ velocity: event.velocityX, -+ clamp: [minTranslateX, maxTranslateX] -+ }); -+ -+ const maxTranslateY = (viewHeight.value / 2) * scale.value - viewHeight.value / 2; -+ const minTranslateY = -maxTranslateY; -+ translationY.value = withDecay({ -+ velocity: event.velocityY, -+ clamp: [minTranslateY, maxTranslateY] -+ }); - }); - - const pinch = Gesture.Pinch() diff --git a/ios/Podfile.lock b/ios/Podfile.lock index c8013d819..fc51e2384 100644 --- a/ios/Podfile.lock +++ b/ios/Podfile.lock @@ -1,12 +1,14 @@ PODS: - boost (1.83.0) + - ComputableLayout (0.7.0): + - DGSwiftUtilities (~> 0.11) - ContextMenuAuxiliaryPreview (0.3.1): - DGSwiftUtilities (~> 0.6) - DGSwiftUtilities (0.12.6) - DoubleConversion (1.1.6) - EXApplication (5.8.3): - ExpoModulesCore - - EXAV (13.10.4): + - EXAV (13.10.5): - ExpoModulesCore - ReactCommon/turbomodule/core - EXConstants (15.4.5): @@ -15,15 +17,15 @@ PODS: - ExpoModulesCore - EXNotifications (0.27.6): - ExpoModulesCore - - Expo (50.0.5): + - Expo (50.0.6): - ExpoModulesCore - ExpoCrypto (12.8.0): - ExpoModulesCore - - ExpoFileSystem (16.0.5): + - ExpoFileSystem (16.0.6): - ExpoModulesCore - ExpoHaptics (12.8.1): - ExpoModulesCore - - ExpoImage (1.10.5): + - ExpoImage (1.11.0): - ExpoModulesCore - SDWebImage (~> 5.17.0) - SDWebImageAVIFCoder (~> 0.10.1) @@ -60,19 +62,19 @@ PODS: - glog - RCT-Folly (= 2022.05.16.00) - React-Core - - FBLazyVector (0.73.3) - - FBReactNativeSpec (0.73.3): + - FBLazyVector (0.73.4) + - FBReactNativeSpec (0.73.4): - RCT-Folly (= 2022.05.16.00) - - RCTRequired (= 0.73.3) - - RCTTypeSafety (= 0.73.3) - - React-Core (= 0.73.3) - - React-jsi (= 0.73.3) - - ReactCommon/turbomodule/core (= 0.73.3) + - RCTRequired (= 0.73.4) + - RCTTypeSafety (= 0.73.4) + - React-Core (= 0.73.4) + - React-jsi (= 0.73.4) + - ReactCommon/turbomodule/core (= 0.73.4) - fmt (6.2.1) - glog (0.3.5) - - hermes-engine (0.73.3): - - hermes-engine/Pre-built (= 0.73.3) - - hermes-engine/Pre-built (0.73.3) + - hermes-engine (0.73.4): + - hermes-engine/Pre-built (= 0.73.4) + - hermes-engine/Pre-built (0.73.4) - libaom (3.0.0): - libvmaf (>= 2.2.0) - libavif (0.11.1): @@ -120,26 +122,26 @@ PODS: - fmt (~> 6.2.1) - glog - libevent - - RCTRequired (0.73.3) - - RCTTypeSafety (0.73.3): - - FBLazyVector (= 0.73.3) - - RCTRequired (= 0.73.3) - - React-Core (= 0.73.3) - - React (0.73.3): - - React-Core (= 0.73.3) - - React-Core/DevSupport (= 0.73.3) - - React-Core/RCTWebSocket (= 0.73.3) - - React-RCTActionSheet (= 0.73.3) - - React-RCTAnimation (= 0.73.3) - - React-RCTBlob (= 0.73.3) - - React-RCTImage (= 0.73.3) - - React-RCTLinking (= 0.73.3) - - React-RCTNetwork (= 0.73.3) - - React-RCTSettings (= 0.73.3) - - React-RCTText (= 0.73.3) - - React-RCTVibration (= 0.73.3) - - React-callinvoker (0.73.3) - - React-Codegen (0.73.3): + - RCTRequired (0.73.4) + - RCTTypeSafety (0.73.4): + - FBLazyVector (= 0.73.4) + - RCTRequired (= 0.73.4) + - React-Core (= 0.73.4) + - React (0.73.4): + - React-Core (= 0.73.4) + - React-Core/DevSupport (= 0.73.4) + - React-Core/RCTWebSocket (= 0.73.4) + - React-RCTActionSheet (= 0.73.4) + - React-RCTAnimation (= 0.73.4) + - React-RCTBlob (= 0.73.4) + - React-RCTImage (= 0.73.4) + - React-RCTLinking (= 0.73.4) + - React-RCTNetwork (= 0.73.4) + - React-RCTSettings (= 0.73.4) + - React-RCTText (= 0.73.4) + - React-RCTVibration (= 0.73.4) + - React-callinvoker (0.73.4) + - React-Codegen (0.73.4): - DoubleConversion - FBReactNativeSpec - glog @@ -154,11 +156,11 @@ PODS: - React-rncore - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - React-Core (0.73.3): + - React-Core (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-Core/Default (= 0.73.3) + - React-Core/Default (= 0.73.4) - React-cxxreact - React-hermes - React-jsi @@ -168,7 +170,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/CoreModulesHeaders (0.73.3): + - React-Core/CoreModulesHeaders (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -182,7 +184,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/Default (0.73.3): + - React-Core/Default (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -195,23 +197,23 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/DevSupport (0.73.3): + - React-Core/DevSupport (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-Core/Default (= 0.73.3) - - React-Core/RCTWebSocket (= 0.73.3) + - React-Core/Default (= 0.73.4) + - React-Core/RCTWebSocket (= 0.73.4) - React-cxxreact - React-hermes - React-jsi - React-jsiexecutor - - React-jsinspector (= 0.73.3) + - React-jsinspector (= 0.73.4) - React-perflogger - React-runtimescheduler - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTActionSheetHeaders (0.73.3): + - React-Core/RCTActionSheetHeaders (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -225,7 +227,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTAnimationHeaders (0.73.3): + - React-Core/RCTAnimationHeaders (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -239,7 +241,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTBlobHeaders (0.73.3): + - React-Core/RCTBlobHeaders (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -253,7 +255,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTImageHeaders (0.73.3): + - React-Core/RCTImageHeaders (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -267,7 +269,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTLinkingHeaders (0.73.3): + - React-Core/RCTLinkingHeaders (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -281,7 +283,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTNetworkHeaders (0.73.3): + - React-Core/RCTNetworkHeaders (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -295,7 +297,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTSettingsHeaders (0.73.3): + - React-Core/RCTSettingsHeaders (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -309,7 +311,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTTextHeaders (0.73.3): + - React-Core/RCTTextHeaders (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -323,7 +325,7 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTVibrationHeaders (0.73.3): + - React-Core/RCTVibrationHeaders (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -337,11 +339,11 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-Core/RCTWebSocket (0.73.3): + - React-Core/RCTWebSocket (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-Core/Default (= 0.73.3) + - React-Core/Default (= 0.73.4) - React-cxxreact - React-hermes - React-jsi @@ -351,33 +353,33 @@ PODS: - React-utils - SocketRocket (= 0.6.1) - Yoga - - React-CoreModules (0.73.3): + - React-CoreModules (0.73.4): - RCT-Folly (= 2022.05.16.00) - - RCTTypeSafety (= 0.73.3) + - RCTTypeSafety (= 0.73.4) - React-Codegen - - React-Core/CoreModulesHeaders (= 0.73.3) - - React-jsi (= 0.73.3) + - React-Core/CoreModulesHeaders (= 0.73.4) + - React-jsi (= 0.73.4) - React-NativeModulesApple - React-RCTBlob - - React-RCTImage (= 0.73.3) + - React-RCTImage (= 0.73.4) - ReactCommon - SocketRocket (= 0.6.1) - - React-cxxreact (0.73.3): + - React-cxxreact (0.73.4): - boost (= 1.83.0) - DoubleConversion - fmt (~> 6.2.1) - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-callinvoker (= 0.73.3) - - React-debug (= 0.73.3) - - React-jsi (= 0.73.3) - - React-jsinspector (= 0.73.3) - - React-logger (= 0.73.3) - - React-perflogger (= 0.73.3) - - React-runtimeexecutor (= 0.73.3) - - React-debug (0.73.3) - - React-Fabric (0.73.3): + - React-callinvoker (= 0.73.4) + - React-debug (= 0.73.4) + - React-jsi (= 0.73.4) + - React-jsinspector (= 0.73.4) + - React-logger (= 0.73.4) + - React-perflogger (= 0.73.4) + - React-runtimeexecutor (= 0.73.4) + - React-debug (0.73.4) + - React-Fabric (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -388,20 +390,20 @@ PODS: - React-Core - React-cxxreact - React-debug - - React-Fabric/animations (= 0.73.3) - - React-Fabric/attributedstring (= 0.73.3) - - React-Fabric/componentregistry (= 0.73.3) - - React-Fabric/componentregistrynative (= 0.73.3) - - React-Fabric/components (= 0.73.3) - - React-Fabric/core (= 0.73.3) - - React-Fabric/imagemanager (= 0.73.3) - - React-Fabric/leakchecker (= 0.73.3) - - React-Fabric/mounting (= 0.73.3) - - React-Fabric/scheduler (= 0.73.3) - - React-Fabric/telemetry (= 0.73.3) - - React-Fabric/templateprocessor (= 0.73.3) - - React-Fabric/textlayoutmanager (= 0.73.3) - - React-Fabric/uimanager (= 0.73.3) + - React-Fabric/animations (= 0.73.4) + - React-Fabric/attributedstring (= 0.73.4) + - React-Fabric/componentregistry (= 0.73.4) + - React-Fabric/componentregistrynative (= 0.73.4) + - React-Fabric/components (= 0.73.4) + - React-Fabric/core (= 0.73.4) + - React-Fabric/imagemanager (= 0.73.4) + - React-Fabric/leakchecker (= 0.73.4) + - React-Fabric/mounting (= 0.73.4) + - React-Fabric/scheduler (= 0.73.4) + - React-Fabric/telemetry (= 0.73.4) + - React-Fabric/templateprocessor (= 0.73.4) + - React-Fabric/textlayoutmanager (= 0.73.4) + - React-Fabric/uimanager (= 0.73.4) - React-graphics - React-jsi - React-jsiexecutor @@ -410,7 +412,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/animations (0.73.3): + - React-Fabric/animations (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -429,7 +431,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/attributedstring (0.73.3): + - React-Fabric/attributedstring (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -448,7 +450,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/componentregistry (0.73.3): + - React-Fabric/componentregistry (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -467,7 +469,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/componentregistrynative (0.73.3): + - React-Fabric/componentregistrynative (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -486,7 +488,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components (0.73.3): + - React-Fabric/components (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -497,17 +499,17 @@ PODS: - React-Core - React-cxxreact - React-debug - - React-Fabric/components/inputaccessory (= 0.73.3) - - React-Fabric/components/legacyviewmanagerinterop (= 0.73.3) - - React-Fabric/components/modal (= 0.73.3) - - React-Fabric/components/rncore (= 0.73.3) - - React-Fabric/components/root (= 0.73.3) - - React-Fabric/components/safeareaview (= 0.73.3) - - React-Fabric/components/scrollview (= 0.73.3) - - React-Fabric/components/text (= 0.73.3) - - React-Fabric/components/textinput (= 0.73.3) - - React-Fabric/components/unimplementedview (= 0.73.3) - - React-Fabric/components/view (= 0.73.3) + - React-Fabric/components/inputaccessory (= 0.73.4) + - React-Fabric/components/legacyviewmanagerinterop (= 0.73.4) + - React-Fabric/components/modal (= 0.73.4) + - React-Fabric/components/rncore (= 0.73.4) + - React-Fabric/components/root (= 0.73.4) + - React-Fabric/components/safeareaview (= 0.73.4) + - React-Fabric/components/scrollview (= 0.73.4) + - React-Fabric/components/text (= 0.73.4) + - React-Fabric/components/textinput (= 0.73.4) + - React-Fabric/components/unimplementedview (= 0.73.4) + - React-Fabric/components/view (= 0.73.4) - React-graphics - React-jsi - React-jsiexecutor @@ -516,7 +518,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/inputaccessory (0.73.3): + - React-Fabric/components/inputaccessory (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -535,7 +537,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/legacyviewmanagerinterop (0.73.3): + - React-Fabric/components/legacyviewmanagerinterop (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -554,7 +556,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/modal (0.73.3): + - React-Fabric/components/modal (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -573,7 +575,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/rncore (0.73.3): + - React-Fabric/components/rncore (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -592,7 +594,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/root (0.73.3): + - React-Fabric/components/root (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -611,7 +613,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/safeareaview (0.73.3): + - React-Fabric/components/safeareaview (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -630,7 +632,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/scrollview (0.73.3): + - React-Fabric/components/scrollview (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -649,7 +651,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/text (0.73.3): + - React-Fabric/components/text (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -668,7 +670,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/textinput (0.73.3): + - React-Fabric/components/textinput (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -687,7 +689,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/unimplementedview (0.73.3): + - React-Fabric/components/unimplementedview (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -706,7 +708,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/components/view (0.73.3): + - React-Fabric/components/view (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -726,7 +728,7 @@ PODS: - React-utils - ReactCommon/turbomodule/core - Yoga - - React-Fabric/core (0.73.3): + - React-Fabric/core (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -745,7 +747,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/imagemanager (0.73.3): + - React-Fabric/imagemanager (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -764,7 +766,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/leakchecker (0.73.3): + - React-Fabric/leakchecker (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -783,7 +785,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/mounting (0.73.3): + - React-Fabric/mounting (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -802,7 +804,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/scheduler (0.73.3): + - React-Fabric/scheduler (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -821,7 +823,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/telemetry (0.73.3): + - React-Fabric/telemetry (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -840,7 +842,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/templateprocessor (0.73.3): + - React-Fabric/templateprocessor (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -859,7 +861,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/textlayoutmanager (0.73.3): + - React-Fabric/textlayoutmanager (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -879,7 +881,7 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-Fabric/uimanager (0.73.3): + - React-Fabric/uimanager (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog @@ -898,42 +900,42 @@ PODS: - React-runtimescheduler - React-utils - ReactCommon/turbomodule/core - - React-FabricImage (0.73.3): + - React-FabricImage (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) - - RCTRequired (= 0.73.3) - - RCTTypeSafety (= 0.73.3) + - RCTRequired (= 0.73.4) + - RCTTypeSafety (= 0.73.4) - React-Fabric - React-graphics - React-ImageManager - React-jsi - - React-jsiexecutor (= 0.73.3) + - React-jsiexecutor (= 0.73.4) - React-logger - React-rendererdebug - React-utils - ReactCommon - Yoga - - React-graphics (0.73.3): + - React-graphics (0.73.4): - glog - RCT-Folly/Fabric (= 2022.05.16.00) - - React-Core/Default (= 0.73.3) + - React-Core/Default (= 0.73.4) - React-utils - - React-hermes (0.73.3): + - React-hermes (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - RCT-Folly/Futures (= 2022.05.16.00) - - React-cxxreact (= 0.73.3) + - React-cxxreact (= 0.73.4) - React-jsi - - React-jsiexecutor (= 0.73.3) - - React-jsinspector (= 0.73.3) - - React-perflogger (= 0.73.3) - - React-ImageManager (0.73.3): + - React-jsiexecutor (= 0.73.4) + - React-jsinspector (= 0.73.4) + - React-perflogger (= 0.73.4) + - React-ImageManager (0.73.4): - glog - RCT-Folly/Fabric - React-Core/Default @@ -942,31 +944,31 @@ PODS: - React-graphics - React-rendererdebug - React-utils - - React-jserrorhandler (0.73.3): + - React-jserrorhandler (0.73.4): - RCT-Folly/Fabric (= 2022.05.16.00) - React-debug - React-jsi - React-Mapbuffer - - React-jsi (0.73.3): + - React-jsi (0.73.4): - boost (= 1.83.0) - DoubleConversion - fmt (~> 6.2.1) - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-jsiexecutor (0.73.3): + - React-jsiexecutor (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-cxxreact (= 0.73.3) - - React-jsi (= 0.73.3) - - React-perflogger (= 0.73.3) - - React-jsinspector (0.73.3) - - React-logger (0.73.3): + - React-cxxreact (= 0.73.4) + - React-jsi (= 0.73.4) + - React-perflogger (= 0.73.4) + - React-jsinspector (0.73.4) + - React-logger (0.73.4): - glog - - React-Mapbuffer (0.73.3): + - React-Mapbuffer (0.73.4): - glog - React-debug - react-native-blur (4.4.0): @@ -1001,8 +1003,8 @@ PODS: - React-Core - react-native-segmented-control (2.5.0): - React-Core - - React-nativeconfig (0.73.3) - - React-NativeModulesApple (0.73.3): + - React-nativeconfig (0.73.4) + - React-NativeModulesApple (0.73.4): - glog - hermes-engine - React-callinvoker @@ -1012,10 +1014,10 @@ PODS: - React-runtimeexecutor - ReactCommon/turbomodule/bridging - ReactCommon/turbomodule/core - - React-perflogger (0.73.3) - - React-RCTActionSheet (0.73.3): - - React-Core/RCTActionSheetHeaders (= 0.73.3) - - React-RCTAnimation (0.73.3): + - React-perflogger (0.73.4) + - React-RCTActionSheet (0.73.4): + - React-Core/RCTActionSheetHeaders (= 0.73.4) + - React-RCTAnimation (0.73.4): - RCT-Folly (= 2022.05.16.00) - RCTTypeSafety - React-Codegen @@ -1023,7 +1025,7 @@ PODS: - React-jsi - React-NativeModulesApple - ReactCommon - - React-RCTAppDelegate (0.73.3): + - React-RCTAppDelegate (0.73.4): - RCT-Folly - RCTRequired - RCTTypeSafety @@ -1037,7 +1039,7 @@ PODS: - React-RCTNetwork - React-runtimescheduler - ReactCommon - - React-RCTBlob (0.73.3): + - React-RCTBlob (0.73.4): - hermes-engine - RCT-Folly (= 2022.05.16.00) - React-Codegen @@ -1047,7 +1049,7 @@ PODS: - React-NativeModulesApple - React-RCTNetwork - ReactCommon - - React-RCTFabric (0.73.3): + - React-RCTFabric (0.73.4): - glog - hermes-engine - RCT-Folly/Fabric (= 2022.05.16.00) @@ -1065,7 +1067,7 @@ PODS: - React-runtimescheduler - React-utils - Yoga - - React-RCTImage (0.73.3): + - React-RCTImage (0.73.4): - RCT-Folly (= 2022.05.16.00) - RCTTypeSafety - React-Codegen @@ -1074,14 +1076,14 @@ PODS: - React-NativeModulesApple - React-RCTNetwork - ReactCommon - - React-RCTLinking (0.73.3): + - React-RCTLinking (0.73.4): - React-Codegen - - React-Core/RCTLinkingHeaders (= 0.73.3) - - React-jsi (= 0.73.3) + - React-Core/RCTLinkingHeaders (= 0.73.4) + - React-jsi (= 0.73.4) - React-NativeModulesApple - ReactCommon - - ReactCommon/turbomodule/core (= 0.73.3) - - React-RCTNetwork (0.73.3): + - ReactCommon/turbomodule/core (= 0.73.4) + - React-RCTNetwork (0.73.4): - RCT-Folly (= 2022.05.16.00) - RCTTypeSafety - React-Codegen @@ -1089,7 +1091,7 @@ PODS: - React-jsi - React-NativeModulesApple - ReactCommon - - React-RCTSettings (0.73.3): + - React-RCTSettings (0.73.4): - RCT-Folly (= 2022.05.16.00) - RCTTypeSafety - React-Codegen @@ -1097,25 +1099,25 @@ PODS: - React-jsi - React-NativeModulesApple - ReactCommon - - React-RCTText (0.73.3): - - React-Core/RCTTextHeaders (= 0.73.3) + - React-RCTText (0.73.4): + - React-Core/RCTTextHeaders (= 0.73.4) - Yoga - - React-RCTVibration (0.73.3): + - React-RCTVibration (0.73.4): - RCT-Folly (= 2022.05.16.00) - React-Codegen - React-Core/RCTVibrationHeaders - React-jsi - React-NativeModulesApple - ReactCommon - - React-rendererdebug (0.73.3): + - React-rendererdebug (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - RCT-Folly (= 2022.05.16.00) - React-debug - - React-rncore (0.73.3) - - React-runtimeexecutor (0.73.3): - - React-jsi (= 0.73.3) - - React-runtimescheduler (0.73.3): + - React-rncore (0.73.4) + - React-runtimeexecutor (0.73.4): + - React-jsi (= 0.73.4) + - React-runtimescheduler (0.73.4): - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) @@ -1126,61 +1128,62 @@ PODS: - React-rendererdebug - React-runtimeexecutor - React-utils - - React-utils (0.73.3): + - React-utils (0.73.4): - glog - RCT-Folly (= 2022.05.16.00) - React-debug - - ReactCommon (0.73.3): - - React-logger (= 0.73.3) - - ReactCommon/turbomodule (= 0.73.3) - - ReactCommon/turbomodule (0.73.3): + - ReactCommon (0.73.4): + - React-logger (= 0.73.4) + - ReactCommon/turbomodule (= 0.73.4) + - ReactCommon/turbomodule (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-callinvoker (= 0.73.3) - - React-cxxreact (= 0.73.3) - - React-jsi (= 0.73.3) - - React-logger (= 0.73.3) - - React-perflogger (= 0.73.3) - - ReactCommon/turbomodule/bridging (= 0.73.3) - - ReactCommon/turbomodule/core (= 0.73.3) - - ReactCommon/turbomodule/bridging (0.73.3): + - React-callinvoker (= 0.73.4) + - React-cxxreact (= 0.73.4) + - React-jsi (= 0.73.4) + - React-logger (= 0.73.4) + - React-perflogger (= 0.73.4) + - ReactCommon/turbomodule/bridging (= 0.73.4) + - ReactCommon/turbomodule/core (= 0.73.4) + - ReactCommon/turbomodule/bridging (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-callinvoker (= 0.73.3) - - React-cxxreact (= 0.73.3) - - React-jsi (= 0.73.3) - - React-logger (= 0.73.3) - - React-perflogger (= 0.73.3) - - ReactCommon/turbomodule/core (0.73.3): + - React-callinvoker (= 0.73.4) + - React-cxxreact (= 0.73.4) + - React-jsi (= 0.73.4) + - React-logger (= 0.73.4) + - React-perflogger (= 0.73.4) + - ReactCommon/turbomodule/core (0.73.4): - DoubleConversion - fmt (~> 6.2.1) - glog - hermes-engine - RCT-Folly (= 2022.05.16.00) - - React-callinvoker (= 0.73.3) - - React-cxxreact (= 0.73.3) - - React-jsi (= 0.73.3) - - React-logger (= 0.73.3) - - React-perflogger (= 0.73.3) - - ReactNativeIosContextMenu (2.3.0): + - React-callinvoker (= 0.73.4) + - React-cxxreact (= 0.73.4) + - React-jsi (= 0.73.4) + - React-logger (= 0.73.4) + - React-perflogger (= 0.73.4) + - ReactNativeIosContextMenu (2.3.2): - ContextMenuAuxiliaryPreview (~> 0.3) - DGSwiftUtilities - ExpoModulesCore - ReactNativeIosUtilities - - ReactNativeIosUtilities (4.2.3): - - DGSwiftUtilities (~> 0.6) + - ReactNativeIosUtilities (4.3.0): + - ComputableLayout (~> 0.7) + - DGSwiftUtilities (~> 0.12) - ExpoModulesCore - RNCAsyncStorage (1.21.0): - React-Core - RNCClipboard (1.13.2): - React-Core - - RNGestureHandler (2.14.1): + - RNGestureHandler (2.15.0): - glog - RCT-Folly (= 2022.05.16.00) - React-Core @@ -1316,6 +1319,7 @@ DEPENDENCIES: SPEC REPOS: trunk: + - ComputableLayout - ContextMenuAuxiliaryPreview - DGSwiftUtilities - fmt @@ -1518,19 +1522,20 @@ EXTERNAL SOURCES: SPEC CHECKSUMS: boost: d3f49c53809116a5d38da093a8aa78bf551aed09 + ComputableLayout: c50faffac4ed9f8f05b0ce5e6f3a60df1f6042c8 ContextMenuAuxiliaryPreview: afc65e70568ed72d98f9e7c96402c28c38e2edea DGSwiftUtilities: 46adca3abbb5b5fc83a785b7d7aeada4a6e38010 DoubleConversion: fea03f2699887d960129cc54bba7e52542b6f953 EXApplication: 137189a3f149b4e8e546884629392c3efc94cbd3 - EXAV: 09a4d87fa6b113fbb0ada3aade6799f78271cb44 + EXAV: 07e50f934907fa8274dd06fbcd20ee4b9478c619 EXConstants: 988aa430ca0f76b43cd46b66e7fae3287f9cc2fc EXFont: 21b9c760abd593ce8f0d5386b558ced76018506f EXNotifications: e11f0e9a5b657c064a481a5d522f3bc5a07bf7cd - Expo: 49cded7844f2ec4ffb1cc3b86504853f26952935 + Expo: fb745b3074989670b6641f9f20463e8ee56a69ca ExpoCrypto: e2ca148f5c93a0514959df86b34256bb3c50d358 - ExpoFileSystem: 04795dd4d47e76eaf12e38c92091f77d794f9e7f + ExpoFileSystem: a9273932e69a9a1e1a8d01b6ba895bb8294bbea2 ExpoHaptics: 28a771b630353cd6e8dcf1b1e3e693e38ad7c3c3 - ExpoImage: 2b71f20472f293c1fbbf2400795b03d5bf8dd598 + ExpoImage: 390c524542b258f8173f475c1cc71f016444a7be ExpoKeepAwake: 0f5cad99603a3268e50af9a6eb8b76d0d9ac956c ExpoLocalization: f5f5d71dc0c9514d3d77b2771144f6fed6398d04 ExpoModulesCore: 96d1751929ad10622773bb729ab28a8423f0dd0c @@ -1541,11 +1546,11 @@ SPEC CHECKSUMS: ExpoWebBrowser: e31c97230ea93b51a2a74c6c2381b0d4fca5698c EXScreenCapture: 7a491c16de021638078f50281d411e3352bb28c2 EXSplashScreen: 39244885abfb1b12765aae89edb90f8c88db6bbd - FBLazyVector: 70590b4f9e8ae9b0ce076efacea3abd7bc585ace - FBReactNativeSpec: e47ea8c8f044c25e41a4fa5e8b7ff3923d3e0a94 + FBLazyVector: 84f6edbe225f38aebd9deaf1540a4160b1f087d7 + FBReactNativeSpec: d0086a479be91c44ce4687a962956a352d2dc697 fmt: ff9d55029c625d3757ed641535fd4a75fedc7ce9 glog: c5d68082e772fa1c511173d6b30a9de2c05a69a2 - hermes-engine: 5420539d016f368cd27e008f65f777abd6098c56 + hermes-engine: b2669ce35fc4ac14f523b307aff8896799829fe2 libaom: 144606b1da4b5915a1054383c3a4459ccdb3c661 libavif: 84bbb62fb232c3018d6f1bab79beea87e35de7b7 libevent: 4049cae6c81cdb3654a443be001fb9bdceff7913 @@ -1554,26 +1559,26 @@ SPEC CHECKSUMS: MMKV: f902fb6719da13c2ab0965233d8963a59416f911 MMKVCore: d26e4d3edd5cb8588c2569222cbd8be4231374e9 RCT-Folly: 7169b2b1c44399c76a47b5deaaba715eeeb476c0 - RCTRequired: 9b898847f76977a6dfed2a08f4c5ed37add75ec0 - RCTTypeSafety: 0debdc4ba38c8138016d8d8ada4bdf9ec1b8aa82 - React: f8afb04431634ac7e9b876dc96d30af9871f5946 - React-callinvoker: 5ea86c3f93326867aa5114989d229db54d4759d0 - React-Codegen: f8f3172b716f793b334e6603b3b33207c0e813c7 - React-Core: bbac074eba495788a01d1e5455b132872bf86843 - React-CoreModules: 92fee6d8f4095e151b9678e44fcf0dc8eabeae37 - React-cxxreact: e856e0370bf52aea71acce10007ad9ba6a63b66c - React-debug: 23ea1f904cd98ae3b04b2b4982584641d3c7bcb5 - React-Fabric: f692e74b325a408f328d337615a22539315d8a90 - React-FabricImage: 969993a105d5e2a9bfab6945b78b88a2b0d70504 - React-graphics: f95976953fc89d60b1022a4ea3d8281985993fe7 - React-hermes: ac421eebea18bab58a57b70c590b7c11edaac00b - React-ImageManager: d67a26f14b62ff5a0c86c36d5d580940f4f07771 - React-jserrorhandler: 7087c3b3d9691ba72798adf600a4157beeb16fd7 - React-jsi: 57498df51dfb8a37a996f470a457d8797e931eaa - React-jsiexecutor: d83a7d7aea2ffc60dbda0f3d523578a76820f0e1 - React-jsinspector: 6fad0fe14882fb6b1c32e5cc8a4bd3d33a8b6790 - React-logger: cb0dd15ac67b00e7b771ef15203edcb29d4a3f8e - React-Mapbuffer: d59258be3b0d2280c6ba8964ab6e36ec69211871 + RCTRequired: ab7f915c15569f04a49669e573e6e319a53f9faa + RCTTypeSafety: 63b97ced7b766865057e7154db0e81ce4ee6cf1e + React: 1c87497e50fa40ba9c54e5ea5e53483a0f8eecc0 + React-callinvoker: e3a52a9a93e3eb004d7282c26a4fb27003273fe6 + React-Codegen: 50c0f8f073e71b929b057b68bf31be604f1dccc8 + React-Core: d0ecde72894b792cb8922efaa0990199cbe85169 + React-CoreModules: 2ff1684dd517f0c441495d90a704d499f05e9d0a + React-cxxreact: d9be2fac926741052395da0a6d0bab8d71e2f297 + React-debug: 4678e73a37cb501d784e99ff0f219b4940362a3b + React-Fabric: 460ee9d4b8b9de3382504a711430bfead1d5be1e + React-FabricImage: d0a0631bc8ad9143f42bfccf9d3d533a144cc3d6 + React-graphics: f0d5040263a9649e2a70ebe27b3120c49411afef + React-hermes: b9ac2f7b0c1eeb206eb883583cab7a973d570a6e + React-ImageManager: 6c4bf9d5ed363ead7b5aaf820a3feab221b7063e + React-jserrorhandler: 6e7a7e187583e14dc7a0053a2bdd66c252ea3b21 + React-jsi: 380cd24dd81a705dd042c18989fb10b07182210c + React-jsiexecutor: 8ed7a18b9f119440efdcd424c8257dc7e18067e2 + React-jsinspector: 9ac353eccf6ab54d1e0a33862ba91221d1e88460 + React-logger: 0a57b68dd2aec7ff738195f081f0520724b35dab + React-Mapbuffer: 63913773ed7f96b814a2521e13e6d010282096ad react-native-blur: 27113acc008facbc8accae5fb3a78b8424f64cfd react-native-cameraroll: 3301d62d45616ee9da55ceed04be8d788c3de3ef react-native-image-picker: 6c51359eca7a7df9f07e297218c25696eb9da976 @@ -1585,31 +1590,31 @@ SPEC CHECKSUMS: react-native-quick-base64: 777057ea4286f806b00259ede65dc79c7c706320 react-native-safe-area-context: b97eb6f9e3b7f437806c2ce5983f479f8eb5de4b react-native-segmented-control: 712749e75728a736a2b8a7d7dbc8c2a3344b73e8 - React-nativeconfig: 4d3076dc3dc498ec49819e4e4225b55d3507f902 - React-NativeModulesApple: 46f14baf36010b22ffd84fd89d5586e4148edfb3 - React-perflogger: 27ccacf853ba725524ef2b4e444f14e34d0837b0 - React-RCTActionSheet: 77dd6a2a5cfab9e85b7f1add0f7e2e9cd697d936 - React-RCTAnimation: 977a25a4e8007ecc90e556abcceb1b25602eea7c - React-RCTAppDelegate: 252a478047dbc9d0ac0dcda7440b4d3fbb6184a4 - React-RCTBlob: 1e18ab09f57cf3bd2b9681cbeedfca866d971f50 - React-RCTFabric: f09af5b9aac819d8c362ef3030b2d16be426c176 - React-RCTImage: b1eac9526111cf7e37c304f94e81b76a5ae6a984 - React-RCTLinking: d7f7dc665af6442ff38e18e34308da7865347bb1 - React-RCTNetwork: c2c1df3a3c838e9547259e3638f6b290aebb3b72 - React-RCTSettings: f3074b14047a57fa95499c28fb89028a894d3c18 - React-RCTText: 9d48b2bbce5e1ed9c4d9514414dc6d99731d1b0a - React-RCTVibration: 394ea84082b08b5b3c211dc2bc9c0c4c163e7f23 - React-rendererdebug: 3445e5d7d8fa3c66974d779b6a77b41186224b0f - React-rncore: bfb1b25c3e6ce9535708a7ac109c91fed3c8085b - React-runtimeexecutor: 7e71a40def8262ef7d82a1145d873ea61b1a27b5 - React-runtimescheduler: aa382ce525689b88459e1181b3649220f175dc31 - React-utils: b22b4a51aa578b3aac1e7c19501c0b9ba358ed79 - ReactCommon: e708b8be8cb317b83e31c6ccfeda8bf6c0d1a2b3 - ReactNativeIosContextMenu: 5b5d390c21779291e2f5492ed412a2d1ccb7c85b - ReactNativeIosUtilities: 6b8ba94768909b87b5f6e5b3fa7249afae320947 + React-nativeconfig: d7af5bae6da70fa15ce44f045621cf99ed24087c + React-NativeModulesApple: 0123905d5699853ac68519607555a9a4f5c7b3ac + React-perflogger: 8a1e1af5733004bdd91258dcefbde21e0d1faccd + React-RCTActionSheet: 64bbff3a3963664c2d0146f870fe8e0264aee4c4 + React-RCTAnimation: b698168a7269265a4694727196484342d695f0c1 + React-RCTAppDelegate: dcd8e955116eb1d1908dfaf08b4c970812e6a1e6 + React-RCTBlob: 47f8c3b2b4b7fa2c5f19c43f0b7f77f57fb9d953 + React-RCTFabric: 6067a32d683d0c2b84d444548bc15a263c64abed + React-RCTImage: ac0e77a44c290b20db783649b2b9cddc93e3eb99 + React-RCTLinking: e626fd2900913fe5d25922ea1be394b7aafa09c9 + React-RCTNetwork: d3114bce3977dafe8bd06421b29812f5a8527ba0 + React-RCTSettings: a53511f90d8df637a1a11ac729179a4d2f734481 + React-RCTText: f0176f5f5952f9a4a2c7354f5ae71f7c420aaf34 + React-RCTVibration: 8160223c6eda5b187079fec204f80eca8b8f3177 + React-rendererdebug: ed286b4da8648c27d6ed3ae1410d4b21ba890d5a + React-rncore: 43f133b89ac10c4b6ab43702a541dee1c292a3bf + React-runtimeexecutor: e6ab6bb083dbdbdd489cff426ed0bce0652e6edf + React-runtimescheduler: ed48e5faac6751e66ee1261c4bd01643b436f112 + React-utils: 6e5ad394416482ae21831050928ae27348f83487 + ReactCommon: 840a955d37b7f3358554d819446bffcf624b2522 + ReactNativeIosContextMenu: 73e463367694bc32061d58ba243d9dc6f83e0b53 + ReactNativeIosUtilities: ad0bcb8526a3df32ca82930a119eda4916b31a55 RNCAsyncStorage: 618d03a5f52fbccb3d7010076bc54712844c18ef RNCClipboard: 60fed4b71560d7bfe40e9d35dea9762b024da86d - RNGestureHandler: 25b969a1ffc806b9f9ad2e170d4a3b049c6af85e + RNGestureHandler: deda62b8339496ba721a45e0f3e2d7a319932cee RNReanimated: 5589be82dc26b3f94738eb7c6b1f942787532b25 RNScreens: b582cb834dc4133307562e930e8fa914b8c04ef2 RNSentry: eefa12fa65b37dd71f54371720f9fcddcd17be2f @@ -1623,7 +1628,7 @@ SPEC CHECKSUMS: SentryPrivate: 839b1e58addf58624087a80b2628e543193fa8ef SocketRocket: f32cd54efbe0f095c4d7594881e52619cfe80b17 Swime: d7b2c277503b6cea317774aedc2dce05613f8b0b - Yoga: ff0382b894475dba0b4d2a5fda860bfee5a9afad + Yoga: 1b901a6d6eeba4e8a2e8f308f708691cdb5db312 PODFILE CHECKSUM: dd2fd5ce80174d72c1bff9d8dc7f0dc0592a5438 diff --git a/package.json b/package.json index dd0f92129..cf87060ea 100644 --- a/package.json +++ b/package.json @@ -44,14 +44,14 @@ "@tanstack/react-query": "^4.36.1", "axios": "^1.6.7", "diff": "^5.1.0", - "expo": "^50.0.5", + "expo": "^50.0.6", "expo-auth-session": "^5.4.0", - "expo-av": "^13.10.4", + "expo-av": "^13.10.5", "expo-constants": "^15.4.5", "expo-crypto": "^12.8.0", - "expo-file-system": "^16.0.5", + "expo-file-system": "^16.0.6", "expo-haptics": "^12.8.1", - "expo-image": "^1.10.5", + "expo-image": "^1.11.0", "expo-linking": "^6.2.2", "expo-localization": "^14.8.3", "expo-notifications": "^0.27.6", @@ -68,14 +68,14 @@ "lodash": "^4.17.21", "react": "^18.2.0", "react-dom": "^18.2.0", - "react-i18next": "^14.0.2", + "react-i18next": "^14.0.5", "react-intl": "^6.6.2", - "react-native": "^0.73.3", + "react-native": "^0.73.4", "react-native-flash-message": "^0.4.2", - "react-native-gesture-handler": "^2.14.1", + "react-native-gesture-handler": "^2.15.0", "react-native-image-picker": "^7.1.0", - "react-native-ios-context-menu": "^2.3.0", - "react-native-ios-utilities": "^4.2.3", + "react-native-ios-context-menu": "^2.3.2", + "react-native-ios-utilities": "^4.3.0", "react-native-language-detection": "^0.2.2", "react-native-mmkv": "^2.11.0", "react-native-pager-view": "^6.2.3", @@ -96,12 +96,12 @@ "@babel/plugin-proposal-optional-chaining": "^7.21.0", "@babel/preset-typescript": "^7.23.3", "@expo/config": "^8.5.4", - "@react-native/metro-config": "^0.73.4", + "@react-native/metro-config": "^0.73.5", "@react-native/typescript-config": "^0.74.0", "@types/diff": "^5.0.9", "@types/linkify-it": "^3.0.5", "@types/lodash": "^4.14.202", - "@types/react": "^18.2.52", + "@types/react": "^18.2.55", "@types/react-dom": "^18.2.18", "@types/react-native-share-menu": "^5.0.5", "babel-plugin-module-resolver": "^5.0.0", @@ -113,12 +113,9 @@ }, "packageManager": "yarn@4.1.0", "resolutions": { - "expo-av@^13.0.2": "patch:expo-av@npm%3A13.0.2#./.yarn/patches/expo-av-npm-13.0.2-7a651776f1.patch", "react-native-share-menu@^6.0.0": "patch:react-native-share-menu@npm%3A6.0.0#./.yarn/patches/react-native-share-menu-npm-6.0.0-f1094c3204.patch", "@types/react-native-share-menu@^5.0.2": "patch:@types/react-native-share-menu@npm%3A5.0.2#./.yarn/patches/@types-react-native-share-menu-npm-5.0.2-373df17ecc.patch", - "react-native-ios-context-menu@^1.15.1": "patch:react-native-ios-context-menu@npm%3A1.15.1#./.yarn/patches/react-native-ios-context-menu-npm-1.15.1-0034bfa5ba.patch", - "react-native-reanimated-zoom@^0.3.3": "patch:react-native-reanimated-zoom@npm%3A0.3.3#./.yarn/patches/react-native-reanimated-zoom-npm-0.3.3-bbb8d84109.patch", - "react-native@^0.72.0": "patch:react-native@npm%3A0.72.0#./.yarn/patches/react-native-npm-0.72.0-66f5fd62b3.patch", - "@mattermost/react-native-paste-input@^0.6.2": "patch:@mattermost/react-native-paste-input@npm%3A0.6.2#./.yarn/patches/@mattermost-react-native-paste-input-npm-0.6.2-e109419dfb.patch" + "react-native-ios-context-menu@^2.3.2": "patch:react-native-ios-context-menu@npm%3A2.3.2#~/.yarn/patches/react-native-ios-context-menu-npm-2.3.2-9099ed7858.patch", + "react-native-reanimated-zoom@^0.3.3": "patch:react-native-reanimated-zoom@npm%3A0.3.3#./.yarn/patches/react-native-reanimated-zoom-npm-0.3.3-bbb8d84109.patch" } } diff --git a/yarn.lock b/yarn.lock index cf2d0933c..853e8376b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1725,9 +1725,9 @@ __metadata: languageName: node linkType: hard -"@expo/cli@npm:0.17.4": - version: 0.17.4 - resolution: "@expo/cli@npm:0.17.4" +"@expo/cli@npm:0.17.5": + version: 0.17.5 + resolution: "@expo/cli@npm:0.17.5" dependencies: "@babel/runtime": "npm:^7.20.0" "@expo/code-signing-certificates": "npm:0.0.5" @@ -1795,6 +1795,7 @@ __metadata: send: "npm:^0.18.0" slugify: "npm:^1.3.4" source-map-support: "npm:~0.5.21" + stacktrace-parser: "npm:^0.1.10" structured-headers: "npm:^0.4.1" tar: "npm:^6.0.5" temp-dir: "npm:^2.0.0" @@ -1806,7 +1807,7 @@ __metadata: ws: "npm:^8.12.1" bin: expo-internal: build/bin/cli - checksum: 10/5f39ec28c8c7afc78742392353e0b9c2a002caa93bbe6f39ae830f7cb5329d8034f3046da3e18730afe2256ef66594b757a866bcf94f280bbb1ff23c20e53c6d + checksum: 10/0b68ec76920ebab7b7be61fb91a114bd67da0f0cb370eb3cc73620c55207daf667e9916a904bd606cd4f012d9e8b1c690ba7eafa85f4e074a660d9efe20b481c languageName: node linkType: hard @@ -1951,7 +1952,37 @@ __metadata: languageName: node linkType: hard -"@expo/metro-config@npm:0.17.3, @expo/metro-config@npm:~0.17.0": +"@expo/metro-config@npm:0.17.4": + version: 0.17.4 + resolution: "@expo/metro-config@npm:0.17.4" + dependencies: + "@babel/core": "npm:^7.20.0" + "@babel/generator": "npm:^7.20.5" + "@babel/parser": "npm:^7.20.0" + "@babel/types": "npm:^7.20.0" + "@expo/config": "npm:~8.5.0" + "@expo/env": "npm:~0.2.0" + "@expo/json-file": "npm:~8.3.0" + "@expo/spawn-async": "npm:^1.7.2" + babel-preset-fbjs: "npm:^3.4.0" + chalk: "npm:^4.1.0" + debug: "npm:^4.3.2" + find-yarn-workspace-root: "npm:~2.0.0" + fs-extra: "npm:^9.1.0" + getenv: "npm:^1.0.0" + glob: "npm:^7.2.3" + jsc-safe-url: "npm:^0.2.4" + lightningcss: "npm:~1.19.0" + postcss: "npm:~8.4.32" + resolve-from: "npm:^5.0.0" + sucrase: "npm:3.34.0" + peerDependencies: + "@react-native/babel-preset": "*" + checksum: 10/807384d3a55d5df9d982b58a930487f32867af6297167181c576b41a1a2d4d9776fc4737cc3e129318142f594b674801320f4a6230ee15d5c869dc64ee46d7ee + languageName: node + linkType: hard + +"@expo/metro-config@npm:~0.17.0": version: 0.17.3 resolution: "@expo/metro-config@npm:0.17.3" dependencies: @@ -3381,7 +3412,68 @@ __metadata: languageName: node linkType: hard -"@react-native/babel-preset@npm:0.73.20, @react-native/babel-preset@npm:^0.73.18": +"@react-native/babel-plugin-codegen@npm:0.73.4": + version: 0.73.4 + resolution: "@react-native/babel-plugin-codegen@npm:0.73.4" + dependencies: + "@react-native/codegen": "npm:0.73.3" + checksum: 10/b32651c29d694a530390347c06fa09cfbc0189bddb3ccdbe47caa050e2e909ea0e4e32182b1a2c12fb73e9b8f352da9f3c239fb77e6e892c59c297371758f53a + languageName: node + linkType: hard + +"@react-native/babel-preset@npm:0.73.21": + version: 0.73.21 + resolution: "@react-native/babel-preset@npm:0.73.21" + dependencies: + "@babel/core": "npm:^7.20.0" + "@babel/plugin-proposal-async-generator-functions": "npm:^7.0.0" + "@babel/plugin-proposal-class-properties": "npm:^7.18.0" + "@babel/plugin-proposal-export-default-from": "npm:^7.0.0" + "@babel/plugin-proposal-nullish-coalescing-operator": "npm:^7.18.0" + "@babel/plugin-proposal-numeric-separator": "npm:^7.0.0" + "@babel/plugin-proposal-object-rest-spread": "npm:^7.20.0" + "@babel/plugin-proposal-optional-catch-binding": "npm:^7.0.0" + "@babel/plugin-proposal-optional-chaining": "npm:^7.20.0" + "@babel/plugin-syntax-dynamic-import": "npm:^7.8.0" + "@babel/plugin-syntax-export-default-from": "npm:^7.0.0" + "@babel/plugin-syntax-flow": "npm:^7.18.0" + "@babel/plugin-syntax-nullish-coalescing-operator": "npm:^7.0.0" + "@babel/plugin-syntax-optional-chaining": "npm:^7.0.0" + "@babel/plugin-transform-arrow-functions": "npm:^7.0.0" + "@babel/plugin-transform-async-to-generator": "npm:^7.20.0" + "@babel/plugin-transform-block-scoping": "npm:^7.0.0" + "@babel/plugin-transform-classes": "npm:^7.0.0" + "@babel/plugin-transform-computed-properties": "npm:^7.0.0" + "@babel/plugin-transform-destructuring": "npm:^7.20.0" + "@babel/plugin-transform-flow-strip-types": "npm:^7.20.0" + "@babel/plugin-transform-function-name": "npm:^7.0.0" + "@babel/plugin-transform-literals": "npm:^7.0.0" + "@babel/plugin-transform-modules-commonjs": "npm:^7.0.0" + "@babel/plugin-transform-named-capturing-groups-regex": "npm:^7.0.0" + "@babel/plugin-transform-parameters": "npm:^7.0.0" + "@babel/plugin-transform-private-methods": "npm:^7.22.5" + "@babel/plugin-transform-private-property-in-object": "npm:^7.22.11" + "@babel/plugin-transform-react-display-name": "npm:^7.0.0" + "@babel/plugin-transform-react-jsx": "npm:^7.0.0" + "@babel/plugin-transform-react-jsx-self": "npm:^7.0.0" + "@babel/plugin-transform-react-jsx-source": "npm:^7.0.0" + "@babel/plugin-transform-runtime": "npm:^7.0.0" + "@babel/plugin-transform-shorthand-properties": "npm:^7.0.0" + "@babel/plugin-transform-spread": "npm:^7.0.0" + "@babel/plugin-transform-sticky-regex": "npm:^7.0.0" + "@babel/plugin-transform-typescript": "npm:^7.5.0" + "@babel/plugin-transform-unicode-regex": "npm:^7.0.0" + "@babel/template": "npm:^7.0.0" + "@react-native/babel-plugin-codegen": "npm:0.73.4" + babel-plugin-transform-flow-enums: "npm:^0.0.2" + react-refresh: "npm:^0.14.0" + peerDependencies: + "@babel/core": "*" + checksum: 10/93e62bc1cd9cbc0fc86dc8498a03a6eb26aad75540c03752da9cce4ab56a55c4fc03a6542b624b2dc69269ce8209fa0f483d20afa60b64e35f1e1b3536c9c88d + languageName: node + linkType: hard + +"@react-native/babel-preset@npm:^0.73.18": version: 0.73.20 resolution: "@react-native/babel-preset@npm:0.73.20" dependencies: @@ -3450,14 +3542,31 @@ __metadata: languageName: node linkType: hard -"@react-native/community-cli-plugin@npm:0.73.14": - version: 0.73.14 - resolution: "@react-native/community-cli-plugin@npm:0.73.14" +"@react-native/codegen@npm:0.73.3": + version: 0.73.3 + resolution: "@react-native/codegen@npm:0.73.3" + dependencies: + "@babel/parser": "npm:^7.20.0" + flow-parser: "npm:^0.206.0" + glob: "npm:^7.1.1" + invariant: "npm:^2.2.4" + jscodeshift: "npm:^0.14.0" + mkdirp: "npm:^0.5.1" + nullthrows: "npm:^1.1.1" + peerDependencies: + "@babel/preset-env": ^7.1.6 + checksum: 10/3449b50e9cb388f910ceec9321aea1d741dece477d18dffed2b730219071a90d5f5067cf528bcea45e124213d4881198dcd7f712f8c0824294fda8d3c4f24334 + languageName: node + linkType: hard + +"@react-native/community-cli-plugin@npm:0.73.16": + version: 0.73.16 + resolution: "@react-native/community-cli-plugin@npm:0.73.16" dependencies: "@react-native-community/cli-server-api": "npm:12.3.2" "@react-native-community/cli-tools": "npm:12.3.2" "@react-native/dev-middleware": "npm:0.73.7" - "@react-native/metro-babel-transformer": "npm:0.73.14" + "@react-native/metro-babel-transformer": "npm:0.73.15" chalk: "npm:^4.0.0" execa: "npm:^5.1.1" metro: "npm:^0.80.3" @@ -3465,7 +3574,7 @@ __metadata: metro-core: "npm:^0.80.3" node-fetch: "npm:^2.2.0" readline: "npm:^1.3.0" - checksum: 10/c469c67d2a295731aad843c901ab71a4c73c97d1d7061db6a59d158b1b8b64df86309f00264a1ee7483a915610952d63c354899a069590563ed79461a9a9a045 + checksum: 10/0e2ef69b6f475105da5644d74df9fa9de57635e8ac6b87686ca9d66062b387e18732fc6e1d538044ee2563f264fce421bf41a0ea1e76b41c3f26484d085c4569 languageName: node linkType: hard @@ -3508,29 +3617,29 @@ __metadata: languageName: node linkType: hard -"@react-native/metro-babel-transformer@npm:0.73.14": - version: 0.73.14 - resolution: "@react-native/metro-babel-transformer@npm:0.73.14" +"@react-native/metro-babel-transformer@npm:0.73.15": + version: 0.73.15 + resolution: "@react-native/metro-babel-transformer@npm:0.73.15" dependencies: "@babel/core": "npm:^7.20.0" - "@react-native/babel-preset": "npm:0.73.20" + "@react-native/babel-preset": "npm:0.73.21" hermes-parser: "npm:0.15.0" nullthrows: "npm:^1.1.1" peerDependencies: "@babel/core": "*" - checksum: 10/2a843c8ffcbe5aeee349ba00df4602b6f10e5b0b03aadd2d2fbded7f7c6af35f2fcba072b576ecb8bdc44c608c054f23586aa5a8a27ccc5b4cab13a1bb8279f6 + checksum: 10/8d7b448ecf60f4662de2b7b3be31e6b61d03ebcdd1cbe7f84fedf58faa3065622d185ce5f737257f4c512828a101f5a2008101ec43cc60623c049f493e628340 languageName: node linkType: hard -"@react-native/metro-config@npm:^0.73.4": - version: 0.73.4 - resolution: "@react-native/metro-config@npm:0.73.4" +"@react-native/metro-config@npm:^0.73.5": + version: 0.73.5 + resolution: "@react-native/metro-config@npm:0.73.5" dependencies: "@react-native/js-polyfills": "npm:0.73.1" - "@react-native/metro-babel-transformer": "npm:0.73.14" + "@react-native/metro-babel-transformer": "npm:0.73.15" metro-config: "npm:^0.80.3" metro-runtime: "npm:^0.80.3" - checksum: 10/62b3e56a7832de5ce1675b05e3093e8d6f567e85ec9ee37fa891739a3ac42331a69d344b7f56fe9d64192d2f1febafc68b8dc83f3c9bb79c823eb4cdcd539e70 + checksum: 10/ddf5793664a47bbf16d79d2a4ea7f90cecb01206fbe5fc91aadb5e4169159cf24282ab0116799b9271332b7cb6ce9bc1420a57ad65d9cdfe98ac1e3b9a1f75ae languageName: node linkType: hard @@ -4071,7 +4180,7 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:*, @types/react@npm:16 || 17 || 18, @types/react@npm:^18.2.52": +"@types/react@npm:*, @types/react@npm:16 || 17 || 18": version: 18.2.52 resolution: "@types/react@npm:18.2.52" dependencies: @@ -4082,6 +4191,17 @@ __metadata: languageName: node linkType: hard +"@types/react@npm:^18.2.55": + version: 18.2.55 + resolution: "@types/react@npm:18.2.55" + dependencies: + "@types/prop-types": "npm:*" + "@types/scheduler": "npm:*" + csstype: "npm:^3.0.2" + checksum: 10/bf8fe19e73575489e63c0726355f164157cd69e75f2a862436ad2c0586e732cb953a7255a6bc73145e8f9506ee7a723f9a569ca9a39c53984e5b12b84e1c718a + languageName: node + linkType: hard + "@types/scheduler@npm:*": version: 0.16.8 resolution: "@types/scheduler@npm:0.16.8" @@ -5905,12 +6025,12 @@ __metadata: languageName: node linkType: hard -"expo-av@npm:^13.10.4": - version: 13.10.4 - resolution: "expo-av@npm:13.10.4" +"expo-av@npm:^13.10.5": + version: 13.10.5 + resolution: "expo-av@npm:13.10.5" peerDependencies: expo: "*" - checksum: 10/eab03a693b8a56934435862d35d75f4f02db5baca88943d3107c35233d10a5904e76966e4a7285145362f2ab38629d389a311331e7d42b96b8998d0b6c6ce98a + checksum: 10/50513f4a9fcf85224c3991d046cf71b7b2503801c3bef978b3eeec3463953cf38a84e2c5ef5b43f260ebba9ad9fda7e691d3d3ac14cc7eff49f963b3246b24b9 languageName: node linkType: hard @@ -5936,7 +6056,16 @@ __metadata: languageName: node linkType: hard -"expo-file-system@npm:^16.0.5, expo-file-system@npm:~16.0.0, expo-file-system@npm:~16.0.5": +"expo-file-system@npm:^16.0.6, expo-file-system@npm:~16.0.6": + version: 16.0.6 + resolution: "expo-file-system@npm:16.0.6" + peerDependencies: + expo: "*" + checksum: 10/63eb6ecb0f749225217dcd3657d9c38db2e3288b93e8d465fa67e32d0299a47ad78e1b52c06e58bf5b2e1d7de71222f7106d1b5f95b04cdc213eb4fc4af92021 + languageName: node + linkType: hard + +"expo-file-system@npm:~16.0.0": version: 16.0.5 resolution: "expo-file-system@npm:16.0.5" peerDependencies: @@ -5965,14 +6094,14 @@ __metadata: languageName: node linkType: hard -"expo-image@npm:^1.10.5": - version: 1.10.5 - resolution: "expo-image@npm:1.10.5" +"expo-image@npm:^1.11.0": + version: 1.11.0 + resolution: "expo-image@npm:1.11.0" dependencies: "@react-native/assets-registry": "npm:~0.73.1" peerDependencies: expo: "*" - checksum: 10/19890f663e1cf0016cf0223cccfc4aadf820f0ec353d6ec1e4375d4509b4f870aa1ac749e01572df4ea3fafd7c234185d170e0c3f42f52ba1b683f178260058c + checksum: 10/130a9c8c47a1ee3a18231e8ee525007026ac86d62b571deed836651d2d4ce23a47ae6f3199ae83780a2c28de485ffe2de0d90dd6a46e0c1b0013c93467de772e languageName: node linkType: hard @@ -6006,9 +6135,9 @@ __metadata: languageName: node linkType: hard -"expo-modules-autolinking@npm:1.10.2": - version: 1.10.2 - resolution: "expo-modules-autolinking@npm:1.10.2" +"expo-modules-autolinking@npm:1.10.3": + version: 1.10.3 + resolution: "expo-modules-autolinking@npm:1.10.3" dependencies: "@expo/config": "npm:~8.5.0" chalk: "npm:^4.1.0" @@ -6018,7 +6147,7 @@ __metadata: fs-extra: "npm:^9.1.0" bin: expo-modules-autolinking: bin/expo-modules-autolinking.js - checksum: 10/9afe5833d379b3f3e791515342e4906efa6fb68073a0eb79ee516520c3082c0c98ce9efefc95c2cea37fe66ea336a4e66d12b75439b106f72640f1e26c235a76 + checksum: 10/69c10680fa415dc589dad06f837dfab163d936fbfd2f9bdf9264d80b16405fd54ad85495c2d976477c24e8a578cb6f09433d801365beb29d748b2f4eebdb584e languageName: node linkType: hard @@ -6117,28 +6246,28 @@ __metadata: languageName: node linkType: hard -"expo@npm:^50.0.5": - version: 50.0.5 - resolution: "expo@npm:50.0.5" +"expo@npm:^50.0.6": + version: 50.0.6 + resolution: "expo@npm:50.0.6" dependencies: "@babel/runtime": "npm:^7.20.0" - "@expo/cli": "npm:0.17.4" + "@expo/cli": "npm:0.17.5" "@expo/config": "npm:8.5.4" "@expo/config-plugins": "npm:7.8.4" - "@expo/metro-config": "npm:0.17.3" + "@expo/metro-config": "npm:0.17.4" "@expo/vector-icons": "npm:^14.0.0" babel-preset-expo: "npm:~10.0.1" expo-asset: "npm:~9.0.2" - expo-file-system: "npm:~16.0.5" + expo-file-system: "npm:~16.0.6" expo-font: "npm:~11.10.2" expo-keep-awake: "npm:~12.8.2" - expo-modules-autolinking: "npm:1.10.2" + expo-modules-autolinking: "npm:1.10.3" expo-modules-core: "npm:1.11.8" fbemitter: "npm:^3.0.0" whatwg-url-without-unicode: "npm:8.0.0-3" bin: expo: bin/cli - checksum: 10/2f1b10e7e3b67993756b95589f5f1756588f2e9b8e16a05d89d03488f555f97a786a201354e6e5e58cb5662729d0f9c786450d26aff5713caa5287db039db4d9 + checksum: 10/2bc912248418427e637d4f29b2c32712da4e01880672fcaedad70c77e931c6b478201f169f721b0a822507e180d700adb15f66c77853eb5c4f0d285f64a7b44f languageName: node linkType: hard @@ -9430,9 +9559,9 @@ __metadata: languageName: node linkType: hard -"react-i18next@npm:^14.0.2": - version: 14.0.2 - resolution: "react-i18next@npm:14.0.2" +"react-i18next@npm:^14.0.5": + version: 14.0.5 + resolution: "react-i18next@npm:14.0.5" dependencies: "@babel/runtime": "npm:^7.23.9" html-parse-stringify: "npm:^3.0.1" @@ -9444,7 +9573,7 @@ __metadata: optional: true react-native: optional: true - checksum: 10/6b64b4f4fd9407a00fb0f943e243959450872b248b1c5f84d15354ce513b65dd9939697f84aa52109342d67f5ceb67c7f94ab0d6ac0744130748b0be5e2b8262 + checksum: 10/4c91d4b889ab1ab05d7cda050890f7f41c4a73dadfef4778770a53b0d2f98e9d80f04da5086790706349d8a80cf09eec0c539fc1020a7c6fead562511dd2a2cf languageName: node linkType: hard @@ -9516,9 +9645,9 @@ __metadata: languageName: node linkType: hard -"react-native-gesture-handler@npm:^2.14.1": - version: 2.14.1 - resolution: "react-native-gesture-handler@npm:2.14.1" +"react-native-gesture-handler@npm:^2.15.0": + version: 2.15.0 + resolution: "react-native-gesture-handler@npm:2.15.0" dependencies: "@egjs/hammerjs": "npm:^2.0.17" hoist-non-react-statics: "npm:^3.3.0" @@ -9528,7 +9657,7 @@ __metadata: peerDependencies: react: "*" react-native: "*" - checksum: 10/0a86209d515febf6da489c210f8983ded4a8d6e87dc94bca55f8afab657ec096797b21954b7599f6e05e1238634d770b5462266f3f4018363e4eb73496f2147a + checksum: 10/7feafdcfad1d4e066e5f238340b2f615d5abaa2b39c4d224e2eb0ed6563ce0afabcd1dd927f0aa5a0f3a9464f08909eb8d648a46dec3f25d08875ebc90258e14 languageName: node linkType: hard @@ -9542,9 +9671,9 @@ __metadata: languageName: node linkType: hard -"react-native-ios-context-menu@npm:^2.3.0": - version: 2.3.0 - resolution: "react-native-ios-context-menu@npm:2.3.0" +"react-native-ios-context-menu@npm:2.3.2": + version: 2.3.2 + resolution: "react-native-ios-context-menu@npm:2.3.2" dependencies: "@dominicstop/ts-event-emitter": "npm:^1.1.0" peerDependencies: @@ -9552,18 +9681,32 @@ __metadata: react: "*" react-native: "*" react-native-ios-utilities: 4.2.x - checksum: 10/d1bcea1b4e303820bf51e0949c6bbb66c769a40dbedfb0d294976e69e5751e77af55116c5a6a5f292034e0162c1f10e948479b63381c15505b03569fba7eaeaf + checksum: 10/042a1b56f48cd7aea5556edee1fe585597e91654c23f61029dfa8f23b817a52e74859abea3789620f068ec333b19817ec3ba6b7b7c889cd3d620545e0342b2e3 languageName: node linkType: hard -"react-native-ios-utilities@npm:^4.2.3": - version: 4.2.3 - resolution: "react-native-ios-utilities@npm:4.2.3" +"react-native-ios-context-menu@patch:react-native-ios-context-menu@npm%3A2.3.2#~/.yarn/patches/react-native-ios-context-menu-npm-2.3.2-9099ed7858.patch": + version: 2.3.2 + resolution: "react-native-ios-context-menu@patch:react-native-ios-context-menu@npm%3A2.3.2#~/.yarn/patches/react-native-ios-context-menu-npm-2.3.2-9099ed7858.patch::version=2.3.2&hash=c66b7c" + dependencies: + "@dominicstop/ts-event-emitter": "npm:^1.1.0" peerDependencies: expo: "*" react: "*" react-native: "*" - checksum: 10/fa5ee25c26d4df5cbe199bd6188a6c3b633970a06590b672c51836fa5ec1383564157c97e7a89aaaed744601b19fa866f0619ceca34bd98859d7697fcf44d5ba + react-native-ios-utilities: 4.2.x + checksum: 10/29ca3259a1c53b3edd388a3312df6cd350dc9df2fe0a8f113303d8e9acf0e20539818fd65357657e3f18ae063b101360a09643e7548f751837f49999d48170c6 + languageName: node + linkType: hard + +"react-native-ios-utilities@npm:^4.3.0": + version: 4.3.0 + resolution: "react-native-ios-utilities@npm:4.3.0" + peerDependencies: + expo: "*" + react: "*" + react-native: "*" + checksum: 10/17d1749070553b345cf7aff924ae2c8b2b96cf2fb11f6ff92d74efe647369eeb3e5d9dddbf409c86eeebd76714ee420d53a5f51ae599ec7913aba1538321ac02 languageName: node linkType: hard @@ -9737,17 +9880,17 @@ __metadata: languageName: node linkType: hard -"react-native@npm:^0.73.3": - version: 0.73.3 - resolution: "react-native@npm:0.73.3" +"react-native@npm:^0.73.4": + version: 0.73.4 + resolution: "react-native@npm:0.73.4" dependencies: "@jest/create-cache-key-function": "npm:^29.6.3" "@react-native-community/cli": "npm:12.3.2" "@react-native-community/cli-platform-android": "npm:12.3.2" "@react-native-community/cli-platform-ios": "npm:12.3.2" "@react-native/assets-registry": "npm:0.73.1" - "@react-native/codegen": "npm:0.73.2" - "@react-native/community-cli-plugin": "npm:0.73.14" + "@react-native/codegen": "npm:0.73.3" + "@react-native/community-cli-plugin": "npm:0.73.16" "@react-native/gradle-plugin": "npm:0.73.4" "@react-native/js-polyfills": "npm:0.73.1" "@react-native/normalize-colors": "npm:0.73.2" @@ -9783,7 +9926,7 @@ __metadata: react: 18.2.0 bin: react-native: cli.js - checksum: 10/da794a586aded30b76c185a151742dea15a156dc5fdbef2d84ea3629c35d1ac76861e8b4ed7288d408c4f8fcf109f45ee910647ffa8b264320ee491654e3458b + checksum: 10/77196bfccb4e3d45471b35d564662c3c754925b3d0ead9312003e92b1938b9534d0d5a1b2784b013cd3cc6092e5b5fcbae43f50ef2d985a9a5436e73edb5757b languageName: node linkType: hard @@ -11079,7 +11222,7 @@ __metadata: "@react-native-firebase/app": "npm:^18.8.0" "@react-native-menu/menu": "npm:^0.9.1" "@react-native-segmented-control/segmented-control": "npm:^2.5.0" - "@react-native/metro-config": "npm:^0.73.4" + "@react-native/metro-config": "npm:^0.73.5" "@react-native/typescript-config": "npm:^0.74.0" "@react-navigation/bottom-tabs": "npm:^6.5.11" "@react-navigation/native": "npm:^6.1.9" @@ -11091,7 +11234,7 @@ __metadata: "@types/diff": "npm:^5.0.9" "@types/linkify-it": "npm:^3.0.5" "@types/lodash": "npm:^4.14.202" - "@types/react": "npm:^18.2.52" + "@types/react": "npm:^18.2.55" "@types/react-dom": "npm:^18.2.18" "@types/react-native-share-menu": "npm:^5.0.5" axios: "npm:^1.6.7" @@ -11100,14 +11243,14 @@ __metadata: chalk: "npm:^4.1.2" diff: "npm:^5.1.0" dotenv: "npm:^16.4.1" - expo: "npm:^50.0.5" + expo: "npm:^50.0.6" expo-auth-session: "npm:^5.4.0" - expo-av: "npm:^13.10.4" + expo-av: "npm:^13.10.5" expo-constants: "npm:^15.4.5" expo-crypto: "npm:^12.8.0" - expo-file-system: "npm:^16.0.5" + expo-file-system: "npm:^16.0.6" expo-haptics: "npm:^12.8.1" - expo-image: "npm:^1.10.5" + expo-image: "npm:^1.11.0" expo-linking: "npm:^6.2.2" expo-localization: "npm:^14.8.3" expo-notifications: "npm:^0.27.6" @@ -11124,15 +11267,15 @@ __metadata: lodash: "npm:^4.17.21" react: "npm:^18.2.0" react-dom: "npm:^18.2.0" - react-i18next: "npm:^14.0.2" + react-i18next: "npm:^14.0.5" react-intl: "npm:^6.6.2" - react-native: "npm:^0.73.3" + react-native: "npm:^0.73.4" react-native-clean-project: "npm:^4.0.3" react-native-flash-message: "npm:^0.4.2" - react-native-gesture-handler: "npm:^2.14.1" + react-native-gesture-handler: "npm:^2.15.0" react-native-image-picker: "npm:^7.1.0" - react-native-ios-context-menu: "npm:^2.3.0" - react-native-ios-utilities: "npm:^4.2.3" + react-native-ios-context-menu: "npm:^2.3.2" + react-native-ios-utilities: "npm:^4.3.0" react-native-language-detection: "npm:^0.2.2" react-native-mmkv: "npm:^2.11.0" react-native-pager-view: "npm:^6.2.3" From 6f27785a127f1f505bdaf5b0434dc109fd7c5731 Mon Sep 17 00:00:00 2001 From: xmflsct Date: Wed, 7 Feb 2024 00:22:22 +0100 Subject: [PATCH 2/2] Try fixing navigation --- src/components/Header/Left.tsx | 6 +- src/components/Selections.tsx | 6 +- src/screens/Compose/DraftsList.tsx | 12 +- src/screens/Compose/EditAttachment.tsx | 1 - src/screens/Compose/index.tsx | 13 +- src/screens/Tabs/Local/index.tsx | 8 +- src/screens/Tabs/Me/Preferences/Filter.tsx | 8 +- src/screens/Tabs/Me/Profile/index.tsx | 2 +- src/screens/Tabs/Me/index.tsx | 2 +- src/screens/Tabs/Notifications/index.tsx | 2 +- src/screens/Tabs/Public/index.tsx | 2 +- src/screens/Tabs/Shared/Account/index.tsx | 10 +- src/screens/Tabs/Shared/AccountInLists.tsx | 18 +-- src/screens/Tabs/Shared/Attachments.tsx | 31 ----- src/screens/Tabs/Shared/Filter.tsx | 16 +-- src/screens/Tabs/Shared/Hashtag.tsx | 6 +- src/screens/Tabs/Shared/History.tsx | 13 +- src/screens/Tabs/Shared/Mute.tsx | 10 +- src/screens/Tabs/Shared/Report.tsx | 10 +- src/screens/Tabs/Shared/Search/index.tsx | 7 +- src/screens/Tabs/Shared/Toot.tsx | 50 +++----- src/screens/Tabs/Shared/Users.tsx | 11 +- src/screens/Tabs/Shared/index.tsx | 138 ++++++++++++++++++--- 23 files changed, 187 insertions(+), 195 deletions(-) diff --git a/src/components/Header/Left.tsx b/src/components/Header/Left.tsx index 6d33efa73..40a92e081 100644 --- a/src/components/Header/Left.tsx +++ b/src/components/Header/Left.tsx @@ -1,5 +1,6 @@ import Icon, { IconName } from '@components/Icon' import CustomText from '@components/Text' +import { useNavigation } from '@react-navigation/native' import { StyleConstants } from '@utils/styles/constants' import { useTheme } from '@utils/styles/ThemeManager' import React from 'react' @@ -9,7 +10,7 @@ export type Props = { native?: boolean background?: boolean - onPress: () => void + onPress?: () => void } & ({ type?: undefined; content?: IconName } | { type: 'text'; content: string }) const HeaderLeft: React.FC = ({ @@ -19,6 +20,7 @@ const HeaderLeft: React.FC = ({ background = false, onPress }) => { + const navigation = useNavigation() const { colors } = useTheme() const children = () => { @@ -40,7 +42,7 @@ const HeaderLeft: React.FC = ({ return ( navigation.goBack()} children={children()} style={{ flexDirection: 'row', diff --git a/src/components/Selections.tsx b/src/components/Selections.tsx index bbad0a2b1..907984923 100644 --- a/src/components/Selections.tsx +++ b/src/components/Selections.tsx @@ -1,18 +1,18 @@ -import { StyleConstants } from '@utils/styles/constants' import { useTheme } from '@utils/styles/ThemeManager' +import { StyleConstants } from '@utils/styles/constants' import React from 'react' import { Pressable, View } from 'react-native' -import haptics from './haptics' import Icon from './Icon' import { ParseEmojis } from './Parse' import CustomText from './Text' +import haptics from './haptics' export interface Props { title?: string multiple?: boolean options: { selected: boolean; content: string }[] - setOptions: React.Dispatch> + setOptions: React.Dispatch> disabled?: boolean invalid?: boolean } diff --git a/src/screens/Compose/DraftsList.tsx b/src/screens/Compose/DraftsList.tsx index 0d4ea949c..23b3bb0bb 100644 --- a/src/screens/Compose/DraftsList.tsx +++ b/src/screens/Compose/DraftsList.tsx @@ -1,4 +1,3 @@ -import { HeaderLeft } from '@components/Header' import Icon from '@components/Icon' import { SwipeToActions } from '@components/SwipeToActions' import CustomText from '@components/Text' @@ -7,10 +6,10 @@ import { connectMedia } from '@utils/api/helpers/connect' import apiInstance from '@utils/api/instance' import { ScreenComposeStackScreenProps } from '@utils/navigation/navigators' import { getAccountStorage, setAccountStorage, useAccountStorage } from '@utils/storage/actions' -import { StyleConstants } from '@utils/styles/constants' import { useTheme } from '@utils/styles/ThemeManager' +import { StyleConstants } from '@utils/styles/constants' import { Image } from 'expo-image' -import React, { useContext, useEffect, useState } from 'react' +import React, { useContext, useState } from 'react' import { useTranslation } from 'react-i18next' import { Dimensions, Modal, Pressable, View } from 'react-native' import ComposeContext from './utils/createContext' @@ -35,13 +34,6 @@ const ComposeDraftsList: React.FC { - navigation.setOptions({ - title: t('content.draftsList.header.title'), - headerLeft: () => navigation.goBack()} /> - }) - }, []) - const { composeDispatch } = useContext(ComposeContext) const [drafts] = useAccountStorage.object('drafts') const [checkingAttachments, setCheckingAttachments] = useState(false) diff --git a/src/screens/Compose/EditAttachment.tsx b/src/screens/Compose/EditAttachment.tsx index 53fdf4596..2976aeada 100644 --- a/src/screens/Compose/EditAttachment.tsx +++ b/src/screens/Compose/EditAttachment.tsx @@ -38,7 +38,6 @@ const ComposeEditAttachment: React.FC< useEffect(() => { navigation.setOptions({ - title: t('screenCompose:content.editAttachment.header.title'), headerLeft: () => ( > = ({ + }} /> diff --git a/src/screens/Tabs/Local/index.tsx b/src/screens/Tabs/Local/index.tsx index 5c133c940..90e576c78 100644 --- a/src/screens/Tabs/Local/index.tsx +++ b/src/screens/Tabs/Local/index.tsx @@ -4,15 +4,19 @@ import usePopToTop from '@utils/navigation/usePopToTop' import React from 'react' import TabShared from '../Shared' import Root from './Root' +import { HeaderLeft } from '@components/Header' const Stack = createNativeStackNavigator() const TabLocal: React.FC = () => { usePopToTop('Tab-Local-Root') + return ( - + }} + > - {TabShared({ Stack })} + {TabShared(Stack)} ) } diff --git a/src/screens/Tabs/Me/Preferences/Filter.tsx b/src/screens/Tabs/Me/Preferences/Filter.tsx index d01d6ca5b..7b4ac85b5 100644 --- a/src/screens/Tabs/Me/Preferences/Filter.tsx +++ b/src/screens/Tabs/Me/Preferences/Filter.tsx @@ -51,7 +51,7 @@ const TabMePreferencesFilter: React.FC< const titleState = useState(params.type === 'edit' ? params.filter.title : '') const expirations = ['0', '1800', '3600', '43200', '86400', '604800', '18144000'] as const - const [expiration, setExpiration] = useState('0') + const [expiration, setExpiration] = useState<(typeof expirations)[number]>('0') const [contexts, setContexts] = useState< { @@ -226,8 +226,10 @@ const TabMePreferencesFilter: React.FC< cancelButtonIndex: expirations.length, ...androidActionSheetStyles(colors) }, - (selectedIndex: number) => { - selectedIndex < expirations.length && setExpiration(expirations[selectedIndex]) + selectedIndex => { + selectedIndex && + selectedIndex < expirations.length && + setExpiration(expirations[selectedIndex]) } ) } diff --git a/src/screens/Tabs/Me/Profile/index.tsx b/src/screens/Tabs/Me/Profile/index.tsx index b2f336a51..541249d63 100644 --- a/src/screens/Tabs/Me/Profile/index.tsx +++ b/src/screens/Tabs/Me/Profile/index.tsx @@ -12,7 +12,7 @@ import TabMeProfileRoot from './Root' const Stack = createNativeStackNavigator() -const TabMeProfile: React.FC> = ({ navigation }) => { +const TabMeProfile: React.FC> = ({ navigation }) => { const { t } = useTranslation('screenTabs') const messageRef = useRef(null) diff --git a/src/screens/Tabs/Me/index.tsx b/src/screens/Tabs/Me/index.tsx index bd10f7066..4046bbda0 100644 --- a/src/screens/Tabs/Me/index.tsx +++ b/src/screens/Tabs/Me/index.tsx @@ -156,7 +156,7 @@ const TabMe: React.FC = () => { })} /> - {TabShared({ Stack })} + {TabShared(Stack)} ) } diff --git a/src/screens/Tabs/Notifications/index.tsx b/src/screens/Tabs/Notifications/index.tsx index a3b93d090..734775ed7 100644 --- a/src/screens/Tabs/Notifications/index.tsx +++ b/src/screens/Tabs/Notifications/index.tsx @@ -54,7 +54,7 @@ const TabNotifications: React.FC = () => { component={TabNotificationsFilters} options={{ presentation: 'modal', gestureEnabled: false }} /> - {TabShared({ Stack })} + {TabShared(Stack)} ) } diff --git a/src/screens/Tabs/Public/index.tsx b/src/screens/Tabs/Public/index.tsx index 3135b4b54..203ca841d 100644 --- a/src/screens/Tabs/Public/index.tsx +++ b/src/screens/Tabs/Public/index.tsx @@ -12,7 +12,7 @@ const TabPublic: React.FC = () => { return ( - {TabShared({ Stack })} + {TabShared(Stack)} ) } diff --git a/src/screens/Tabs/Shared/Account/index.tsx b/src/screens/Tabs/Shared/Account/index.tsx index ee2f00488..87310348a 100644 --- a/src/screens/Tabs/Shared/Account/index.tsx +++ b/src/screens/Tabs/Shared/Account/index.tsx @@ -1,17 +1,17 @@ -import menuAccount from '@components/contextMenu/account' -import menuShare from '@components/contextMenu/share' -import { HeaderLeft, HeaderRight } from '@components/Header' +import { HeaderRight } from '@components/Header' import Icon from '@components/Icon' import CustomText from '@components/Text' import Timeline from '@components/Timeline' +import menuAccount from '@components/contextMenu/account' +import menuShare from '@components/contextMenu/share' import { TabSharedStackScreenProps } from '@utils/navigation/navigators' import { queryClient } from '@utils/queryHooks' import { useAccountQuery } from '@utils/queryHooks/account' import { useRelationshipQuery } from '@utils/queryHooks/relationship' import { QueryKeyTimeline } from '@utils/queryHooks/timeline' import { useAccountStorage } from '@utils/storage/actions' -import { StyleConstants } from '@utils/styles/constants' import { useTheme } from '@utils/styles/ThemeManager' +import { StyleConstants } from '@utils/styles/constants' import React, { Fragment, useEffect, useMemo } from 'react' import { useTranslation } from 'react-i18next' import { Platform, Pressable, Text, View } from 'react-native' @@ -65,8 +65,6 @@ const TabSharedAccount: React.FC navigation.setOptions({ headerTransparent: true, headerStyle: { backgroundColor: `rgba(255, 255, 255, 0)` }, - title: '', - headerLeft: () => navigation.goBack()} background />, headerRight: () => { return ( diff --git a/src/screens/Tabs/Shared/AccountInLists.tsx b/src/screens/Tabs/Shared/AccountInLists.tsx index 7e93c110a..9da80e11f 100644 --- a/src/screens/Tabs/Shared/AccountInLists.tsx +++ b/src/screens/Tabs/Shared/AccountInLists.tsx @@ -1,6 +1,5 @@ import Button from '@components/Button' import haptics from '@components/haptics' -import { HeaderRight } from '@components/Header' import { MenuRow } from '@components/Menu' import CustomText from '@components/Text' import { TabSharedStackScreenProps } from '@utils/navigation/navigators' @@ -8,14 +7,13 @@ import { useAccountInListsQuery } from '@utils/queryHooks/account' import { useListAccountsMutation, useListsQuery } from '@utils/queryHooks/lists' import { StyleConstants } from '@utils/styles/constants' import { useTheme } from '@utils/styles/ThemeManager' -import React, { useEffect } from 'react' +import React from 'react' import { useTranslation } from 'react-i18next' import { SectionList, View } from 'react-native' const TabSharedAccountInLists: React.FC< TabSharedStackScreenProps<'Tab-Shared-Account-In-Lists'> > = ({ - navigation, route: { params: { account } } @@ -23,20 +21,6 @@ const TabSharedAccountInLists: React.FC< const { colors } = useTheme() const { t } = useTranslation(['common', 'screenTabs']) - useEffect(() => { - navigation.setOptions({ - presentation: 'modal', - title: t('screenTabs:shared.accountInLists.name', { username: account.username }), - headerRight: () => ( - navigation.pop(1)} - /> - ) - }) - }, []) - const listsQuery = useListsQuery() const accountInListsQuery = useAccountInListsQuery({ id: account.id }) diff --git a/src/screens/Tabs/Shared/Attachments.tsx b/src/screens/Tabs/Shared/Attachments.tsx index 6e8ed39be..bfa48c370 100644 --- a/src/screens/Tabs/Shared/Attachments.tsx +++ b/src/screens/Tabs/Shared/Attachments.tsx @@ -1,12 +1,7 @@ -import { HeaderLeft } from '@components/Header' -import { ParseEmojis } from '@components/Parse' -import CustomText from '@components/Text' import Timeline from '@components/Timeline' import { TabSharedStackScreenProps } from '@utils/navigation/navigators' import { QueryKeyTimeline } from '@utils/queryHooks/timeline' -import { useTheme } from '@utils/styles/ThemeManager' import React, { useEffect } from 'react' -import { Trans } from 'react-i18next' const TabSharedAttachments: React.FC> = ({ navigation, @@ -14,33 +9,7 @@ const TabSharedAttachments: React.FC { - const { colors } = useTheme() - useEffect(() => { - navigation.setOptions({ - headerLeft: () => navigation.goBack()} background />, - headerTitle: () => ( - - , - - ]} - /> - - ), - headerBackVisible: false - }) navigation.setParams({ queryKey }) }, []) diff --git a/src/screens/Tabs/Shared/Filter.tsx b/src/screens/Tabs/Shared/Filter.tsx index ab1525912..d97a196d0 100644 --- a/src/screens/Tabs/Shared/Filter.tsx +++ b/src/screens/Tabs/Shared/Filter.tsx @@ -1,6 +1,5 @@ import Button from '@components/Button' import { Filter } from '@components/Filter' -import { HeaderRight } from '@components/Header' import Hr from '@components/Hr' import CustomText from '@components/Text' import { featureCheck } from '@utils/helpers/featureCheck' @@ -8,7 +7,7 @@ import { TabSharedStackScreenProps, useNavState } from '@utils/navigation/naviga import { useFilterMutation, useFiltersQuery } from '@utils/queryHooks/filters' import { StyleConstants } from '@utils/styles/constants' import { useTheme } from '@utils/styles/ThemeManager' -import React, { useEffect } from 'react' +import React from 'react' import { useTranslation } from 'react-i18next' import { SectionList, View } from 'react-native' @@ -24,19 +23,6 @@ const TabSharedFilter: React.FC> const { colors } = useTheme() const { t } = useTranslation(['common', 'screenTabs']) - useEffect(() => { - navigation.setOptions({ - title: t('screenTabs:shared.filter.name'), - headerRight: () => ( - navigation.goBack()} - /> - ) - }) - }, []) - const { data, isFetching, refetch } = useFiltersQuery<'v2'>({ version: 'v2' }) const sections = [ { diff --git a/src/screens/Tabs/Shared/Hashtag.tsx b/src/screens/Tabs/Shared/Hashtag.tsx index 6a1d3f581..f992fe933 100644 --- a/src/screens/Tabs/Shared/Hashtag.tsx +++ b/src/screens/Tabs/Shared/Hashtag.tsx @@ -1,5 +1,5 @@ import menuHashtag from '@components/contextMenu/hashtag' -import { HeaderLeft, HeaderRight } from '@components/Header' +import { HeaderRight } from '@components/Header' import Timeline from '@components/Timeline' import { featureCheck } from '@utils/helpers/featureCheck' import { TabSharedStackScreenProps } from '@utils/navigation/navigators' @@ -20,10 +20,6 @@ const TabSharedHashtag: React.FC const mHashtag = menuHashtag({ tag_name, queryKey }) useEffect(() => { - navigation.setOptions({ - headerLeft: () => navigation.goBack()} />, - title: `#${decodeURIComponent(tag_name)}` - }) navigation.setParams({ queryKey: queryKey }) }, []) diff --git a/src/screens/Tabs/Shared/History.tsx b/src/screens/Tabs/Shared/History.tsx index fdfc47203..99ca0f9cb 100644 --- a/src/screens/Tabs/Shared/History.tsx +++ b/src/screens/Tabs/Shared/History.tsx @@ -1,4 +1,3 @@ -import { HeaderLeft } from '@components/Header' import Icon from '@components/Icon' import { ParseEmojis } from '@components/Parse' import ComponentSeparator from '@components/Separator' @@ -12,8 +11,7 @@ import { useStatusHistory } from '@utils/queryHooks/statusesHistory' import { StyleConstants } from '@utils/styles/constants' import { useTheme } from '@utils/styles/ThemeManager' import { diffChars, diffWords } from 'diff' -import React, { useEffect } from 'react' -import { useTranslation } from 'react-i18next' +import React from 'react' import { FlatList, View } from 'react-native' const SCRIPTS_WITHOUT_BOUNDARIES = [ @@ -136,21 +134,12 @@ const ContentView: React.FC<{ } const TabSharedHistory: React.FC> = ({ - navigation, route: { params: { status, detectedLanguage } } }) => { - const { t } = useTranslation('screenTabs') const { data } = useStatusHistory({ status }) - useEffect(() => { - navigation.setOptions({ - title: t('shared.history.name'), - headerLeft: () => navigation.goBack()} /> - }) - }, []) - const dataReversed = data ? [...data].reverse() : [] const withoutBoundary = !!SCRIPTS_WITHOUT_BOUNDARIES.filter(script => diff --git a/src/screens/Tabs/Shared/Mute.tsx b/src/screens/Tabs/Shared/Mute.tsx index f60c28a47..3c154ad33 100644 --- a/src/screens/Tabs/Shared/Mute.tsx +++ b/src/screens/Tabs/Shared/Mute.tsx @@ -13,7 +13,7 @@ import React, { useEffect, useState } from 'react' import { useTranslation } from 'react-i18next' import { Pressable, View } from 'react-native' -const TabSharedMute: React.FC> = ({ +const TabSharedMute: React.FC> = ({ navigation, route: { params: { account } @@ -47,14 +47,6 @@ const TabSharedMute: React.FC> = useEffect(() => { navigation.setOptions({ - title: t('screenTabs:shared.mute.name', { acct: `@${account.acct}` }), - headerLeft: () => ( - navigation.goBack()} - /> - ), headerRight: () => ( > const [isReporting, setIsReporting] = useState(false) useEffect(() => { navigation.setOptions({ - title: t('screenTabs:shared.report.name', { acct: `@${account.acct}` }), - headerLeft: () => ( - navigation.goBack()} - /> - ), headerRight: () => ( > const [searchTerm, setSearchTerm] = useState('') useEffect(() => { navigation.setOptions({ - headerLeft: () => navigation.goBack()} />, headerTitle: () => { return ( > /> ) - }, - headerBackVisible: false + } }) }, [mode]) useEffect(() => { diff --git a/src/screens/Tabs/Shared/Toot.tsx b/src/screens/Tabs/Shared/Toot.tsx index b2ae75358..154a6da4b 100644 --- a/src/screens/Tabs/Shared/Toot.tsx +++ b/src/screens/Tabs/Shared/Toot.tsx @@ -1,8 +1,6 @@ -import { HeaderLeft } from '@components/Header' -import Icon from '@components/Icon' +import { HeaderRight } from '@components/Header' import { Loading } from '@components/Loading' import ComponentSeparator from '@components/Separator' -import CustomText from '@components/Text' import TimelineDefault from '@components/Timeline/Default' import { useQuery } from '@tanstack/react-query' import apiGeneral from '@utils/api/general' @@ -17,7 +15,7 @@ import { StyleConstants } from '@utils/styles/constants' import { useTheme } from '@utils/styles/ThemeManager' import React, { useEffect, useRef, useState } from 'react' import { useTranslation } from 'react-i18next' -import { Alert, FlatList, Platform, Pressable, View } from 'react-native' +import { Alert, FlatList, Platform, View } from 'react-native' import { Path, Svg } from 'react-native-svg' const TabSharedToot: React.FC> = ({ @@ -38,38 +36,20 @@ const TabSharedToot: React.FC> = ({ const flRef = useRef>(null) useEffect(() => { - navigation.setOptions({ - headerTitle: () => ( - - Alert.alert( - t('screenTabs:shared.toot.remoteFetch.title'), - t('screenTabs:shared.toot.remoteFetch.message') - ) - } - > - {hasRemoteContent ? ( - - ) : null} - ( + + Alert.alert( + t('screenTabs:shared.toot.remoteFetch.title'), + t('screenTabs:shared.toot.remoteFetch.message') + ) + } /> - - ), - headerLeft: () => navigation.goBack()} />, - headerBackVisible: false - }) + ) + }) navigation.setParams({ queryKey: queryKey.local }) }, [hasRemoteContent]) diff --git a/src/screens/Tabs/Shared/Users.tsx b/src/screens/Tabs/Shared/Users.tsx index 13cfcd9b5..c4d62f606 100644 --- a/src/screens/Tabs/Shared/Users.tsx +++ b/src/screens/Tabs/Shared/Users.tsx @@ -1,5 +1,4 @@ import ComponentAccount from '@components/Account' -import { HeaderLeft } from '@components/Header' import Icon from '@components/Icon' import { Loading } from '@components/Loading' import ComponentSeparator from '@components/Separator' @@ -9,7 +8,7 @@ import { QueryKeyUsers, useUsersQuery } from '@utils/queryHooks/users' import { flattenPages } from '@utils/queryHooks/utils' import { StyleConstants } from '@utils/styles/constants' import { useTheme } from '@utils/styles/ThemeManager' -import React, { useEffect } from 'react' +import React from 'react' import { useTranslation } from 'react-i18next' import { View } from 'react-native' import { FlatList } from 'react-native-gesture-handler' @@ -20,14 +19,6 @@ const TabSharedUsers: React.FC> = }) => { const { colors } = useTheme() const { t } = useTranslation('screenTabs') - useEffect(() => { - navigation.setOptions({ - title: t(`shared.users.${params.reference}.${params.type}`, { - count: params.count - } as any) as any, - headerLeft: () => navigation.goBack()} /> - }) - }, []) const queryKey: QueryKeyUsers = ['Users', params] const { data, isFetching, hasNextPage, fetchNextPage, isFetchingNextPage } = useUsersQuery({ diff --git a/src/screens/Tabs/Shared/index.tsx b/src/screens/Tabs/Shared/index.tsx index 770ea13da..33ce91411 100644 --- a/src/screens/Tabs/Shared/index.tsx +++ b/src/screens/Tabs/Shared/index.tsx @@ -1,3 +1,5 @@ +import { HeaderLeft, HeaderRight } from '@components/Header' +import { createNativeStackNavigator } from '@react-navigation/native-stack' import TabSharedAccount from '@screens/Tabs/Shared/Account' import TabSharedAccountInLists from '@screens/Tabs/Shared/AccountInLists' import TabSharedAttachments from '@screens/Tabs/Shared/Attachments' @@ -8,58 +10,166 @@ import TabSharedSearch from '@screens/Tabs/Shared/Search' import TabSharedToot from '@screens/Tabs/Shared/Toot' import TabSharedUsers from '@screens/Tabs/Shared/Users' import React from 'react' +import { Trans, useTranslation } from 'react-i18next' import TabSharedFilter from './Filter' import TabSharedMute from './Mute' +import { + TabLocalStackParamList, + TabMeStackParamList, + TabNotificationsStackParamList, + TabPublicStackParamList +} from '@utils/navigation/navigators' +import CustomText from '@components/Text' +import { ParseEmojis } from '@components/Parse' +import { useTheme } from '@utils/styles/ThemeManager' + +const TabShared = ( + Stack: ReturnType< + typeof createNativeStackNavigator< + | TabLocalStackParamList + | TabPublicStackParamList + | TabNotificationsStackParamList + | TabMeStackParamList + > + > +) => { + const { colors } = useTheme() + const { t } = useTranslation(['common', 'screenTabs']) -const TabShared = ({ Stack }: { Stack: any }) => { return ( + }} /> ({ + presentation: 'modal', + title: t('screenTabs:shared.accountInLists.name', { username: username }), + headerRight: () => ( + navigation.pop(1)} + /> + ) + })} /> ({ + headerTitle: () => ( + + , + + ]} + /> + + ) + })} /> ({ + presentation: 'modal', + title: t('screenTabs:shared.filter.name'), + headerRight: () => ( + navigation.goBack()} + /> + ) + })} /> ({ title: `#${decodeURIComponent(tag_name)}` })} /> ({ + presentation: 'modal', + headerLeft: () => , + title: t('screenTabs:shared.mute.name', { acct: `@${acct}` }) + })} /> ({ + presentation: 'modal', + headerLeft: () => , + title: t('screenTabs:shared.report.name', { acct: `@${account.acct}` }) + })} /> - - + + ({ + title: t(`shared.users.${params.reference}.${params.type}`, { + count: params.count + } as any) as any + })} + /> ) }