-
Notifications
You must be signed in to change notification settings - Fork 13.9k
refactor(ui-voip): Make draggable optional and extract MediaCallWidgetViewRouter from MediaCallWidget
#41613
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,38 @@ | ||
| import { Palette } from '@rocket.chat/fuselage'; | ||
| import styled from '@rocket.chat/styled'; | ||
|
|
||
| type WidgetBaseProps = { inline?: boolean; borderless?: boolean }; | ||
|
|
||
| const WidgetBase = styled('div', ({ borderless: _borderless, inline: _inline, ...props }: WidgetBaseProps) => props)` | ||
| padding: 0; | ||
| display: flex; | ||
| flex-direction: column; | ||
| width: 248px; | ||
| min-height: 128px; | ||
| border-radius: 4px; | ||
| background-color: ${Palette.surface['surface-tint'].toString()}; | ||
| color: ${Palette.text['font-default'].toString()}; | ||
| overflow: hidden; | ||
|
|
||
| ${({ borderless }) => | ||
| borderless | ||
| ? '' | ||
| : ` | ||
| border: 1px solid ${Palette.stroke['stroke-dark'].toString()}; | ||
| `} | ||
|
|
||
| ${({ inline }) => | ||
| inline | ||
| ? '' | ||
| : ` | ||
| position: fixed; | ||
| right: 2em; | ||
| top: 11em; | ||
| z-index: 100; | ||
| box-shadow: | ||
| 0px 0px 1px 0px ${Palette.shadow['shadow-elevation-2x'].toString()}, | ||
| 0px 0px 12px 0px ${Palette.shadow['shadow-elevation-2y'].toString()}; | ||
| `} | ||
| `; | ||
|
|
||
| export default WidgetBase; |
16 changes: 5 additions & 11 deletions
16
packages/ui-voip/src/components/Widget/WidgetDraggableContext.ts
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,18 +1,12 @@ | ||
| import type { Ref } from 'react'; | ||
| import type { RefCallback } from 'react'; | ||
| import { createContext, useContext } from 'react'; | ||
|
|
||
| type DragContextValue = { | ||
| draggableRef: Ref<HTMLElement>; | ||
| boundingRef: Ref<HTMLElement>; | ||
| handleRef: Ref<HTMLElement>; | ||
| draggableRef: RefCallback<HTMLElement>; | ||
| boundingRef: RefCallback<HTMLElement>; | ||
| handleRef: RefCallback<HTMLElement>; | ||
| }; | ||
|
|
||
| export const DragContext = createContext<DragContextValue | undefined>(undefined); | ||
|
|
||
| export const useDraggableWidget = (): DragContextValue => { | ||
| const context = useContext(DragContext); | ||
| if (!context) { | ||
| throw new Error('useDraggableWidget - context unavailable'); | ||
| } | ||
| return context; | ||
| }; | ||
| export const useDraggableWidget = (): DragContextValue | undefined => useContext(DragContext); |
26 changes: 26 additions & 0 deletions
26
packages/ui-voip/src/components/Widget/WidgetDraggableProvider.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| import type { ReactNode } from 'react'; | ||
| import { useLayoutEffect } from 'react'; | ||
|
|
||
| import { DragContext } from './WidgetDraggableContext'; | ||
| import { useMediaCallView } from '../../context'; | ||
| import { useDraggable } from '../../hooks'; | ||
|
|
||
| type WidgetDraggableProviderProps = { | ||
| children: ReactNode; | ||
| }; | ||
|
|
||
| const WidgetDraggableProvider = ({ children }: WidgetDraggableProviderProps) => { | ||
| const { widgetPositionTracker } = useMediaCallView(); | ||
| const [draggableRef, boundingRef, handleRef] = useDraggable({ | ||
| onChangePosition: widgetPositionTracker?.onChangePosition, | ||
| restorePosition: widgetPositionTracker?.getRestorePosition(), | ||
| }); | ||
|
|
||
| useLayoutEffect(() => { | ||
| boundingRef(document.body); | ||
| }, [boundingRef]); | ||
|
gabriellsh marked this conversation as resolved.
|
||
|
|
||
| return <DragContext.Provider value={{ draggableRef, boundingRef, handleRef }}>{children}</DragContext.Provider>; | ||
| }; | ||
|
|
||
| export default WidgetDraggableProvider; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 11 additions & 24 deletions
35
packages/ui-voip/src/views/MediaCallWidget/MediaCallWidget.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,27 @@ | ||
| import { OngoingCall, NewCall, IncomingCall, OutgoingCall, IncomingCallTransfer, OutgoingCallTransfer } from '..'; | ||
| import OngoingCallWithScreen from './OngoingCallWithScreen'; | ||
| import MediaCallWidgetViewRouter from './MediaCallWidgetViewRouter'; | ||
| import WidgetDraggableProvider from '../../components/Widget/WidgetDraggableProvider'; | ||
| import { useMediaCallView } from '../../context/MediaCallViewContext'; | ||
| import useRegisterView from '../../context/useRegisterView'; | ||
|
|
||
| const MediaCallWidget = () => { | ||
| const currentViews = useRegisterView('widget'); | ||
| const { | ||
| sessionState: { state, hidden, transferredBy, peerInfo, supportedFeatures }, | ||
| sessionState: { state, hidden }, | ||
| } = useMediaCallView(); | ||
|
|
||
| if (hidden || !currentViews.includes('widget')) { | ||
| return null; | ||
| } | ||
|
|
||
| switch (state) { | ||
| case 'ongoing': | ||
| if ('username' in peerInfo && supportedFeatures.includes('screen-share')) { | ||
| return <OngoingCallWithScreen />; | ||
| } | ||
| return <OngoingCall />; | ||
| case 'new': | ||
| return <NewCall />; | ||
| case 'ringing': | ||
| if (transferredBy) { | ||
| return <IncomingCallTransfer />; | ||
| } | ||
| return <IncomingCall />; | ||
| case 'calling': | ||
| if (transferredBy) { | ||
| return <OutgoingCallTransfer />; | ||
| } | ||
| return <OutgoingCall />; | ||
| case 'closed': | ||
| default: | ||
| return null; | ||
| if (state === 'closed') { | ||
| return null; | ||
| } | ||
|
|
||
| return ( | ||
| <WidgetDraggableProvider> | ||
| <MediaCallWidgetViewRouter /> | ||
| </WidgetDraggableProvider> | ||
| ); | ||
| }; | ||
|
|
||
| export default MediaCallWidget; |
34 changes: 34 additions & 0 deletions
34
packages/ui-voip/src/views/MediaCallWidget/MediaCallWidgetViewRouter.tsx
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,34 @@ | ||
| import { OngoingCall, NewCall, IncomingCall, OutgoingCall, IncomingCallTransfer, OutgoingCallTransfer } from '..'; | ||
|
gabriellsh marked this conversation as resolved.
|
||
| import OngoingCallWithScreen from './OngoingCallWithScreen'; | ||
| import { useMediaCallView } from '../../context/MediaCallViewContext'; | ||
|
|
||
| const MediaCallWidgetViewRouter = () => { | ||
| const { | ||
| sessionState: { state, transferredBy, peerInfo, supportedFeatures }, | ||
|
gabriellsh marked this conversation as resolved.
|
||
| } = useMediaCallView(); | ||
|
|
||
| switch (state) { | ||
| case 'ongoing': | ||
| if ('username' in peerInfo && supportedFeatures.includes('screen-share')) { | ||
|
gabriellsh marked this conversation as resolved.
|
||
| return <OngoingCallWithScreen />; | ||
| } | ||
| return <OngoingCall />; | ||
| case 'new': | ||
| return <NewCall />; | ||
| case 'ringing': | ||
| if (transferredBy) { | ||
| return <IncomingCallTransfer />; | ||
| } | ||
| return <IncomingCall />; | ||
| case 'calling': | ||
| if (transferredBy) { | ||
| return <OutgoingCallTransfer />; | ||
| } | ||
| return <OutgoingCall />; | ||
| case 'closed': | ||
| default: | ||
| return null; | ||
| } | ||
| }; | ||
|
|
||
| export default MediaCallWidgetViewRouter; | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.