Page MenuHomePhabricator
Files F3519763

D14006.id46110.diff
No OneTemporary
Actions

D14006.id46110.diff
View Options

diff --git a/native/chat/chat-input-bar.react.js b/native/chat/chat-input-bar.react.js
--- a/native/chat/chat-input-bar.react.js
+++ b/native/chat/chat-input-bar.react.js
@@ -309,10 +309,12 @@
+currentUserIsVoiced: boolean,
+currentUserCanJoin: boolean,
+threadFrozen: boolean,
-};
-type State = {
+text: string,
+ +setText: (text: string) => void,
+textEdited: boolean,
+ +setTextEdited: (edited: boolean) => void,
+};
+type State = {
+buttonsExpanded: boolean,
+isExitingDuringEditMode: boolean,
};
@@ -339,8 +341,6 @@
constructor(props: Props) {
super(props);
this.state = {
- text: props.draft,
- textEdited: false,
buttonsExpanded: true,
isExitingDuringEditMode: false,
};
@@ -513,10 +513,10 @@
}
}
- componentDidUpdate(prevProps: Props, prevState: State) {
+ componentDidUpdate(prevProps: Props) {
if (
- this.state.textEdited &&
- this.state.text &&
+ this.props.textEdited &&
+ this.props.text &&
this.props.threadInfo.id !== prevProps.threadInfo.id
) {
this.props.dispatch({
@@ -526,8 +526,8 @@
newKey: draftKeyFromThreadID(this.props.threadInfo.id),
},
});
- } else if (!this.state.textEdited && this.props.draft !== prevProps.draft) {
- this.setState({ text: this.props.draft });
+ } else if (!this.props.textEdited && this.props.draft !== prevProps.draft) {
+ this.props.setText(this.props.draft);
}
if (this.props.isActive && !prevProps.isActive) {
this.addEditInputMessageListener();
@@ -535,8 +535,8 @@
this.removeEditInputMessageListener();
}
- const currentText = trimMessage(this.state.text);
- const prevText = trimMessage(prevState.text);
+ const currentText = trimMessage(this.props.text);
+ const prevText = trimMessage(prevProps.text);
if (
(currentText === '' && prevText !== '') ||
@@ -678,7 +678,7 @@
) {
typeaheadTooltip = (
<TypeaheadTooltip
- text={this.state.text}
+ text={this.props.text}
matchedStrings={this.props.typeaheadMatchedStrings}
suggestions={this.props.suggestions}
focusAndUpdateTextAndSelection={this.focusAndUpdateTextAndSelection}
@@ -832,7 +832,7 @@
</AnimatedView>
<SelectableTextInput
allowImagePasteForThreadID={this.props.threadInfo.id}
- value={this.state.text}
+ value={this.props.text}
onChangeText={this.updateText}
selection={this.props.selectionState.selection}
onUpdateSyncedSelectionData={this.props.setSelectionState}
@@ -850,7 +850,7 @@
onPress={this.onSend}
activeOpacity={0.4}
style={this.props.styles.sendButton}
- disabled={trimMessage(this.state.text) === ''}
+ disabled={trimMessage(this.props.text) === ''}
>
<Icon
name="md-send"
@@ -883,7 +883,8 @@
if (this.state.isExitingDuringEditMode) {
return;
}
- this.setState({ text, textEdited: true });
+ this.props.setText(text);
+ this.props.setTextEdited(true);
this.props.messageEditingContext?.setEditedMessageChanged(
this.isMessageEdited(text),
);
@@ -905,10 +906,8 @@
focusAndUpdateTextAndSelection = (text: string, selection: Selection) => {
this.selectableTextInput?.prepareForSelectionMutation(text, selection);
- this.setState({
- text,
- textEdited: true,
- });
+ this.props.setText(text);
+ this.props.setTextEdited(true);
this.props.setSelectionState({ text, selection });
this.saveDraft(text);
@@ -917,7 +916,7 @@
focusAndUpdateText = (params: EditInputBarMessageParameters) => {
const { message: text, mode } = params;
- const currentText = this.state.text;
+ const currentText = this.props.text;
if (mode === 'replace') {
this.updateText(text);
} else if (!currentText.startsWith(text)) {
@@ -940,13 +939,13 @@
};
onSend = async () => {
- if (!trimMessage(this.state.text)) {
+ if (!trimMessage(this.props.text)) {
return;
}
const editedMessage = this.getEditedMessage();
if (editedMessage && editedMessage.id) {
- await this.editMessage(editedMessage.id, this.state.text);
+ await this.editMessage(editedMessage.id, this.props.text);
return;
}
@@ -993,7 +992,7 @@
};
isMessageEdited = (newText?: string): boolean => {
- let text = newText ?? this.state.text;
+ let text = newText ?? this.props.text;
text = trimMessage(text);
const originalText = this.props.editedMessageInfo?.text;
return text !== originalText;
@@ -1102,10 +1101,8 @@
if (!this.isEditMode()) {
return;
}
- this.setState(
- { text: this.props.draft, isExitingDuringEditMode: true },
- this.exitEditMode,
- );
+ this.props.setText(this.props.draft);
+ this.setState({ isExitingDuringEditMode: true }, this.exitEditMode);
};
onNavigationBeforeRemove = (e: {
@@ -1304,6 +1301,9 @@
selection: { start: 0, end: 0 },
});
+ const [text, setText] = React.useState(draft);
+ const [textEdited, setTextEdited] = React.useState(false);
+
const typeaheadRegexMatches = React.useMemo(
() =>
getTypeaheadRegexMatches(
@@ -1386,6 +1386,10 @@
currentUserIsVoiced={currentUserIsVoiced}
currentUserCanJoin={currentUserCanJoin}
threadFrozen={threadFrozen}
+ text={text}
+ setText={setText}
+ textEdited={textEdited}
+ setTextEdited={setTextEdited}
/>
);
}

File Metadata

Mime Type
text/plain
Expires
Mon, Dec 23, 10:59 PM (19 h, 10 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2697048
Default Alt Text
D14006.id46110.diff (5 KB)

Event Timeline