Merge remote-tracking branch 'origin/main' into feature_sfu

src/Menu.tsx

@@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 
-import React, { Key, ReactNode, useRef, useState } from "react";
+import React, { Key, useRef, useState } from "react";
 import { AriaMenuOptions, useMenu, useMenuItem } from "@react-aria/menu";
 import { TreeState, useTreeState } from "@react-stately/tree";
 import { mergeProps } from "@react-aria/utils";
@@ -25,11 +25,10 @@ import { Node } from "@react-types/shared";
 import styles from "./Menu.module.css";
 
 interface MenuProps<T> extends AriaMenuOptions<T> {
-  className?: string;
+  className?: String;
   onClose?: () => void;
   onAction: (value: Key) => void;
   label?: string;
-  children: ReactNode;
 }
 
 export function Menu<T extends object>({
@@ -39,11 +38,7 @@ export function Menu<T extends object>({
   label,
   ...rest
 }: MenuProps<T>) {
-  const state = useTreeState<T>({
-    ...rest,
-    selectionMode: "none",
-    children: undefined,
-  });
+  const state = useTreeState<T>({ ...rest, selectionMode: "none" });
   const menuRef = useRef();
   const { menuProps } = useMenu<T>(rest, state, menuRef);
 

src/Modal.tsx

@@ -32,13 +32,13 @@ import { useDialog } from "@react-aria/dialog";
 import { FocusScope } from "@react-aria/focus";
 import { ButtonAria, useButton } from "@react-aria/button";
 import classNames from "classnames";
-import { SpectrumDialogProps } from "@react-types/dialog";
+import { AriaDialogProps } from "@react-types/dialog";
 import { useTranslation } from "react-i18next";
 
 import { ReactComponent as CloseIcon } from "./icons/Close.svg";
 import styles from "./Modal.module.css";
 
-export interface ModalProps extends OverlayProps, SpectrumDialogProps {
+export interface ModalProps extends OverlayProps, AriaDialogProps {
   title: string;
   children: ReactNode;
   className?: string;

src/room/PTTFeed.tsx

@@ -30,5 +30,5 @@ export function PTTFeed({
 }) {
   const { isLocal, stream } = useCallFeed(callFeed);
   const mediaRef = useMediaStream(stream, audioOutputDevice, isLocal);
-  return <audio ref={mediaRef} className={styles.audioFeed} />;
+  return <audio ref={mediaRef} className={styles.audioFeed} playsInline />;
 }