Răsfoiți Sursa

remove codes that depend to isScrollTop

Yuki Takei 4 ani în urmă
părinte
comite
ecbf97eed1

+ 14 - 14
packages/app/src/client/services/NavigationContainer.js

@@ -24,11 +24,11 @@ export default class NavigationContainer extends Container {
     this.state = {
       // editorMode: 'view',
 
-      isScrollTop: true,
+      // isScrollTop: true,
     };
 
     // this.setEditorMode = this.setEditorMode.bind(this);
-    this.initScrollEvent();
+    // this.initScrollEvent();
   }
 
   /**
@@ -43,18 +43,18 @@ export default class NavigationContainer extends Container {
   }
 
   initScrollEvent() {
-    window.addEventListener('scroll', () => {
-      const currentYOffset = window.pageYOffset;
-
-      // original throttling
-      if (SCROLL_THRES_SKIP < currentYOffset) {
-        return;
-      }
-
-      this.setState({
-        isScrollTop: currentYOffset === 0,
-      });
-    });
+    // window.addEventListener('scroll', () => {
+    //   const currentYOffset = window.pageYOffset;
+
+    //   // original throttling
+    //   if (SCROLL_THRES_SKIP < currentYOffset) {
+    //     return;
+    //   }
+
+    //   this.setState({
+    //     isScrollTop: currentYOffset === 0,
+    //   });
+    // });
   }
 
   // setEditorMode(editorMode) {

+ 1 - 10
packages/app/src/components/StickyStretchableScroller.jsx

@@ -5,8 +5,6 @@ import { debounce } from 'throttle-debounce';
 import StickyEvents from 'sticky-events';
 import loggerFactory from '~/utils/logger';
 
-import { withUnstatedContainers } from './UnstatedUtils';
-
 const logger = loggerFactory('growi:cli:StickyStretchableScroller');
 
 
@@ -103,7 +101,7 @@ const StickyStretchableScroller = (props) => {
 
   const stickyChangeHandler = useCallback((event) => {
     logger.debug('StickyEvents.CHANGE detected');
-    resetScrollbar();
+    setTimeout(resetScrollbar, 100);
   }, [resetScrollbar]);
 
   // setup effect by sticky event
@@ -139,13 +137,6 @@ const StickyStretchableScroller = (props) => {
     };
   }, [resetScrollbarDebounced]);
 
-  // setup effect by isScrollTop
-  // useEffect(() => {
-  //   if (navigationContainer.state.isScrollTop) {
-  //     resetScrollbar();
-  //   }
-  // }, [navigationContainer.state.isScrollTop, resetScrollbar]);
-
   // setup effect by update props
   useEffect(() => {
     resetScrollbarDebounced();