fix: useDismissableLayer attrs

Author: teleskop150750

packages/vue-primitives/src/dialog/DialogContentImpl.ts

@@ -30,26 +30,14 @@ export function useDialogContentImpl(props: UseDialogContentImplProps): RadixPri
 
   const useDialogContentImpl = context.modal ? useDialogContentModal : useDialogContentNonModal
 
-  const dialogContentImpl = useDialogContentImpl({
+  return useDialogContentImpl({
     onOpenAutoFocus: props.onOpenAutoFocus,
     onCloseAutoFocus: props.onCloseAutoFocus,
     onEscapeKeydown: props.onEscapeKeydown,
     onPointerdownOutside: props.onPointerdownOutside,
     onFocusOutside: props.onFocusOutside,
     onInteractOutside: props.onInteractOutside,
   })
-
-  return {
-    attrs(extraAttrs = []) {
-      const attrs = dialogContentImpl.attrs()
-
-      if (extraAttrs && extraAttrs.length > 0) {
-        mergePrimitiveAttrs(attrs, extraAttrs)
-      }
-
-      return attrs
-    },
-  }
 }
 
 export function useDialogContentModal(props: UseDialogContentImplProps): RadixPrimitiveReturns {
@@ -61,7 +49,7 @@ export function useDialogContentModal(props: UseDialogContentImplProps): RadixPr
       hideOthers(context.content.value)
   })
 
-  const dialogContentImpl = useDialogContentImplShared({
+  return useDialogContentImplShared({
     trapFocus() {
       return context.open.value
     },
@@ -98,18 +86,6 @@ export function useDialogContentModal(props: UseDialogContentImplProps): RadixPr
     },
     onEscapeKeydown: props.onEscapeKeydown,
   })
-
-  return {
-    attrs(extraAttrs) {
-      const attrs = dialogContentImpl.attrs()
-
-      if (extraAttrs && extraAttrs.length > 0) {
-        mergePrimitiveAttrs(attrs, extraAttrs)
-      }
-
-      return attrs
-    },
-  }
 }
 
 export function useDialogContentNonModal(props: UseDialogContentImplProps): RadixPrimitiveReturns {
@@ -118,7 +94,7 @@ export function useDialogContentNonModal(props: UseDialogContentImplProps): Radi
   let hasInteractedOutsideRef = false
   let hasPointerDownOutsideRef = false
 
-  const dialogContentImpl = useDialogContentImplShared({
+  return useDialogContentImplShared({
     trapFocus() {
       return false
     },
@@ -168,18 +144,6 @@ export function useDialogContentNonModal(props: UseDialogContentImplProps): Radi
     onFocusOutside: props.onFocusOutside,
     onEscapeKeydown: props.onEscapeKeydown,
   })
-
-  return {
-    attrs(extraAttrs = []) {
-      const attrs = dialogContentImpl.attrs()
-
-      if (extraAttrs && extraAttrs.length > 0) {
-        mergePrimitiveAttrs(attrs, extraAttrs)
-      }
-
-      return attrs
-    },
-  }
 }
 
 export interface UseDialogContentImplSharedProps extends EmitsToHookProps<DialogContentImplPublicEmits>, Omit<UseDismissableLayerProps, 'onDismiss'> {

packages/vue-primitives/src/dismissable-layer/DismissableLayer.ts

@@ -178,7 +178,8 @@ export function useDismissableLayer(props: UseDismissableLayerProps = {}): Radix
 
   return {
     attrs(extraAttrs = []) {
-      const attrs: PrimitiveElAttrs = {
+      const attrs = {}
+      const overideAttrs: PrimitiveElAttrs = {
         'elRef': setTemplateEl,
         'data-dismissable-layer': true,
         'style': {
@@ -190,7 +191,7 @@ export function useDismissableLayer(props: UseDismissableLayerProps = {}): Radix
         },
       }
 
-      mergePrimitiveAttrs({}, [...extraAttrs, attrs])
+      mergePrimitiveAttrs(attrs, [...extraAttrs, overideAttrs])
 
       return attrs
     },