@jeremyckahn/farmhand 1.23.2 → 1.23.4

package/src/game-logic/reducers/showNotification.ts

@@ -10,7 +10,8 @@ export const showNotification = (
   state: farmhand.state,
   message: string,
   severity: notificationSeverity = 'info',
-  onClick: import('@mui/material/Alert').AlertProps['onClick'] = undefined
+  onClick: farmhand.notification['onClick'] = undefined,
+  actionLabel: farmhand.notification['actionLabel'] = undefined
 ): farmhand.state => {
   const { showNotifications, todaysNotifications } = state
 
@@ -20,6 +21,7 @@ export const showNotification = (
       latestNotification: {
         message,
         onClick,
+        actionLabel,
         severity,
       },
     }),
@@ -28,6 +30,6 @@ export const showNotification = (
       notification => notification.message === message
     )
       ? todaysNotifications
-      : todaysNotifications.concat({ message, onClick, severity }),
+      : todaysNotifications.concat({ message, onClick, actionLabel, severity }),
   }
 }

package/src/game-logic/reducers/updateAchievements.ts

@@ -10,7 +10,7 @@ export const updateAchievements = (
   achievements.reduce(
     (
       reducerState: farmhand.state,
-      achievement: Omit<typeof achievements[number], 'condition'> & {
+      achievement: Omit<(typeof achievements)[number], 'condition'> & {
         condition: (s: farmhand.state, ps: farmhand.state) => boolean
       }
     ) => {

package/src/game-logic/reducers/updateFinancialRecords.test.ts

@@ -37,17 +37,15 @@ describe('updateFinancialRecords', () => {
   })
 
   test('truncates logs', () => {
-    const {
-      historicalDailyLosses,
-      historicalDailyRevenue,
-    } = updateFinancialRecords(
-      testState({
-        historicalDailyLosses: [-1, -2, -3, -4, -5, -6, -7],
-        historicalDailyRevenue: [1, 2, 3, 4, 5, 6, 7],
-        todaysLosses: -5,
-        todaysRevenue: 10,
-      })
-    )
+    const { historicalDailyLosses, historicalDailyRevenue } =
+      updateFinancialRecords(
+        testState({
+          historicalDailyLosses: [-1, -2, -3, -4, -5, -6, -7],
+          historicalDailyRevenue: [1, 2, 3, 4, 5, 6, 7],
+          todaysLosses: -5,
+          todaysRevenue: 10,
+        })
+      )
 
     expect(historicalDailyLosses).toEqual([-5, -1, -2, -3, -4, -5, -6])
     expect(historicalDailyRevenue).toEqual([10, 1, 2, 3, 4, 5, 6])
@@ -55,20 +53,18 @@ describe('updateFinancialRecords', () => {
 
   describe('profitabilityStreak', () => {
     test('unprofitable day resets streak', () => {
-      const {
-        profitabilityStreak,
-        recordProfitabilityStreak,
-      } = updateFinancialRecords(
-        testState({
-          historicalDailyLosses: [],
-          historicalDailyRevenue: [],
-          profitabilityStreak: 10,
-          record7dayProfitAverage: 0,
-          recordProfitabilityStreak: 10,
-          todaysLosses: -10,
-          todaysRevenue: 10,
-        })
-      )
+      const { profitabilityStreak, recordProfitabilityStreak } =
+        updateFinancialRecords(
+          testState({
+            historicalDailyLosses: [],
+            historicalDailyRevenue: [],
+            profitabilityStreak: 10,
+            record7dayProfitAverage: 0,
+            recordProfitabilityStreak: 10,
+            todaysLosses: -10,
+            todaysRevenue: 10,
+          })
+        )
 
       expect(profitabilityStreak).toEqual(0)
       expect(recordProfitabilityStreak).toEqual(10)

package/src/game-logic/reducers/updateFinancialRecords.ts

@@ -13,11 +13,8 @@ export const updateFinancialRecords = (
     record7dayProfitAverage,
     recordProfitabilityStreak,
   } = state
-  let {
-    historicalDailyLosses,
-    historicalDailyRevenue,
-    recordSingleDayProfit,
-  } = state
+  let { historicalDailyLosses, historicalDailyRevenue, recordSingleDayProfit } =
+    state
 
   historicalDailyLosses = [todaysLosses, ...historicalDailyLosses].slice(
     0,

package/src/game-logic/reducers/updateInventoryRecordsForNextDay.test.ts

@@ -4,20 +4,18 @@ import { updateInventoryRecordsForNextDay } from './updateInventoryRecordsForNex
 
 describe('updateInventoryRecordsForNextDay', () => {
   test('records inventory records for next day', () => {
-    const {
-      todaysPurchases,
-      todaysStartingInventory,
-    } = updateInventoryRecordsForNextDay(
-      testState({
-        inventory: [
-          { id: 'sample-item-1', quantity: 2 },
-          { id: 'sample-item-2', quantity: 5 },
-        ],
-        todaysPurchases: {
-          'sample-item-3': 3,
-        },
-      })
-    )
+    const { todaysPurchases, todaysStartingInventory } =
+      updateInventoryRecordsForNextDay(
+        testState({
+          inventory: [
+            { id: 'sample-item-1', quantity: 2 },
+            { id: 'sample-item-2', quantity: 5 },
+          ],
+          todaysPurchases: {
+            'sample-item-3': 3,
+          },
+        })
+      )
 
     expect(todaysPurchases).toEqual({})
     expect(todaysStartingInventory).toEqual({

package/src/handlers/ui-events.test.ts

@@ -48,8 +48,10 @@ describe('UI Event Handlers', () => {
         isAwaitingCowTradeRequest: false,
         currentDialogView: dialogView.NONE,
         showHomeScreen: true,
+        notificationDuration: 6000,
       },
       setState: vi.fn(),
+      props: { localforage: { setItem: vi.fn().mockResolvedValue(undefined) } },
       purchaseItem: vi.fn(),
       makeRecipe: vi.fn(),
       makeFermentationRecipe: vi.fn(),
@@ -152,9 +154,8 @@ describe('UI Event Handlers', () => {
 
   describe('handleViewChangeButtonClick', () => {
     test('navigates to selected view', () => {
-      const handler = uiEventHandlers.handleViewChangeButtonClick.bind(
-        mockContext
-      )
+      const handler =
+        uiEventHandlers.handleViewChangeButtonClick.bind(mockContext)
 
       handler(stageFocusType.SHOP)
 
@@ -172,7 +173,7 @@ describe('UI Event Handlers', () => {
         enablesFieldMode: fieldMode.PLANT,
       })
 
-      handler((mockItem as unknown) as Parameters<typeof handler>[0])
+      handler(mockItem as unknown as Parameters<typeof handler>[0])
 
       expect(mockContext.setState).toHaveBeenCalledWith({
         fieldMode: fieldMode.PLANT,
@@ -183,12 +184,11 @@ describe('UI Event Handlers', () => {
 
   describe('handleForestItemSelectClick', () => {
     test('selects the sapling and switches to PLANT mode', () => {
-      const handler = uiEventHandlers.handleForestItemSelectClick.bind(
-        mockContext
-      )
+      const handler =
+        uiEventHandlers.handleForestItemSelectClick.bind(mockContext)
       const mockItem = testItem({ id: 'test-sapling' })
 
-      handler((mockItem as unknown) as Parameters<typeof handler>[0])
+      handler(mockItem as unknown as Parameters<typeof handler>[0])
 
       // Regression: selecting a sapling must back out of whatever field
       // mode (e.g. CHOP, FERTILIZE) was previously active, or clicking an
@@ -219,7 +219,7 @@ describe('UI Event Handlers', () => {
     test('opens menu when explicitly requested', () => {
       const handler = uiEventHandlers.handleMenuToggle.bind(mockContext)
 
-      handler((true as unknown) as Parameters<typeof handler>[0])
+      handler(true as unknown as Parameters<typeof handler>[0])
 
       const stateUpdater = mockContext.setState.mock.calls[0][0]
       const newState = stateUpdater({ isMenuOpen: false })
@@ -305,9 +305,8 @@ describe('UI Event Handlers', () => {
 
   describe('handleClickDialogViewButton', () => {
     test('displays requested dialog screen', () => {
-      const handler = uiEventHandlers.handleClickDialogViewButton.bind(
-        mockContext
-      )
+      const handler =
+        uiEventHandlers.handleClickDialogViewButton.bind(mockContext)
 
       handler(dialogView.FARMERS_LOG)
 
@@ -350,9 +349,8 @@ describe('UI Event Handlers', () => {
 
   describe('handleFieldActionRangeChange', () => {
     test('adjusts tool range preview size', () => {
-      const handler = uiEventHandlers.handleFieldActionRangeChange.bind(
-        mockContext
-      )
+      const handler =
+        uiEventHandlers.handleFieldActionRangeChange.bind(mockContext)
 
       handler(3)
 
@@ -413,9 +411,8 @@ describe('UI Event Handlers', () => {
 
   describe('handleShowHomeScreenChange', () => {
     test('enables home screen display', () => {
-      const handler = uiEventHandlers.handleShowHomeScreenChange.bind(
-        mockContext
-      )
+      const handler =
+        uiEventHandlers.handleShowHomeScreenChange.bind(mockContext)
 
       handler(null, true)
 
@@ -426,9 +423,8 @@ describe('UI Event Handlers', () => {
 
     test('navigates away from home when disabling home screen while viewing it', () => {
       mockContext.state.stageFocus = stageFocusType.HOME
-      const handler = uiEventHandlers.handleShowHomeScreenChange.bind(
-        mockContext
-      )
+      const handler =
+        uiEventHandlers.handleShowHomeScreenChange.bind(mockContext)
 
       handler(null, false)
 
@@ -439,6 +435,19 @@ describe('UI Event Handlers', () => {
     })
   })
 
+  describe('notification duration handlers', () => {
+    test('updates notification duration in milliseconds from slider seconds', () => {
+      const handler =
+        uiEventHandlers.handleNotificationDurationChange.bind(mockContext)
+
+      handler(new Event('change'), 8)
+
+      expect(mockContext.setState).toHaveBeenCalledWith({
+        notificationDuration: 8000,
+      })
+    })
+  })
+
   describe('handleRNGSeedChange', () => {
     test('applies custom random seed for reproducible gameplay', () => {
       const handler = uiEventHandlers.handleRNGSeedChange.bind(mockContext)
@@ -465,9 +474,8 @@ describe('UI Event Handlers', () => {
 
   describe('navigation handlers', () => {
     test('moves to next view', () => {
-      const handler = uiEventHandlers.handleClickNextMenuButton.bind(
-        mockContext
-      )
+      const handler =
+        uiEventHandlers.handleClickNextMenuButton.bind(mockContext)
 
       handler()
 
@@ -475,9 +483,8 @@ describe('UI Event Handlers', () => {
     })
 
     test('moves to previous view', () => {
-      const handler = uiEventHandlers.handleClickPreviousMenuButton.bind(
-        mockContext
-      )
+      const handler =
+        uiEventHandlers.handleClickPreviousMenuButton.bind(mockContext)
 
       handler()
 
@@ -503,9 +510,8 @@ describe('UI Event Handlers', () => {
     })
 
     test('increases inventory capacity', () => {
-      const handler = uiEventHandlers.handleStorageExpansionPurchase.bind(
-        mockContext
-      )
+      const handler =
+        uiEventHandlers.handleStorageExpansionPurchase.bind(mockContext)
 
       handler()
 
@@ -515,9 +521,8 @@ describe('UI Event Handlers', () => {
 
   describe('loan handlers', () => {
     test('reduces debt by payment amount', () => {
-      const handler = uiEventHandlers.handleClickLoanPaydownButton.bind(
-        mockContext
-      )
+      const handler =
+        uiEventHandlers.handleClickLoanPaydownButton.bind(mockContext)
 
       handler(500)
 
@@ -525,9 +530,8 @@ describe('UI Event Handlers', () => {
     })
 
     test('borrows money increasing debt', () => {
-      const handler = uiEventHandlers.handleClickTakeOutLoanButton.bind(
-        mockContext
-      )
+      const handler =
+        uiEventHandlers.handleClickTakeOutLoanButton.bind(mockContext)
 
       handler(1000)
 
@@ -537,9 +541,8 @@ describe('UI Event Handlers', () => {
 
   describe('utility handlers', () => {
     test('resets all saved game data', () => {
-      const handler = uiEventHandlers.handleClearPersistedDataClick.bind(
-        mockContext
-      )
+      const handler =
+        uiEventHandlers.handleClearPersistedDataClick.bind(mockContext)
 
       handler()
 
@@ -555,9 +558,8 @@ describe('UI Event Handlers', () => {
     })
 
     test('shows or hides chat window', () => {
-      const handler = uiEventHandlers.handleChatRoomOpenStateChange.bind(
-        mockContext
-      )
+      const handler =
+        uiEventHandlers.handleChatRoomOpenStateChange.bind(mockContext)
 
       handler(true)
 

package/src/handlers/ui-events.tsx

@@ -460,6 +460,16 @@ export default {
     this.setState({ showNotifications: checked })
   },
 
+  handleNotificationDurationChange(
+    this: Farmhand,
+    _event: React.SyntheticEvent | Event,
+    value: number | number[]
+  ) {
+    if (typeof value === 'number') {
+      this.setState({ notificationDuration: value * 1000 })
+    }
+  },
+
   handleClickNotificationIndicator(this: Farmhand) {
     this.openDialogView(dialogView.FARMERS_LOG)
   },
@@ -531,8 +541,13 @@ export default {
     this: Farmhand,
     updateServiceWorker: (reloadPage?: boolean) => Promise<void>
   ) {
-    this.showNotification(UPDATE_AVAILABLE, 'success', () => {
-      updateServiceWorker(true)
-    })
+    this.showNotification(
+      UPDATE_AVAILABLE,
+      'success',
+      () => {
+        updateServiceWorker(true)
+      },
+      'Reload'
+    )
   },
 }

package/src/hooks/usePrefersReducedMotion.ts

@@ -27,18 +27,22 @@ export const usePrefersReducedMotion = (): boolean => {
       mediaQueryList.addEventListener('change', listener)
     } else if ('addListener' in mediaQueryList) {
       // Compatibility for legacy mediaQueryList implementations
-      ;((mediaQueryList as unknown) as {
-        addListener: (cb: (e: MediaQueryListEvent) => void) => void
-      }).addListener(listener)
+      ;(
+        mediaQueryList as unknown as {
+          addListener: (cb: (e: MediaQueryListEvent) => void) => void
+        }
+      ).addListener(listener)
     }
 
     return () => {
       if (mediaQueryList.removeEventListener) {
         mediaQueryList.removeEventListener('change', listener)
       } else if ('removeListener' in mediaQueryList) {
-        ;((mediaQueryList as unknown) as {
-          removeListener: (cb: (e: MediaQueryListEvent) => void) => void
-        }).removeListener(listener)
+        ;(
+          mediaQueryList as unknown as {
+            removeListener: (cb: (e: MediaQueryListEvent) => void) => void
+          }
+        ).removeListener(listener)
       }
     }
   }, [])

package/src/index.tsx

@@ -9,8 +9,6 @@ import { HashRouter as Router, Route } from 'react-router-dom'
 
 import Farmhand from './components/Farmhand/index.js'
 import { features } from './config.js'
-import '@fontsource/francois-one'
-import '@fontsource/public-sans'
 
 const FarmhandRoute = (props: any) => <Farmhand {...{ ...props, features }} />