@dxos/react-ui 0.8.1 → 0.8.2-main.2f9c567

package/src/components/Avatars/Avatar.tsx

@@ -41,19 +41,22 @@ const DxAvatar = createComponent({
 
 type AvatarContentProps = ThemedClassName<Omit<ComponentProps<typeof DxAvatar>, 'children'>>;
 
-const AvatarContent = ({ icon, classNames, ...props }: AvatarContentProps) => {
-  const href = useIconHref(icon);
-  const { labelId, descriptionId } = useAvatarContext('AvatarContent');
-  return (
-    <DxAvatar
-      {...props}
-      icon={href}
-      labelId={labelId}
-      aria-describedby={descriptionId}
-      rootClassName={mx(classNames)}
-    />
-  );
-};
+const AvatarContent = forwardRef<NaturalDxAvatar, AvatarContentProps>(
+  ({ icon, classNames, ...props }, forwardedRef) => {
+    const href = useIconHref(icon);
+    const { labelId, descriptionId } = useAvatarContext('AvatarContent');
+    return (
+      <DxAvatar
+        {...props}
+        icon={href}
+        aria-labelledby={labelId}
+        aria-describedby={descriptionId}
+        rootClassName={mx(classNames)}
+        ref={forwardedRef}
+      />
+    );
+  },
+);
 
 type AvatarLabelProps = ThemedClassName<Omit<ComponentPropsWithRef<typeof Primitive.span>, 'id'>> & {
   asChild?: boolean;
@@ -113,4 +116,5 @@ export type {
   AvatarContentProps,
   AvatarLabelProps,
   AvatarDescriptionProps,
+  NaturalDxAvatar as DxAvatar,
 };

package/src/components/Dialogs/Dialog.tsx

@@ -115,6 +115,7 @@ const DialogContent: ForwardRefExoticComponent<DialogContentProps> = forwardRef<
 
     return (
       <DialogContentPrimitive
+        aria-describedby={undefined}
         {...props}
         className={tx(
           'dialog.content',

package/src/components/Popover/Popover.tsx

@@ -571,6 +571,8 @@ const PopoverViewport = forwardRef<HTMLDivElement, PopoverViewportProps>(
 
 const getState = (open: boolean) => (open ? 'open' : 'closed');
 
+type PopoverContentInteractOutsideEvent = Parameters<NonNullable<PopoverContentProps['onInteractOutside']>>[0];
+
 export const Popover = {
   Root: PopoverRoot,
   Anchor: PopoverAnchor,
@@ -595,4 +597,5 @@ export type {
   PopoverCloseProps,
   PopoverArrowProps,
   PopoverViewportProps,
+  PopoverContentInteractOutsideEvent,
 };

package/src/components/index.ts

@@ -8,12 +8,12 @@ export * from './Breadcrumb';
 export * from './Buttons';
 export * from './Clipboard';
 export * from './Dialogs';
-export * from './Menus';
 export * from './Icon';
 export * from './Input';
 export * from './Link';
 export * from './Lists';
 export * from './Main';
+export * from './Menus';
 export * from './Message';
 export * from './Popover';
 export * from './Status';