Page MenuHomePhabricator
Differential D4051

[web] Use `EnumSettingOption` components in `ThreadSettingsPrivacyTab`
ClosedPublic
Actions

Authored by atul on May 15 2022, 1:38 PM.
Tags
None
Referenced Files
F4948440: D4051.diff
Wed, Mar 19, 9:35 PM
Unknown Object (File)
Mon, Mar 10, 5:11 AM
Unknown Object (File)
Sat, Mar 8, 5:00 PM
Unknown Object (File)
Thu, Mar 6, 6:13 PM
Unknown Object (File)
Mon, Mar 3, 6:51 AM
Unknown Object (File)
Tue, Feb 25, 8:17 PM
Unknown Object (File)
Tue, Feb 25, 2:59 PM
Unknown Object (File)
Tue, Feb 25, 2:59 PM
View All Files
Subscribers
• abosh
• adrian
ashoat

Details

Reviewers
tomek
• jacek
• benschac
Commits
rCOMM231bfee83568: [web] Use `EnumSettingOption` components in `ThreadSettingsPrivacyTab`
Summary

This is a minimally-viable first pass.

Replace the inputs in ThreadSettingsPrivacyTab with EnumSettingOptions. There is still a good bit to go with stying, but should be functionally complete.

Here's how it looks:

Depends on D4050

Test Plan

Click around, change visibility, observe that things look/behave as expected

Diff Detail

Repository
rCOMM Comm
Branch
landmay19 (branched from master)
Lint
No Lint Coverage
Unit
No Test Coverage

Event Timeline

atul created this revision.May 15 2022, 1:38 PM
Herald added subscribers: • abosh, • adrian, ashoat. · View Herald TranscriptMay 15 2022, 1:38 PM
atul published this revision for review.May 15 2022, 1:40 PM
atul edited the summary of this revision. (Show Details)
atul added a parent revision: D4050: [web] Pass `optionSelected` from `EnumSettingsOption` to `EnumSettingsOptionInfo`.
atul added inline comments.
web/modals/threads/settings/thread-settings-privacy-tab.react.js
33 ↗(On Diff #12696)

Will probably type these as maybe instead of optional in subsequent diff to avoid having to explicitly write undefined here

114 ↗(On Diff #12696)

Lack of disabled prop is a "known issue," will be addressed later in this stack.

Harbormaster completed remote builds in B9131: Diff 12696.May 15 2022, 1:43 PM
atul updated this revision to Diff 12697.May 15 2022, 2:46 PM

max-width

atul edited the summary of this revision. (Show Details)May 15 2022, 2:47 PM
atul added inline comments.
web/modals/threads/settings/thread-settings-privacy-tab.react.js
104–122 ↗(On Diff #12697)

could probably introduce a third "general" callback to cut repetition here

Harbormaster completed remote builds in B9132: Diff 12697.May 15 2022, 2:53 PM
tomek accepted this revision.May 17 2022, 7:10 AM
tomek added inline comments.
web/components/enum-settings-option-info.css
5 ↗(On Diff #12697)

Shouldn't it be limited by its parent? It would become more reusable.

web/modals/threads/settings/thread-settings-privacy-tab.react.js
105 ↗(On Diff #12697)

Why do we need to assert a constant?

This revision is now accepted and ready to land.May 17 2022, 7:10 AM
atul updated this revision to Diff 12961.May 19 2022, 9:00 AM

rebase after resolving merge conflicts and before landing

Harbormaster completed remote builds in B9355: Diff 12961.May 19 2022, 9:05 AM
atul added inline comments.May 19 2022, 9:07 AM
web/components/enum-settings-option-info.css
5 ↗(On Diff #12697)

Yeah, you're right that this is hacky and specifically to get ThreadSettingsPrivacyTab to look right.

Will find a better approach here that's more general

web/modals/threads/settings/thread-settings-privacy-tab.react.js
105 ↗(On Diff #12697)

Good point, there's no longer a reason. We were previously asserting that event.currentTarget.value was a threadType, but that's not longer relevant. Will update.

atul updated this revision to Diff 12962.May 19 2022, 10:34 AM

address feedback

Harbormaster completed remote builds in B9356: Diff 12962.May 19 2022, 10:39 AM
Closed by commit rCOMM231bfee83568: [web] Use `EnumSettingOption` components in `ThreadSettingsPrivacyTab` (authored by atul). · Explain WhyMay 19 2022, 10:55 AM
This revision was automatically updated to reflect the committed changes.
atul added a commit: rCOMM231bfee83568: [web] Use `EnumSettingOption` components in `ThreadSettingsPrivacyTab`.

Revision Contents
Changeset List

PathSize
web/
modals/
threads/
settings/
6 lines
120 lines

Diff 12962

View Options

web/modals/threads/settings/thread-settings-privacy-tab.css

// @flow // @flow
import * as React from 'react'; import * as React from 'react';
import { FlatList, Platform } from 'react-native'; import { FlatList, Platform } from 'react-native';
import { SafeAreaView } from 'react-native-safe-area-context'; import { SafeAreaView } from 'react-native-safe-area-context';
import { useSelector } from 'react-redux'; import { useSelector } from 'react-redux';
import { import {
childThreadInfos, childThreadInfos,
communityThreadSelector, communityThreadSelector,
} from 'lib/selectors/thread-selectors'; } from 'lib/selectors/thread-selectors';
import { threadIsChannel } from 'lib/shared/thread-utils'; import {
import { type ThreadInfo, communitySubthreads } from 'lib/types/thread-types'; createRecursiveDrawerItemsData,
appendSuffix,
} from 'lib/utils/drawer-utils.react';
import { useNavigateToThread } from '../chat/message-list-types'; import { useNavigateToThread } from '../chat/message-list-types';
import { useStyles } from '../themes/colors'; import { useStyles } from '../themes/colors';
import type { TextStyle } from '../types/styles';
import CommunityDrawerItemCommunity from './community-drawer-item-cummunity.react'; import CommunityDrawerItemCommunity from './community-drawer-item-cummunity.react';
const maxDepth = 2; const maxDepth = 2;
const safeAreaEdges = Platform.select({ const safeAreaEdges = Platform.select({
ios: ['top'], ios: ['top'],
default: ['top', 'bottom'], default: ['top', 'bottom'],
}); });
Show All 10 Linesfunction CommunityDrawerContent(): React.Node {
const navigateToThread = useNavigateToThread(); const navigateToThread = useNavigateToThread();
const childThreadInfosMap = useSelector(childThreadInfos); const childThreadInfosMap = useSelector(childThreadInfos);
const setOpenCommunnityOrClose = React.useCallback((index: string) => { const setOpenCommunnityOrClose = React.useCallback((index: string) => {
setOpenCommunity(open => (open === index ? null : index)); setOpenCommunity(open => (open === index ? null : index));
}, []); }, []);
const renderItem = React.useCallback( const renderItem = React.useCallback(
({ item }) => { ({ item }) => {
const itemData = {
threadInfo: item.threadInfo,
itemChildren: item.itemChildren,
labelStyle: item.labelStyle,
hasSubchannelsButton: item.subchannelsButton,
};
return ( return (
<CommunityDrawerItemCommunity <CommunityDrawerItemCommunity
key={item.key} key={item.threadInfo.id}
itemData={itemData} itemData={item}
toggleExpanded={setOpenCommunnityOrClose} toggleExpanded={setOpenCommunnityOrClose}
expanded={itemData.threadInfo.id === openCommunity} expanded={item.threadInfo.id === openCommunity}
navigateToThread={navigateToThread} navigateToThread={navigateToThread}
/> />
); );
}, },
michalUnsubmitted
Not Done
Inline Actions
}, []);
const renderItem = React.useCallback(
- ({ item }) => {
- return (
+ ({ item }) => (
<CommunityDrawerItemCommunity
key={item.threadInfo.id}
itemData={item}
toggleExpanded={setOpenCommunnityOrClose}
expanded={item.threadInfo.id === openCommunity}
navigateToThread={navigateToThread}
/>
- );
- },
+ ),
[navigateToThread, openCommunity, setOpenCommunnityOrClose],

This now can be simplified.

michal: This now can be simplified.
[navigateToThread, openCommunity, setOpenCommunnityOrClose], [navigateToThread, openCommunity, setOpenCommunnityOrClose],
); );
const labelStylesObj = useStyles(labelUnboundStyles); const labelStylesObj = useStyles(labelUnboundStyles);
const labelStyles = React.useMemo( const labelStyles = React.useMemo(
() => [ () => [
labelStylesObj.level0Label, labelStylesObj.level0Label,
labelStylesObj.level1Label, labelStylesObj.level1Label,
labelStylesObj.level2Label, labelStylesObj.level2Label,
], ],
[labelStylesObj], [labelStylesObj],
); );
const drawerItemsData = React.useMemo( const drawerItemsData = React.useMemo(
() => () =>
createRecursiveDrawerItemsData( createRecursiveDrawerItemsData(
childThreadInfosMap, childThreadInfosMap,
communitiesSuffixed, communitiesSuffixed,
labelStyles, labelStyles,
maxDepth,
), ),
[childThreadInfosMap, communitiesSuffixed, labelStyles], [childThreadInfosMap, communitiesSuffixed, labelStyles],
); );
return ( return (
<SafeAreaView style={styles.drawerContent} edges={safeAreaEdges}> <SafeAreaView style={styles.drawerContent} edges={safeAreaEdges}>
<FlatList data={drawerItemsData} renderItem={renderItem} /> <FlatList data={drawerItemsData} renderItem={renderItem} />
</SafeAreaView> </SafeAreaView>
); );
} }
function createRecursiveDrawerItemsData(
childThreadInfosMap: { +[id: string]: $ReadOnlyArray<ThreadInfo> },
communities: $ReadOnlyArray<ThreadInfo>,
labelStyles: $ReadOnlyArray<TextStyle>,
) {
const result = communities.map(community => ({
key: community.id,
threadInfo: community,
itemChildren: [],
labelStyle: labelStyles[0],
subchannelsButton: false,
}));
let queue = result.map(item => [item, 0]);
for (let i = 0; i < queue.length; i++) {
const [item, lvl] = queue[i];
const itemChildThreadInfos = childThreadInfosMap[item.threadInfo.id] ?? [];
if (lvl < maxDepth) {
item.itemChildren = itemChildThreadInfos
.filter(childItem => communitySubthreads.includes(childItem.type))
.map(childItem => ({
threadInfo: childItem,
itemChildren: [],
labelStyle: labelStyles[Math.min(lvl + 1, labelStyles.length - 1)],
hasSubchannelsButton:
lvl + 1 === maxDepth &&
threadHasSubchannels(childItem, childThreadInfosMap),
}));
queue = queue.concat(
item.itemChildren.map(childItem => [childItem, lvl + 1]),
);
}
}
return result;
}
function threadHasSubchannels(
threadInfo: ThreadInfo,
childThreadInfosMap: { +[id: string]: $ReadOnlyArray<ThreadInfo> },
) {
if (!childThreadInfosMap[threadInfo.id]?.length) {
return false;
}
return childThreadInfosMap[threadInfo.id].some(thread =>
threadIsChannel(thread),
);
}
function appendSuffix(chats: $ReadOnlyArray<ThreadInfo>): ThreadInfo[] {
const result = [];
const names = new Map<string, number>();
for (const chat of chats) {
let name = chat.uiName;
const numberOfOccurrences = names.get(name);
names.set(name, (numberOfOccurrences ?? 0) + 1);
if (numberOfOccurrences) {
name = `${name} (${numberOfOccurrences.toString()})`;
}
result.push({ ...chat, uiName: name });
}
return result;
}
const unboundStyles = { const unboundStyles = {
drawerContent: { drawerContent: {
flex: 1, flex: 1,
paddingRight: 8, paddingRight: 8,
paddingTop: 8, paddingTop: 8,
backgroundColor: 'drawerBackgroud', backgroundColor: 'drawerBackgroud',
}, },
}; };
Show All 26 Lines
View Options

web/modals/threads/settings/thread-settings-privacy-tab.react.js

// @flow // @flow
import * as React from 'react'; import * as React from 'react';
import { FlatList, Platform } from 'react-native'; import { FlatList, Platform } from 'react-native';
import { SafeAreaView } from 'react-native-safe-area-context'; import { SafeAreaView } from 'react-native-safe-area-context';
import { useSelector } from 'react-redux'; import { useSelector } from 'react-redux';
import { import {
childThreadInfos, childThreadInfos,
communityThreadSelector, communityThreadSelector,
} from 'lib/selectors/thread-selectors'; } from 'lib/selectors/thread-selectors';
import { threadIsChannel } from 'lib/shared/thread-utils'; import {
import { type ThreadInfo, communitySubthreads } from 'lib/types/thread-types'; createRecursiveDrawerItemsData,
appendSuffix,
} from 'lib/utils/drawer-utils.react';
import { useNavigateToThread } from '../chat/message-list-types'; import { useNavigateToThread } from '../chat/message-list-types';
import { useStyles } from '../themes/colors'; import { useStyles } from '../themes/colors';
import type { TextStyle } from '../types/styles';
import CommunityDrawerItemCommunity from './community-drawer-item-cummunity.react'; import CommunityDrawerItemCommunity from './community-drawer-item-cummunity.react';
const maxDepth = 2; const maxDepth = 2;
const safeAreaEdges = Platform.select({ const safeAreaEdges = Platform.select({
ios: ['top'], ios: ['top'],
default: ['top', 'bottom'], default: ['top', 'bottom'],
}); });
Show All 10 Linesfunction CommunityDrawerContent(): React.Node {
const navigateToThread = useNavigateToThread(); const navigateToThread = useNavigateToThread();
const childThreadInfosMap = useSelector(childThreadInfos); const childThreadInfosMap = useSelector(childThreadInfos);
const setOpenCommunnityOrClose = React.useCallback((index: string) => { const setOpenCommunnityOrClose = React.useCallback((index: string) => {
setOpenCommunity(open => (open === index ? null : index)); setOpenCommunity(open => (open === index ? null : index));
}, []); }, []);
const renderItem = React.useCallback( const renderItem = React.useCallback(
({ item }) => { ({ item }) => {
const itemData = {
threadInfo: item.threadInfo,
itemChildren: item.itemChildren,
labelStyle: item.labelStyle,
hasSubchannelsButton: item.subchannelsButton,
};
return ( return (
<CommunityDrawerItemCommunity <CommunityDrawerItemCommunity
key={item.key} key={item.threadInfo.id}
itemData={itemData} itemData={item}
toggleExpanded={setOpenCommunnityOrClose} toggleExpanded={setOpenCommunnityOrClose}
expanded={itemData.threadInfo.id === openCommunity} expanded={item.threadInfo.id === openCommunity}
navigateToThread={navigateToThread} navigateToThread={navigateToThread}
/> />
); );
}, },
michalUnsubmitted
Not Done
Inline Actions
}, []);
const renderItem = React.useCallback(
- ({ item }) => {
- return (
+ ({ item }) => (
<CommunityDrawerItemCommunity
key={item.threadInfo.id}
itemData={item}
toggleExpanded={setOpenCommunnityOrClose}
expanded={item.threadInfo.id === openCommunity}
navigateToThread={navigateToThread}
/>
- );
- },
+ ),
[navigateToThread, openCommunity, setOpenCommunnityOrClose],

This now can be simplified.

michal: This now can be simplified.
[navigateToThread, openCommunity, setOpenCommunnityOrClose], [navigateToThread, openCommunity, setOpenCommunnityOrClose],
); );
const labelStylesObj = useStyles(labelUnboundStyles); const labelStylesObj = useStyles(labelUnboundStyles);
const labelStyles = React.useMemo( const labelStyles = React.useMemo(
() => [ () => [
labelStylesObj.level0Label, labelStylesObj.level0Label,
labelStylesObj.level1Label, labelStylesObj.level1Label,
labelStylesObj.level2Label, labelStylesObj.level2Label,
], ],
[labelStylesObj], [labelStylesObj],
); );
const drawerItemsData = React.useMemo( const drawerItemsData = React.useMemo(
() => () =>
createRecursiveDrawerItemsData( createRecursiveDrawerItemsData(
childThreadInfosMap, childThreadInfosMap,
communitiesSuffixed, communitiesSuffixed,
labelStyles, labelStyles,
maxDepth,
), ),
[childThreadInfosMap, communitiesSuffixed, labelStyles], [childThreadInfosMap, communitiesSuffixed, labelStyles],
); );
return ( return (
<SafeAreaView style={styles.drawerContent} edges={safeAreaEdges}> <SafeAreaView style={styles.drawerContent} edges={safeAreaEdges}>
<FlatList data={drawerItemsData} renderItem={renderItem} /> <FlatList data={drawerItemsData} renderItem={renderItem} />
</SafeAreaView> </SafeAreaView>
); );
} }
function createRecursiveDrawerItemsData(
childThreadInfosMap: { +[id: string]: $ReadOnlyArray<ThreadInfo> },
communities: $ReadOnlyArray<ThreadInfo>,
labelStyles: $ReadOnlyArray<TextStyle>,
) {
const result = communities.map(community => ({
key: community.id,
threadInfo: community,
itemChildren: [],
labelStyle: labelStyles[0],
subchannelsButton: false,
}));
let queue = result.map(item => [item, 0]);
for (let i = 0; i < queue.length; i++) {
const [item, lvl] = queue[i];
const itemChildThreadInfos = childThreadInfosMap[item.threadInfo.id] ?? [];
if (lvl < maxDepth) {
item.itemChildren = itemChildThreadInfos
.filter(childItem => communitySubthreads.includes(childItem.type))
.map(childItem => ({
threadInfo: childItem,
itemChildren: [],
labelStyle: labelStyles[Math.min(lvl + 1, labelStyles.length - 1)],
hasSubchannelsButton:
lvl + 1 === maxDepth &&
threadHasSubchannels(childItem, childThreadInfosMap),
}));
queue = queue.concat(
item.itemChildren.map(childItem => [childItem, lvl + 1]),
);
}
}
return result;
}
function threadHasSubchannels(
threadInfo: ThreadInfo,
childThreadInfosMap: { +[id: string]: $ReadOnlyArray<ThreadInfo> },
) {
if (!childThreadInfosMap[threadInfo.id]?.length) {
return false;
}
return childThreadInfosMap[threadInfo.id].some(thread =>
threadIsChannel(thread),
);
}
function appendSuffix(chats: $ReadOnlyArray<ThreadInfo>): ThreadInfo[] {
const result = [];
const names = new Map<string, number>();
for (const chat of chats) {
let name = chat.uiName;
const numberOfOccurrences = names.get(name);
names.set(name, (numberOfOccurrences ?? 0) + 1);
if (numberOfOccurrences) {
name = `${name} (${numberOfOccurrences.toString()})`;
}
result.push({ ...chat, uiName: name });
}
return result;
}
const unboundStyles = { const unboundStyles = {
drawerContent: { drawerContent: {
flex: 1, flex: 1,
paddingRight: 8, paddingRight: 8,
paddingTop: 8, paddingTop: 8,
backgroundColor: 'drawerBackgroud', backgroundColor: 'drawerBackgroud',
}, },
}; };
Show All 26 Lines