From 2341a6deb173690c8300946d5d6812b5b5612059 Mon Sep 17 00:00:00 2001
From: Ignace Maes <contact@ignacemaes.com>
Date: Thu, 22 Aug 2024 18:09:34 +0200
Subject: [PATCH] remove router scroll tweaks

---
 app/components/pokemon-evolution-nav.gts | 4 ----
 app/components/pokemon-grid-item.gts     | 4 ----
 app/utils/router-scroll-service.ts       | 3 ---
 3 files changed, 11 deletions(-)
 delete mode 100644 app/utils/router-scroll-service.ts

diff --git a/app/components/pokemon-evolution-nav.gts b/app/components/pokemon-evolution-nav.gts
index c01af86..69cadcb 100644
--- a/app/components/pokemon-evolution-nav.gts
+++ b/app/components/pokemon-evolution-nav.gts
@@ -6,7 +6,6 @@ import { service } from '@ember/service';
 import { fn } from '@ember/helper';
 import { on } from '@ember/modifier';
 import { preloadImage } from 'ember-polaris-pokedex/components/pokemon-grid-item';
-import { type RouterScrollService } from 'ember-polaris-pokedex/utils/router-scroll-service';
 
 export function getPokemonById(pokemons: PokemonModel[], id: string) {
   return pokemons.find((pokemon) => pokemon.id!.toString() === id);
@@ -17,13 +16,10 @@ export default class PokemonEvolutionNav extends Component<{
 }> {
   @service declare router: RouterService;
 
-  @service declare routerScroll: RouterScrollService;
-
   transitionToPokemonDetails = (
     pokemonId: string,
     direction: 'forwards' | 'backwards',
   ) => {
-    this.routerScroll.preserveScrollPosition = true;
     // Fallback for browsers that don't support this API:
     if (!document.startViewTransition) {
       this.router.transitionTo('pokemon.pokemon', pokemonId.toString());
diff --git a/app/components/pokemon-grid-item.gts b/app/components/pokemon-grid-item.gts
index c5df8a7..18a5df4 100644
--- a/app/components/pokemon-grid-item.gts
+++ b/app/components/pokemon-grid-item.gts
@@ -4,7 +4,6 @@ import Component from '@glimmer/component';
 import type PokemonModel from 'ember-polaris-pokedex/models/pokemon';
 import { service } from '@ember/service';
 import type RouterService from '@ember/routing/router-service';
-import { type RouterScrollService } from 'ember-polaris-pokedex/utils/router-scroll-service';
 
 export function preloadImage(imageUrl: string) {
   const img = new Image();
@@ -18,10 +17,7 @@ interface PokemonSignature {
 export default class PokemonGridItem extends Component<PokemonSignature> {
   @service declare router: RouterService;
 
-  @service declare routerScroll: RouterScrollService;
-
   transitionToPokemonDetails = (pokemon: PokemonModel, event: MouseEvent) => {
-    this.routerScroll.preserveScrollPosition = false;
     // Fallback for browsers that don't support this API:
     if (!document.startViewTransition) {
       this.router.transitionTo('pokemon.pokemon', pokemon.id?.toString());
diff --git a/app/utils/router-scroll-service.ts b/app/utils/router-scroll-service.ts
deleted file mode 100644
index cf7debc..0000000
--- a/app/utils/router-scroll-service.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export interface RouterScrollService {
-  preserveScrollPosition: boolean;
-}