xmj/element-call
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #837 from vector-im/SimonBrandner/feat/unsub-logic

Browse source
This commit is contained in:
Šimon Brandner 2023-01-11 18:26:08 +01:00 • committed by GitHub
commit 74780d5c8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
package.json
View file

@ -45,7 +45,7 @@
"i18next": "^21.10.0",
"i18next-browser-languagedetector": "^6.1.8",
"i18next-http-backend": "^1.4.4",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#61c1881193c3225166d8c2f4a56b8a009d577d49",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#77ae9947984fb9f1c1bee9f28e6dfda75539e739",
"matrix-widget-api": "^1.0.0",
"mermaid": "^8.13.8",
"normalize.css": "^8.0.1",

2
src/room/InCallView.tsx
View file

@ -217,7 +217,7 @@ export function InCallView({
// shouldn't bother showing it
if (connectionState !== undefined) {
tileDescriptors.push({
id: screenshareFeed.stream.id,
id: screenshareFeed.feedId,
member,
callFeed: screenshareFeed,
focused: true,

6
src/video-grid/VideoTileContainer.tsx
View file

@ -96,7 +96,11 @@ export function VideoTileContainer({
useEffect(() => {
item.callFeed?.setResolution(width, height);
}, [width, height, item]);
}, [width, height, item.callFeed]);
useEffect(() => {
item.callFeed?.setIsVisible(true);
}, [item.callFeed]);
return (
<>

4
yarn.lock
View file

@ -10362,9 +10362,9 @@ matrix-events-sdk@0.0.1:
resolved "https://registry.yarnpkg.com/matrix-events-sdk/-/matrix-events-sdk-0.0.1.tgz#c8c38911e2cb29023b0bbac8d6f32e0de2c957dd"
integrity sha512-1QEOsXO+bhyCroIe2/A5OwaxHvBm7EsSQ46DEDn8RBIfQwN5HWBpFvyWWR4QY0KHPPnnJdI99wgRiAl7Ad5qaA==
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#61c1881193c3225166d8c2f4a56b8a009d577d49":
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#76075e050f859d668218dcb6f8a2e6940f23fa4e":
version "23.0.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/61c1881193c3225166d8c2f4a56b8a009d577d49"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/76075e050f859d668218dcb6f8a2e6940f23fa4e"
dependencies:
"@babel/runtime" "^7.12.5"
"@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.2"