modify state

frontend/src/components/dirent-grid-view/dirent-grid-view.js

@@ -73,7 +73,7 @@ class DirentGridView extends React.Component{
   }
 
   componentWillReceiveProps(nextProps) {
-    if (this.props.isCurrentPage) {
+    if (!this.props.isCurrentPage) {
       this.setState({itemIdex: 100})
     }
   }

frontend/src/components/dirent-list-view/dirent-list-view.js

@@ -81,16 +81,12 @@ class DirentListView extends React.Component {
     this.zipToken = null;
   }
 
-  freezeItem = () => {
-    this.setState({isItemFreezed: true});
-  }
-
   componentDidMount() {
     window.addEventListener('scroll', this.listViewScroll, true);
   }
 
   componentWillReceiveProps(nextProps) {
-    if (this.props.isCurrentPage) {
+    if (!this.props.isCurrentPage) {
       this.setState({itemIdex: 100})
     }
   }
@@ -99,6 +95,10 @@ class DirentListView extends React.Component {
     window.removeEventListener('scroll', this.listViewScroll, true);
   }
 
+  freezeItem = () => {
+    this.setState({isItemFreezed: true});
+  }
+
   unfreezeItem = () => {
     this.setState({isItemFreezed: false});
   }
@@ -147,6 +147,17 @@ class DirentListView extends React.Component {
     this.props.sortItems(sortBy, sortOrder);
   }
 
+  listViewScroll = (e) => {
+    let target = e.target;
+    let itemIdex = this.state.itemIdex;
+
+    if (target.scrollTop + document.documentElement.clientHeight - target.offsetTop >= target.scrollHeight) {
+      itemIdex += 100
+      this.setState({itemIdex: itemIdex})
+    }
+    this.props.scrollPage();
+  }
+
   // for image popup
   prepareImageItem = (item) => {
     const useThumbnail = !this.repoEncrypted;
@@ -538,17 +549,6 @@ class DirentListView extends React.Component {
     return [];
   }
 
-  listViewScroll = (e) => {
-    let target = e.target;
-    let itemIdex = this.state.itemIdex;
-
-    if (target.scrollTop + document.documentElement.clientHeight - target.offsetTop >= target.scrollHeight) {
-      itemIdex += 100
-      this.setState({itemIdex: itemIdex})
-    }
-    this.props.scrollPage();
-  }
-
   render() {
     const { direntList, sortBy, sortOrder } = this.props;
 

frontend/src/pages/lib-content-view/lib-content-view.js

@@ -71,7 +71,7 @@ class LibContentView extends React.Component {
       errorMsg: '',
       isDirentDetailShow: false,
       updateDetail: false,
-      isCurrentPage: false,
+      isCurrentPage: true,
     };
 
     window.onpopstate = this.onpopstate;
@@ -413,11 +413,11 @@ class LibContentView extends React.Component {
   }
 
   scrollPage = () => {
-    this.setState({isCurrentPage: false})
+    this.setState({isCurrentPage: true})
   }
 
   switchPage = () => {
-    this.setState({isCurrentPage: true})
+    this.setState({isCurrentPage: false})
   }
 
   getThumbnails = (repoID, path, direntList) => {