Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UserStatusScreen: Convert to use hooks & react navigation v5 #4447

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

UserStatusScreen: Convert to use hooks & react navigation v5 #4447

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ios/Podfile.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -723,4 +723,4 @@ SPEC CHECKSUMS:

PODFILE CHECKSUM: 0eb2bf1b0f7972fc7183f5eac73708f76355c614

COCOAPODS: 1.9.3
COCOAPODS: 1.10.0
142 changes: 59 additions & 83 deletions src/user-status/UserStatusScreen.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
/* @flow strict-local */
import React, { PureComponent } from 'react';
import React, { useContext, useState } from 'react';
import { FlatList, View } from 'react-native';
import { TranslationContext } from '../boot/TranslationProvider';
import { createStyleSheet } from '../styles';

import type { RouteProp } from '../react-navigation';
import type { AppNavigationProp } from '../nav/AppNavigator';
import * as NavigationService from '../nav/NavigationService';
import type { GetText, Dispatch } from '../types';
import { connect } from '../react-redux';
import type { RouteProp } from '../react-navigation';
import { Input, OptionButton, Screen, ZulipButton } from '../common';
import { getSelfUserStatusText } from '../selectors';
import { IconCancel, IconDone } from '../common/Icons';
import statusSuggestions from './userStatusTextSuggestions';
import { updateUserStatusText } from './userStatusActions';
import { navigateBack } from '../nav/navActions';
import { useNavigation } from '../react-navigation';
import { useSelector, useDispatch } from '../react-redux';

const styles = createStyleSheet({
statusTextInput: {
Expand All @@ -32,93 +29,72 @@ const styles = createStyleSheet({
type Props = $ReadOnly<{|
navigation: AppNavigationProp<'user-status'>,
route: RouteProp<'user-status', void>,

dispatch: Dispatch,
userStatusText: string,
|}>;

type State = {|
statusText: string,
|};

class UserStatusScreen extends PureComponent<Props, State> {
static contextType = TranslationContext;
context: GetText;

state = {
statusText: this.props.userStatusText,
};
export default function UserStatusScreen(props: Props) {
const _ = useContext(TranslationContext);
const userStatusText = useSelector(state => getSelfUserStatusText(state));
const [statusText, setStatusText] = useState(userStatusText);
const navigation = useNavigation();
const dispatch = useDispatch();

setStatusTextState = (statusText: string) => {
this.setState({
statusText,
});
const setStatusTextState = (text: string) => {
setStatusText(text);
};

updateStatusText = (statusText: string) => {
const { dispatch } = this.props;
dispatch(updateUserStatusText(statusText));
NavigationService.dispatch(navigateBack());
const updateStatusText = (text: string) => {
dispatch(updateUserStatusText(text));
navigation.goBack();
};

handleStatusTextUpdate = () => {
const { statusText } = this.state;
this.updateStatusText(statusText);
const handleStatusTextUpdate = () => {
updateStatusText(statusText);
};

handleStatusTextClear = () => {
this.setStatusTextState('');
this.updateStatusText('');
const handleStatusTextClear = () => {
setStatusTextState('');
updateStatusText('');
};

render() {
const { statusText } = this.state;
const _ = this.context;

return (
<Screen title="User status">
<Input
autoFocus
maxLength={60}
style={styles.statusTextInput}
placeholder="What’s your status?"
value={statusText}
onChangeText={this.setStatusTextState}
return (
<Screen title="User status">
<Input
autoFocus
maxLength={60}
style={styles.statusTextInput}
placeholder="What’s your status?"
value={statusText}
onChangeText={setStatusTextState}
/>
<FlatList
data={statusSuggestions}
keyboardShouldPersistTaps="always"
keyExtractor={item => item}
renderItem={({ item, index }) => (
<OptionButton
key={item}
label={item}
onPress={() => {
setStatusTextState(_(item));
}}
/>
)}
/>
<View style={styles.buttonsWrapper}>
<ZulipButton
style={styles.button}
secondary
text="Clear"
onPress={handleStatusTextClear}
Icon={IconCancel}
/>
<FlatList
data={statusSuggestions}
keyboardShouldPersistTaps="always"
keyExtractor={item => item}
renderItem={({ item, index }) => (
<OptionButton
key={item}
label={item}
onPress={() => {
this.setStatusTextState(_(item));
}}
/>
)}
<ZulipButton
style={styles.button}
text="Update"
onPress={handleStatusTextUpdate}
Icon={IconDone}
/>
<View style={styles.buttonsWrapper}>
<ZulipButton
style={styles.button}
secondary
text="Clear"
onPress={this.handleStatusTextClear}
Icon={IconCancel}
/>
<ZulipButton
style={styles.button}
text="Update"
onPress={this.handleStatusTextUpdate}
Icon={IconDone}
/>
</View>
</Screen>
);
}
</View>
</Screen>
);
}

export default connect(state => ({
userStatusText: getSelfUserStatusText(state),
}))(UserStatusScreen);