-
Notifications
You must be signed in to change notification settings - Fork 0
#107- Adaptive notifications made #116
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.
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
Merged
Changes from all commits
Commits
Show all changes
9 commits
Select commit
Hold shift + click to select a range
6d31dae
feat(107): extract NotificationItem
xyzelena 4ca8aaf
fix(107): merge main
xyzelena 0e6e34c
fix(107): merge main
xyzelena ef81d27
fix(107): adjust padding and margin for improved layout
xyzelena c076243
fix(107): merge main
xyzelena 3ece6f1
feat(107): refactor notifications component structure
xyzelena 2ac137a
fix(107): merge main
xyzelena 80ac3b4
fix(107): update pnpm lockfile
xyzelena b596852
fix(107): add useNotificationsInfiniteScroll hook and update exports
xyzelena File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| export { useNotificationsInfiniteScroll } from './useNotificationsInfiniteScroll'; | ||
| export { useVirtualList } from './useVirtualList'; |
94 changes: 94 additions & 0 deletions
94
packages/modules.navigation/src/hooks/useNotificationsInfiniteScroll.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,94 @@ | ||
| import { useEffect } from 'react'; | ||
|
|
||
| export const useNotificationsInfiniteScroll = ({ | ||
| scrollAreaRef, | ||
| hasMore, | ||
| isFetchingNextPage, | ||
| loadMore, | ||
| }: { | ||
| scrollAreaRef: React.RefObject<HTMLDivElement | null>; | ||
| hasMore: boolean; | ||
| isFetchingNextPage?: boolean; | ||
| loadMore: () => void; | ||
| }) => { | ||
| useEffect(() => { | ||
| const handleScroll = () => { | ||
| const el = scrollAreaRef.current; | ||
| if (!el) { | ||
| return; | ||
| } | ||
|
|
||
| const { scrollTop, scrollHeight, clientHeight } = el; | ||
| const distanceToBottom = scrollHeight - scrollTop - clientHeight; | ||
|
|
||
| if (isFetchingNextPage || !hasMore) { | ||
| return; | ||
| } | ||
|
|
||
| // Загружаем следующую страницу, когда до конца осталось меньше 100px | ||
| if (distanceToBottom < 100) { | ||
| loadMore(); | ||
| } | ||
| }; | ||
|
|
||
| let currentElement: HTMLDivElement | null = null; | ||
| let intervalId: ReturnType<typeof setInterval> | null = null; | ||
| let observer: MutationObserver | null = null; | ||
|
|
||
| const attachScrollListener = () => { | ||
| const el = scrollAreaRef.current; | ||
| if (!el) { | ||
| return false; | ||
| } | ||
|
|
||
| currentElement = el; | ||
| el.addEventListener('scroll', handleScroll); | ||
|
|
||
| // Также проверяем сразу, может быть уже нужно загрузить | ||
| handleScroll(); | ||
|
|
||
| return true; | ||
| }; | ||
|
|
||
| if (!attachScrollListener()) { | ||
| let attempts = 0; | ||
| const maxAttempts = 10; | ||
| intervalId = setInterval(() => { | ||
| attempts++; | ||
| if (attachScrollListener() || attempts >= maxAttempts) { | ||
| if (intervalId) { | ||
| clearInterval(intervalId); | ||
| intervalId = null; | ||
| } | ||
| } | ||
| }, 100); | ||
|
|
||
| observer = new MutationObserver(() => { | ||
| if (attachScrollListener()) { | ||
| if (observer) { | ||
| observer.disconnect(); | ||
| observer = null; | ||
| } | ||
| } | ||
| }); | ||
|
|
||
| // DropdownMenuContent рендерится через портал | ||
| observer.observe(document.body, { | ||
| childList: true, | ||
| subtree: true, | ||
| }); | ||
| } | ||
|
|
||
| return () => { | ||
| if (intervalId) { | ||
| clearInterval(intervalId); | ||
| } | ||
| if (observer) { | ||
| observer.disconnect(); | ||
| } | ||
| if (currentElement) { | ||
| currentElement.removeEventListener('scroll', handleScroll); | ||
| } | ||
| }; | ||
| }, [hasMore, isFetchingNextPage, loadMore, scrollAreaRef]); | ||
| }; |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Вынеси, пожалуйста, хук в папку на уровне пакета, у нас всё же здесь ui лежит
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Да, сорри, протупила и свалила все в одну папку. Исправила !