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

Restructure to pass props from componentWillRecieveProps.

pull/21833/head
Richard Lewis 2017-10-31 16:31:46 +00:00
parent 758df29b23
commit 17c0405862
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/components/views/elements/AppTile.js
View File

@ -58,22 +58,28 @@ export default React.createClass({
}; };
}, },
_getInitialState() {
const widgetPermissionId = [this.props.room.roomId, encodeURIComponent(this.props.url)].join('_'); /**
* Set initial component state when the App wUrl (widget URL) is being updated
* @param {Object} props The component props *must* be passed (rather than using this.props) so that it can be called with future props, e.g. from componentWillReceiveProps.
* @return {Object} Updated component state to be set with setState
*/
_getNewUrlState(props) {
const widgetPermissionId = [props.room.roomId, encodeURIComponent(props.url)].join('_');
const hasPermissionToLoad = localStorage.getItem(widgetPermissionId); const hasPermissionToLoad = localStorage.getItem(widgetPermissionId);
return { return {
loading: true, loading: true,
widgetUrl: this.props.url, widgetUrl: props.url,
widgetPermissionId: widgetPermissionId, widgetPermissionId: widgetPermissionId,
// Assume that widget has permission to load if we are the user who added it to the room, or if explicitly granted by the user // Assume that widget has permission to load if we are the user who added it to the room, or if explicitly granted by the user
hasPermissionToLoad: hasPermissionToLoad === 'true' || this.props.userId === this.props.creatorUserId, hasPermissionToLoad: hasPermissionToLoad === 'true' || props.userId === props.creatorUserId,
error: null, error: null,
deleting: false, deleting: false,
}; };
}, },
getInitialState() { getInitialState() {
return this._getInitialState(); return this._getNewUrlState(this.props);
}, },
// Returns true if props.url is a scalar URL, typically https://scalar.vector.im/api // Returns true if props.url is a scalar URL, typically https://scalar.vector.im/api
@ -109,7 +115,7 @@ export default React.createClass({
}, },
updateWidgetContent() { updateWidgetContent() {
this.setState(this._getInitialState()); this.setState(this._getNewUrlState());
// Set scalar token on the wUrl, if needed // Set scalar token on the wUrl, if needed
this.setScalarToken(); this.setScalarToken();
}, },
@ -150,9 +156,9 @@ export default React.createClass({
window.removeEventListener('message', this._onMessage); window.removeEventListener('message', this._onMessage);
}, },
componentDidUpdate(prevProps) { componentWillReceiveProps(nextProps) {
if (prevProps.url !== this.props.url) { if (nextProps.url !== this.props.url) {
this.updateWidgetContent(); this.updateWidgetContent(nextProps);
} }
}, },