From f8647c7c232a16846382e64259e9d1301988f6fd Mon Sep 17 00:00:00 2001
From: Mikayla Maki <mikayla.c.maki@gmail.com>
Date: Mon, 12 Dec 2022 15:47:16 -0800
Subject: [PATCH] Merge pull request #1961 from
 zed-industries/fix-next-screen-bug

Fixed issue where the NextScreen action would never have an effect
---
 crates/editor/src/editor.rs         | 1 -
 crates/editor/src/scroll/actions.rs | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/crates/editor/src/editor.rs b/crates/editor/src/editor.rs
index 417b60bc5bb99dc20bc128e57e5b7708962456ff..1d5ee458b81555ca963ee4b68dac20d48fb4d4b1 100644
--- a/crates/editor/src/editor.rs
+++ b/crates/editor/src/editor.rs
@@ -184,7 +184,6 @@ actions!(
         Paste,
         Undo,
         Redo,
-        NextScreen,
         MoveUp,
         PageUp,
         MoveDown,
diff --git a/crates/editor/src/scroll/actions.rs b/crates/editor/src/scroll/actions.rs
index 8e574025326c3b2abb28245cc473a294198926ea..fb3dec01291e40024b7882c0d00628aab9cb20e4 100644
--- a/crates/editor/src/scroll/actions.rs
+++ b/crates/editor/src/scroll/actions.rs
@@ -64,15 +64,15 @@ impl Editor {
             return None;
         }
 
-        self.context_menu.as_mut()?;
+        if self.mouse_context_menu.read(cx).visible() {
+            return None;
+        }
 
         if matches!(self.mode, EditorMode::SingleLine) {
             cx.propagate_action();
             return None;
         }
-
         self.request_autoscroll(Autoscroll::Next, cx);
-
         Some(())
     }