From e1abbd52919952f4055694811aee3f7867ed1056 Mon Sep 17 00:00:00 2001 From: David Baker Date: Thu, 2 Feb 2023 12:49:54 +0000 Subject: [PATCH] Yarn upgrade Along with some type fixes to make typescript happy again. Hopefully they are sensible. --- src/Menu.tsx | 11 +- src/Modal.tsx | 4 +- src/room/PTTFeed.tsx | 2 +- yarn.lock | 5564 ++++++++++++++++++++---------------------- 4 files changed, 2624 insertions(+), 2957 deletions(-) diff --git a/src/Menu.tsx b/src/Menu.tsx index 0a995afa..93b8822b 100644 --- a/src/Menu.tsx +++ b/src/Menu.tsx @@ -14,7 +14,7 @@ See the License for the specific language governing permissions and limitations under the License. */ -import React, { Key, useRef, useState } from "react"; +import React, { Key, ReactNode, 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,10 +25,11 @@ import { Node } from "@react-types/shared"; import styles from "./Menu.module.css"; interface MenuProps extends AriaMenuOptions { - className?: String; + className?: string; onClose?: () => void; onAction: (value: Key) => void; label?: string; + children: ReactNode; } export function Menu({ @@ -38,7 +39,11 @@ export function Menu({ label, ...rest }: MenuProps) { - const state = useTreeState({ ...rest, selectionMode: "none" }); + const state = useTreeState({ + ...rest, + selectionMode: "none", + children: undefined, + }); const menuRef = useRef(); const { menuProps } = useMenu(rest, state, menuRef); diff --git a/src/Modal.tsx b/src/Modal.tsx index 2665e116..7cb7e593 100644 --- a/src/Modal.tsx +++ b/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 { AriaDialogProps } from "@react-types/dialog"; +import { SpectrumDialogProps } 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, AriaDialogProps { +export interface ModalProps extends OverlayProps, SpectrumDialogProps { title: string; children: ReactNode; className?: string; diff --git a/src/room/PTTFeed.tsx b/src/room/PTTFeed.tsx index 49a40e0d..389badbe 100644 --- a/src/room/PTTFeed.tsx +++ b/src/room/PTTFeed.tsx @@ -30,5 +30,5 @@ export function PTTFeed({ }) { const { isLocal, stream } = useCallFeed(callFeed); const mediaRef = useMediaStream(stream, audioOutputDevice, isLocal); - return