Skip to content
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/components/dismissable-layer/src/DismissableLayer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ import {
h,
mergeProps,
nextTick,
onBeforeUnmount,
onMounted,
onUnmounted,
reactive,
ref,
toRefs,
Expand Down Expand Up @@ -269,7 +269,7 @@ const DismissableLayer = defineComponent({
document.addEventListener(INJECT_UPDATE, handleUpdate)
})

onUnmounted(() => {
onBeforeUnmount(() => {
document.removeEventListener(INJECT_UPDATE, handleUpdate)
})
const originalReturn = () =>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<script setup lang="ts">
import { OkuDismissableLayer } from '@oku-ui/dismissable-layer'
import { createApp, onUnmounted, ref } from 'vue'
import { createApp, onBeforeUnmount, ref } from 'vue'
import { OkuFocusScope } from '@oku-ui/focus-scope'
import DummyDialog from './DummyDialog.vue'
import DummyPopover from './DummyPopover.vue'
Expand Down Expand Up @@ -94,7 +94,7 @@ function handlePopupClick() {
const app = createApp(DismissableBox)
app.mount(containerNode)

onUnmounted(() => containerNode.remove())
onBeforeUnmount(() => containerNode.remove())
}
</script>

Expand Down
6 changes: 3 additions & 3 deletions packages/components/popover/src/popoverContentModal.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { defineComponent, h, mergeProps, onUnmounted, ref } from 'vue'
import { defineComponent, h, mergeProps, onBeforeUnmount, ref } from 'vue'
import { primitiveProps, propsOmit } from '@oku-ui/primitive'
import { useComposedRefs, useForwardRef, useScrollLock } from '@oku-ui/use-composable'
import { hideOthers } from 'aria-hidden'
Expand Down Expand Up @@ -47,10 +47,10 @@ const popoverContentModal = defineComponent({

const isRightClickOutsideRef = ref(false)

onUnmounted(() => {
onBeforeUnmount(() => {
const content = contentRef.value
if (content)
return hideOthers(content)
hideOthers(content)
})

useScrollLock(contentRef, true)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import {
OkuPopperContent,
} from '@oku-ui/popper'
import { OkuPortal } from '@oku-ui/portal'
import { onMounted, onUnmounted, ref } from 'vue'
import { onBeforeUnmount, onMounted, ref } from 'vue'
import Scrollable from './Scrollable.vue'

// const [left, setLeft] = React.useState(0);
Expand All @@ -27,7 +27,7 @@ onMounted(() => {
}, 500)
})

onUnmounted(() => {
onBeforeUnmount(() => {
if (intervalId)
clearInterval(intervalId)
})
Expand Down
4 changes: 2 additions & 2 deletions packages/components/presence/src/usePresence.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { type Ref, computed, nextTick, onUnmounted, ref, watch } from 'vue'
import { type Ref, computed, nextTick, onBeforeUnmount, ref, watch } from 'vue'
import { useStateMachine } from './useStateMachine'

function getAnimationName(styles?: CSSStyleDeclaration) {
Expand Down Expand Up @@ -117,7 +117,7 @@ export function usePresence(present: Ref<boolean>) {
immediate: true,
})

onUnmounted(() => {
onBeforeUnmount(() => {
elWatch()
presentWatch()
})
Expand Down
4 changes: 2 additions & 2 deletions packages/components/tooltip/src/tooltip.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { PropType, Ref } from 'vue'
import { computed, defineComponent, h, onUnmounted, ref, toRefs, useModel } from 'vue'
import { computed, defineComponent, h, onBeforeUnmount, ref, toRefs, useModel } from 'vue'
import { primitiveProps } from '@oku-ui/primitive'
import { useControllable, useId } from '@oku-ui/use-composable'
import { OkuPopper } from '@oku-ui/popper'
Expand Down Expand Up @@ -156,7 +156,7 @@ const tooltip = defineComponent({
}, delayDuration.value)
}

onUnmounted(() => {
onBeforeUnmount(() => {
window.clearTimeout(openTimerRef.value)
})

Expand Down
4 changes: 2 additions & 2 deletions packages/components/tooltip/src/tooltipProvider.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { Ref } from 'vue'
import { defineComponent, onMounted, onUnmounted, ref, toRefs } from 'vue'
import { defineComponent, onBeforeUnmount, onMounted, ref, toRefs } from 'vue'
import { DEFAULT_DELAY_DURATION, createTooltipProvide } from './utils'
import { scopeTooltipProps } from './types'

Expand Down Expand Up @@ -79,7 +79,7 @@ const tooltipProvider = defineComponent({
skipDelayTimer.value = skipDelayTimerRef.value
})

onUnmounted(() => {
onBeforeUnmount(() => {
window.clearTimeout(skipDelayTimer.value)
})

Expand Down
4 changes: 2 additions & 2 deletions packages/core/use-composable/src/useSize.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/// <reference types="resize-observer-browser" />

import type { Ref } from 'vue'
import { onUnmounted, ref, watch } from 'vue'
import { onBeforeUnmount, ref, watch } from 'vue'

interface Size {
width: number
Expand Down Expand Up @@ -53,7 +53,7 @@ function useSize(element: Ref<HTMLElement | null>) {
}
})

onUnmounted(() => {
onBeforeUnmount(() => {
if (element.value)
resizeObserver.value?.unobserve(element.value)
})
Expand Down