mirrors/element-web
1
0
Fork 0
mirror of https://github.com/element-hq/element-web synced 2024-10-26 04:35:55 +03:00
Code Issues Projects Releases Packages Wiki Activity

Send visibility only when changed, and messaging is available

Browse source
This commit is contained in:
Luke Barnard 2018-05-11 18:06:58 +01:00
parent 1f2f3474ed
commit 06898394eb
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/components/views/elements/AppTile.js
View file

@ -172,12 +172,7 @@ export default class AppTile extends React.Component {
componentDidUpdate() { componentDidUpdate() {
// Allow parents to access widget messaging // Allow parents to access widget messaging
if (this.props.collectWidgetMessaging) { if (this.props.collectWidgetMessaging) {
this.props.collectWidgetMessaging(new Promise((resolve) => { this.props.collectWidgetMessaging(this.widgetMessaging);
if (this.widgetMessaging) resolve(this.widgetMessaging);
// Expect this to be resolved later
this._exposeWidgetMessaging = resolve;
}));
} }
} }

21
src/components/views/rooms/Stickerpicker.js
View file

@ -105,11 +105,7 @@ export default class Stickerpicker extends React.Component {
} }
componentDidUpdate(prevProps, prevState) { componentDidUpdate(prevProps, prevState) {
if (this._appWidgetMessaging && this._sendVisibilityToWidget(this.state.showStickers);
prevState.showStickers !== this.state.showStickers
) {
this._appWidgetMessaging.sendVisibility(this.state.showStickers);
}
} }
_imError(errorMsg, e) { _imError(errorMsg, e) {
@ -147,10 +143,19 @@ export default class Stickerpicker extends React.Component {
); );
} }
async _collectWidgetMessaging(prom) { _collectWidgetMessaging(widgetMessaging) {
const widgetMessaging = await prom;
this._appWidgetMessaging = widgetMessaging; this._appWidgetMessaging = widgetMessaging;
this._appWidgetMessaging.sendVisibility(true);
// Do this now instead of in componentDidMount because we might not have had the
// reference to widgetMessaging when mounting
this._sendVisibilityToWidget(true);
}
_sendVisibilityToWidget(visible) {
if (this._appWidgetMessaging && visible !== this._prevSentVisibility) {
this._appWidgetMessaging.sendVisibility(visible);
this._prevSentVisibility = visible;
}
} }
_getStickerpickerContent() { _getStickerpickerContent() {