Page MenuHomePhabricator
Differential D3875

[web] Introduce close button in `Label` component
ClosedPublic
Actions

Authored by • jacek on Apr 29 2022, 4:46 AM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Apr 1, 12:00 PM
Unknown Object (File)
Tue, Apr 1, 11:51 AM
Unknown Object (File)
Fri, Mar 21, 10:18 AM
Unknown Object (File)
Wed, Mar 12, 10:36 AM
Unknown Object (File)
Tue, Mar 11, 10:37 AM
Unknown Object (File)
Mar 3 2025, 4:01 PM
Unknown Object (File)
Feb 24 2025, 3:28 AM
Unknown Object (File)
Feb 21 2025, 11:00 AM
View All Files
Subscribers
• abosh
• adrian
ashoat
atul

Details

Reviewers
tomek
• benschac
atul
Commits
rCOMM22df63a928fd: [web] Introduce close button in `Label` component
Summary

Introduce close action for Label component. The aim is to use in MembersModal in the list of pending users to add to the thread.

Without close action:

Screenshot_Google Chrome_2022-04-29_135216.png (47×113 px, 4 KB)

With:
Screenshot_Google Chrome_2022-04-29_135140.png (46×185 px, 5 KB)

Test Plan

Currently used Labels don't change because introduced property is optional and will be used in the next diff.

Diff Detail

Repository
rCOMM Comm
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

• jacek created this revision.Apr 29 2022, 4:46 AM
Herald added subscribers: • abosh, • karol, atul and 2 others. · View Herald TranscriptApr 29 2022, 4:46 AM
Harbormaster completed remote builds in B8693: Diff 12112.Apr 29 2022, 4:50 AM
• jacek requested review of this revision.Apr 29 2022, 4:50 AM
• jacek edited the summary of this revision. (Show Details)Apr 29 2022, 4:52 AM
• jacek added reviewers: • benschac, atul.
• jacek added a child revision: D3876: [web] Display list of pending users to add in `AddMembersModal`.Apr 29 2022, 6:11 AM
tomek accepted this revision.Apr 29 2022, 7:56 AM
This revision is now accepted and ready to land.Apr 29 2022, 7:56 AM
• jacek updated this revision to Diff 12323.May 6 2022, 1:40 AM

rebase

Harbormaster completed remote builds in B8839: Diff 12323.May 6 2022, 1:48 AM
Closed by commit rCOMM22df63a928fd: [web] Introduce close button in `Label` component (authored by • jacek). · Explain WhyMay 6 2022, 1:55 AM
This revision was automatically updated to reflect the committed changes.
• jacek added a commit: rCOMM22df63a928fd: [web] Introduce close button in `Label` component.
• karol removed a subscriber: • karol.May 6 2022, 3:54 AM

Revision Contents
Changeset List

PathSize
web/
components/
10 lines
15 lines

Diff 12334

View Options

web/components/label.css

// @flow // @flow
import { useRoute } from '@react-navigation/native';
import * as React from 'react'; import * as React from 'react';
import { View } from 'react-native'; import { View } from 'react-native';
import { useStringForUser } from 'lib/hooks/ens-cache.js'; import { useStringForUser } from 'lib/hooks/ens-cache.js';
import { clusterEndHeight, avatarOffset } from './chat-constants.js'; import { clusterEndHeight, avatarOffset } from './chat-constants.js';
import type { DisplayType } from './timestamp.react.js'; import type { DisplayType } from './timestamp.react.js';
import { Timestamp, timestampHeight } from './timestamp.react.js'; import { Timestamp, timestampHeight } from './timestamp.react.js';
import { SingleLine } from '../components/single-line.react.js'; import { SingleLine } from '../components/single-line.react.js';
import { MessageListRouteName } from '../navigation/route-names.js';
import { useStyles } from '../themes/colors.js'; import { useStyles } from '../themes/colors.js';
import type { ChatMessageInfoItemWithHeight } from '../types/chat-types.js'; import type { ChatMessageInfoItemWithHeight } from '../types/chat-types.js';
import { useShouldRenderAvatars } from '../utils/avatar-utils.js'; import { useShouldRenderAvatars } from '../utils/avatar-utils.js';
type Props = { type Props = {
+item: ChatMessageInfoItemWithHeight, +item: ChatMessageInfoItemWithHeight,
+focused: boolean, +focused: boolean,
+display: DisplayType, +display: DisplayType,
}; };
function MessageHeader(props: Props): React.Node { function MessageHeader(props: Props): React.Node {
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
const { item, focused, display } = props; const { item, focused, display } = props;
const { creator, time } = item.messageInfo; const { creator, time } = item.messageInfo;
const { isViewer } = creator; const { isViewer } = creator;
const route = useRoute();
const modalDisplay = display === 'modal'; const modalDisplay = display === 'modal';
const shouldShowUsername = !isViewer && (modalDisplay || item.startsCluster); const shouldShowUsername = !isViewer && (modalDisplay || item.startsCluster);
const stringForUser = useStringForUser(shouldShowUsername ? creator : null); const stringForUser = useStringForUser(shouldShowUsername ? creator : null);
const shouldRenderAvatars = useShouldRenderAvatars(); const shouldRenderAvatars = useShouldRenderAvatars();
let authorName = null; let authorName = null;
if (stringForUser) { if (stringForUser) {
const style = [styles.authorName]; const style = [styles.authorName];
if (modalDisplay) { if (modalDisplay) {
style.push(styles.modal); style.push(styles.modal);
} }
if (shouldRenderAvatars) { if (shouldRenderAvatars) {
style.push({ marginLeft: 12 + avatarOffset }); style.push({ marginLeft: 12 + avatarOffset });
} else { } else {
style.push({ marginLeft: 12 }); style.push({ marginLeft: 12 });
} }
authorName = <SingleLine style={style}>{stringForUser}</SingleLine>; authorName = <SingleLine style={style}>{stringForUser}</SingleLine>;
} }
// We only want to render the top-placed timestamp for a message if it's
// rendered in the message list, and not any separate screens (i.e.
// the MessageResultsScreen).
const presentedFromMessageList =
typeof route.params?.presentedFrom === 'string' &&
route.params.presentedFrom.startsWith(MessageListRouteName);
const messageInMessageList =
route.name === MessageListRouteName || presentedFromMessageList;
const timestamp = const timestamp =
modalDisplay || item.startsConversation ? ( messageInMessageList && (modalDisplay || item.startsConversation) ? (
<Timestamp time={time} display={display} /> <Timestamp time={time} display={display} />
) : null; ) : null;
let style = null; let style = null;
if (focused && !modalDisplay) { if (focused && !modalDisplay) {
let topMargin = 0; let topMargin = 0;
if (!item.startsCluster && !item.messageInfo.creator.isViewer) { if (!item.startsCluster && !item.messageInfo.creator.isViewer) {
topMargin += authorNameHeight + clusterEndHeight; topMargin += authorNameHeight + clusterEndHeight;
Show All 34 Lines
View Options

web/components/label.react.js

// @flow // @flow
import { useRoute } from '@react-navigation/native';
import * as React from 'react'; import * as React from 'react';
import { View } from 'react-native'; import { View } from 'react-native';
import { useStringForUser } from 'lib/hooks/ens-cache.js'; import { useStringForUser } from 'lib/hooks/ens-cache.js';
import { clusterEndHeight, avatarOffset } from './chat-constants.js'; import { clusterEndHeight, avatarOffset } from './chat-constants.js';
import type { DisplayType } from './timestamp.react.js'; import type { DisplayType } from './timestamp.react.js';
import { Timestamp, timestampHeight } from './timestamp.react.js'; import { Timestamp, timestampHeight } from './timestamp.react.js';
import { SingleLine } from '../components/single-line.react.js'; import { SingleLine } from '../components/single-line.react.js';
import { MessageListRouteName } from '../navigation/route-names.js';
import { useStyles } from '../themes/colors.js'; import { useStyles } from '../themes/colors.js';
import type { ChatMessageInfoItemWithHeight } from '../types/chat-types.js'; import type { ChatMessageInfoItemWithHeight } from '../types/chat-types.js';
import { useShouldRenderAvatars } from '../utils/avatar-utils.js'; import { useShouldRenderAvatars } from '../utils/avatar-utils.js';
type Props = { type Props = {
+item: ChatMessageInfoItemWithHeight, +item: ChatMessageInfoItemWithHeight,
+focused: boolean, +focused: boolean,
+display: DisplayType, +display: DisplayType,
}; };
function MessageHeader(props: Props): React.Node { function MessageHeader(props: Props): React.Node {
const styles = useStyles(unboundStyles); const styles = useStyles(unboundStyles);
const { item, focused, display } = props; const { item, focused, display } = props;
const { creator, time } = item.messageInfo; const { creator, time } = item.messageInfo;
const { isViewer } = creator; const { isViewer } = creator;
const route = useRoute();
const modalDisplay = display === 'modal'; const modalDisplay = display === 'modal';
const shouldShowUsername = !isViewer && (modalDisplay || item.startsCluster); const shouldShowUsername = !isViewer && (modalDisplay || item.startsCluster);
const stringForUser = useStringForUser(shouldShowUsername ? creator : null); const stringForUser = useStringForUser(shouldShowUsername ? creator : null);
const shouldRenderAvatars = useShouldRenderAvatars(); const shouldRenderAvatars = useShouldRenderAvatars();
let authorName = null; let authorName = null;
if (stringForUser) { if (stringForUser) {
const style = [styles.authorName]; const style = [styles.authorName];
if (modalDisplay) { if (modalDisplay) {
style.push(styles.modal); style.push(styles.modal);
} }
if (shouldRenderAvatars) { if (shouldRenderAvatars) {
style.push({ marginLeft: 12 + avatarOffset }); style.push({ marginLeft: 12 + avatarOffset });
} else { } else {
style.push({ marginLeft: 12 }); style.push({ marginLeft: 12 });
} }
authorName = <SingleLine style={style}>{stringForUser}</SingleLine>; authorName = <SingleLine style={style}>{stringForUser}</SingleLine>;
} }
// We only want to render the top-placed timestamp for a message if it's
// rendered in the message list, and not any separate screens (i.e.
// the MessageResultsScreen).
const presentedFromMessageList =
typeof route.params?.presentedFrom === 'string' &&
route.params.presentedFrom.startsWith(MessageListRouteName);
const messageInMessageList =
route.name === MessageListRouteName || presentedFromMessageList;
const timestamp = const timestamp =
modalDisplay || item.startsConversation ? ( messageInMessageList && (modalDisplay || item.startsConversation) ? (
<Timestamp time={time} display={display} /> <Timestamp time={time} display={display} />
) : null; ) : null;
let style = null; let style = null;
if (focused && !modalDisplay) { if (focused && !modalDisplay) {
let topMargin = 0; let topMargin = 0;
if (!item.startsCluster && !item.messageInfo.creator.isViewer) { if (!item.startsCluster && !item.messageInfo.creator.isViewer) {
topMargin += authorNameHeight + clusterEndHeight; topMargin += authorNameHeight + clusterEndHeight;
Show All 34 Lines