PrivateCoffee/element-web
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 3

Merge pull request #3532 from matrix-org/jryans/join-soft-crash

Browse source 
Fix soft crash on room join
This commit is contained in:
J. Ryan Stinnett 2019-10-08 23:22:57 +01:00 committed by GitHub
commit e81df88ec2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/components/structures/MainSplit.js
View file

@ -1,5 +1,6 @@
/* /*
Copyright 2018 New Vector Ltd Copyright 2018 New Vector Ltd
Copyright 2019 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -79,9 +80,12 @@ export default class MainSplit extends React.Component {
const wasPanelSet = this.props.panel && !prevProps.panel; const wasPanelSet = this.props.panel && !prevProps.panel;
const wasPanelCleared = !this.props.panel && prevProps.panel; const wasPanelCleared = !this.props.panel && prevProps.panel;
if (wasExpanded || wasPanelSet) { if (this.resizeContainer && (wasExpanded || wasPanelSet)) {
// The resizer can only be created when **both** expanded and the panel is
// set. Once both are true, the container ref will mount, which is required
// for the resizer to work.
this._createResizer(); this._createResizer();
} else if (wasCollapsed || wasPanelCleared) { } else if (this.resizer && (wasCollapsed || wasPanelCleared)) {
this.resizer.detach(); this.resizer.detach();
this.resizer = null; this.resizer = null;
} }

4
src/resizer/resizer.js
View file

@ -1,5 +1,6 @@
/* /*
Copyright 2018 New Vector Ltd Copyright 2018 New Vector Ltd
Copyright 2019 The Matrix.org Foundation C.I.C.
Licensed under the Apache License, Version 2.0 (the "License"); Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License. you may not use this file except in compliance with the License.
@ -31,6 +32,9 @@ export default class Resizer {
// TODO move vertical/horizontal to config option/container class // TODO move vertical/horizontal to config option/container class
// as it doesn't make sense to mix them within one container/Resizer // as it doesn't make sense to mix them within one container/Resizer
constructor(container, distributorCtor, config) { constructor(container, distributorCtor, config) {
if (!container) {
throw new Error("Resizer requires a non-null `container` arg");
}
this.container = container; this.container = container;
this.distributorCtor = distributorCtor; this.distributorCtor = distributorCtor;
this.config = config; this.config = config;