Skip to content

Commit

Permalink
Merge branch 'main' into fix/useScrollLock
Browse files Browse the repository at this point in the history
  • Loading branch information
loongzhu committed Apr 8, 2024
2 parents 34f1216 + 1558cd2 commit 278ff03
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
2 changes: 2 additions & 0 deletions packages/core/useDraggable/index.ts
Expand Up @@ -145,6 +145,8 @@ export function useDraggable(
}

const start = (e: PointerEvent) => {
if (e.button !== 0)
return
if (toValue(options.disabled) || !filterEvent(e))
return
if (toValue(exact) && e.target !== toValue(target))
Expand Down
2 changes: 1 addition & 1 deletion packages/core/useMounted/index.ts
Expand Up @@ -13,7 +13,7 @@ export function useMounted() {
if (instance) {
onMounted(() => {
isMounted.value = true
}, isVue2 ? null : instance)
}, isVue2 ? undefined : instance)
}

return isMounted
Expand Down
2 changes: 1 addition & 1 deletion packages/nuxt/README.md
Expand Up @@ -7,7 +7,7 @@
## Install

```bash
npm i @vueuse/nuxt
npm i @vueuse/nuxt @vueuse/core
```

```ts
Expand Down
2 changes: 1 addition & 1 deletion packages/nuxt/ssr-plugin.mjs
Expand Up @@ -15,7 +15,7 @@ setSSRHandler('getDefaultStorage', () => {
}
})

if (process.server) {
if (import.meta.server) {
setSSRHandler('updateHTMLAttrs', (selector, attr, value) => {
if (selector === 'html') {
useHead({
Expand Down

0 comments on commit 278ff03

Please sign in to comment.