diff --git a/web/src/compose_recipient.ts b/web/src/compose_recipient.ts index 3477dd7486..64fcd26358 100644 --- a/web/src/compose_recipient.ts +++ b/web/src/compose_recipient.ts @@ -12,7 +12,7 @@ import * as compose_fade from "./compose_fade"; import * as compose_pm_pill from "./compose_pm_pill"; import * as compose_state from "./compose_state"; import * as compose_ui from "./compose_ui"; -import type {ComposePlaceholderOptions, ComposeTriggeredOptions} from "./compose_ui"; +import type {ComposeTriggeredOptions} from "./compose_ui"; import * as compose_validate from "./compose_validate"; import * as drafts from "./drafts"; import * as dropdown_widget from "./dropdown_widget"; @@ -362,22 +362,21 @@ export function update_placeholder_text(): void { return; } const message_type = compose_state.get_message_type(); - assert(message_type !== undefined); - let opts: ComposePlaceholderOptions; + let placeholder = compose_ui.DEFAULT_COMPOSE_PLACEHOLDER; if (message_type === "stream") { const stream_id = compose_state.stream_id(); - opts = { + placeholder = compose_ui.compute_placeholder_text({ message_type, stream_id, topic: compose_state.topic(), - }; - } else { - opts = { + }); + } else if (message_type === "private") { + placeholder = compose_ui.compute_placeholder_text({ message_type, direct_message_user_ids: compose_pm_pill.get_user_ids(), - }; + }); } - $("textarea#compose-textarea").attr("placeholder", compose_ui.compute_placeholder_text(opts)); + $("textarea#compose-textarea").attr("placeholder", placeholder); } diff --git a/web/src/compose_ui.ts b/web/src/compose_ui.ts index b50d2fed98..7da357ec6b 100644 --- a/web/src/compose_ui.ts +++ b/web/src/compose_ui.ts @@ -22,6 +22,8 @@ import * as stream_data from "./stream_data"; import * as user_status from "./user_status"; import * as util from "./util"; +export const DEFAULT_COMPOSE_PLACEHOLDER = $t({defaultMessage: "Compose your message here"}); + export type ComposeTriggeredOptions = { trigger: string; } & ( @@ -333,7 +335,7 @@ export function compute_placeholder_text(opts: ComposePlaceholderOptions): strin } return $t({defaultMessage: "Message {recipient_names}"}, {recipient_names}); } - return $t({defaultMessage: "Compose your message here"}); + return DEFAULT_COMPOSE_PLACEHOLDER; } export function set_compose_box_top(set_top: boolean): void {