skip textarea if can't post new discussion

ppy · Mar 16, 2023 · 2a1e8fe · 2a1e8fe
1 parent 6c73cec
commit 2a1e8fe
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 13 deletions.
diff --git a/resources/css/bem/beatmap-discussion-new.less b/resources/css/bem/beatmap-discussion-new.less
@@ -72,7 +72,10 @@
   }
 
   &__message {
+    .content-font();
+    font-size: @font-size--title-small-2;
     flex: 1;
+    color: hsl(var(--hsl-f1));
   }
 
   &__message-area {

diff --git a/resources/js/beatmap-discussions/new-discussion.tsx b/resources/js/beatmap-discussions/new-discussion.tsx
@@ -104,13 +104,15 @@ export class NewDiscussion extends React.Component<Props> {
     return localStorage.getItem(this.storageKey) ?? '';
   }
 
-  private get textareaPlaceholder() {
-    if (core.currentUser == null) return;
-
+  private get placeholderText() {
     if (this.canPost) {
       return trans(`beatmaps.discussions.message_placeholder.${this.props.mode}`, { version: this.props.currentBeatmap.version });
     }
 
+    if (core.currentUser == null) {
+      return trans('beatmaps.discussions.require-login');
+    }
+
     if (core.currentUser.is_silenced) {
       return trans('beatmaps.discussions.message_placeholder_silenced');
     } else if (this.props.beatmapset.discussion_locked || downloadLimited(this.props.beatmapset)) {
@@ -385,15 +387,15 @@ export class NewDiscussion extends React.Component<Props> {
   }
 
   private renderTextarea() {
-    if (core.currentUser == null) return trans('beatmaps.discussions.require-login');
-
-    return (
+    return this.canPost ? (
       <>
-        <MarkdownEditorSwitcher
-          id={0}
-          mode={this.mode}
-          onModeChange={this.handleModeChange}
-        />
+        {this.canPost && (
+          <MarkdownEditorSwitcher
+            id={0}
+            mode={this.mode}
+            onModeChange={this.handleModeChange}
+          />
+        )}
         <MarkdownEditor
           disabled={this.posting != null}
           isTimeline={this.isTimeline}
@@ -402,11 +404,11 @@ export class NewDiscussion extends React.Component<Props> {
           onChange={this.setMessage}
           onFocus={this.onFocus}
           onKeyDown={this.handleKeyDown}
-          placeholder={this.textareaPlaceholder}
+          placeholder={this.placeholderText}
           value={this.message}
         />
       </>
-    );
+    ) : this.placeholderText;
   }
 
   private renderTimestamp() {