OpenCloud
/
element-web
mirror of https://github.com/vector-im/element-web
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1896 from matrix-org/luke/fix-first-time-sticker-widget 

Update widget state when account data changes
pull/21833/head
Luke Barnard 2018-05-14 11:27:06 +01:00 committed by GitHub
parent d90292c6f1 98c06315cf
commit b9f9a914df
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/components/views/rooms/Stickerpicker.js
View File

@ -34,6 +34,7 @@ export default class Stickerpicker extends React.Component {
this._onHideStickersClick = this._onHideStickersClick.bind(this); this._onHideStickersClick = this._onHideStickersClick.bind(this);
this._launchManageIntegrations = this._launchManageIntegrations.bind(this); this._launchManageIntegrations = this._launchManageIntegrations.bind(this);
this._removeStickerpickerWidgets = this._removeStickerpickerWidgets.bind(this); this._removeStickerpickerWidgets = this._removeStickerpickerWidgets.bind(this);
this._updateWidget = this._updateWidget.bind(this);
this._onWidgetAction = this._onWidgetAction.bind(this); this._onWidgetAction = this._onWidgetAction.bind(this);
this._onResize = this._onResize.bind(this); this._onResize = this._onResize.bind(this);
this._onFinished = this._onFinished.bind(this); this._onFinished = this._onFinished.bind(this);
@ -90,11 +91,12 @@ export default class Stickerpicker extends React.Component {
if (!this.state.imError) { if (!this.state.imError) {
this.dispatcherRef = dis.register(this._onWidgetAction); this.dispatcherRef = dis.register(this._onWidgetAction);
} }
const stickerpickerWidget = Widgets.getStickerpickerWidgets()[0];
this.setState({ // Track updates to widget state in account data
stickerpickerWidget, MatrixClientPeg.get().on('accountData', this._updateWidget);
widgetId: stickerpickerWidget ? stickerpickerWidget.id : null,
}); // Initialise widget state from current account data
this._updateWidget();
} }
componentWillUnmount() { componentWillUnmount() {
@ -116,6 +118,14 @@ export default class Stickerpicker extends React.Component {
}); });
} }
_updateWidget() {
const stickerpickerWidget = Widgets.getStickerpickerWidgets()[0];
this.setState({
stickerpickerWidget,
widgetId: stickerpickerWidget ? stickerpickerWidget.id : null,
});
}
_onWidgetAction(payload) { _onWidgetAction(payload) {
if (payload.action === "user_widget_updated") { if (payload.action === "user_widget_updated") {
this.forceUpdate(); this.forceUpdate();