ActionSheet [nfc]: Rename HeaderActionSheet to TopicActionSheet.

This is a better name since this type of action sheet is used with Topics.
zulip · Jun 15, 2021 · 28d86d0 · 28d86d0
1 parent 4dd471c
commit 28d86d0
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 24 deletions.
diff --git a/src/message/__tests__/messageActionSheet-test.js b/src/message/__tests__/messageActionSheet-test.js
@@ -4,7 +4,7 @@ import { HOME_NARROW } from '../../utils/narrow';
 import { streamNameOfStreamMessage } from '../../utils/recipient';
 
 import * as eg from '../../__tests__/lib/exampleData';
-import { constructMessageActionButtons, constructHeaderActionButtons } from '../messageActionSheet';
+import { constructMessageActionButtons, constructTopicActionButtons } from '../messageActionSheet';
 
 const baseBackgroundData = deepFreeze({
   alertWords: [],
@@ -56,10 +56,10 @@ describe('constructActionButtons', () => {
   });
 });
 
-describe('constructHeaderActionButtons', () => {
+describe('constructTopicActionButtons', () => {
   test('show Unmute topic option if topic is muted', () => {
     const mute = deepFreeze([['electron issues', 'issue #556']]);
-    const buttons = constructHeaderActionButtons({
+    const buttons = constructTopicActionButtons({
       backgroundData: { ...baseBackgroundData, mute },
       stream: 'electron issues',
       topic: 'issue #556',
@@ -68,7 +68,7 @@ describe('constructHeaderActionButtons', () => {
   });
 
   test('show mute topic option if topic is not muted', () => {
-    const buttons = constructHeaderActionButtons({
+    const buttons = constructTopicActionButtons({
       backgroundData: { ...baseBackgroundData, mute: [] },
       stream: streamNameOfStreamMessage(eg.streamMessage()),
       topic: eg.streamMessage().subject,
@@ -78,7 +78,7 @@ describe('constructHeaderActionButtons', () => {
 
   test('show Unmute stream option if stream is not in home view', () => {
     const subscriptions = [{ ...eg.subscription, in_home_view: false }];
-    const buttons = constructHeaderActionButtons({
+    const buttons = constructTopicActionButtons({
       backgroundData: { ...baseBackgroundData, subscriptions },
       stream: streamNameOfStreamMessage(eg.streamMessage()),
       topic: eg.streamMessage().subject,
@@ -88,7 +88,7 @@ describe('constructHeaderActionButtons', () => {
 
   test('show mute stream option if stream is in home view', () => {
     const subscriptions = [{ ...eg.subscription, in_home_view: true }];
-    const buttons = constructHeaderActionButtons({
+    const buttons = constructTopicActionButtons({
       backgroundData: { ...baseBackgroundData, subscriptions },
       stream: streamNameOfStreamMessage(eg.streamMessage()),
       topic: eg.streamMessage().subject,
@@ -98,7 +98,7 @@ describe('constructHeaderActionButtons', () => {
 
   test('show delete topic option if current user is an admin', () => {
     const ownUser = { ...eg.selfUser, is_admin: true };
-    const buttons = constructHeaderActionButtons({
+    const buttons = constructTopicActionButtons({
       backgroundData: { ...baseBackgroundData, ownUser },
       stream: streamNameOfStreamMessage(eg.streamMessage()),
       topic: eg.streamMessage().subject,
@@ -107,7 +107,7 @@ describe('constructHeaderActionButtons', () => {
   });
 
   test('do not show delete topic option if current user is not an admin', () => {
-    const buttons = constructHeaderActionButtons({
+    const buttons = constructTopicActionButtons({
       backgroundData: baseBackgroundData,
       stream: streamNameOfStreamMessage(eg.streamMessage()),
       topic: eg.streamMessage().subject,

diff --git a/src/message/messageActionSheet.js b/src/message/messageActionSheet.js
@@ -35,7 +35,7 @@ export type ShowActionSheetWithOptions = (
   (number) => void,
 ) => void;
 
-type HeaderArgs = {
+type TopicArgs = {
   auth: Auth,
   stream: string,
   topic: string,
@@ -55,7 +55,7 @@ type MessageArgs = {
   ...
 };
 
-type Button<Args: HeaderArgs | MessageArgs> = {|
+type Button<Args: TopicArgs | MessageArgs> = {|
   (Args): void | Promise<void>,
 
   /** The label for the button. */
@@ -226,7 +226,7 @@ const cancel = params => {};
 cancel.title = 'Cancel';
 cancel.errorMessage = 'Failed to hide menu';
 
-export const constructHeaderActionButtons = ({
+export const constructTopicActionButtons = ({
   backgroundData: { mute, subscriptions, ownUser },
   stream,
   topic,
@@ -239,7 +239,7 @@ export const constructHeaderActionButtons = ({
   }>,
   stream: string,
   topic: string,
-|}): Button<HeaderArgs>[] => {
+|}): Button<TopicArgs>[] => {
   const buttons = [];
   if (ownUser.is_admin) {
     buttons.push(deleteTopic);
@@ -338,10 +338,7 @@ export const constructNonHeaderActionButtons = ({
   }
 };
 
-function makeButtonCallback<Args: HeaderArgs | MessageArgs>(
-  buttonList: Button<Args>[],
-  args: Args,
-) {
+function makeButtonCallback<Args: TopicArgs | MessageArgs>(buttonList: Button<Args>[], args: Args) {
   return buttonIndex => {
     (async () => {
       const pressedButton: Button<Args> = buttonList[buttonIndex];
@@ -392,7 +389,7 @@ export const showMessageActionSheet = ({
   );
 };
 
-export const showHeaderActionSheet = ({
+export const showTopicActionSheet = ({
   showActionSheetWithOptions,
   callbacks,
   backgroundData,
@@ -415,7 +412,7 @@ export const showHeaderActionSheet = ({
   stream: string,
   topic: string,
 |}): void => {
-  const buttonList = constructHeaderActionButtons({
+  const buttonList = constructTopicActionButtons({
     backgroundData,
     stream,
     topic,

diff --git a/src/streams/TopicItem.js b/src/streams/TopicItem.js
@@ -5,7 +5,7 @@ import { useActionSheet } from '@expo/react-native-action-sheet';
 
 import styles, { BRAND_COLOR, createStyleSheet } from '../styles';
 import { RawLabel, Touchable, UnreadCount } from '../common';
-import { showHeaderActionSheet } from '../message/messageActionSheet';
+import { showTopicActionSheet } from '../message/messageActionSheet';
 import type { ShowActionSheetWithOptions } from '../message/messageActionSheet';
 import { TranslationContext } from '../boot/TranslationProvider';
 import { useDispatch, useSelector } from '../react-redux';
@@ -54,7 +54,7 @@ export default function TopicItem(props: Props) {
     <Touchable
       onPress={() => onPress(stream, name)}
       onLongPress={() => {
-        showHeaderActionSheet({
+        showTopicActionSheet({
           showActionSheetWithOptions,
           callbacks: { dispatch, _ },
           backgroundData,

diff --git a/src/title/TitleStream.js b/src/title/TitleStream.js
@@ -27,7 +27,7 @@ import {
   getOwnUser,
   getStreamInNarrow,
 } from '../selectors';
-import { showHeaderActionSheet } from '../message/messageActionSheet';
+import { showTopicActionSheet } from '../message/messageActionSheet';
 import type { ShowActionSheetWithOptions } from '../message/messageActionSheet';
 
 type SelectorProps = {|
@@ -74,7 +74,7 @@ const TitleStream = (props: Props) => {
       onLongPress={
         isTopicNarrow(narrow)
           ? () => {
-              showHeaderActionSheet({
+              showTopicActionSheet({
                 showActionSheetWithOptions,
                 callbacks: { dispatch, _ },
                 backgroundData,

diff --git a/src/webview/handleOutboundEvents.js b/src/webview/handleOutboundEvents.js
@@ -23,7 +23,7 @@ import {
   navigateToLightbox,
   messageLinkPress,
 } from '../actions';
-import { showHeaderActionSheet, showMessageActionSheet } from '../message/messageActionSheet';
+import { showTopicActionSheet, showMessageActionSheet } from '../message/messageActionSheet';
 import { ensureUnreachable } from '../types';
 import { base64Utf8Decode } from '../utils/encoding';
 
@@ -214,7 +214,7 @@ const handleLongPress = (
   const { dispatch, showActionSheetWithOptions, backgroundData, narrow, startEditMessage } = props;
   if (target === 'header') {
     if (message.type === 'stream') {
-      showHeaderActionSheet({
+      showTopicActionSheet({
         showActionSheetWithOptions,
         callbacks: { dispatch, _ },
         backgroundData,