Page MenuHomePhorge
Files F32222863

D4940.1765205679.diff
No OneTemporary
Actions

Size
5 KB
Referenced Files
None
Subscribers
None

D4940.1765205679.diff
View Options

diff --git a/web/chat/chat-message-list-container.react.js b/web/chat/chat-message-list-container.react.js
--- a/web/chat/chat-message-list-container.react.js
+++ b/web/chat/chat-message-list-container.react.js
@@ -22,6 +22,7 @@
import { InputStateContext } from '../input/input-state';
import { updateNavInfoActionType } from '../redux/action-types';
import { useSelector } from '../redux/redux-utils';
+import { newThreadID } from '../selectors/nav-selectors';
import ChatInputBar from './chat-input-bar.react';
import css from './chat-message-list-container.css';
import ChatMessageList from './chat-message-list.react';
@@ -53,7 +54,6 @@
}),
);
- const newThreadID = 'pending/new_thread';
const pendingNewThread = React.useMemo(
() => ({
...createPendingThread({
diff --git a/web/chat/chat-thread-composer.react.js b/web/chat/chat-thread-composer.react.js
--- a/web/chat/chat-thread-composer.react.js
+++ b/web/chat/chat-thread-composer.react.js
@@ -5,6 +5,7 @@
import { userSearchIndexForPotentialMembers } from 'lib/selectors/user-selectors';
import { getPotentialMemberItems } from 'lib/shared/search-utils';
+import { threadIsPending } from 'lib/shared/thread-utils';
import type { AccountUserInfo, UserListItem } from 'lib/types/user-types';
import Label from '../components/label.react';
@@ -22,6 +23,8 @@
+inputState: InputState,
};
+type ActiveThreadBehaviour = 'renew-active-thread' | 'keep-active-thread';
+
function ChatThreadComposer(props: Props): React.Node {
const { userInfoInputArray, otherUserInfos, threadID, inputState } = props;
@@ -105,15 +108,26 @@
usernameInputText,
]);
- const hideSearch = React.useCallback(() => {
- dispatch({
- type: updateNavInfoActionType,
- payload: {
- chatMode: 'view',
- activeChatThreadID: threadID,
- },
- });
- }, [dispatch, threadID]);
+ const hideSearch = React.useCallback(
+ (threadBehaviour: ActiveThreadBehaviour = 'keep-active-thread') => {
+ dispatch({
+ type: updateNavInfoActionType,
+ payload: {
+ chatMode: 'view',
+ activeChatThreadID:
+ threadBehaviour === 'keep-active-thread' ||
+ !threadIsPending(threadID)
+ ? threadID
+ : '',
+ },
+ });
+ },
+ [dispatch, threadID],
+ );
+
+ const onCloseSearch = React.useCallback(() => {
+ hideSearch('renew-active-thread');
+ }, [hideSearch]);
const tagsList = React.useMemo(() => {
if (!userInfoInputArray?.length) {
@@ -155,7 +169,7 @@
placeholder="Select users for chat"
/>
</div>
- <div className={css.closeSearch} onClick={hideSearch}>
+ <div className={css.closeSearch} onClick={onCloseSearch}>
<SWMansionIcon size={25} icon="cross" />
</div>
</div>
diff --git a/web/chat/chat-thread-list-item.react.js b/web/chat/chat-thread-list-item.react.js
--- a/web/chat/chat-thread-list-item.react.js
+++ b/web/chat/chat-thread-list-item.react.js
@@ -33,6 +33,11 @@
const { id: threadID, currentUser } = threadInfo;
const ancestorThreads = useAncestorThreads(threadInfo);
+
+ const isCreateMode = useSelector(
+ state => state.navInfo.chatMode === 'create',
+ );
+
const onClick = useOnClickThread(item.threadInfo);
const timeZone = useSelector(state => state.timeZone);
@@ -130,7 +135,10 @@
return (
<>
- <div className={containerClassName} onClick={onClick}>
+ <div
+ className={containerClassName}
+ onClick={isCreateMode && active ? null : onClick}
+ >
<div className={css.colorContainer}>
<div className={css.colorSplotchContainer}>
<div className={css.dotContainer}>{unreadDot}</div>
diff --git a/web/selectors/nav-selectors.js b/web/selectors/nav-selectors.js
--- a/web/selectors/nav-selectors.js
+++ b/web/selectors/nav-selectors.js
@@ -128,6 +128,8 @@
},
);
+const newThreadID = 'pending/new_thread';
+
function useOnClickThread(
thread: ?ThreadInfo,
): (event: SyntheticEvent<HTMLElement>) => void {
@@ -140,24 +142,22 @@
);
event.preventDefault();
const { id: threadID } = thread;
+
+ let payload;
if (threadID.includes('pending')) {
- dispatch({
- type: updateNavInfoActionType,
- payload: {
- chatMode: 'view',
- activeChatThreadID: threadID,
- pendingThread: thread,
- },
- });
+ payload = {
+ chatMode: 'view',
+ activeChatThreadID: threadID,
+ pendingThread: thread,
+ };
} else {
- dispatch({
- type: updateNavInfoActionType,
- payload: {
- chatMode: 'view',
- activeChatThreadID: threadID,
- },
- });
+ payload = {
+ chatMode: 'view',
+ activeChatThreadID: threadID,
+ };
}
+
+ dispatch({ type: updateNavInfoActionType, payload });
},
[dispatch, thread],
);
@@ -236,6 +236,7 @@
useThreadIsActive,
useOnClickPendingSidebar,
useOnClickNewThread,
+ newThreadID,
navTabSelector,
navSettingsSectionSelector,
};

File Metadata

Mime Type
text/plain
Expires
Mon, Dec 8, 2:54 PM (5 h, 51 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5848758
Default Alt Text
D4940.1765205679.diff (5 KB)

Event Timeline