Merge pull request #10875 from DestinyItemManager/farming-cleanup

Farming CSS modules + remove ghosts

docs/CHANGELOG.md

@@ -4,6 +4,7 @@
   * For crafted weapons, this looks at the level thresholds of the enhanced versions of the weapon's current perks
   * For enhanced weapons, this looks at whether the next tier of enhancement is selectable on the weapon
 * Updated `enhancedperk` search to allow `is:enhancedperk` to find any weapons with already-enhanced perk columns
+* Farming mode will no longer make room for Ghosts.
 
 ## 8.52.0 <span class="changelog-date">(2024-12-22)</span>
 

src/app/farming/farming.scss → src/app/farming/Farming.m.scss

@@ -1,6 +1,6 @@
 @use '../variables.scss' as *;
 
-#item-farming {
+.farming {
   position: fixed;
   backface-visibility: hidden;
   bottom: 0;
@@ -52,22 +52,4 @@
   p {
     margin: 0.25em 0;
   }
-
-  &.farming-enter {
-    transform: translateY(250px) translateX(-50%);
-  }
-
-  &.farming-enter.farming-enter-active {
-    transform: translateY(0) translateX(-50%);
-    transition: transform 200ms $easeOutCubic;
-  }
-
-  &.farming-exit {
-    transform: translateY(0) translateX(-50%);
-  }
-
-  &.farming-exit.farming-exit-active {
-    transform: translateY(250px) translateX(-50%);
-    transition: transform 200ms $easeInCubic;
-  }
 }

src/app/farming/Farming.tsx

@@ -2,12 +2,11 @@ import { settingSelector } from 'app/dim-api/selectors';
 import { t } from 'app/i18next-t';
 import { useSetting } from 'app/settings/hooks';
 import { useThunkDispatch } from 'app/store/thunk-dispatch';
-import clsx from 'clsx';
 import { AnimatePresence, Spring, Variants, motion } from 'motion/react';
 import React from 'react';
 import { useSelector } from 'react-redux';
 import { stopFarming } from './actions';
-import './farming.scss';
+import styles from './Farming.m.scss';
 import { farmingStoreSelector } from './selectors';
 
 const animateVariants: Variants = {
@@ -31,8 +30,7 @@ export default function Farming() {
     <AnimatePresence>
       {store && (
         <motion.div
-          id="item-farming"
-          className={clsx({ 'd2-farming': store.destinyVersion === 2 })}
+          className={styles.farming}
           initial="hidden"
           animate="shown"
           exit="hidden"

src/app/farming/actions.ts

@@ -41,7 +41,6 @@ const makeRoomTypes = [
   BucketHashes.LegArmor,
   BucketHashes.ClassArmor,
   D1BucketHashes.Artifact,
-  BucketHashes.Ghost,
   BucketHashes.Consumables,
   BucketHashes.Materials,
 ];