chore: Fix ui-voip package folder structure

packages/ui-voip/src/v2/components/DevicePicker.tsx → 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;

packages/ui-voip/src/v2/components/Keypad/Keypad.stories.tsx → 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',

packages/ui-voip/src/v2/useKeypad.tsx → 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;

packages/ui-voip/src/v2/components/PeerAutocomplete.tsx → 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

packages/ui-voip/src/v2/components/PeerInfo/InternalUser.tsx → 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;

packages/ui-voip/src/v2/useInfoSlots.ts → 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;

packages/ui-voip/src/v2/components/Widget/Widget.tsx → 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

packages/ui-voip/src/v2/components/index.ts → 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';

packages/ui-voip/src/v2/MediaCallContext.ts → 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;

packages/ui-voip/src/v2/MediaCallProvider.tsx → packages/ui-voip/src/context/MediaCallProvider.tsx

@@ -18,15 +18,15 @@ 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';
 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;

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';

packages/ui-voip/src/v2/useDesktopNotifications.ts → 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) {

packages/ui-voip/src/components/VoipPopupDraggable/DraggableCore.ts → 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';
 

packages/ui-voip/src/hooks/index.ts

@@ -1 +1,3 @@
 export * from './useDevicePermissionPrompt';
+export { useDraggable } from './VoipPopupDraggable/DraggableCore';
+export { useMediaCallAction } from './useMediaCallAction';

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;

packages/ui-voip/src/v2/useMediaCallAction.ts → 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,

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';

packages/ui-voip/src/v2/views/IncomingCall.stories.tsx → 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', {

packages/ui-voip/src/v2/views/IncomingCall.tsx → 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();

packages/ui-voip/src/v2/views/IncomingCallTransfer.stories.tsx → 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', {

packages/ui-voip/src/v2/views/IncomingCallTransfer.tsx → 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();

packages/ui-voip/src/v2/MediaCallWidget.stories.tsx → 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', {

packages/ui-voip/src/v2/MediaCallWidget.tsx → 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();

packages/ui-voip/src/v2/views/NewCall.stories.tsx → 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', {

packages/ui-voip/src/v2/views/NewCall.tsx → 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();

packages/ui-voip/src/v2/views/OngoingCall.stories.tsx → 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();
 

packages/ui-voip/src/v2/views/OngoingCall.tsx → 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();

packages/ui-voip/src/v2/views/OutgoingCall.stories.tsx → 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', {

packages/ui-voip/src/v2/views/OutgoingCall.tsx → 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();

packages/ui-voip/src/v2/views/OutgoingCallTransfer.stories.tsx → 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', {

packages/ui-voip/src/v2/views/OutgoingCallTransfer.tsx → 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();

packages/ui-voip/src/v2/views/index.ts → 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';

packages/ui-voip/src/v2/TransferModal.tsx → 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;

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';