Skip to content

Commit 522a1be

Browse files
committed
fixed a bug where scrollToMessage
1 parent 935a230 commit 522a1be

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

src/modules/App/DesktopLayout.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ export const DesktopLayout: React.FC<DesktopLayoutProps> = (props: DesktopLayout
8484
onSearchClick: () => {
8585
setShowSettings(false);
8686
setShowThread(false);
87-
setShowSearch(!showSearch);
87+
setShowSearch((prev: boolean) => { return !prev; });
8888
},
8989
onReplyInThread: onClickThreadReply,
9090
onQuoteMessageClick: ({ message }) => {

src/modules/App/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ export interface DesktopLayoutProps extends AppLayoutProps, SubLayoutCommonProps
4343
showSettings: boolean;
4444
setShowSettings: React.Dispatch<boolean>;
4545
showSearch: boolean;
46-
setShowSearch: React.Dispatch<boolean>;
46+
setShowSearch: React.Dispatch<React.SetStateAction<boolean>>;
4747
// thread
4848
showThread: boolean;
4949
setShowThread: React.Dispatch<boolean>;

src/modules/GroupChannel/context/hooks/useGroupChannel.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,21 +126,21 @@ export const useGroupChannel = () => {
126126

127127
if (message) {
128128
const topOffset = getMessageTopOffset(message.createdAt);
129-
if (topOffset) state.scrollPubSub.publish('scroll', { top: topOffset, animated: scrollAnimated });
129+
if (topOffset !== null) state.scrollPubSub.publish('scroll', { top: topOffset, animated: scrollAnimated });
130130
if (messageFocusAnimated ?? true) setAnimatedMessageId(messageId);
131131
} else if (state.initialized) {
132132
await state.resetWithStartingPoint(createdAt);
133133
setTimeout(() => {
134134
const topOffset = getMessageTopOffset(createdAt);
135-
if (topOffset) {
135+
if (topOffset !== null) {
136136
state.scrollPubSub.publish('scroll', {
137137
top: topOffset,
138138
lazy: false,
139139
animated: scrollAnimated,
140140
});
141141
}
142142
if (messageFocusAnimated ?? true) setAnimatedMessageId(messageId);
143-
});
143+
}, 500);
144144
}
145145
clickHandler.activate();
146146
}, [

src/modules/MessageSearch/context/hooks/useMessageSearch.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ const useMessageSearch = () => {
6060
store.setState(state => ({ ...state, allMessages: [] }));
6161
}, [store]);
6262

63-
const setSelectedMessageId = (messageId: number) => useCallback(() => {
63+
const setSelectedMessageId = useCallback((messageId: number) => {
6464
store.setState(state => ({ ...state, selectedMessageId: messageId }));
6565
}, [store]);
6666

0 commit comments

Comments
 (0)