Skip to content

Chore: Migrate DisplayPrefsView to Typescript #3555

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

Merged
diegolmello merged 6 commits into from
Jan 11, 2022
Merged

Chore: Migrate DisplayPrefsView to Typescript #3555

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6c36347
Chore: Migrate DisplayPrefsView to TS
reinaldonetof Dec 14, 2021
6925dcd
created enums for sortby and display mode
reinaldonetof Dec 27, 2021
3c0002d
partial iparam
reinaldonetof Dec 27, 2021
4b48ace
minor tweak
reinaldonetof Dec 28, 2021
9de60cf
fixes on enums
reinaldonetof Dec 28, 2021
ab84043
Merge branch 'develop' into chore.ts-displayprefsview
diegolmello Jan 11, 2022
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
40 changes: 27 additions & 13 deletions app/views/DisplayPrefsView.js → app/views/DisplayPrefsView.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { useEffect } from 'react';
import PropTypes from 'prop-types';
import { Switch } from 'react-native';
import { RadioButton } from 'react-native-ui-lib';
import { StackNavigationProp } from '@react-navigation/stack';
import { useDispatch, useSelector } from 'react-redux';

import { setPreference } from '../actions/sortPreferences';
Expand All @@ -16,12 +16,29 @@ import SafeAreaView from '../containers/SafeAreaView';
import { ICON_SIZE } from '../containers/List/constants';
import log, { events, logEvent } from '../utils/log';
import { DISPLAY_MODE_CONDENSED, DISPLAY_MODE_EXPANDED } from '../constants/constantDisplayMode';

const DisplayPrefsView = props => {
import { SettingsStackParamList } from '../stacks/types';

interface IParam {
Comment thread
reinaldonetof marked this conversation as resolved.
sortBy?: 'alphabetical' | 'activity';
Comment thread
reinaldonetof marked this conversation as resolved.
Outdated
groupByType?: boolean;
showFavorites?: boolean;
showUnread?: boolean;
showAvatar?: boolean;
displayMode?: typeof DISPLAY_MODE_EXPANDED | typeof DISPLAY_MODE_CONDENSED;
}

interface IDisplayPrefsView {
navigation: StackNavigationProp<SettingsStackParamList, 'DisplayPrefsView'>;
isMasterDetail: boolean;
}

const DisplayPrefsView = (props: IDisplayPrefsView): JSX.Element => {
const { theme } = useTheme();

const { sortBy, groupByType, showFavorites, showUnread, showAvatar, displayMode } = useSelector(state => state.sortPreferences);
const { isMasterDetail } = useSelector(state => state.app);
const { sortBy, groupByType, showFavorites, showUnread, showAvatar, displayMode } = useSelector(
(state: any) => state.sortPreferences
);
const { isMasterDetail } = useSelector((state: any) => state.app);
const dispatch = useDispatch();

useEffect(() => {
Expand All @@ -36,7 +53,7 @@ const DisplayPrefsView = props => {
}
}, []);

const setSortPreference = async param => {
const setSortPreference = async (param: IParam) => {
try {
dispatch(setPreference(param));
await RocketChat.saveSortPreference(param);
Expand Down Expand Up @@ -85,15 +102,15 @@ const DisplayPrefsView = props => {
await setSortPreference({ displayMode: DISPLAY_MODE_CONDENSED });
};

const renderCheckBox = value => (
const renderCheckBox = (value: boolean) => (
<List.Icon name={value ? 'checkbox-checked' : 'checkbox-unchecked'} color={value ? themes[theme].actionTintColor : null} />
);

const renderAvatarSwitch = value => (
const renderAvatarSwitch = (value: boolean) => (
<Switch value={value} onValueChange={() => toggleAvatar()} testID='display-pref-view-avatar-switch' />
);

const renderRadio = value => (
const renderRadio = (value: boolean) => (
<RadioButton
selected={!!value}
color={value ? themes[theme].actionTintColor : themes[theme].auxiliaryText}
Expand Down Expand Up @@ -184,9 +201,6 @@ const DisplayPrefsView = props => {
);
};

DisplayPrefsView.propTypes = {
navigation: PropTypes.object,
isMasterDetail: PropTypes.bool
};
DisplayPrefsView.propTypes = {};

export default DisplayPrefsView;