Skip to content

Commit 456d36a

Browse files
teleskop150750teleskop150750
committed
feat: refactor
1 parent 4e0937e commit 456d36a

25 files changed

+69
-51
lines changed

‎packages/vue-primitives/src/accordion/AccordionContent.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script setup lang="ts">
22
import { shallowRef } from 'vue'
33
import { useCollapsibleContent } from '../collapsible/CollapsibleContent.ts'
4-
import { useForwardElement } from '../hooks/useForwardElement.ts'
4+
import { useForwardElement } from '../hooks/index.ts'
55
import { Primitive } from '../primitive/index.ts'
66
import { useAccordionItemContext } from './AccordionItem.ts'
77
import { useAccordionContext } from './AccordionRoot.ts'

‎packages/vue-primitives/src/alert-dialog/AlertDialogRoot.vue‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
<script setup lang="ts">
22
import { provideDialogContext } from '../dialog/index.ts'
3-
import { useId, useRef } from '../hooks/index.ts'
4-
import { useControllableState } from '../hooks/useControllableState.ts'
3+
import { useControllableState, useId, useRef } from '../hooks/index.ts'
54
import type { DialogContentElement } from '../dialog/DialogRoot.ts'
65
import type { AlertDialogRootEmits, AlertDialogRootProps } from './AlertDialogRoot.ts'
76

‎packages/vue-primitives/src/dialog/DialogContentModal.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,6 @@ const dismissableLayer = useDismissableLayer($el, {
111111
:id="context.contentId"
112112
:ref="forwardElement"
113113

114-
tabindex="-1"
115-
116114
data-dismissable-layer
117115

118116
:style="{ pointerEvents: dismissableLayer.pointerEvents() }"
@@ -121,11 +119,13 @@ const dismissableLayer = useDismissableLayer($el, {
121119
:aria-labelledby="context.titleId"
122120
:data-state="getState(context.open.value)"
123121

124-
@keydown="focusScope.onKeydown"
122+
tabindex="-1"
125123

126124
@focus.capture="dismissableLayer.onFocusCapture"
127125
@blur.capture="dismissableLayer.onBlurCapture"
128126
@pointerdown.capture="dismissableLayer.onPointerdownCapture"
127+
128+
@keydown="focusScope.onKeydown"
129129
>
130130
<slot />
131131
</Primitive>

‎packages/vue-primitives/src/dialog/DialogContentNonModal.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,6 @@ const dismissableLayer = useDismissableLayer($el, {
121121
:id="context.contentId"
122122
:ref="forwardElement"
123123

124-
tabindex="-1"
125-
126124
data-dismissable-layer
127125

128126
:style="{ pointerEvents: dismissableLayer.pointerEvents() }"
@@ -131,11 +129,13 @@ const dismissableLayer = useDismissableLayer($el, {
131129
:aria-labelledby="context.titleId"
132130
:data-state="getState(context.open.value)"
133131

134-
@keydown="focusScope.onKeydown"
132+
tabindex="-1"
135133

136134
@focus.capture="dismissableLayer.onFocusCapture"
137135
@blur.capture="dismissableLayer.onBlurCapture"
138136
@pointerdown.capture="dismissableLayer.onPointerdownCapture"
137+
138+
@keydown="focusScope.onKeydown"
139139
>
140140
<slot />
141141
</Primitive>

‎packages/vue-primitives/src/floating/useFloating.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import {
1010
watchEffect,
1111
} from 'vue'
1212

13-
import { useRef } from '../hooks/useRef.ts'
13+
import { useRef } from '../hooks/index.ts'
1414
import { getDPR } from './utils/getDPR.ts'
1515
import { roundByDPR } from './utils/roundByDPR.ts'
1616
import type {

‎packages/vue-primitives/src/hover-card/HoverCardContentImpl.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<script setup lang="ts">
22
import { onBeforeUnmount, onMounted, shallowRef, watchEffect } from 'vue'
33
import { type FocusOutsideEvent, useDismissableLayer } from '../dismissable-layer/index.ts'
4-
import { useForwardElement } from '../hooks/useForwardElement.ts'
4+
import { useForwardElement } from '../hooks/index.ts'
55
import { PopperContent } from '../popper/index.ts'
66
import { composeEventHandlers } from '../utils/vue.ts'
77
import { useHoverCardContext } from './HoverCardRoot.ts'

‎packages/vue-primitives/src/hover-card/HoverCardTrigger.vue‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<script setup lang="ts">
2-
import { onMounted, shallowRef } from 'vue'
3-
import { useForwardElement } from '../hooks/useForwardElement.ts'
2+
import { onMounted } from 'vue'
3+
import { useForwardElement, useRef } from '../hooks/index.ts'
44
import { usePopperContext } from '../popper/index.ts'
55
import { Primitive } from '../primitive/index.ts'
66
import { composeEventHandlers } from '../utils/vue.ts'
@@ -45,11 +45,11 @@ const onTouchstart = composeEventHandlers<TouchEvent>((event) => {
4545
4646
const popperContext = usePopperContext('PopperAnchor')
4747
48-
const $el = shallowRef<HTMLDivElement>()
48+
const $el = useRef<HTMLDivElement>()
4949
const forwardElement = useForwardElement($el)
5050
5151
onMounted(() => {
52-
popperContext.onAnchorChange(props.virtualRef?.current || $el.value)
52+
popperContext.onAnchorChange(props.virtualRef?.current || $el.current)
5353
})
5454
</script>
5555

‎packages/vue-primitives/src/popover/PopoverContentModal.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,6 @@ const dismissableLayer = useDismissableLayer($el, {
114114
:id="context.contentId"
115115
:ref="forwardElement"
116116

117-
tabindex="-1"
118-
119117
data-dismissable-layer
120118

121119
:data-state="getState(context.open.value)"
@@ -129,11 +127,13 @@ const dismissableLayer = useDismissableLayer($el, {
129127
'--radix-popover-trigger-height': 'var(--radix-popper-anchor-height)',
130128
}"
131129

132-
@keydown="focusScope.onKeydown"
130+
tabindex="-1"
133131

134132
@focus.capture="dismissableLayer.onFocusCapture"
135133
@blur.capture="dismissableLayer.onBlurCapture"
136134
@pointerdown.capture="dismissableLayer.onPointerdownCapture"
135+
136+
@keydown="focusScope.onKeydown"
137137
>
138138
<slot />
139139
</PopperContent>

‎packages/vue-primitives/src/popover/PopoverContentNonModal.vue‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -121,8 +121,6 @@ const dismissableLayer = useDismissableLayer($el, {
121121
:id="context.contentId"
122122
:ref="forwardElement"
123123

124-
tabindex="-1"
125-
126124
data-dismissable-layer
127125

128126
:data-state="getState(context.open.value)"
@@ -136,11 +134,13 @@ const dismissableLayer = useDismissableLayer($el, {
136134
'--radix-popover-trigger-height': 'var(--radix-popper-anchor-height)',
137135
}"
138136

139-
@keydown="focusScope.onKeydown"
137+
tabindex="-1"
140138

141139
@focus.capture="dismissableLayer.onFocusCapture"
142140
@blur.capture="dismissableLayer.onBlurCapture"
143141
@pointerdown.capture="dismissableLayer.onPointerdownCapture"
142+
143+
@keydown="focusScope.onKeydown"
144144
>
145145
<slot />
146146
</PopperContent>

‎packages/vue-primitives/src/primitive/Primitive.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { type Component, defineComponent, h, type PropType, shallowRef } from 'vue'
2-
import { useForwardElement } from '../hooks/useForwardElement.ts'
2+
import { useForwardElement } from '../hooks/index.ts'
33
import { Slot } from '../slot/index.ts'
44

55
export type AsTag =

0 commit comments

Comments
 (0)