diff --git a/packages/ui-voip/src/v2/components/ActionButton.tsx b/packages/ui-voip/src/components/ActionButton.tsx similarity index 100% rename from packages/ui-voip/src/v2/components/ActionButton.tsx rename to packages/ui-voip/src/components/ActionButton.tsx diff --git a/packages/ui-voip/src/v2/components/DevicePicker.tsx b/packages/ui-voip/src/components/DevicePicker.tsx similarity index 96% rename from packages/ui-voip/src/v2/components/DevicePicker.tsx rename to packages/ui-voip/src/components/DevicePicker.tsx index 82693aeda1a97..91845a8ca48d2 100644 --- a/packages/ui-voip/src/v2/components/DevicePicker.tsx +++ b/packages/ui-voip/src/components/DevicePicker.tsx @@ -8,8 +8,8 @@ import { forwardRef, useCallback, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { ActionButton } from '.'; -import { useDevicePermissionPrompt2, stopTracks } from '../../hooks/useDevicePermissionPrompt'; -import { useMediaCallContext } from '../MediaCallContext'; +import { useMediaCallContext } from '../context'; +import { useDevicePermissionPrompt2, stopTracks } from '../hooks/useDevicePermissionPrompt'; type DevicePickerButtonProps = { secondary?: boolean; diff --git a/packages/ui-voip/src/v2/components/Keypad/Key.tsx b/packages/ui-voip/src/components/Keypad/Key.tsx similarity index 100% rename from packages/ui-voip/src/v2/components/Keypad/Key.tsx rename to packages/ui-voip/src/components/Keypad/Key.tsx diff --git a/packages/ui-voip/src/v2/components/Keypad/Keypad.stories.tsx b/packages/ui-voip/src/components/Keypad/Keypad.stories.tsx similarity index 88% rename from packages/ui-voip/src/v2/components/Keypad/Keypad.stories.tsx rename to packages/ui-voip/src/components/Keypad/Keypad.stories.tsx index 89b25ae33e19b..19e7e09b703ae 100644 --- a/packages/ui-voip/src/v2/components/Keypad/Keypad.stories.tsx +++ b/packages/ui-voip/src/components/Keypad/Keypad.stories.tsx @@ -1,7 +1,7 @@ import type { Meta, StoryFn } from '@storybook/react'; import Keypad from './Keypad'; -import { useTonePlayer } from '../../useTonePlayer'; +import { useTonePlayer } from '../../context/useTonePlayer'; export default { title: 'V2/Components/Keypad', diff --git a/packages/ui-voip/src/v2/components/Keypad/Keypad.tsx b/packages/ui-voip/src/components/Keypad/Keypad.tsx similarity index 100% rename from packages/ui-voip/src/v2/components/Keypad/Keypad.tsx rename to packages/ui-voip/src/components/Keypad/Keypad.tsx diff --git a/packages/ui-voip/src/v2/useKeypad.tsx b/packages/ui-voip/src/components/Keypad/useKeypad.tsx similarity index 96% rename from packages/ui-voip/src/v2/useKeypad.tsx rename to packages/ui-voip/src/components/Keypad/useKeypad.tsx index 59481e6b9f802..3a9ec4272e8fc 100644 --- a/packages/ui-voip/src/v2/useKeypad.tsx +++ b/packages/ui-voip/src/components/Keypad/useKeypad.tsx @@ -3,7 +3,7 @@ import type { ReactNode } from 'react'; import { useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { Keypad } from './components'; +import Keypad from './Keypad'; type UseKeypad = { element: ReactNode; diff --git a/packages/ui-voip/src/v2/components/PeerAutocomplete.tsx b/packages/ui-voip/src/components/PeerAutocomplete.tsx similarity index 96% rename from packages/ui-voip/src/v2/components/PeerAutocomplete.tsx rename to packages/ui-voip/src/components/PeerAutocomplete.tsx index b2cd745c645dd..90ea5ea1c9110 100644 --- a/packages/ui-voip/src/v2/components/PeerAutocomplete.tsx +++ b/packages/ui-voip/src/components/PeerAutocomplete.tsx @@ -3,7 +3,7 @@ import { AutoComplete, Option, Avatar, Field, FieldRow, FieldDescription, FieldE import { useId } from 'react'; import { useTranslation } from 'react-i18next'; -import { isFirstPeerAutocompleteOption } from '../MediaCallContext'; +import { isFirstPeerAutocompleteOption } from '../context'; export type PeerAutocompleteOptions = { value: string; // user id diff --git a/packages/ui-voip/src/v2/components/PeerInfo/InternalUser.tsx b/packages/ui-voip/src/components/PeerInfo/InternalUser.tsx similarity index 97% rename from packages/ui-voip/src/v2/components/PeerInfo/InternalUser.tsx rename to packages/ui-voip/src/components/PeerInfo/InternalUser.tsx index 049c6f3cbca70..96cfa6c812ea6 100644 --- a/packages/ui-voip/src/v2/components/PeerInfo/InternalUser.tsx +++ b/packages/ui-voip/src/components/PeerInfo/InternalUser.tsx @@ -1,7 +1,7 @@ import type { UserStatus } from '@rocket.chat/core-typings'; import { Avatar, Box, Icon, StatusBullet } from '@rocket.chat/fuselage'; -import type { Slot } from '../../useInfoSlots'; +import type { Slot } from './useInfoSlots'; type InternalUserProps = { displayName: string; diff --git a/packages/ui-voip/src/v2/components/PeerInfo/PeerInfo.stories.tsx b/packages/ui-voip/src/components/PeerInfo/PeerInfo.stories.tsx similarity index 100% rename from packages/ui-voip/src/v2/components/PeerInfo/PeerInfo.stories.tsx rename to packages/ui-voip/src/components/PeerInfo/PeerInfo.stories.tsx diff --git a/packages/ui-voip/src/v2/components/PeerInfo/PeerInfo.tsx b/packages/ui-voip/src/components/PeerInfo/PeerInfo.tsx similarity index 100% rename from packages/ui-voip/src/v2/components/PeerInfo/PeerInfo.tsx rename to packages/ui-voip/src/components/PeerInfo/PeerInfo.tsx diff --git a/packages/ui-voip/src/v2/components/PeerInfo/PhoneNumber.tsx b/packages/ui-voip/src/components/PeerInfo/PhoneNumber.tsx similarity index 100% rename from packages/ui-voip/src/v2/components/PeerInfo/PhoneNumber.tsx rename to packages/ui-voip/src/components/PeerInfo/PhoneNumber.tsx diff --git a/packages/ui-voip/src/v2/components/PeerInfo/index.ts b/packages/ui-voip/src/components/PeerInfo/index.ts similarity index 100% rename from packages/ui-voip/src/v2/components/PeerInfo/index.ts rename to packages/ui-voip/src/components/PeerInfo/index.ts diff --git a/packages/ui-voip/src/v2/useInfoSlots.ts b/packages/ui-voip/src/components/PeerInfo/useInfoSlots.ts similarity index 96% rename from packages/ui-voip/src/v2/useInfoSlots.ts rename to packages/ui-voip/src/components/PeerInfo/useInfoSlots.ts index 00ff776eb845b..d3a32181ce63e 100644 --- a/packages/ui-voip/src/v2/useInfoSlots.ts +++ b/packages/ui-voip/src/components/PeerInfo/useInfoSlots.ts @@ -2,7 +2,7 @@ import type { Keys as IconNames } from '@rocket.chat/icons'; import { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import type { ConnectionState } from './MediaCallContext'; +import type { ConnectionState } from '../../context'; export type Slot = { text: string; diff --git a/packages/ui-voip/src/v2/components/Timer.tsx b/packages/ui-voip/src/components/Timer.tsx similarity index 100% rename from packages/ui-voip/src/v2/components/Timer.tsx rename to packages/ui-voip/src/components/Timer.tsx diff --git a/packages/ui-voip/src/v2/components/ToggleButton.stories.tsx b/packages/ui-voip/src/components/ToggleButton.stories.tsx similarity index 100% rename from packages/ui-voip/src/v2/components/ToggleButton.stories.tsx rename to packages/ui-voip/src/components/ToggleButton.stories.tsx diff --git a/packages/ui-voip/src/v2/components/ToggleButton.tsx b/packages/ui-voip/src/components/ToggleButton.tsx similarity index 100% rename from packages/ui-voip/src/v2/components/ToggleButton.tsx rename to packages/ui-voip/src/components/ToggleButton.tsx diff --git a/packages/ui-voip/src/v2/components/Widget/Widget.stories.tsx b/packages/ui-voip/src/components/Widget/Widget.stories.tsx similarity index 100% rename from packages/ui-voip/src/v2/components/Widget/Widget.stories.tsx rename to packages/ui-voip/src/components/Widget/Widget.stories.tsx diff --git a/packages/ui-voip/src/v2/components/Widget/Widget.tsx b/packages/ui-voip/src/components/Widget/Widget.tsx similarity index 94% rename from packages/ui-voip/src/v2/components/Widget/Widget.tsx rename to packages/ui-voip/src/components/Widget/Widget.tsx index caf555916e929..4cff6c10f6bdd 100644 --- a/packages/ui-voip/src/v2/components/Widget/Widget.tsx +++ b/packages/ui-voip/src/components/Widget/Widget.tsx @@ -5,7 +5,7 @@ import { useLayoutEffect } from 'react'; import { FocusScope } from 'react-aria'; import { DragContext } from './WidgetDraggableContext'; -import { useDraggable } from '../../../components/VoipPopupDraggable/DraggableCore'; +import { useDraggable } from '../../hooks'; // TODO: Initial position from the draggable api instead of style props // TODO: A11Y diff --git a/packages/ui-voip/src/v2/components/Widget/WidgetContent.tsx b/packages/ui-voip/src/components/Widget/WidgetContent.tsx similarity index 100% rename from packages/ui-voip/src/v2/components/Widget/WidgetContent.tsx rename to packages/ui-voip/src/components/Widget/WidgetContent.tsx diff --git a/packages/ui-voip/src/v2/components/Widget/WidgetDraggableContext.ts b/packages/ui-voip/src/components/Widget/WidgetDraggableContext.ts similarity index 100% rename from packages/ui-voip/src/v2/components/Widget/WidgetDraggableContext.ts rename to packages/ui-voip/src/components/Widget/WidgetDraggableContext.ts diff --git a/packages/ui-voip/src/v2/components/Widget/WidgetFooter.tsx b/packages/ui-voip/src/components/Widget/WidgetFooter.tsx similarity index 100% rename from packages/ui-voip/src/v2/components/Widget/WidgetFooter.tsx rename to packages/ui-voip/src/components/Widget/WidgetFooter.tsx diff --git a/packages/ui-voip/src/v2/components/Widget/WidgetHandle.tsx b/packages/ui-voip/src/components/Widget/WidgetHandle.tsx similarity index 100% rename from packages/ui-voip/src/v2/components/Widget/WidgetHandle.tsx rename to packages/ui-voip/src/components/Widget/WidgetHandle.tsx diff --git a/packages/ui-voip/src/v2/components/Widget/WidgetHeader.tsx b/packages/ui-voip/src/components/Widget/WidgetHeader.tsx similarity index 100% rename from packages/ui-voip/src/v2/components/Widget/WidgetHeader.tsx rename to packages/ui-voip/src/components/Widget/WidgetHeader.tsx diff --git a/packages/ui-voip/src/v2/components/Widget/WidgetInfo.tsx b/packages/ui-voip/src/components/Widget/WidgetInfo.tsx similarity index 100% rename from packages/ui-voip/src/v2/components/Widget/WidgetInfo.tsx rename to packages/ui-voip/src/components/Widget/WidgetInfo.tsx diff --git a/packages/ui-voip/src/v2/components/Widget/index.ts b/packages/ui-voip/src/components/Widget/index.ts similarity index 100% rename from packages/ui-voip/src/v2/components/Widget/index.ts rename to packages/ui-voip/src/components/Widget/index.ts diff --git a/packages/ui-voip/src/v2/components/index.ts b/packages/ui-voip/src/components/index.ts similarity index 80% rename from packages/ui-voip/src/v2/components/index.ts rename to packages/ui-voip/src/components/index.ts index 6d7f5390ac1d8..66d3b4619f7bc 100644 --- a/packages/ui-voip/src/v2/components/index.ts +++ b/packages/ui-voip/src/components/index.ts @@ -5,6 +5,8 @@ export * from './PeerAutocomplete'; export { default as ToggleButton } from './ToggleButton'; export { default as ActionButton } from './ActionButton'; export { default as Keypad } from './Keypad/Keypad'; +export { useKeypad } from './Keypad/useKeypad'; +export { useInfoSlots } from './PeerInfo/useInfoSlots'; export { default as PeerAutocomplete } from './PeerAutocomplete'; export { default as Timer } from './Timer'; export { default as DevicePicker } from './DevicePicker'; diff --git a/packages/ui-voip/src/v2/MediaCallContext.ts b/packages/ui-voip/src/context/MediaCallContext.ts similarity index 98% rename from packages/ui-voip/src/v2/MediaCallContext.ts rename to packages/ui-voip/src/context/MediaCallContext.ts index 1e8b2d216bd8e..c063138807981 100644 --- a/packages/ui-voip/src/v2/MediaCallContext.ts +++ b/packages/ui-voip/src/context/MediaCallContext.ts @@ -4,7 +4,7 @@ import type { Device } from '@rocket.chat/ui-contexts'; import { keepPreviousData, useQuery } from '@tanstack/react-query'; import { createContext, useContext, useState } from 'react'; -import type { PeerAutocompleteOptions } from './components'; +import type { PeerAutocompleteOptions } from '../components'; type InternalPeerInfo = { displayName: string; diff --git a/packages/ui-voip/src/v2/MediaCallLogger.ts b/packages/ui-voip/src/context/MediaCallLogger.ts similarity index 100% rename from packages/ui-voip/src/v2/MediaCallLogger.ts rename to packages/ui-voip/src/context/MediaCallLogger.ts diff --git a/packages/ui-voip/src/v2/MediaCallProvider.tsx b/packages/ui-voip/src/context/MediaCallProvider.tsx similarity index 98% rename from packages/ui-voip/src/v2/MediaCallProvider.tsx rename to packages/ui-voip/src/context/MediaCallProvider.tsx index 7a0b834d482a4..2c665a9eb20ae 100644 --- a/packages/ui-voip/src/v2/MediaCallProvider.tsx +++ b/packages/ui-voip/src/context/MediaCallProvider.tsx @@ -18,8 +18,6 @@ import { useTranslation } from 'react-i18next'; import type { PeerInfo } from './MediaCallContext'; import MediaCallContext from './MediaCallContext'; -import MediaCallWidget from './MediaCallWidget'; -import TransferModal from './TransferModal'; import { useCallSounds } from './useCallSounds'; import { useDesktopNotifications } from './useDesktopNotifications'; import { getExtensionFromPeerInfo, useMediaSession } from './useMediaSession'; @@ -27,6 +25,8 @@ import { useMediaSessionInstance } from './useMediaSessionInstance'; import useMediaStream from './useMediaStream'; import { isValidTone, useTonePlayer } from './useTonePlayer'; import { stopTracks, useDevicePermissionPrompt2, PermissionRequestCancelledCallRejectedError } from '../hooks/useDevicePermissionPrompt'; +import { MediaCallWidget } from '../views'; +import TransferModal from '../views/TransferModal'; type MediaCallProviderProps = { children: ReactNode; diff --git a/packages/ui-voip/src/v2/MockedMediaCallProvider.tsx b/packages/ui-voip/src/context/MockedMediaCallProvider.tsx similarity index 100% rename from packages/ui-voip/src/v2/MockedMediaCallProvider.tsx rename to packages/ui-voip/src/context/MockedMediaCallProvider.tsx diff --git a/packages/ui-voip/src/context/index.ts b/packages/ui-voip/src/context/index.ts new file mode 100644 index 0000000000000..b0e94b134c883 --- /dev/null +++ b/packages/ui-voip/src/context/index.ts @@ -0,0 +1,4 @@ +export { useMediaCallContext, useMediaCallExternalContext, default as MediaCallContext, usePeerAutocomplete } from './MediaCallContext'; +export type { PeerInfo, ConnectionState } from './MediaCallContext'; +export { isFirstPeerAutocompleteOption } from './MediaCallContext'; +export { default as MockedMediaCallProvider } from './MockedMediaCallProvider'; diff --git a/packages/ui-voip/src/v2/useCallSounds.ts b/packages/ui-voip/src/context/useCallSounds.ts similarity index 100% rename from packages/ui-voip/src/v2/useCallSounds.ts rename to packages/ui-voip/src/context/useCallSounds.ts diff --git a/packages/ui-voip/src/v2/useDesktopNotifications.ts b/packages/ui-voip/src/context/useDesktopNotifications.ts similarity index 96% rename from packages/ui-voip/src/v2/useDesktopNotifications.ts rename to packages/ui-voip/src/context/useDesktopNotifications.ts index 7704312ecad01..30183cf53f58c 100644 --- a/packages/ui-voip/src/v2/useDesktopNotifications.ts +++ b/packages/ui-voip/src/context/useDesktopNotifications.ts @@ -4,7 +4,7 @@ import { useTranslation } from 'react-i18next'; import type { PeerInfo } from './MediaCallContext'; import type { SessionInfo } from './useMediaSessionInstance'; -import { convertAvatarUrlToPng } from './utils/convertAvatarUrlToPng'; +import { convertAvatarUrlToPng } from '../utils/convertAvatarUrlToPng'; const getDisplayInfo = (peerInfo?: PeerInfo) => { if (!peerInfo) { diff --git a/packages/ui-voip/src/v2/useMediaSession.ts b/packages/ui-voip/src/context/useMediaSession.ts similarity index 100% rename from packages/ui-voip/src/v2/useMediaSession.ts rename to packages/ui-voip/src/context/useMediaSession.ts diff --git a/packages/ui-voip/src/v2/useMediaSessionInstance.ts b/packages/ui-voip/src/context/useMediaSessionInstance.ts similarity index 100% rename from packages/ui-voip/src/v2/useMediaSessionInstance.ts rename to packages/ui-voip/src/context/useMediaSessionInstance.ts diff --git a/packages/ui-voip/src/v2/useMediaStream.ts b/packages/ui-voip/src/context/useMediaStream.ts similarity index 100% rename from packages/ui-voip/src/v2/useMediaStream.ts rename to packages/ui-voip/src/context/useMediaStream.ts diff --git a/packages/ui-voip/src/v2/useTonePlayer.ts b/packages/ui-voip/src/context/useTonePlayer.ts similarity index 100% rename from packages/ui-voip/src/v2/useTonePlayer.ts rename to packages/ui-voip/src/context/useTonePlayer.ts diff --git a/packages/ui-voip/src/components/VoipPopupDraggable/DraggableCore.ts b/packages/ui-voip/src/hooks/VoipPopupDraggable/DraggableCore.ts similarity index 100% rename from packages/ui-voip/src/components/VoipPopupDraggable/DraggableCore.ts rename to packages/ui-voip/src/hooks/VoipPopupDraggable/DraggableCore.ts index 93adfe5b55617..fdc1f2cae4852 100644 --- a/packages/ui-voip/src/components/VoipPopupDraggable/DraggableCore.ts +++ b/packages/ui-voip/src/hooks/VoipPopupDraggable/DraggableCore.ts @@ -1,5 +1,5 @@ -import type { OffCallbackHandler } from '@rocket.chat/emitter'; import { Emitter } from '@rocket.chat/emitter'; +import type { OffCallbackHandler } from '@rocket.chat/emitter'; import { useSafeRefCallback } from '@rocket.chat/ui-client'; import { useCallback, useRef, useState } from 'react'; diff --git a/packages/ui-voip/src/components/VoipPopupDraggable/useDraggable.stories.tsx b/packages/ui-voip/src/hooks/VoipPopupDraggable/useDraggable.stories.tsx similarity index 100% rename from packages/ui-voip/src/components/VoipPopupDraggable/useDraggable.stories.tsx rename to packages/ui-voip/src/hooks/VoipPopupDraggable/useDraggable.stories.tsx diff --git a/packages/ui-voip/src/hooks/index.ts b/packages/ui-voip/src/hooks/index.ts index 8b58b842e44f4..3f9656838500c 100644 --- a/packages/ui-voip/src/hooks/index.ts +++ b/packages/ui-voip/src/hooks/index.ts @@ -1 +1,3 @@ export * from './useDevicePermissionPrompt'; +export { useDraggable } from './VoipPopupDraggable/DraggableCore'; +export { useMediaCallAction } from './useMediaCallAction'; diff --git a/packages/ui-voip/src/hooks/useDevicePermissionPrompt.tsx b/packages/ui-voip/src/hooks/useDevicePermissionPrompt.tsx index 184d71009e46c..6540d92beabc5 100644 --- a/packages/ui-voip/src/hooks/useDevicePermissionPrompt.tsx +++ b/packages/ui-voip/src/hooks/useDevicePermissionPrompt.tsx @@ -2,7 +2,7 @@ import { useMediaDeviceMicrophonePermission, useSelectedDevices, useSetInputMedi import { useQueryClient } from '@tanstack/react-query'; import { useCallback } from 'react'; -import PermissionFlowModal, { type PermissionFlowModalType } from '../components/PermissionFlow/PermissionFlowModal'; +import { PermissionFlowModal, type PermissionFlowModalType } from '../views'; type OnAccept = (stream: MediaStream) => void; type OnReject = (error?: DOMException) => void; diff --git a/packages/ui-voip/src/v2/useMediaCallAction.ts b/packages/ui-voip/src/hooks/useMediaCallAction.ts similarity index 93% rename from packages/ui-voip/src/v2/useMediaCallAction.ts rename to packages/ui-voip/src/hooks/useMediaCallAction.ts index 1d6b74cd17212..937b5b3533347 100644 --- a/packages/ui-voip/src/v2/useMediaCallAction.ts +++ b/packages/ui-voip/src/hooks/useMediaCallAction.ts @@ -2,8 +2,8 @@ import type { Keys as IconNames } from '@rocket.chat/icons'; import { useMemo } from 'react'; import { useTranslation } from 'react-i18next'; -import type { PeerInfo } from './MediaCallContext'; -import { useMediaCallExternalContext } from './MediaCallContext'; +import type { PeerInfo } from '../context'; +import { useMediaCallExternalContext } from '../context'; export const useMediaCallAction = ( callee?: PeerInfo, diff --git a/packages/ui-voip/src/index.ts b/packages/ui-voip/src/index.ts index d28ae53a6c93b..1bdb9100eb5ac 100644 --- a/packages/ui-voip/src/index.ts +++ b/packages/ui-voip/src/index.ts @@ -1,5 +1,5 @@ -export { default as MediaCallProvider } from './v2/MediaCallProvider'; +export { default as MediaCallProvider } from './context/MediaCallProvider'; -export * from './hooks'; +export { MediaCallContext, useMediaCallExternalContext as useMediaCallContext, type PeerInfo } from './context'; -export { MediaCallContext, useMediaCallExternalContext as useMediaCallContext, useMediaCallAction, type PeerInfo } from './v2'; +export { useMediaCallAction } from './hooks'; diff --git a/packages/ui-voip/src/v2/utils/convertAvatarUrlToPng.ts b/packages/ui-voip/src/utils/convertAvatarUrlToPng.ts similarity index 100% rename from packages/ui-voip/src/v2/utils/convertAvatarUrlToPng.ts rename to packages/ui-voip/src/utils/convertAvatarUrlToPng.ts diff --git a/packages/ui-voip/src/v2/index.ts b/packages/ui-voip/src/v2/index.ts deleted file mode 100644 index d6e5aded77eaf..0000000000000 --- a/packages/ui-voip/src/v2/index.ts +++ /dev/null @@ -1,4 +0,0 @@ -export { useMediaCallContext, useMediaCallExternalContext, default as MediaCallContext } from './MediaCallContext'; -export type { PeerInfo } from './MediaCallContext'; -export { default as MediaCallWidget } from './MediaCallWidget'; -export { useMediaCallAction } from './useMediaCallAction'; diff --git a/packages/ui-voip/src/v2/views/IncomingCall.stories.tsx b/packages/ui-voip/src/views/MediaCallWidget/IncomingCall.stories.tsx similarity index 91% rename from packages/ui-voip/src/v2/views/IncomingCall.stories.tsx rename to packages/ui-voip/src/views/MediaCallWidget/IncomingCall.stories.tsx index ffc34e625c3c6..0b97769206685 100644 --- a/packages/ui-voip/src/v2/views/IncomingCall.stories.tsx +++ b/packages/ui-voip/src/views/MediaCallWidget/IncomingCall.stories.tsx @@ -2,7 +2,7 @@ import { mockAppRoot } from '@rocket.chat/mock-providers'; import type { Meta, StoryFn } from '@storybook/react'; import IncomingCall from './IncomingCall'; -import MockedMediaCallProvider from '../MockedMediaCallProvider'; +import { MockedMediaCallProvider } from '../../context'; const mockedContexts = mockAppRoot() .withTranslations('en', 'core', { diff --git a/packages/ui-voip/src/v2/views/IncomingCall.tsx b/packages/ui-voip/src/views/MediaCallWidget/IncomingCall.tsx similarity index 90% rename from packages/ui-voip/src/v2/views/IncomingCall.tsx rename to packages/ui-voip/src/views/MediaCallWidget/IncomingCall.tsx index 5ded8e7415495..6a22a99040ce9 100644 --- a/packages/ui-voip/src/v2/views/IncomingCall.tsx +++ b/packages/ui-voip/src/views/MediaCallWidget/IncomingCall.tsx @@ -1,8 +1,8 @@ import { Button, ButtonGroup } from '@rocket.chat/fuselage'; import { useTranslation } from 'react-i18next'; -import { useMediaCallContext } from '../MediaCallContext'; -import { DevicePicker, PeerInfo, Widget, WidgetFooter, WidgetHandle, WidgetHeader, WidgetContent } from '../components'; +import { DevicePicker, PeerInfo, Widget, WidgetFooter, WidgetHandle, WidgetHeader, WidgetContent } from '../../components'; +import { useMediaCallContext } from '../../context'; const IncomingCall = () => { const { t } = useTranslation(); diff --git a/packages/ui-voip/src/v2/views/IncomingCallTransfer.stories.tsx b/packages/ui-voip/src/views/MediaCallWidget/IncomingCallTransfer.stories.tsx similarity index 92% rename from packages/ui-voip/src/v2/views/IncomingCallTransfer.stories.tsx rename to packages/ui-voip/src/views/MediaCallWidget/IncomingCallTransfer.stories.tsx index a0a48f3de288c..3cae7e88530e7 100644 --- a/packages/ui-voip/src/v2/views/IncomingCallTransfer.stories.tsx +++ b/packages/ui-voip/src/views/MediaCallWidget/IncomingCallTransfer.stories.tsx @@ -2,7 +2,7 @@ import { mockAppRoot } from '@rocket.chat/mock-providers'; import type { Meta, StoryFn } from '@storybook/react'; import IncomingCallTransfer from './IncomingCallTransfer'; -import MockedMediaCallProvider from '../MockedMediaCallProvider'; +import { MockedMediaCallProvider } from '../../context'; const mockedContexts = mockAppRoot() .withTranslations('en', 'core', { diff --git a/packages/ui-voip/src/v2/views/IncomingCallTransfer.tsx b/packages/ui-voip/src/views/MediaCallWidget/IncomingCallTransfer.tsx similarity index 89% rename from packages/ui-voip/src/v2/views/IncomingCallTransfer.tsx rename to packages/ui-voip/src/views/MediaCallWidget/IncomingCallTransfer.tsx index aad6c4fedc5fb..c90aa674399d8 100644 --- a/packages/ui-voip/src/v2/views/IncomingCallTransfer.tsx +++ b/packages/ui-voip/src/views/MediaCallWidget/IncomingCallTransfer.tsx @@ -1,8 +1,8 @@ import { Button, ButtonGroup } from '@rocket.chat/fuselage'; import { useTranslation } from 'react-i18next'; -import { useMediaCallContext } from '../MediaCallContext'; -import { DevicePicker, PeerInfo, Widget, WidgetFooter, WidgetHandle, WidgetHeader, WidgetContent, WidgetInfo } from '../components'; +import { DevicePicker, PeerInfo, Widget, WidgetFooter, WidgetHandle, WidgetHeader, WidgetContent, WidgetInfo } from '../../components'; +import { useMediaCallContext } from '../../context'; const IncomingCallTransfer = () => { const { t } = useTranslation(); diff --git a/packages/ui-voip/src/v2/MediaCallWidget.spec.tsx b/packages/ui-voip/src/views/MediaCallWidget/MediaCallWidget.spec.tsx similarity index 100% rename from packages/ui-voip/src/v2/MediaCallWidget.spec.tsx rename to packages/ui-voip/src/views/MediaCallWidget/MediaCallWidget.spec.tsx diff --git a/packages/ui-voip/src/v2/MediaCallWidget.stories.tsx b/packages/ui-voip/src/views/MediaCallWidget/MediaCallWidget.stories.tsx similarity index 93% rename from packages/ui-voip/src/v2/MediaCallWidget.stories.tsx rename to packages/ui-voip/src/views/MediaCallWidget/MediaCallWidget.stories.tsx index 4fe83d06c602e..b155f7b3dffd9 100644 --- a/packages/ui-voip/src/v2/MediaCallWidget.stories.tsx +++ b/packages/ui-voip/src/views/MediaCallWidget/MediaCallWidget.stories.tsx @@ -2,9 +2,8 @@ import { Button } from '@rocket.chat/fuselage'; import { mockAppRoot } from '@rocket.chat/mock-providers'; import type { Meta, StoryFn, StoryObj } from '@storybook/react'; -import { useMediaCallContext } from './MediaCallContext'; import MediaCallWidget from './MediaCallWidget'; -import MockedMediaCallProvider from './MockedMediaCallProvider'; +import { useMediaCallContext, MockedMediaCallProvider } from '../../context'; const mockedContexts = mockAppRoot() .withTranslations('en', 'core', { diff --git a/packages/ui-voip/src/v2/MediaCallWidget.tsx b/packages/ui-voip/src/views/MediaCallWidget/MediaCallWidget.tsx similarity index 84% rename from packages/ui-voip/src/v2/MediaCallWidget.tsx rename to packages/ui-voip/src/views/MediaCallWidget/MediaCallWidget.tsx index dbc2d4dd8a041..58ddd06bfd780 100644 --- a/packages/ui-voip/src/v2/MediaCallWidget.tsx +++ b/packages/ui-voip/src/views/MediaCallWidget/MediaCallWidget.tsx @@ -1,5 +1,5 @@ -import { useMediaCallContext } from './MediaCallContext'; -import { OngoingCall, NewCall, IncomingCall, OutgoingCall, IncomingCallTransfer, OutgoingCallTransfer } from './views'; +import { OngoingCall, NewCall, IncomingCall, OutgoingCall, IncomingCallTransfer, OutgoingCallTransfer } from '..'; +import { useMediaCallContext } from '../../context'; const MediaCallWidget = () => { const { state, hidden, transferredBy } = useMediaCallContext(); diff --git a/packages/ui-voip/src/v2/views/NewCall.stories.tsx b/packages/ui-voip/src/views/MediaCallWidget/NewCall.stories.tsx similarity index 90% rename from packages/ui-voip/src/v2/views/NewCall.stories.tsx rename to packages/ui-voip/src/views/MediaCallWidget/NewCall.stories.tsx index 953485f7c4921..c365151de26a4 100644 --- a/packages/ui-voip/src/v2/views/NewCall.stories.tsx +++ b/packages/ui-voip/src/views/MediaCallWidget/NewCall.stories.tsx @@ -2,7 +2,7 @@ import { mockAppRoot } from '@rocket.chat/mock-providers'; import type { Meta, StoryFn } from '@storybook/react'; import NewCall from './NewCall'; -import MockedMediaCallProvider from '../MockedMediaCallProvider'; +import { MockedMediaCallProvider } from '../../context'; const mockedContexts = mockAppRoot() .withTranslations('en', 'core', { diff --git a/packages/ui-voip/src/v2/views/NewCall.tsx b/packages/ui-voip/src/views/MediaCallWidget/NewCall.tsx similarity index 91% rename from packages/ui-voip/src/v2/views/NewCall.tsx rename to packages/ui-voip/src/views/MediaCallWidget/NewCall.tsx index f47c106449358..d83f72264507c 100644 --- a/packages/ui-voip/src/v2/views/NewCall.tsx +++ b/packages/ui-voip/src/views/MediaCallWidget/NewCall.tsx @@ -1,7 +1,6 @@ import { Box, Button, ButtonGroup } from '@rocket.chat/fuselage'; import { useTranslation } from 'react-i18next'; -import { useMediaCallContext, usePeerAutocomplete } from '../MediaCallContext'; import { PeerInfo, PeerAutocomplete, @@ -12,7 +11,8 @@ import { WidgetContent, DevicePicker, ActionButton, -} from '../components'; +} from '../../components'; +import { useMediaCallContext, usePeerAutocomplete } from '../../context'; const NewCall = () => { const { t } = useTranslation(); diff --git a/packages/ui-voip/src/v2/views/OngoingCall.stories.tsx b/packages/ui-voip/src/views/MediaCallWidget/OngoingCall.stories.tsx similarity index 96% rename from packages/ui-voip/src/v2/views/OngoingCall.stories.tsx rename to packages/ui-voip/src/views/MediaCallWidget/OngoingCall.stories.tsx index a8158cfb388a4..d97afe302369d 100644 --- a/packages/ui-voip/src/v2/views/OngoingCall.stories.tsx +++ b/packages/ui-voip/src/views/MediaCallWidget/OngoingCall.stories.tsx @@ -2,7 +2,7 @@ import { mockAppRoot } from '@rocket.chat/mock-providers'; import type { Meta, StoryFn } from '@storybook/react'; import OngoingCall from './OngoingCall'; -import MockedMediaCallProvider from '../MockedMediaCallProvider'; +import { MockedMediaCallProvider } from '../../context'; const mockedContexts = mockAppRoot().buildStoryDecorator(); diff --git a/packages/ui-voip/src/v2/views/OngoingCall.tsx b/packages/ui-voip/src/views/MediaCallWidget/OngoingCall.tsx similarity index 92% rename from packages/ui-voip/src/v2/views/OngoingCall.tsx rename to packages/ui-voip/src/views/MediaCallWidget/OngoingCall.tsx index df07a09706173..f1827c563e69e 100644 --- a/packages/ui-voip/src/v2/views/OngoingCall.tsx +++ b/packages/ui-voip/src/views/MediaCallWidget/OngoingCall.tsx @@ -1,7 +1,6 @@ import { ButtonGroup } from '@rocket.chat/fuselage'; import { useTranslation } from 'react-i18next'; -import { useMediaCallContext } from '../MediaCallContext'; import { ToggleButton, PeerInfo, @@ -14,9 +13,10 @@ import { Timer, DevicePicker, ActionButton, -} from '../components'; -import { useInfoSlots } from '../useInfoSlots'; -import { useKeypad } from '../useKeypad'; + useKeypad, + useInfoSlots, +} from '../../components'; +import { useMediaCallContext } from '../../context'; const OngoingCall = () => { const { t } = useTranslation(); diff --git a/packages/ui-voip/src/v2/views/OutgoingCall.stories.tsx b/packages/ui-voip/src/views/MediaCallWidget/OutgoingCall.stories.tsx similarity index 90% rename from packages/ui-voip/src/v2/views/OutgoingCall.stories.tsx rename to packages/ui-voip/src/views/MediaCallWidget/OutgoingCall.stories.tsx index fb02940f146c0..748f187a290f9 100644 --- a/packages/ui-voip/src/v2/views/OutgoingCall.stories.tsx +++ b/packages/ui-voip/src/views/MediaCallWidget/OutgoingCall.stories.tsx @@ -2,7 +2,7 @@ import { mockAppRoot } from '@rocket.chat/mock-providers'; import type { Meta, StoryFn } from '@storybook/react'; import OutgoingCall from './OutgoingCall'; -import MockedMediaCallProvider from '../MockedMediaCallProvider'; +import { MockedMediaCallProvider } from '../../context'; const mockedContexts = mockAppRoot() .withTranslations('en', 'core', { diff --git a/packages/ui-voip/src/v2/views/OutgoingCall.tsx b/packages/ui-voip/src/views/MediaCallWidget/OutgoingCall.tsx similarity index 89% rename from packages/ui-voip/src/v2/views/OutgoingCall.tsx rename to packages/ui-voip/src/views/MediaCallWidget/OutgoingCall.tsx index 26dd5338bb9e2..94c669980aef8 100644 --- a/packages/ui-voip/src/v2/views/OutgoingCall.tsx +++ b/packages/ui-voip/src/views/MediaCallWidget/OutgoingCall.tsx @@ -1,8 +1,8 @@ import { Button, ButtonGroup } from '@rocket.chat/fuselage'; import { useTranslation } from 'react-i18next'; -import { useMediaCallContext } from '../MediaCallContext'; -import { PeerInfo, Widget, WidgetFooter, WidgetHandle, WidgetHeader, WidgetContent, DevicePicker } from '../components'; +import { PeerInfo, Widget, WidgetFooter, WidgetHandle, WidgetHeader, WidgetContent, DevicePicker } from '../../components'; +import { useMediaCallContext } from '../../context'; const OutgoingCall = () => { const { t } = useTranslation(); diff --git a/packages/ui-voip/src/v2/views/OutgoingCallTransfer.stories.tsx b/packages/ui-voip/src/views/MediaCallWidget/OutgoingCallTransfer.stories.tsx similarity index 92% rename from packages/ui-voip/src/v2/views/OutgoingCallTransfer.stories.tsx rename to packages/ui-voip/src/views/MediaCallWidget/OutgoingCallTransfer.stories.tsx index f64fe038b7305..a7735a90b962c 100644 --- a/packages/ui-voip/src/v2/views/OutgoingCallTransfer.stories.tsx +++ b/packages/ui-voip/src/views/MediaCallWidget/OutgoingCallTransfer.stories.tsx @@ -2,7 +2,7 @@ import { mockAppRoot } from '@rocket.chat/mock-providers'; import type { Meta, StoryFn } from '@storybook/react'; import OutgoingCallTransfer from './OutgoingCallTransfer'; -import MockedMediaCallProvider from '../MockedMediaCallProvider'; +import { MockedMediaCallProvider } from '../../context'; const mockedContexts = mockAppRoot() .withTranslations('en', 'core', { diff --git a/packages/ui-voip/src/v2/views/OutgoingCallTransfer.tsx b/packages/ui-voip/src/views/MediaCallWidget/OutgoingCallTransfer.tsx similarity index 89% rename from packages/ui-voip/src/v2/views/OutgoingCallTransfer.tsx rename to packages/ui-voip/src/views/MediaCallWidget/OutgoingCallTransfer.tsx index 3fb07e2f94336..ef98641fe6999 100644 --- a/packages/ui-voip/src/v2/views/OutgoingCallTransfer.tsx +++ b/packages/ui-voip/src/views/MediaCallWidget/OutgoingCallTransfer.tsx @@ -1,8 +1,8 @@ import { Button, ButtonGroup } from '@rocket.chat/fuselage'; import { useTranslation } from 'react-i18next'; -import { useMediaCallContext } from '../MediaCallContext'; -import { PeerInfo, Widget, WidgetFooter, WidgetHandle, WidgetHeader, WidgetContent, DevicePicker, WidgetInfo } from '../components'; +import { PeerInfo, Widget, WidgetFooter, WidgetHandle, WidgetHeader, WidgetContent, DevicePicker, WidgetInfo } from '../../components'; +import { useMediaCallContext } from '../../context'; const OutgoingCallTransfer = () => { const { t } = useTranslation(); diff --git a/packages/ui-voip/src/v2/__snapshots__/MediaCallWidget.spec.tsx.snap b/packages/ui-voip/src/views/MediaCallWidget/__snapshots__/MediaCallWidget.spec.tsx.snap similarity index 100% rename from packages/ui-voip/src/v2/__snapshots__/MediaCallWidget.spec.tsx.snap rename to packages/ui-voip/src/views/MediaCallWidget/__snapshots__/MediaCallWidget.spec.tsx.snap diff --git a/packages/ui-voip/src/v2/views/index.ts b/packages/ui-voip/src/views/MediaCallWidget/index.ts similarity index 85% rename from packages/ui-voip/src/v2/views/index.ts rename to packages/ui-voip/src/views/MediaCallWidget/index.ts index 163a89d90b8a9..8dc9f32853fcd 100644 --- a/packages/ui-voip/src/v2/views/index.ts +++ b/packages/ui-voip/src/views/MediaCallWidget/index.ts @@ -4,3 +4,4 @@ export { default as IncomingCall } from './IncomingCall'; export { default as OutgoingCall } from './OutgoingCall'; export { default as IncomingCallTransfer } from './IncomingCallTransfer'; export { default as OutgoingCallTransfer } from './OutgoingCallTransfer'; +export { default as MediaCallWidget } from './MediaCallWidget'; diff --git a/packages/ui-voip/src/components/PermissionFlow/PermissionFlowModal.spec.tsx b/packages/ui-voip/src/views/PermissionFlow/PermissionFlowModal.spec.tsx similarity index 100% rename from packages/ui-voip/src/components/PermissionFlow/PermissionFlowModal.spec.tsx rename to packages/ui-voip/src/views/PermissionFlow/PermissionFlowModal.spec.tsx diff --git a/packages/ui-voip/src/components/PermissionFlow/PermissionFlowModal.stories.tsx b/packages/ui-voip/src/views/PermissionFlow/PermissionFlowModal.stories.tsx similarity index 100% rename from packages/ui-voip/src/components/PermissionFlow/PermissionFlowModal.stories.tsx rename to packages/ui-voip/src/views/PermissionFlow/PermissionFlowModal.stories.tsx diff --git a/packages/ui-voip/src/components/PermissionFlow/PermissionFlowModal.tsx b/packages/ui-voip/src/views/PermissionFlow/PermissionFlowModal.tsx similarity index 100% rename from packages/ui-voip/src/components/PermissionFlow/PermissionFlowModal.tsx rename to packages/ui-voip/src/views/PermissionFlow/PermissionFlowModal.tsx diff --git a/packages/ui-voip/src/components/PermissionFlow/__snapshots__/PermissionFlowModal.spec.tsx.snap b/packages/ui-voip/src/views/PermissionFlow/__snapshots__/PermissionFlowModal.spec.tsx.snap similarity index 100% rename from packages/ui-voip/src/components/PermissionFlow/__snapshots__/PermissionFlowModal.spec.tsx.snap rename to packages/ui-voip/src/views/PermissionFlow/__snapshots__/PermissionFlowModal.spec.tsx.snap diff --git a/packages/ui-voip/src/v2/TransferModal.tsx b/packages/ui-voip/src/views/TransferModal.tsx similarity index 91% rename from packages/ui-voip/src/v2/TransferModal.tsx rename to packages/ui-voip/src/views/TransferModal.tsx index 7f0b7a6c11fdc..54c80332e752e 100644 --- a/packages/ui-voip/src/v2/TransferModal.tsx +++ b/packages/ui-voip/src/views/TransferModal.tsx @@ -12,9 +12,8 @@ import { import { useId, useState } from 'react'; import { useTranslation } from 'react-i18next'; -import { usePeerAutocomplete } from './MediaCallContext'; -import type { PeerInfo as PeerInfoType } from './MediaCallContext'; -import { PeerAutocomplete, PeerInfo } from './components'; +import { PeerAutocomplete, PeerInfo } from '../components'; +import { usePeerAutocomplete, type PeerInfo as PeerInfoType } from '../context'; type TransferModalProps = { onCancel(): void; diff --git a/packages/ui-voip/src/views/index.ts b/packages/ui-voip/src/views/index.ts new file mode 100644 index 0000000000000..1deba45f179e7 --- /dev/null +++ b/packages/ui-voip/src/views/index.ts @@ -0,0 +1,3 @@ +export { default as TransferModal } from './TransferModal'; +export * from './MediaCallWidget'; +export { default as PermissionFlowModal, type PermissionFlowModalType } from './PermissionFlow/PermissionFlowModal';