Page MenuHomePhabricator
Files F3299531

D13338.id44189.diff
No OneTemporary
Actions

D13338.id44189.diff
View Options

diff --git a/web/chat/chat-input-bar.react.js b/web/chat/chat-input-bar.react.js
--- a/web/chat/chat-input-bar.react.js
+++ b/web/chat/chat-input-bar.react.js
@@ -85,6 +85,7 @@
+currentUserIsVoiced: boolean,
+currentUserCanJoinThread: boolean,
+threadFrozen: boolean,
+ +cancelPendingUpload: (uploadID: string) => void,
};
class ChatInputBar extends React.PureComponent<Props> {
@@ -240,7 +241,7 @@
);
}
- const { pendingUploads, cancelPendingUpload } = this.props.inputState;
+ const { pendingUploads } = this.props.inputState;
const multimediaPreviews = pendingUploads.map(pendingUpload => {
const { uri, mediaType, thumbHash, dimensions } = pendingUpload;
let mediaSource = { thumbHash, dimensions };
@@ -270,7 +271,7 @@
<Multimedia
mediaSource={mediaSource}
pendingUpload={pendingUpload}
- remove={cancelPendingUpload}
+ remove={this.props.cancelPendingUpload}
multimediaCSSClass={css.multimedia}
multimediaImageCSSClass={css.multimediaImage}
key={pendingUpload.localID}
@@ -684,6 +685,13 @@
[suggestedUsers, suggestedChats],
);
+ const cancelPendingUpload = React.useCallback(
+ (uploadID: string) => {
+ props.inputState.cancelPendingUpload(props.threadInfo, uploadID);
+ },
+ [props.inputState, props.threadInfo],
+ );
+
return (
<ChatInputBar
{...props}
@@ -701,6 +709,7 @@
currentUserIsVoiced={currentUserIsVoiced}
currentUserCanJoinThread={currentUserCanJoinThread}
threadFrozen={threadFrozen}
+ cancelPendingUpload={cancelPendingUpload}
/>
);
});
diff --git a/web/input/input-state-container.react.js b/web/input/input-state-container.react.js
--- a/web/input/input-state-container.react.js
+++ b/web/input/input-state-container.react.js
@@ -43,10 +43,7 @@
import { useNewThickThread } from 'lib/hooks/thread-hooks.js';
import { useLegacyAshoatKeyserverCall } from 'lib/keyserver-conn/legacy-keyserver-call.js';
import { getNextLocalUploadID } from 'lib/media/media-utils.js';
-import {
- threadInfoSelector,
- pendingToRealizedThreadIDsSelector,
-} from 'lib/selectors/thread-selectors.js';
+import { pendingToRealizedThreadIDsSelector } from 'lib/selectors/thread-selectors.js';
import {
dmOperationSpecificationTypes,
type OutboundDMOperationSpecification,
@@ -145,7 +142,7 @@
};
type Props = {
...BaseProps,
- +activeChatThreadInfo: ?ThreadInfo,
+ +activeChatThreadID: ?string,
+drafts: { +[key: string]: string },
+viewerID: ?string,
+messageStoreMessages: { +[id: string]: RawMessageInfo },
@@ -616,21 +613,17 @@
return threadCreationPromise;
}
- inputBaseStateSelector: (?ThreadInfo) => PropsAndState => BaseInputState =
- _memoize((activeThreadInfo: ?ThreadInfo) =>
+ inputBaseStateSelector: (?string) => PropsAndState => BaseInputState =
+ _memoize(threadID =>
createSelector(
(propsAndState: PropsAndState) =>
- activeThreadInfo
- ? propsAndState.pendingUploads[activeThreadInfo.id]
- : null,
+ threadID ? propsAndState.pendingUploads[threadID] : null,
(propsAndState: PropsAndState) =>
- activeThreadInfo
- ? propsAndState.drafts[draftKeyFromThreadID(activeThreadInfo.id)]
+ threadID
+ ? propsAndState.drafts[draftKeyFromThreadID(threadID)]
: null,
(propsAndState: PropsAndState) =>
- activeThreadInfo
- ? propsAndState.textCursorPositions[activeThreadInfo.id]
- : null,
+ threadID ? propsAndState.textCursorPositions[threadID] : null,
(
pendingUploads: ?{ [localUploadID: string]: PendingMultimediaUpload },
draft: ?string,
@@ -655,7 +648,6 @@
];
}
}
- const threadID = activeThreadInfo?.id;
return ({
pendingUploads: threadPendingUploads,
assignedUploads,
@@ -665,8 +657,10 @@
threadInfo: ThreadInfo,
files: $ReadOnlyArray<File>,
) => this.appendFiles(threadInfo, files),
- cancelPendingUpload: (localUploadID: string) =>
- this.cancelPendingUpload(activeThreadInfo, localUploadID),
+ cancelPendingUpload: (
+ threadInfo: ThreadInfo,
+ localUploadID: string,
+ ) => this.cancelPendingUpload(threadInfo, localUploadID),
sendTextMessage: (
messageInfo: RawTextMessageInfo,
threadInfo: ThreadInfo,
@@ -1219,14 +1213,11 @@
this.props.dispatch({ type: queueReportsActionType, payload: { reports } });
}
- cancelPendingUpload(threadInfo: ?ThreadInfo, localUploadID: string) {
- invariant(threadInfo, 'threadID should be set in cancelPendingUpload');
-
+ cancelPendingUpload(threadInfo: ThreadInfo, localUploadID: string) {
let revokeURL: ?string, abortRequest: ?() => void;
this.setState(
prevState => {
- const threadID = threadInfo.id;
- const newThreadID = this.getRealizedOrPendingThreadID(threadID);
+ const newThreadID = this.getRealizedOrPendingThreadID(threadInfo.id);
const currentPendingUploads = prevState.pendingUploads[newThreadID];
if (!currentPendingUploads) {
return {};
@@ -1246,7 +1237,7 @@
if (!threadTypeIsThick(threadInfo.type)) {
void this.props.deleteUpload({
id: serverID,
- keyserverOrThreadID: threadID,
+ keyserverOrThreadID: threadInfo.id,
});
}
if (isBlobServiceURI(pendingUpload.uri)) {
@@ -1696,11 +1687,11 @@
};
render(): React.Node {
- const { activeChatThreadInfo } = this.props;
+ const { activeChatThreadID } = this.props;
// we're going with two selectors as we want to avoid
// recreation of chat state setter functions on typeahead state updates
- const inputBaseState = this.inputBaseStateSelector(activeChatThreadInfo)({
+ const inputBaseState = this.inputBaseStateSelector(activeChatThreadID)({
...this.state,
...this.props,
});
@@ -1728,9 +1719,6 @@
const activeChatThreadID = useSelector(
state => state.navInfo.activeChatThreadID,
);
- const activeChatThreadInfo = useSelector(state =>
- activeChatThreadID ? threadInfoSelector(state)[activeChatThreadID] : null,
- );
const drafts = useSelector(state => state.draftStore.drafts);
const viewerID = useSelector(
state => state.currentUserInfo && state.currentUserInfo.id,
@@ -1775,7 +1763,7 @@
return (
<InputStateContainer
{...props}
- activeChatThreadInfo={activeChatThreadInfo}
+ activeChatThreadID={activeChatThreadID}
drafts={drafts}
viewerID={viewerID}
messageStoreMessages={messageStoreMessages}
diff --git a/web/input/input-state.js b/web/input/input-state.js
--- a/web/input/input-state.js
+++ b/web/input/input-state.js
@@ -66,7 +66,7 @@
threadInfo: ThreadInfo,
files: $ReadOnlyArray<File>,
) => Promise<boolean>,
- +cancelPendingUpload: (localUploadID: string) => void,
+ +cancelPendingUpload: (threadInfo: ThreadInfo, localUploadID: string) => void,
+sendTextMessage: (
messageInfo: RawTextMessageInfo,
threadInfo: ThreadInfo,

File Metadata

Mime Type
text/plain
Expires
Mon, Nov 18, 1:05 PM (20 h, 39 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2534970
Default Alt Text
D13338.id44189.diff (7 KB)

Event Timeline