haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(vpaas): Avoid url blipping on invite dialog

This commit is contained in:
Vlad Piersec 2021-05-24 10:17:40 +03:00 committed by vp8x8
parent 4138e1ac53
commit d99bf9797d
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
react/features/dynamic-branding/functions.js
View File

@ -34,3 +34,13 @@ export function getDynamicBrandingUrl(state: Object) {
return `${baseUrl}?conferenceFqn=${encodeURIComponent(fqn)}`; return `${baseUrl}?conferenceFqn=${encodeURIComponent(fqn)}`;
} }
} }
/**
* Selector used for getting the load state of the dynamic branding data.
*
* @param {Object} state - Global state of the app.
* @returns {boolean}
*/
export function isDynamicBrandingDataLoaded(state: Object) {
return state['features/dynamic-branding'].customizationReady;
}

4
react/features/dynamic-branding/reducer.js
View File

@ -32,8 +32,8 @@ const DEFAULT_STATE = {
backgroundImageUrl: '', backgroundImageUrl: '',
/** /**
* Flag indicating that the logo (JitsiWatermark) can be displayed. * Flag indicating that the branding data can be displayed.
* This is used in order to avoid image flickering. * This is used in order to avoid image flickering / text changing(blipping).
* *
* @public * @public
* @type {boolean} * @type {boolean}

3
react/features/invite/components/add-people-dialog/web/AddPeopleDialog.js
View File

@ -9,6 +9,7 @@ import { translate } from '../../../../base/i18n';
import { JitsiRecordingConstants } from '../../../../base/lib-jitsi-meet'; import { JitsiRecordingConstants } from '../../../../base/lib-jitsi-meet';
import { connect } from '../../../../base/redux'; import { connect } from '../../../../base/redux';
import { isVpaasMeeting } from '../../../../billing-counter/functions'; import { isVpaasMeeting } from '../../../../billing-counter/functions';
import { isDynamicBrandingDataLoaded } from '../../../../dynamic-branding/functions';
import EmbedMeetingTrigger from '../../../../embed-meeting/components/EmbedMeetingTrigger'; import EmbedMeetingTrigger from '../../../../embed-meeting/components/EmbedMeetingTrigger';
import { getActiveSession } from '../../../../recording'; import { getActiveSession } from '../../../../recording';
import { updateDialInNumbers } from '../../../actions'; import { updateDialInNumbers } from '../../../actions';
@ -201,7 +202,7 @@ function mapStateToProps(state, ownProps) {
_dialIn: dialIn, _dialIn: dialIn,
_embedMeetingVisible: !isVpaasMeeting(state) && isSharingEnabled(sharingFeatures.embed), _embedMeetingVisible: !isVpaasMeeting(state) && isSharingEnabled(sharingFeatures.embed),
_dialInVisible: isSharingEnabled(sharingFeatures.dialIn), _dialInVisible: isSharingEnabled(sharingFeatures.dialIn),
_urlSharingVisible: isSharingEnabled(sharingFeatures.url), _urlSharingVisible: isDynamicBrandingDataLoaded(state) && isSharingEnabled(sharingFeatures.url),
_emailSharingVisible: isSharingEnabled(sharingFeatures.email), _emailSharingVisible: isSharingEnabled(sharingFeatures.email),
_invitationText: getInviteText({ state, _invitationText: getInviteText({ state,
phoneNumber, phoneNumber,