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.

Sign up for GitHub

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

Jump to bottom

fix(useClipboard): fix issue when permission is not defined #3812

Merged
merged 3 commits into from
Feb 27, 2024
Merged

fix(useClipboard): fix issue when permission is not defined #3812

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
69fd2a2
fix(useClipboard): fix issue when permission is not defined
Mister-Hope Feb 22, 2024
8ed6351
chore: tweaks
Mister-Hope Feb 22, 2024
7f5e3a6
chore: fix typos
Mister-Hope Feb 22, 2024
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: 6 additions & 2 deletions packages/core/useClipboard/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ export function useClipboard(options: UseClipboardOptions<MaybeRefOrGetter<strin
const timeout = useTimeoutFn(() => copied.value = false, copiedDuring)

function updateText() {
if (isClipboardApiSupported.value && permissionRead.value !== 'denied') {
if (isClipboardApiSupported.value && isAllowed(permissionRead.value)) {
navigator!.clipboard.readText().then((value) => {
text.value = value
})
Expand All @@ -86,7 +86,7 @@ export function useClipboard(options: UseClipboardOptions<MaybeRefOrGetter<strin

async function copy(value = toValue(source)) {
if (isSupported.value && value != null) {
if (isClipboardApiSupported.value && permissionWrite.value !== 'denied')
if (isClipboardApiSupported.value && isAllowed(permissionWrite.value))
await navigator!.clipboard.writeText(value)
else
legacyCopy(value)
Expand All @@ -112,6 +112,10 @@ export function useClipboard(options: UseClipboardOptions<MaybeRefOrGetter<strin
return document?.getSelection?.()?.toString() ?? ''
}

function isAllowed(status: PermissionState | undefined) {
return status === 'granted' || status === 'prompt'
}

return {
isSupported,
text: text as ComputedRef<string>,
Expand Down