Fix back button from posts going back twice instead of once (LemmyNet…

…#2220)
dockur · Nov 14, 2023 · ad300f1 · ad300f1
1 parent b40a3c3
commit ad300f1
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 96 deletions.
diff --git a/lemmy-translations b/lemmy-translations
diff --git a/src/shared/components/home/home.tsx b/src/shared/components/home/home.tsx
@@ -78,12 +78,7 @@ import {
   InitialFetchRequest,
 } from "../../interfaces";
 import { mdToHtml } from "../../markdown";
-import {
-  FirstLoadService,
-  HomeCacheService,
-  I18NextService,
-  UserService,
-} from "../../services";
+import { FirstLoadService, I18NextService, UserService } from "../../services";
 import {
   EMPTY_REQUEST,
   HttpService,
@@ -288,18 +283,12 @@ export class Home extends Component<any, HomeState> {
         postsRes,
         isIsomorphic: true,
       };
-
-      HomeCacheService.postsRes = postsRes;
     }
 
     this.state.tagline = getRandomFromList(this.state?.siteRes?.taglines ?? [])
       ?.content;
   }
 
-  componentWillUnmount() {
-    HomeCacheService.activate();
-  }
-
   async componentDidMount() {
     if (
       !this.state.isIsomorphic ||
@@ -812,28 +801,16 @@ export class Home extends Component<any, HomeState> {
     const { dataType, pageCursor, listingType, sort } = getHomeQueryParams();
 
     if (dataType === DataType.Post) {
-      if (HomeCacheService.active) {
-        const { postsRes, scrollY } = HomeCacheService;
-        HomeCacheService.deactivate();
-        this.setState({ postsRes });
-        window.scrollTo({
-          left: 0,
-          top: scrollY,
-        });
-      } else {
-        this.setState({ postsRes: LOADING_REQUEST });
-        this.setState({
-          postsRes: await HttpService.client.getPosts({
-            page_cursor: pageCursor,
-            limit: fetchLimit,
-            sort,
-            saved_only: false,
-            type_: listingType,
-          }),
-        });
-
-        HomeCacheService.postsRes = this.state.postsRes;
-      }
+      this.setState({ postsRes: LOADING_REQUEST });
+      this.setState({
+        postsRes: await HttpService.client.getPosts({
+          page_cursor: pageCursor,
+          limit: fetchLimit,
+          sort,
+          saved_only: false,
+          type_: listingType,
+        }),
+      });
     } else {
       this.setState({ commentsRes: LOADING_REQUEST });
       this.setState({

diff --git a/src/shared/services/HomeCacheService.ts b/src/shared/services/HomeCacheService.ts
diff --git a/src/shared/services/index.ts b/src/shared/services/index.ts
@@ -1,5 +1,4 @@
 export { FirstLoadService } from "./FirstLoadService";
-export { HomeCacheService } from "./HomeCacheService";
 export { HttpService } from "./HttpService";
 export { I18NextService } from "./I18NextService";
 export { UserService } from "./UserService";