aboutsummaryrefslogtreecommitdiff
path: root/FrontEnd/src/utilities
diff options
context:
space:
mode:
Diffstat (limited to 'FrontEnd/src/utilities')
-rw-r--r--FrontEnd/src/utilities/hooks.ts10
-rw-r--r--FrontEnd/src/utilities/hooks/useReverseScrollPositionRemember.ts2
-rw-r--r--FrontEnd/src/utilities/hooks/useScrollToBottom.ts (renamed from FrontEnd/src/utilities/hooks/useScrollToTop.ts)12
3 files changed, 11 insertions, 13 deletions
diff --git a/FrontEnd/src/utilities/hooks.ts b/FrontEnd/src/utilities/hooks.ts
index c499b36b..a59f7167 100644
--- a/FrontEnd/src/utilities/hooks.ts
+++ b/FrontEnd/src/utilities/hooks.ts
@@ -1,11 +1,5 @@
import useClickOutside from "./hooks/useClickOutside";
-import useReverseScrollPositionRemember from "./hooks/useReverseScrollPositionRemember";
-import useScrollToTop from "./hooks/useScrollToTop";
+import useScrollToBottom from "./hooks/useScrollToBottom";
import { useIsSmallScreen } from "./hooks/mediaQuery";
-export {
- useClickOutside,
- useReverseScrollPositionRemember,
- useScrollToTop,
- useIsSmallScreen,
-};
+export { useClickOutside, useScrollToBottom, useIsSmallScreen };
diff --git a/FrontEnd/src/utilities/hooks/useReverseScrollPositionRemember.ts b/FrontEnd/src/utilities/hooks/useReverseScrollPositionRemember.ts
index 6fdd4b43..c0b6ce2c 100644
--- a/FrontEnd/src/utilities/hooks/useReverseScrollPositionRemember.ts
+++ b/FrontEnd/src/utilities/hooks/useReverseScrollPositionRemember.ts
@@ -1,3 +1,5 @@
+// Not used now!!! But preserved for future use.
+
import React from "react";
let on = false;
diff --git a/FrontEnd/src/utilities/hooks/useScrollToTop.ts b/FrontEnd/src/utilities/hooks/useScrollToBottom.ts
index 95c8b7b9..f6780d9f 100644
--- a/FrontEnd/src/utilities/hooks/useScrollToTop.ts
+++ b/FrontEnd/src/utilities/hooks/useScrollToBottom.ts
@@ -2,7 +2,7 @@ import React from "react";
import { fromEvent } from "rxjs";
import { filter, throttleTime } from "rxjs/operators";
-function useScrollToTop(
+function useScrollToBottom(
handler: () => void,
enable = true,
option = {
@@ -23,9 +23,11 @@ function useScrollToTop(
React.useEffect(() => {
const subscription = fromEvent(window, "scroll")
.pipe(
- filter(() => {
- return window.scrollY <= option.maxOffset;
- }),
+ filter(
+ () =>
+ window.scrollY >=
+ document.body.scrollHeight - window.innerHeight - option.maxOffset
+ ),
throttleTime(option.throttle)
)
.subscribe(() => {
@@ -40,4 +42,4 @@ function useScrollToTop(
}, [enable, option.maxOffset, option.throttle]);
}
-export default useScrollToTop;
+export default useScrollToBottom;