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(useToggle): new options #1523

Merged
merged 6 commits into from May 3, 2022
Merged
Show file tree
Hide file tree
Changes from 4 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
96 changes: 96 additions & 0 deletions packages/shared/useToggle/index.test.ts
@@ -0,0 +1,96 @@
import { isRef, ref, unref } from 'vue-demi'
import { useToggle } from '.'

describe('useToggle', () => {
it('should be defined', () => {
expect(useToggle).toBeDefined()
})

it('default result', () => {
const result = useToggle()
const [value, toggle] = result

expect(Array.isArray(result)).toBe(true)
expect(result.length).toBe(2)

expect(typeof toggle).toBe('function')
expect(isRef(value)).toBe(true)
expect(unref(value)).toBe(false)
})

it('default result with initialValue', () => {
const result = useToggle(true)
const [value, toggle] = result

expect(Array.isArray(result)).toBe(true)
expect(result.length).toBe(2)

expect(typeof toggle).toBe('function')
expect(isRef(value)).toBe(true)
expect(unref(value)).toBe(true)
})

it('should toggle', () => {
const result = useToggle()
const [value, toggle] = result

expect(toggle()).toBe(true)
expect(unref(value)).toBe(true)

expect(toggle()).toBe(false)
expect(unref(value)).toBe(false)
})

it('should receive toggle param', () => {
const result = useToggle()
const [value, toggle] = result

expect(toggle(false)).toBe(false)
expect(unref(value)).toBe(false)

expect(toggle(true)).toBe(true)
expect(unref(value)).toBe(true)
})

it('ref initialValue', () => {
const isDark = ref(true)
const toggle = useToggle(isDark)

expect(typeof toggle).toBe('function')

expect(toggle()).toBe(false)
expect(unref(isDark)).toBe(false)

expect(toggle()).toBe(true)
expect(unref(isDark)).toBe(true)

expect(toggle(false)).toBe(false)
expect(unref(isDark)).toBe(false)

expect(toggle(true)).toBe(true)
expect(unref(isDark)).toBe(true)
})

it('should toggle with truly & falsely', () => {
const status = ref('ON')
const toggle = useToggle(status, {
trulyValue: 'ON',
falselyValue: 'OFF',
})

expect(unref(status)).toBe('ON')
expect(typeof toggle).toBe('function')

expect(toggle()).toBe('OFF')
expect(unref(status)).toBe('OFF')

expect(toggle()).toBe('ON')
expect(unref(status)).toBe('ON')

expect(toggle('OFF')).toBe('OFF')
expect(unref(status)).toBe('OFF')

expect(toggle('ON')).toBe('ON')
expect(unref(status)).toBe('ON')
})
})
51 changes: 31 additions & 20 deletions packages/shared/useToggle/index.ts
@@ -1,33 +1,44 @@
import type { Ref } from 'vue-demi'
import { isRef, ref } from 'vue-demi'
import { isRef, ref, unref } from 'vue-demi'
import type { MaybeRef } from '../utils'

export interface UseToggleOptions<Truly, Falsely> {
trulyValue?: MaybeRef<Truly>
falselyValue?: MaybeRef<Falsely>
}

export function useToggle<Truly, Falsely, T = Truly | Falsely>(initialValue: Ref<T>, options?: UseToggleOptions<Truly, Falsely>): (value?: T) => T
export function useToggle<Truly = true, Falsely = false, T = Truly | Falsely>(initialValue?: T, options?: UseToggleOptions<Truly, Falsely>): [Ref<T>, (value?: T) => T]

/**
* A boolean ref with a toggler
*
* @see https://vueuse.org/useToggle
* @param [initialValue=false]
*/
export function useToggle(value: Ref<boolean>): (value?: boolean) => boolean
export function useToggle(initialValue?: boolean): [Ref<boolean>, (value?: boolean) => boolean]
export function useToggle(initialValue: MaybeRef<boolean> = false, options: UseToggleOptions<true, false> = {}) {
const {
trulyValue = true,
falselyValue = false,
} = options

const valueIsRef = isRef(initialValue)
const innerValue = ref(initialValue) as Ref<boolean>

export function useToggle(initialValue: boolean | Ref<boolean> = false) {
if (isRef(initialValue)) {
return (value?: boolean) => {
initialValue.value = typeof value === 'boolean'
? value
: !initialValue.value
return initialValue.value
function toggle(value?: boolean) {
// has arguments
if (arguments.length) {
innerValue.value = value!
return innerValue.value
}
}
else {
const boolean = ref(initialValue)
const toggle = (value?: boolean) => {
boolean.value = typeof value === 'boolean'
? value
: !boolean.value
return boolean.value
else {
innerValue.value = innerValue.value === unref(trulyValue) ? unref(falselyValue) : unref(trulyValue)
return innerValue.value
}

return [boolean, toggle] as const
}

if (valueIsRef)
return toggle
else
return [innerValue, toggle]
okxiaoliang4 marked this conversation as resolved.
Show resolved Hide resolved
}