Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/modules/App/DesktopLayout.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ export const DesktopLayout: React.FC<DesktopLayoutProps> = (props: DesktopLayout
onSearchClick: () => {
setShowSettings(false);
setShowThread(false);
setShowSearch(!showSearch);
setShowSearch((prev: boolean) => { return !prev; });
},
onReplyInThread: onClickThreadReply,
onQuoteMessageClick: ({ message }) => {
Expand Down
2 changes: 1 addition & 1 deletion src/modules/App/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ export interface DesktopLayoutProps extends AppLayoutProps, SubLayoutCommonProps
showSettings: boolean;
setShowSettings: React.Dispatch<boolean>;
showSearch: boolean;
setShowSearch: React.Dispatch<boolean>;
setShowSearch: React.Dispatch<React.SetStateAction<boolean>>;
// thread
showThread: boolean;
setShowThread: React.Dispatch<boolean>;
Expand Down
6 changes: 3 additions & 3 deletions src/modules/GroupChannel/context/hooks/useGroupChannel.ts
Original file line number Diff line number Diff line change
Expand Up @@ -126,21 +126,21 @@ export const useGroupChannel = () => {

if (message) {
const topOffset = getMessageTopOffset(message.createdAt);
if (topOffset) state.scrollPubSub.publish('scroll', { top: topOffset, animated: scrollAnimated });
if (topOffset !== null) state.scrollPubSub.publish('scroll', { top: topOffset, animated: scrollAnimated });
if (messageFocusAnimated ?? true) setAnimatedMessageId(messageId);
} else if (state.initialized) {
await state.resetWithStartingPoint(createdAt);
setTimeout(() => {
const topOffset = getMessageTopOffset(createdAt);
if (topOffset) {
if (topOffset !== null) {
state.scrollPubSub.publish('scroll', {
top: topOffset,
lazy: false,
animated: scrollAnimated,
});
}
if (messageFocusAnimated ?? true) setAnimatedMessageId(messageId);
});
}, 500);
}
clickHandler.activate();
}, [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ const useMessageSearch = () => {
store.setState(state => ({ ...state, allMessages: [] }));
}, [store]);

const setSelectedMessageId = (messageId: number) => useCallback(() => {
const setSelectedMessageId = useCallback((messageId: number) => {
store.setState(state => ({ ...state, selectedMessageId: messageId }));
}, [store]);

Expand Down