verdnatura-mirror/Rocket.Chat.ReactNative
verdnatura-mirror
/
Rocket.Chat.ReactNative
mirror of https://github.com/RocketChat/Rocket.Chat.ReactNative
2
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

Starting room

This commit is contained in:
Diego Mello 2020-05-21 15:12:19 -03:00
parent 3867e57641
commit e4de36d25d
2 changed files with 79 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/stacks/InsideStack.js
View File

@ -63,6 +63,11 @@ const ChatsStack = () => {
component={RoomsListView} component={RoomsListView}
options={RoomsListView.navigationOptions} options={RoomsListView.navigationOptions}
/> />
<Chats.Screen
name='RoomView'
component={RoomView}
options={RoomView.navigationOptions}
/>
{/* <Chats.Screen {/* <Chats.Screen
name='RoomActionsView' name='RoomActionsView'
component={RoomActionsView} component={RoomActionsView}
@ -123,11 +128,6 @@ const ChatsStack = () => {
component={NotificationPrefView} component={NotificationPrefView}
options={NotificationPrefView.navigationOptions} options={NotificationPrefView.navigationOptions}
/> />
<Chats.Screen
name='RoomView'
component={RoomView}
options={RoomView.navigationOptions}
/>
<Chats.Screen <Chats.Screen
name='ThreadMessagesView' name='ThreadMessagesView'
component={ThreadMessagesView} component={ThreadMessagesView}

149
app/views/RoomView/index.js
View File

@ -72,72 +72,9 @@ const stateAttrsUpdate = [
const roomAttrsUpdate = ['f', 'ro', 'blocked', 'blocker', 'archived', 'muted', 'jitsiTimeout', 'announcement', 'sysMes', 'topic', 'name', 'fname', 'roles', 'bannerClosed', 'visitor']; const roomAttrsUpdate = ['f', 'ro', 'blocked', 'blocker', 'archived', 'muted', 'jitsiTimeout', 'announcement', 'sysMes', 'topic', 'name', 'fname', 'roles', 'bannerClosed', 'visitor'];
class RoomView extends React.Component { class RoomView extends React.Component {
static navigationOptions = ({ navigation, screenProps }) => {
const rid = navigation.getParam('rid', null);
const prid = navigation.getParam('prid');
const title = navigation.getParam('name');
const subtitle = navigation.getParam('subtitle');
const t = navigation.getParam('t');
const tmid = navigation.getParam('tmid');
const baseUrl = navigation.getParam('baseUrl');
const userId = navigation.getParam('userId');
const token = navigation.getParam('token');
const avatar = navigation.getParam('avatar');
const toggleFollowThread = navigation.getParam('toggleFollowThread', () => {});
const goRoomActionsView = navigation.getParam('goRoomActionsView', () => {});
const unreadsCount = navigation.getParam('unreadsCount', null);
const roomUserId = navigation.getParam('roomUserId');
const visitor = navigation.getParam('visitor');
if (!rid) {
return {
...themedHeader(screenProps.theme)
};
}
return {
...themedHeader(screenProps.theme),
headerTitle: (
<RoomHeaderView
rid={rid}
prid={prid}
tmid={tmid}
title={title}
subtitle={subtitle}
type={t}
widthOffset={tmid ? 95 : 130}
roomUserId={roomUserId}
visitor={visitor}
goRoomActionsView={goRoomActionsView}
/>
),
headerRight: (
<RightButtons
rid={rid}
tmid={tmid}
t={t}
navigation={navigation}
toggleFollowThread={toggleFollowThread}
/>
),
headerLeft: (
<RoomHeaderLeft
tmid={tmid}
unreadsCount={unreadsCount}
navigation={navigation}
baseUrl={baseUrl}
userId={userId}
token={token}
title={avatar}
theme={screenProps.theme}
t={t}
goRoomActionsView={goRoomActionsView}
split={screenProps.split}
/>
)
};
}
static propTypes = { static propTypes = {
navigation: PropTypes.object, navigation: PropTypes.object,
route: PropTypes.object,
user: PropTypes.shape({ user: PropTypes.shape({
id: PropTypes.string.isRequired, id: PropTypes.string.isRequired,
username: PropTypes.string.isRequired, username: PropTypes.string.isRequired,
@ -161,15 +98,15 @@ class RoomView extends React.Component {
super(props); super(props);
console.time(`${ this.constructor.name } init`); console.time(`${ this.constructor.name } init`);
console.time(`${ this.constructor.name } mount`); console.time(`${ this.constructor.name } mount`);
this.rid = props.navigation.getParam('rid'); this.rid = props.route.params?.rid;
this.t = props.navigation.getParam('t'); this.t = props.route.params?.t;
this.tmid = props.navigation.getParam('tmid', null); this.tmid = props.route.params?.tmid;
const room = props.navigation.getParam('room'); const room = props.route.params?.room;
const selectedMessage = props.navigation.getParam('message'); const selectedMessage = props.route.params?.message;
const name = props.navigation.getParam('name'); const name = props.route.params?.name;
const fname = props.navigation.getParam('fname'); const fname = props.route.params?.fname;
const search = props.navigation.getParam('search'); const search = props.route.params?.search;
const prid = props.navigation.getParam('prid'); const prid = props.route.params?.prid;
this.state = { this.state = {
joined: true, joined: true,
room: room || { room: room || {
@ -613,9 +550,9 @@ class RoomView extends React.Component {
.observeWithColumns(['unread']); .observeWithColumns(['unread']);
this.queryUnreads = observable.subscribe((data) => { this.queryUnreads = observable.subscribe((data) => {
const { navigation } = this.props; const { navigation, route } = this.props;
const unreadsCount = data.filter(s => s.unread > 0).reduce((a, b) => a + (b.unread || 0), 0); const unreadsCount = data.filter(s => s.unread > 0).reduce((a, b) => a + (b.unread || 0), 0);
if (unreadsCount !== navigation.getParam('unreadsCount')) { if (unreadsCount !== route.params?.unreadsCount) {
navigation.setParams({ navigation.setParams({
unreadsCount unreadsCount
}); });
@ -1084,4 +1021,66 @@ const mapDispatchToProps = dispatch => ({
replyBroadcast: message => dispatch(replyBroadcastAction(message)) replyBroadcast: message => dispatch(replyBroadcastAction(message))
}); });
RoomView.navigationOptions = ({ navigation, route }) => {
const rid = route.params?.rid ?? null;
const prid = route.params?.prid;
const title = route.params?.name;
const subtitle = route.params?.subtitle;
const t = route.params?.t;
const tmid = route.params?.tmid;
const baseUrl = route.params?.baseUrl;
const userId = route.params?.userId;
const token = route.params?.token;
const avatar = route.params?.avatar;
const toggleFollowThread = route.params?.toggleFollowThread ?? (() => {});
const goRoomActionsView = route.params?.goRoomActionsView ?? (() => {});
const unreadsCount = route.params?.unreadsCount ?? null;
const roomUserId = route.params?.roomUserId;
const visitor = route.params?.visitor;
if (!rid) {
return {};
}
return {
// headerTitle: (
// <RoomHeaderView
// rid={rid}
// prid={prid}
// tmid={tmid}
// title={title}
// subtitle={subtitle}
// type={t}
// widthOffset={tmid ? 95 : 130}
// roomUserId={roomUserId}
// visitor={visitor}
// goRoomActionsView={goRoomActionsView}
// />
// ),
title: 'asdahsdohia',
headerRight: () => (
<RightButtons
rid={rid}
tmid={tmid}
t={t}
navigation={navigation}
toggleFollowThread={toggleFollowThread}
/>
),
// headerLeft: () => (
// <RoomHeaderLeft
// tmid={tmid}
// unreadsCount={unreadsCount}
// navigation={navigation}
// baseUrl={baseUrl}
// userId={userId}
// token={token}
// title={avatar}
// theme='light' // TODO: ?
// t={t}
// goRoomActionsView={goRoomActionsView}
// split={false} // TODO: ?
// />
// )
};
};
export default connect(mapStateToProps, mapDispatchToProps)(withTheme(RoomView)); export default connect(mapStateToProps, mapDispatchToProps)(withTheme(RoomView));