From 856d1ee5f997e1558c7d01c8a01537ebb9066bc2 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 15 Jun 2018 18:39:12 +0100 Subject: [PATCH 1/7] fix: Invalid prop `focus` of type `string` supplied to `DialogButtons` Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/dialogs/ChatCreateOrReuseDialog.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/dialogs/ChatCreateOrReuseDialog.js b/src/components/views/dialogs/ChatCreateOrReuseDialog.js index e2387064cf..80c6b8502c 100644 --- a/src/components/views/dialogs/ChatCreateOrReuseDialog.js +++ b/src/components/views/dialogs/ChatCreateOrReuseDialog.js @@ -170,7 +170,7 @@ export default class ChatCreateOrReuseDialog extends React.Component { { profile } + onPrimaryButtonClick={this.props.onNewDMClick} focus={true} /> ; } From 5fbadbc44f415589bb70d79bcafc607403819ebb Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 15 Jun 2018 18:42:51 +0100 Subject: [PATCH 2/7] comment out `visibility:hidden` div as it seems unfinished and refers to undefined method `this._onJoinGroupClick` Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/MyGroups.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js index 7a93cfb886..0bfb30674e 100644 --- a/src/components/structures/MyGroups.js +++ b/src/components/structures/MyGroups.js @@ -124,7 +124,7 @@ export default withMatrixClient(React.createClass({ ) } -
+ {/*
@@ -140,7 +140,7 @@ export default withMatrixClient(React.createClass({ { 'i': (sub) => { sub } }) }
-
+ */}
{ contentHeader } From a2219472f6a115897ba23c6dcdfea64722d568b0 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 15 Jun 2018 18:47:15 +0100 Subject: [PATCH 3/7] inline redundant `bodyNodes`, fixes react no unique key warning too Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/GroupView.js | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js index c7610219f7..365aadffa5 100644 --- a/src/components/structures/GroupView.js +++ b/src/components/structures/GroupView.js @@ -1127,10 +1127,6 @@ export default React.createClass({ let avatarNode; let nameNode; let shortDescNode; - const bodyNodes = [ - this._getMembershipSection(), - this._getGroupSection(), - ]; const rightButtons = []; if (this.state.editing && this.state.isUserPrivileged) { let avatarImage; @@ -1269,7 +1265,8 @@ export default React.createClass({
- { bodyNodes } + { this._getMembershipSection() } + { this._getGroupSection() } ); From a7f5059aca1b6e61ade8ce5512ea782a22b20d08 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 15 Jun 2018 18:55:21 +0100 Subject: [PATCH 4/7] add nop to fix `onClick` being required warning Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/groups/GroupTile.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/components/views/groups/GroupTile.js b/src/components/views/groups/GroupTile.js index c1554cd9ed..509c209baa 100644 --- a/src/components/views/groups/GroupTile.js +++ b/src/components/views/groups/GroupTile.js @@ -22,6 +22,7 @@ import sdk from '../../../index'; import dis from '../../../dispatcher'; import FlairStore from '../../../stores/FlairStore'; +function nop() {} const GroupTile = React.createClass({ displayName: 'GroupTile', @@ -81,7 +82,7 @@ const GroupTile = React.createClass({ ) : null; // XXX: Use onMouseDown as a workaround for https://github.com/atlassian/react-beautiful-dnd/issues/273 // instead of onClick. Otherwise we experience https://github.com/vector-im/riot-web/issues/6156 - return + return { (droppableProvided, droppableSnapshot) => (
From a899871d52f6c296285064ff9a08ec38cab24fdd Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 15 Jun 2018 18:55:37 +0100 Subject: [PATCH 5/7] specify unique key to make react happy Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/MyGroups.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/structures/MyGroups.js b/src/components/structures/MyGroups.js index 0bfb30674e..edb50fcedb 100644 --- a/src/components/structures/MyGroups.js +++ b/src/components/structures/MyGroups.js @@ -70,7 +70,7 @@ export default withMatrixClient(React.createClass({ if (this.state.groups) { const groupNodes = []; this.state.groups.forEach((g) => { - groupNodes.push(); + groupNodes.push(); }); contentHeader = groupNodes.length > 0 ?

{ _t('Your Communities') }

:
; content = groupNodes.length > 0 ? From 43681026b8f93f14bb5fbd7f97b52e36f506866f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Fri, 15 Jun 2018 19:01:12 +0100 Subject: [PATCH 6/7] s/onClick/onChange because react cries about it Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/structures/GroupView.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/structures/GroupView.js b/src/components/structures/GroupView.js index 365aadffa5..96dea14c1f 100644 --- a/src/components/structures/GroupView.js +++ b/src/components/structures/GroupView.js @@ -1052,7 +1052,7 @@ export default React.createClass({
{ _t('Only people who have been invited') } @@ -1064,7 +1064,7 @@ export default React.createClass({
{ _t('Everyone') } From fd90992294c62464e1755731e242cc7fc67bd6da Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Sat, 16 Jun 2018 15:58:16 +0100 Subject: [PATCH 7/7] s/onClick/onChange on checkbox to make React happy Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- src/components/views/groups/GroupPublicityToggle.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/views/groups/GroupPublicityToggle.js b/src/components/views/groups/GroupPublicityToggle.js index 78522c2f55..ff0fc553b8 100644 --- a/src/components/views/groups/GroupPublicityToggle.js +++ b/src/components/views/groups/GroupPublicityToggle.js @@ -69,7 +69,7 @@ export default React.createClass({ render() { const GroupTile = sdk.getComponent('groups.GroupTile'); const input = ; const labelText = !this.state.ready ? _t("Loading...") :