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

Merge pull request #920 from vector-im/SimonBrandner/update-js

Browse source
This commit is contained in:
Šimon Brandner 2023-02-18 21:32:26 +01:00 committed by GitHub
commit 27e3f6628e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 8 additions and 8 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#0d97a933c24d082d5978a7005dbc5bdb01b51284",
"matrix-js-sdk": "github:matrix-org/matrix-js-sdk#b1757b4f9dfe8a1fbb5b8d9ed697ff8b8516413e",
"matrix-widget-api": "^1.0.0",
"mermaid": "^9.4.0-rc.2",
"normalize.css": "^8.0.1",

4
src/inspectors/MediaInspector.tsx
View file

@ -78,14 +78,14 @@ function Table({ name, feeds }: TableProp): JSX.Element {
<div className={styles.col}>Tracks</div>
</header>
{feeds.map((feed, i) => {
const user = feed.isLocal()
const user = feed.isLocal
? "local"
: feed.getMember() !== null
? feed.getMember()?.name
: feed.userId;
return (
<TableRow
key={feed.feedId}
key={feed.id}
index={i}
user={user ? user : feed.userId}
stream={feed.stream}

4
src/room/InCallView.tsx
View file

@ -227,11 +227,11 @@ export function InCallView({
// shouldn't bother showing it
if (connectionState !== undefined) {
tileDescriptors.push({
id: screenshareFeed.feedId,
id: screenshareFeed.id,
member,
callFeed: screenshareFeed,
focused: true,
isLocal: screenshareFeed.isLocal(),
isLocal: screenshareFeed.isLocal,
presenter: false,
connectionState,
});

2
src/video-grid/useCallFeed.ts
View file

@ -49,7 +49,7 @@ function getDebugInfo(callFeed: CallFeed | undefined): CallFeedDebugInfo {
function getCallFeedState(callFeed: CallFeed | undefined): CallFeedState {
return {
callFeed,
isLocal: callFeed ? callFeed.isLocal() : false,
isLocal: callFeed ? callFeed.isLocal : false,
speaking: callFeed ? callFeed.isSpeaking() : false,
videoMuted: callFeed ? callFeed.isVideoMuted() : true,
audioMuted: callFeed ? callFeed.isAudioMuted() : true,

4
yarn.lock
View file

@ -10213,9 +10213,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#0d97a933c24d082d5978a7005dbc5bdb01b51284":
"matrix-js-sdk@github:matrix-org/matrix-js-sdk#b1757b4f9dfe8a1fbb5b8d9ed697ff8b8516413e":
version "23.2.0"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/0d97a933c24d082d5978a7005dbc5bdb01b51284"
resolved "https://codeload.github.com/matrix-org/matrix-js-sdk/tar.gz/b1757b4f9dfe8a1fbb5b8d9ed697ff8b8516413e"
dependencies:
"@babel/runtime" "^7.12.5"
"@matrix-org/matrix-sdk-crypto-js" "^0.1.0-alpha.3"