Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(refAutoReset): support maybe-ref as value #3342

Merged
merged 1 commit into from Aug 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 8 additions & 0 deletions packages/shared/refAutoReset/index.test.ts
Expand Up @@ -30,6 +30,14 @@ describe('refAutoReset', () => {
expect(val.value).toBe('default')
})

it('should be reset with maybeRef', async () => {
const val = refAutoReset(() => [123], () => 10)
val.value = [999]
expect(val.value).toEqual([999])
await new Promise(resolve => setTimeout(resolve, 11))
expect(val.value).toEqual([123])
})

it('should change afterMs', async () => {
const afterMs = ref(150)
const val = refAutoReset('default', afterMs)
Expand Down
6 changes: 3 additions & 3 deletions packages/shared/refAutoReset/index.ts
Expand Up @@ -11,14 +11,14 @@ import { tryOnScopeDispose } from '../tryOnScopeDispose'
* @param defaultValue The value which will be set.
* @param afterMs A zero-or-greater delay in milliseconds.
*/
export function refAutoReset<T>(defaultValue: T, afterMs: MaybeRefOrGetter<number> = 10000): Ref<T> {
export function refAutoReset<T>(defaultValue: MaybeRefOrGetter<T>, afterMs: MaybeRefOrGetter<number> = 10000): Ref<T> {
return customRef<T>((track, trigger) => {
let value: T = defaultValue
let value: T = toValue(defaultValue)
let timer: any

const resetAfter = () =>
setTimeout(() => {
value = defaultValue
value = toValue(defaultValue)
trigger()
}, toValue(afterMs))

Expand Down