degmods/degmods.com
6
1
Fork 0
Code Issues 24 Pull Requests Actions Packages Projects 3 Releases Wiki Activity

categories,18popup,clear.TextEditorSwap,GameCardHover #177

Merged
freakoverse merged 64 commits from staging into master 2024-12-24 19:44:30 +00:00
Conversation 0 Commits 64 Files Changed 62 +18 -6
2 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit cbcb82e779 - Show all commits

12
src/hooks/useLocalStorage.tsx
View File

@ -1,4 +1,4 @@
import React from 'react' import React, { useMemo } from 'react'
import { import {
getLocalStorageItem, getLocalStorageItem,
removeLocalStorageItem, removeLocalStorageItem,
@ -11,7 +11,11 @@ const useLocalStorageSubscribe = (callback: () => void) => {
} }
function mergeWithInitialValue<T>(storedValue: T, initialValue: T): T { function mergeWithInitialValue<T>(storedValue: T, initialValue: T): T {
if (typeof storedValue === 'object' && storedValue !== null) { if (
!Array.isArray(storedValue) &&
typeof storedValue === 'object' &&
storedValue !== null
) {
return { ...initialValue, ...storedValue } return { ...initialValue, ...storedValue }
} }
return storedValue return storedValue
@ -64,5 +68,7 @@ export function useLocalStorage<T>(
} }
}, [key, initialValue]) }, [key, initialValue])
return [JSON.parse(data) as T, setState] const memoized = useMemo(() => JSON.parse(data) as T, [data])
return [memoized, setState]
} }

12
src/hooks/useSessionStorage.tsx
View File

@ -1,4 +1,4 @@
import React from 'react' import React, { useMemo } from 'react'
import { import {
getSessionStorageItem, getSessionStorageItem,
removeSessionStorageItem, removeSessionStorageItem,
@ -11,7 +11,11 @@ const useSessionStorageSubscribe = (callback: () => void) => {
} }
function mergeWithInitialValue<T>(storedValue: T, initialValue: T): T { function mergeWithInitialValue<T>(storedValue: T, initialValue: T): T {
if (typeof storedValue === 'object' && storedValue !== null) { if (
!Array.isArray(storedValue) &&
typeof storedValue === 'object' &&
storedValue !== null
) {
return { ...initialValue, ...storedValue } return { ...initialValue, ...storedValue }
} }
return storedValue return storedValue
@ -67,5 +71,7 @@ export function useSessionStorage<T>(
} }
}, [key, initialValue]) }, [key, initialValue])
return [JSON.parse(data) as T, setState] const memoized = useMemo(() => JSON.parse(data) as T, [data])
return [memoized, setState]
} }