-
Notifications
You must be signed in to change notification settings - Fork 833
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
4 changed files
with
214 additions
and
94 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
diff --git a/node_modules/expo/android/build.gradle b/node_modules/expo/android/build.gradle | ||
index f8995f0..a60c4e1 100644 | ||
--- a/node_modules/expo/android/build.gradle | ||
+++ b/node_modules/expo/android/build.gradle | ||
@@ -33,7 +33,7 @@ def getRNVersion() { | ||
ensureDependeciesWereEvaluated(project) | ||
|
||
group = 'host.exp.exponent' | ||
-version = '48.0.10' | ||
+version = '48.0.9' | ||
|
||
buildscript { | ||
def expoModulesCorePlugin = new File(project(":expo-modules-core").projectDir.absolutePath, "ExpoModulesCorePlugin.gradle") | ||
@@ -104,7 +104,7 @@ android { | ||
minSdkVersion safeExtGet("minSdkVersion", 21) | ||
targetSdkVersion safeExtGet("targetSdkVersion", 33) | ||
versionCode 1 | ||
- versionName "48.0.10" | ||
+ versionName "48.0.9" | ||
consumerProguardFiles("proguard-rules.pro") | ||
} | ||
lintOptions { | ||
diff --git a/node_modules/expo/build/environment/getInstallationIdAsync.js b/node_modules/expo/build/environment/getInstallationIdAsync.js | ||
index 75366e4..5c83839 100644 | ||
--- a/node_modules/expo/build/environment/getInstallationIdAsync.js | ||
+++ b/node_modules/expo/build/environment/getInstallationIdAsync.js | ||
@@ -1,5 +1,5 @@ | ||
import * as Application from 'expo-application'; | ||
-import uuidv5 from 'uuid/v5'; | ||
+import { v5 as uuidv5 } from 'uuid'; | ||
let installationId; | ||
const UUID_NAMESPACE = '29cc8a0d-747c-5f85-9ff9-f2f16636d963'; // uuidv5(0, "expo") | ||
export default async function getInstallationIdAsync() { | ||
diff --git a/node_modules/expo/bundledNativeModules.json b/node_modules/expo/bundledNativeModules.json | ||
index 783f93d..6e064e4 100644 | ||
--- a/node_modules/expo/bundledNativeModules.json | ||
+++ b/node_modules/expo/bundledNativeModules.json | ||
@@ -33,7 +33,7 @@ | ||
"expo-crypto": "~12.2.1", | ||
"expo-dev-client": "~2.1.6", | ||
"expo-device": "~5.2.1", | ||
- "expo-document-picker": "~11.2.2", | ||
+ "expo-document-picker": "~11.2.1", | ||
"expo-face-detector": "~12.1.1", | ||
"expo-file-system": "~15.2.2", | ||
"expo-font": "~11.1.1", | ||
@@ -76,13 +76,13 @@ | ||
"expo-system-ui": "~2.2.1", | ||
"expo-task-manager": "~11.1.1", | ||
"expo-tracking-transparency": "~3.0.3", | ||
- "expo-updates": "~0.16.4", | ||
+ "expo-updates": "~0.16.3", | ||
"expo-video-thumbnails": "~7.2.1", | ||
"expo-web-browser": "~12.1.1", | ||
"lottie-react-native": "5.1.4", | ||
"react": "18.2.0", | ||
"react-dom": "18.2.0", | ||
- "react-native": "0.71.6", | ||
+ "react-native": "0.71.4", | ||
"react-native-web": "~0.18.10", | ||
"react-native-branch": "^5.4.0", | ||
"react-native-gesture-handler": "~2.9.0", |
67 changes: 67 additions & 0 deletions
67
packages/app-mobile/patches/react-native-gifted-chat+2.0.1.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,67 @@ | ||
diff --git a/node_modules/react-native-gifted-chat/lib/GiftedChat.js b/node_modules/react-native-gifted-chat/lib/GiftedChat.js | ||
index a91d004..54fd541 100644 | ||
--- a/node_modules/react-native-gifted-chat/lib/GiftedChat.js | ||
+++ b/node_modules/react-native-gifted-chat/lib/GiftedChat.js | ||
@@ -44,6 +44,7 @@ class GiftedChat extends React.Component { | ||
typingDisabled: false, | ||
text: undefined, | ||
messages: undefined, | ||
+ contextValues: {} | ||
}; | ||
this.getLocale = () => this._locale; | ||
this.onKeyboardWillShow = (e) => { | ||
@@ -193,6 +194,11 @@ class GiftedChat extends React.Component { | ||
this.initLocale(); | ||
this.setMessages(messages || []); | ||
this.setTextFromProp(text); | ||
+ this.setState({contextValues: { | ||
+ actionSheet: this.props.actionSheet || | ||
+ (() => { var _a; return (_a = this._actionSheetRef.current) === null || _a === void 0 ? void 0 : _a.getContext(); }), | ||
+ getLocale: this.getLocale, | ||
+ }}); | ||
} | ||
componentWillUnmount() { | ||
this.setIsMounted(false); | ||
@@ -416,13 +422,7 @@ class GiftedChat extends React.Component { | ||
} | ||
render() { | ||
if (this.state.isInitialized === true) { | ||
- const actionSheet = this.props.actionSheet || | ||
- (() => { var _a; return (_a = this._actionSheetRef.current) === null || _a === void 0 ? void 0 : _a.getContext(); }); | ||
- const { getLocale } = this; | ||
- return (<GiftedChatContext.Provider value={{ | ||
- actionSheet, | ||
- getLocale, | ||
- }}> | ||
+ return (<GiftedChatContext.Provider value={this.state.contextValues}> | ||
<View testID={TEST_ID.WRAPPER} style={styles.wrapper}> | ||
<ActionSheetProvider ref={this._actionSheetRef}> | ||
<View style={styles.container} onLayout={this.onMainViewLayout}> | ||
diff --git a/node_modules/react-native-gifted-chat/lib/MessageContainer.js b/node_modules/react-native-gifted-chat/lib/MessageContainer.js | ||
index 6bdf6da..7256f5a 100644 | ||
--- a/node_modules/react-native-gifted-chat/lib/MessageContainer.js | ||
+++ b/node_modules/react-native-gifted-chat/lib/MessageContainer.js | ||
@@ -54,6 +54,7 @@ export default class MessageContainer extends React.PureComponent { | ||
showScrollBottom: false, | ||
hasScrolled: false, | ||
}; | ||
+ this._extraData = [undefined, undefined] | ||
this.renderTypingIndicator = () => { | ||
if (Platform.OS === 'web') { | ||
return null; | ||
@@ -191,8 +192,14 @@ export default class MessageContainer extends React.PureComponent { | ||
} | ||
render() { | ||
const { inverted } = this.props; | ||
+ if ( | ||
+ this._extraData[0] !== this.props.extraData || | ||
+ this._extraData[1] !== this.props.isTyping | ||
+ ) { | ||
+ this._extraData = [this.props.extraData, this.props.isTyping] | ||
+ } | ||
return (<View style={this.props.alignTop ? styles.containerAlignTop : styles.container}> | ||
- <FlatList ref={this.props.forwardRef} extraData={[this.props.extraData, this.props.isTyping]} keyExtractor={this.keyExtractor} enableEmptySections automaticallyAdjustContentInsets={false} inverted={inverted} data={this.props.messages} style={styles.listStyle} contentContainerStyle={styles.contentContainerStyle} renderItem={this.renderRow} {...this.props.invertibleScrollViewProps} ListEmptyComponent={this.renderChatEmpty} ListFooterComponent={inverted ? this.renderHeaderWrapper : this.renderFooter} ListHeaderComponent={inverted ? this.renderFooter : this.renderHeaderWrapper} onScroll={this.handleOnScroll} scrollEventThrottle={100} onLayout={this.onLayoutList} onEndReached={this.onEndReached} onEndReachedThreshold={0.1} {...this.props.listViewProps}/> | ||
+ <FlatList ref={this.props.forwardRef} extraData={this._extraData} keyExtractor={this.keyExtractor} enableEmptySections automaticallyAdjustContentInsets={false} inverted={inverted} data={this.props.messages} style={styles.listStyle} contentContainerStyle={styles.contentContainerStyle} renderItem={this.renderRow} {...this.props.invertibleScrollViewProps} ListEmptyComponent={this.renderChatEmpty} ListFooterComponent={inverted ? this.renderHeaderWrapper : this.renderFooter} ListHeaderComponent={inverted ? this.renderFooter : this.renderHeaderWrapper} onScroll={this.handleOnScroll} scrollEventThrottle={100} onLayout={this.onLayoutList} onEndReached={this.onEndReached} onEndReachedThreshold={0.1} {...this.props.listViewProps}/> | ||
{this.state.showScrollBottom && this.props.scrollToBottom | ||
? this.renderScrollToBottomWrapper() | ||
: null} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
9cdb560
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Successfully deployed to the following URLs:
backpack – ./
backpack-200ms.vercel.app
backpack-git-master-200ms.vercel.app
www.backpack.app
backpack.app
devnet.backpack.app