Skip to content

[CLNP-6698] resetWithStartingPoint not defined error #1332

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
chrisallo merged 2 commits into from
Apr 29, 2025
Merged

[CLNP-6698] resetWithStartingPoint not defined error #1332

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f92e7e
bug-fix by adding deps
chrisallo Apr 24, 2025
4e8c170
Fix test cases
git-babel Apr 25, 2025
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
4 changes: 2 additions & 2 deletions src/modules/GroupChannel/context/GroupChannelProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,10 +248,10 @@ const GroupChannelManager :React.FC<React.PropsWithChildren<GroupChannelProvider

// Starting point handling
useEffect(() => {
if (typeof startingPoint === 'number') {
if (typeof startingPoint === 'number' && messageDataSource.initialized) {
actions.scrollToMessage(startingPoint, 0, false, false);
}
}, [startingPoint]);
}, [messageDataSource.initialized, startingPoint]);

// Animated message handling
useEffect(() => {
Expand Down
1 change: 1 addition & 0 deletions src/modules/GroupChannel/context/__tests__/useGroupChannel.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,6 +304,7 @@ describe('useGroupChannel', () => {
const mockResetWithStartingPoint = jest.fn().mockResolvedValue(undefined);
const mockStore = createMockStore({
messages: [],
initialized: true,
scrollRef: {
current: document.createElement('div'),
},
Expand Down
9 changes: 7 additions & 2 deletions src/modules/GroupChannel/context/hooks/useGroupChannel.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ export const useGroupChannel = () => {
const topOffset = getMessageTopOffset(message.createdAt);
if (topOffset) state.scrollPubSub.publish('scroll', { top: topOffset, animated: scrollAnimated });
if (messageFocusAnimated ?? true) setAnimatedMessageId(messageId);
} else {
} else if (state.initialized) {
await state.resetWithStartingPoint(createdAt);
setTimeout(() => {
const topOffset = getMessageTopOffset(createdAt);
Expand All @@ -130,7 +130,12 @@ export const useGroupChannel = () => {
});
}
clickHandler.activate();
}, [setAnimatedMessageId, state.scrollRef.current, state.messages?.map(it => it?.messageId)]);
}, [
setAnimatedMessageId,
state.initialized,
state.scrollRef.current,
state.messages?.map(it => it?.messageId),
]);

const toggleReaction = useCallback((message: SendableMessageType, emojiKey: string, isReacted: boolean) => {
if (!state.currentChannel) return;
Expand Down