ilyakooo0/urbit
1
0
Fork 0
mirror of https://github.com/ilyakooo0/urbit.git synced 2024-12-11 08:55:23 +03:00
Code Issues Packages Projects Releases Wiki Activity

chat-fe: show spinner on join

Browse Source 
Shows the spinner whilst joining a channel, both manually and from a
url. Also fixes an issue where a newly joined channel may be navigated
away from automatically.
This commit is contained in:
Liam Fitzgerald 2020-04-09 12:48:55 +10:00
parent c570def06a
commit b4fb8d5163
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/interface/chat/src/js/components/chat.js
View File

@ -69,7 +69,10 @@ export class ChatScreen extends Component {
this.updateReadNumber();
}
);
} else if (props.chatInitialized && !(props.station in props.inbox)) {
} else if (props.chatInitialized &&
!(props.station in props.inbox) &&
!(props.station in props.chatSynced) ) {
props.history.push("/~chat");
} else if (
props.envelopes.length - prevProps.envelopes.length >=

20
pkg/interface/chat/src/js/components/join.js
View File

@ -1,6 +1,7 @@
import React, { Component } from 'react';
import classnames from 'classnames';
import { Route, Link } from 'react-router-dom';
import { Spinner } from './lib/icons/icon-spinner';
import urbitOb from 'urbit-ob';
@ -11,7 +12,8 @@ export class JoinScreen extends Component {
this.state = {
station: '/',
error: false
error: false,
awaiting: false,
};
this.stationChange = this.stationChange.bind(this);
@ -36,11 +38,12 @@ export class JoinScreen extends Component {
});
return;
}
this.setState({
station
}, () => {
props.api.chatView.join(ship, station, true);
});
station,
awaiting: true
}, () => props.api.chatView.join(ship, station, true))
}
}
@ -48,6 +51,7 @@ export class JoinScreen extends Component {
const { props, state } = this;
if (state.station in props.inbox ||
props.chatSynced !== prevProps.chatSynced) {
this.setState({ awaiting: false });
props.history.push(`/~chat/room${state.station}`);
}
}
@ -81,7 +85,10 @@ export class JoinScreen extends Component {
return;
}
props.api.chatView.join(ship, `/${station}`, true);
this.setState({
awaiting: true,
station: `/${station}`
}, () => props.api.chatView.join(ship, `/${station}`, true))
}
stationChange(event) {
@ -140,6 +147,7 @@ export class JoinScreen extends Component {
onClick={this.onClickJoin.bind(this)}
className={joinClasses}
>Join Chat</button>
<Spinner awaiting={this.state.awaiting} classes="mt4" text="Joining chat..." />
</div>
</div>
);