From 4bad63e48426b933a7656de9a97ae37950ae9cc9 Mon Sep 17 00:00:00 2001 From: Jaya Allamsetty <54324652+jallamsetty1@users.noreply.github.com> Date: Wed, 21 Dec 2022 12:12:17 -0500 Subject: [PATCH 01/10] chore(deps) lib-jitsi-meet@latest https://github.com/jitsi/lib-jitsi-meet/compare/v1560.0.0+92a5738b...v1561.0.0+2d4cd935 --- package-lock.json | 10 +++++----- package.json | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package-lock.json b/package-lock.json index 011e12866..1179e866a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -74,7 +74,7 @@ "js-md5": "0.6.1", "js-sha512": "0.8.0", "jwt-decode": "2.2.0", - "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1560.0.0+92a5738b/lib-jitsi-meet.tgz", + "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1561.0.0+2d4cd935/lib-jitsi-meet.tgz", "lodash": "4.17.21", "moment": "2.29.4", "moment-duration-format": "2.2.2", @@ -13497,8 +13497,8 @@ }, "node_modules/lib-jitsi-meet": { "version": "0.0.0", - "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1560.0.0+92a5738b/lib-jitsi-meet.tgz", - "integrity": "sha512-H8y04Nug8prhCYbtJuqNNpAqEE7ctOKor2RoCIxjVrmdtTbyRI8tmj4OPVDUOZZyAxF4l/V3aHmDz2JvWJU7Pw==", + "resolved": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1561.0.0+2d4cd935/lib-jitsi-meet.tgz", + "integrity": "sha512-ec3XE3LheQQEkIBZ8mrfGdRDE/9yKM/CQpw7E2eF1zMQJGGREZRZ+Xqbhgv7o1eYPgI5GsAECns8ZjmWtre8bg==", "license": "Apache-2.0", "dependencies": { "@jitsi/js-utils": "2.0.0", @@ -30496,8 +30496,8 @@ } }, "lib-jitsi-meet": { - "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1560.0.0+92a5738b/lib-jitsi-meet.tgz", - "integrity": "sha512-H8y04Nug8prhCYbtJuqNNpAqEE7ctOKor2RoCIxjVrmdtTbyRI8tmj4OPVDUOZZyAxF4l/V3aHmDz2JvWJU7Pw==", + "version": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1561.0.0+2d4cd935/lib-jitsi-meet.tgz", + "integrity": "sha512-ec3XE3LheQQEkIBZ8mrfGdRDE/9yKM/CQpw7E2eF1zMQJGGREZRZ+Xqbhgv7o1eYPgI5GsAECns8ZjmWtre8bg==", "requires": { "@jitsi/js-utils": "2.0.0", "@jitsi/logger": "2.0.0", diff --git a/package.json b/package.json index fc80da0d7..05df941dd 100644 --- a/package.json +++ b/package.json @@ -79,7 +79,7 @@ "js-md5": "0.6.1", "js-sha512": "0.8.0", "jwt-decode": "2.2.0", - "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1560.0.0+92a5738b/lib-jitsi-meet.tgz", + "lib-jitsi-meet": "https://github.com/jitsi/lib-jitsi-meet/releases/download/v1561.0.0+2d4cd935/lib-jitsi-meet.tgz", "lodash": "4.17.21", "moment": "2.29.4", "moment-duration-format": "2.2.2", From 580f56010a540e668b379bb802c1bb83d41a77a2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 21 Dec 2022 18:58:54 +0000 Subject: [PATCH 02/10] chore(deps): bump loader-utils from 1.4.1 to 1.4.2 Bumps [loader-utils](https://github.com/webpack/loader-utils) from 1.4.1 to 1.4.2. - [Release notes](https://github.com/webpack/loader-utils/releases) - [Changelog](https://github.com/webpack/loader-utils/blob/v1.4.2/CHANGELOG.md) - [Commits](https://github.com/webpack/loader-utils/compare/v1.4.1...v1.4.2) --- updated-dependencies: - dependency-name: loader-utils dependency-type: indirect ... Signed-off-by: dependabot[bot] --- package-lock.json | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/package-lock.json b/package-lock.json index 1179e866a..36fa22841 100644 --- a/package-lock.json +++ b/package-lock.json @@ -13571,9 +13571,9 @@ } }, "node_modules/loader-utils": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz", - "integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", + "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", "dev": true, "dependencies": { "big.js": "^5.2.2", @@ -14711,9 +14711,9 @@ } }, "node_modules/null-loader/node_modules/loader-utils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz", - "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "dependencies": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", @@ -18177,9 +18177,9 @@ } }, "node_modules/string-replace-loader/node_modules/loader-utils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz", - "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "dev": true, "dependencies": { "big.js": "^5.2.2", @@ -30565,9 +30565,9 @@ "dev": true }, "loader-utils": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.1.tgz", - "integrity": "sha512-1Qo97Y2oKaU+Ro2xnDMR26g1BwMT29jNbem1EvcujW2jqt+j5COXyscjM7bLQkM9HaxI7pkWeW7gnI072yMI9Q==", + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", + "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", "dev": true, "requires": { "big.js": "^5.2.2", @@ -31474,9 +31474,9 @@ }, "dependencies": { "loader-utils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz", - "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "requires": { "big.js": "^5.2.2", "emojis-list": "^3.0.0", @@ -34086,9 +34086,9 @@ }, "dependencies": { "loader-utils": { - "version": "2.0.3", - "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.3.tgz", - "integrity": "sha512-THWqIsn8QRnvLl0shHYVBN9syumU8pYWEHPTmkiVGd+7K5eFNVSY6AJhRvgGF70gg1Dz+l/k8WicvFCxdEs60A==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", "dev": true, "requires": { "big.js": "^5.2.2", From 27754c88746b33c3fa99322a42a1ea49820e824b Mon Sep 17 00:00:00 2001 From: Hristo Terezov Date: Wed, 21 Dec 2022 16:24:49 -0600 Subject: [PATCH 03/10] fix(filmstrip): scroll Add SS tiles to the number of participants in scroll calculations. This fixes an issue where the scroll is not displayed if there is a SS tile and only part of 1 tile is overflowing. --- react/features/base/participants/functions.ts | 4 ++-- react/features/filmstrip/actions.web.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/react/features/base/participants/functions.ts b/react/features/base/participants/functions.ts index dffbc1236..45465ee04 100644 --- a/react/features/base/participants/functions.ts +++ b/react/features/base/participants/functions.ts @@ -351,11 +351,11 @@ export function isWhiteboardParticipant(participant?: IParticipant): boolean { * features/base/participants. * @returns {number} */ -export function getRemoteParticipantCount(stateful: IStateful) { +export function getRemoteParticipantCountWithFake(stateful: IStateful) { const state = toState(stateful); const participantsState = state['features/base/participants']; - return participantsState.remote.size - participantsState.sortedRemoteVirtualScreenshareParticipants.size; + return participantsState.remote.size; } /** diff --git a/react/features/filmstrip/actions.web.ts b/react/features/filmstrip/actions.web.ts index d0b539701..85024b3ff 100644 --- a/react/features/filmstrip/actions.web.ts +++ b/react/features/filmstrip/actions.web.ts @@ -3,7 +3,7 @@ import { pinParticipant } from '../base/participants/actions'; import { getLocalParticipant, getParticipantById, - getRemoteParticipantCount + getRemoteParticipantCountWithFake } from '../base/participants/functions'; import { shouldHideSelfView } from '../base/settings/functions.web'; import { getMaxColumnCount } from '../video-layout/functions.web'; @@ -149,7 +149,7 @@ export function setVerticalViewDimensions() { const disableSelfView = shouldHideSelfView(state); const resizableFilmstrip = isFilmstripResizable(state); const _verticalViewGrid = showGridInVerticalView(state); - const numberOfRemoteParticipants = getRemoteParticipantCount(state); + const numberOfRemoteParticipants = getRemoteParticipantCountWithFake(state); const { localScreenShare } = state['features/base/participants']; let gridView = {}; @@ -261,7 +261,7 @@ export function setHorizontalViewDimensions() { = clientWidth - (disableSelfView ? 0 : thumbnails?.local?.width) - HORIZONTAL_FILMSTRIP_MARGIN; const remoteVideosContainerHeight = thumbnails?.local?.height + TILE_VERTICAL_MARGIN + STAGE_VIEW_THUMBNAIL_VERTICAL_BORDER + SCROLL_SIZE; - const numberOfRemoteParticipants = getRemoteParticipantCount(state); + const numberOfRemoteParticipants = getRemoteParticipantCountWithFake(state); const hasScroll = remoteVideosContainerHeight < (thumbnails?.remote.width + TILE_HORIZONTAL_MARGIN) * numberOfRemoteParticipants; From c441e8abcaf021708ddfe7740e9e8efdbbb2ac80 Mon Sep 17 00:00:00 2001 From: Horatiu Muresan <39557534+horymury@users.noreply.github.com> Date: Thu, 22 Dec 2022 15:15:38 +0200 Subject: [PATCH 04/10] fix(welcome-page) Fix error before joining a meeting from welcome page (#12718) --- .../welcome/components/AbstractWelcomePage.js | 2 +- react/features/welcome/components/WelcomePage.web.js | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/react/features/welcome/components/AbstractWelcomePage.js b/react/features/welcome/components/AbstractWelcomePage.js index 3ad235898..e6273d5a7 100644 --- a/react/features/welcome/components/AbstractWelcomePage.js +++ b/react/features/welcome/components/AbstractWelcomePage.js @@ -274,7 +274,7 @@ export class AbstractWelcomePage extends Component { export function _mapStateToProps(state: Object) { return { _calendarEnabled: isCalendarEnabled(state), - _deeplinkingCfg: state['features/base/config'].deeplinking, + _deeplinkingCfg: state['features/base/config'].deeplinking || {}, _enableInsecureRoomNameWarning: state['features/base/config'].enableInsecureRoomNameWarning || false, _moderatedRoomServiceUrl: state['features/base/config'].moderatedRoomServiceUrl, _recentListEnabled: isRecentListEnabled(), diff --git a/react/features/welcome/components/WelcomePage.web.js b/react/features/welcome/components/WelcomePage.web.js index 16fea1897..0484d4afa 100644 --- a/react/features/welcome/components/WelcomePage.web.js +++ b/react/features/welcome/components/WelcomePage.web.js @@ -346,14 +346,15 @@ class WelcomePage extends AbstractWelcomePage { const { t, _deeplinkingCfg: { - ios: { downloadLink: iosDownloadLink }, - android: { - fDroidUrl, - downloadLink: androidDownloadLink - } + ios = {}, + android = {} } } = this.props; + const { downloadLink: iosDownloadLink } = ios; + + const { fDroidUrl, downloadLink: androidDownloadLink } = android; + return (