Merge branch 'master' into replay-file-cleanup

nanaya · Nov 1, 2023 · ab5cbd3 · ab5cbd3
2 parents 12b79f0 + a6a67c1
commit ab5cbd3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/resources/js/beatmap-discussions/main.coffee b/resources/js/beatmap-discussions/main.coffee
@@ -153,6 +153,7 @@ export class Main extends React.PureComponent
                   currentBeatmap: @currentBeatmap()
                   currentUser: @state.currentUser
                   innerRef: @newDiscussionRef
+                  onFocus: @handleNewDiscussionFocus
                   pinned: @state.pinnedNewDiscussion
                   setPinned: @setPinnedNewDiscussion
                   stickTo: @modeSwitcherRef

diff --git a/resources/js/components/select-options.tsx b/resources/js/components/select-options.tsx
@@ -48,9 +48,9 @@ export default class SelectOptions<T extends Option> extends React.Component<Pro
     super(props);
     makeObservable(this);
     disposeOnUnmount(this, reaction(
-      () => this.showingSelector,
-      (showing) => {
-        blackoutToggle(showing, 0.5);
+      () => this.props.blackout && this.showingSelector,
+      (value) => {
+        blackoutToggle(value ?? false, 0.5);
       },
     ));
   }