feat: add ranking entry

kokororin · Mar 28, 2020 · 8d35f27 · 8d35f27
1 parent 3111179
commit 8d35f27
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/src/containers/GalleryContainer.tsx b/src/containers/GalleryContainer.tsx
@@ -15,6 +15,7 @@ import {
   ListSubheader
 } from '@material-ui/core';
 import { Menu as MenuIcon, Done as DoneIcon } from '@material-ui/icons';
+import H from 'history';
 import DocumentTitle from 'react-document-title';
 import { FormattedMessage, injectIntl, InjectedIntl } from 'react-intl';
 
@@ -62,6 +63,7 @@ interface IGalleryContainerProps extends WithStyles<typeof styles> {
   dispatch: Dispatch<IGalleryAction> & TGalleryThunkDispatch;
   intl: InjectedIntl;
   gallery: IGalleryState;
+  location: H.Location;
 }
 
 interface IGalleryContainerState {
@@ -90,10 +92,14 @@ class GalleryContainer extends React.Component<
       this.onSearch(this.props.gallery.word);
       this.props.dispatch(GalleryActions.setFromIllust(false));
     } else {
-      const cachedWord = Storage.get('word');
-      this.props.dispatch(
-        GalleryActions.setWord(cachedWord ? cachedWord : 'ranking')
-      );
+      if (this.props.location.search === '?entry=ranking') {
+        this.props.dispatch(GalleryActions.setWord('ranking'));
+      } else {
+        const cachedWord = Storage.get('word');
+        this.props.dispatch(
+          GalleryActions.setWord(cachedWord ? cachedWord : 'ranking')
+        );
+      }
 
       if (this.props.gallery.items.length === 0) {
         this.fetchSource(true);
@@ -192,7 +198,7 @@ class GalleryContainer extends React.Component<
     );
   }
 
-  onHeaderClick = (event: React.MouseEvent<HTMLDivElement, MouseEvent>) => {
+  onHeaderClick = (event: React.MouseEvent<HTMLDivElement>) => {
     const target = event.target as HTMLDivElement;
     const tagName = target.tagName.toLowerCase();
 

diff --git a/src/containers/IllustContainer.tsx b/src/containers/IllustContainer.tsx
@@ -200,14 +200,10 @@ class IllustContainer extends React.Component<
     return this.props.illust.items[this.illustId];
   }
 
-  onBackClick = (event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => {
+  onBackClick = (event: React.MouseEvent<HTMLAnchorElement>) => {
     event.preventDefault();
     event.stopPropagation();
-    if (this.props.history.length > 1) {
-      this.props.history.goBack();
-    } else {
-      this.props.history.push('/');
-    }
+    this.props.history.push('/');
   };
 
   // @autobind

diff --git a/tsconfig.json b/tsconfig.json
@@ -12,7 +12,6 @@
     "sourceMap": true,
     "baseUrl": ".",
     "strictPropertyInitialization": false,
-    "types": ["webpack-env"],
     "paths": {
       "@/*": ["src/*"]
     }