Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Render Jitsi (and other sticky widgets) in PiP container, so it can be dragged and the "jump to room functionality" is provided #7450

Merged
merged 29 commits into from
Jan 13, 2022
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
48224bb
Always show jitsi
toger5 Dec 21, 2021
17e3776
make active widgets (jitsi call) use the same container pip container…
toger5 Dec 27, 2021
68e30d5
Rename files and fix missing update
toger5 Dec 27, 2021
4553b9f
remove comments
toger5 Dec 28, 2021
47f0906
extend callType enum with Widget (jitsi Call)
toger5 Dec 28, 2021
a24ba78
onWidgetAction->onAction
toger5 Dec 28, 2021
c975cbc
clean up onAction switch
toger5 Dec 28, 2021
d90e2c5
add translation
toger5 Dec 28, 2021
4fb3d9f
rename call-> pip in missing places
toger5 Dec 28, 2021
01c34a6
CallContainer -> PiPcontainer
toger5 Dec 28, 2021
d648c3f
fix pointer events beeing captured by IFrame on drag
toger5 Dec 28, 2021
f489316
the linter.. the linter ..
toger5 Dec 28, 2021
5c5abc3
revert CallType.Widget enum case
toger5 Dec 28, 2021
34f5b4c
fix i18n
toger5 Dec 28, 2021
b9afcac
review fixes
toger5 Dec 29, 2021
7e7bae2
Merge branch 'toger5/maximised_widgets_jitsy_flaoting' into toger5/ji…
toger5 Dec 29, 2021
c590a07
fix go to room on double click on pip widget
toger5 Dec 29, 2021
346eb6e
Merge branch 'develop' into toger5/maximised_widgets_jitsy_flaoting
toger5 Jan 5, 2022
b62c868
refactor for new right panel
toger5 Jan 5, 2022
c3698f0
Merge branch 'toger5/maximised_widgets_jitsy_flaoting' into toger5/ji…
toger5 Jan 5, 2022
5bcf608
fix for react not updating state
toger5 Jan 5, 2022
9e4aeca
Update src/components/views/elements/PersistentApp.tsx
toger5 Jan 11, 2022
b033398
Merge branch 'toger5/maximised_widgets_jitsy_flaoting' into toger5/ji…
toger5 Jan 11, 2022
e0d5216
review
toger5 Jan 11, 2022
2eb3af2
"PiP" -> "Pip"
toger5 Jan 11, 2022
8acf163
Merge branch 'develop' into toger5/jitsi_pip_container
toger5 Jan 11, 2022
c49b72b
lint
toger5 Jan 11, 2022
55d8cab
improove weird styling
toger5 Jan 12, 2022
d24195d
Merge branch 'develop' into toger5/jitsi_pip_container
toger5 Jan 12, 2022
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/structures/LoggedInView.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ import { DefaultTagID } from "../../stores/room-list/models";
import { hideToast as hideServerLimitToast, showToast as showServerLimitToast } from "../../toasts/ServerLimitToast";
import { Action } from "../../dispatcher/actions";
import LeftPanel from "./LeftPanel";
import PiPContainer from '../views/voip/PiPContainer';
import PiPContainer from '../views/voip/PipContainer';
import { ViewRoomDeltaPayload } from "../../dispatcher/payloads/ViewRoomDeltaPayload";
import RoomListStore from "../../stores/room-list/RoomListStore";
import NonUrgentToastContainer from "./NonUrgentToastContainer";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ limitations under the License.

import React from 'react';

import PiPViewer from './PiPView';
import PipView from './PipView';
import { replaceableComponent } from "../../../utils/replaceableComponent";

interface IProps {
Expand All @@ -32,7 +32,7 @@ interface IState {
export default class PiPContainer extends React.PureComponent<IProps, IState> {
public render() {
return <div className="mx_PiPContainer">
<PiPViewer />
<PipView />
</div>;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -101,13 +101,13 @@ function getPrimarySecondaryCallsForPip(roomId: string): [MatrixCall, MatrixCall
}

/**
* PiPView shows a small version of the CallView or a sticky widget hovering over the UI in 'picture-in-picture'
* PipView shows a small version of the CallView or a sticky widget hovering over the UI in 'picture-in-picture'
* (PiP mode). It displays the call(s) which is *not* in the room the user is currently viewing
* and all widgets that are active but not shown in any other possible container.
*/

@replaceableComponent("views.voip.PiPView")
export default class PiPView extends React.Component<IProps, IState> {
@replaceableComponent("views.voip.PipView")
export default class PipView extends React.Component<IProps, IState> {
private roomStoreToken: EventSubscription;
private settingsWatcherRef: string;

Expand Down