Skip to content

Commit cf4a7ea

Browse files
committed
fix: 修复 FaDrawer 和 FaModal 组件开启时警告错误
1 parent 42b7ab3 commit cf4a7ea

26 files changed

Lines changed: 15 additions & 0 deletions

packages/components/src/drawer/index.ts

100755100644
File mode changed.

packages/components/src/drawer/index.vue

100755100644
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ const slots = defineSlots<{
5050
footer?: () => VNode
5151
}>()
5252
53+
const sheetContentRef = useTemplateRef('sheetContentRef')
5354
const drawerId = shallowRef(props.id ?? useId())
5455
const isOpen = ref(props.modelValue)
5556
@@ -140,6 +141,9 @@ function handleOpenAutoFocus(e: Event) {
140141
if (!props.openAutoFocus) {
141142
e.preventDefault()
142143
e.stopPropagation()
144+
nextTick(() => {
145+
sheetContentRef.value?.el?.$el?.focus()
146+
})
143147
}
144148
}
145149
@@ -176,6 +180,7 @@ function handleAnimationEnd() {
176180
<template>
177181
<Sheet :open="isOpen" @update:open="updateOpen">
178182
<SheetContent
183+
ref="sheetContentRef"
179184
:drawer-id="drawerId"
180185
:open="isOpen"
181186
:z-index="props.zIndex"

packages/components/src/drawer/sheet/Sheet.vue

100755100644
File mode changed.

packages/components/src/drawer/sheet/SheetClose.vue

100755100644
File mode changed.

packages/components/src/drawer/sheet/SheetContent.vue

100755100644
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,12 @@ const delegatedProps = reactiveOmit(props, 'class', 'side')
3838
3939
const forwarded = useForwardPropsEmits(delegatedProps, emits)
4040
41+
const sheetContentRef = useTemplateRef<ComponentPublicInstance<typeof DialogContent>>('sheetContentRef')
42+
43+
defineExpose({
44+
el: sheetContentRef,
45+
})
46+
4147
const showOverlay = computed(() => props.open && props.overlay)
4248
</script>
4349

@@ -67,6 +73,7 @@ const showOverlay = computed(() => props.open && props.overlay)
6773
</Transition>
6874
<SheetOverlay class="hidden" />
6975
<DialogContent
76+
ref="sheetContentRef"
7077
data-slot="sheet-content"
7178
:class="cn(
7279
'bg-background data-[state=open]:animate-in data-[state=closed]:animate-out fixed z-50 flex flex-col gap-4 shadow-lg transition ease-in-out data-[state=closed]:duration-300 data-[state=open]:duration-500',

packages/components/src/drawer/sheet/SheetDescription.vue

100755100644
File mode changed.

packages/components/src/drawer/sheet/SheetFooter.vue

100755100644
File mode changed.

packages/components/src/drawer/sheet/SheetHeader.vue

100755100644
File mode changed.

packages/components/src/drawer/sheet/SheetOverlay.vue

100755100644
File mode changed.

packages/components/src/drawer/sheet/SheetTitle.vue

100755100644
File mode changed.

0 commit comments

Comments
 (0)