From 3a471e5f0abedee4cf3f838ab0ab44487159730b Mon Sep 17 00:00:00 2001
From: Thomas Walpole <twalpole@gmail.com>
Date: Mon, 28 Dec 2020 09:18:18 -0800
Subject: [PATCH 1/2] Check if field is already focused when sending keys with
 FF

---
 lib/capybara/selenium/driver.rb             | 2 +-
 lib/capybara/selenium/nodes/firefox_node.rb | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/lib/capybara/selenium/driver.rb b/lib/capybara/selenium/driver.rb
index 6bb3824f..b7452074 100644
--- a/lib/capybara/selenium/driver.rb
+++ b/lib/capybara/selenium/driver.rb
@@ -66,7 +66,7 @@ class Capybara::Selenium::Driver < Capybara::Driver::Base
         end
       end
       processed_options = options.reject { |key, _val| SPECIAL_OPTIONS.include?(key) }
-      @browser = Selenium::WebDriver.for(options[:browser], processed_options)
+      @browser = Selenium::WebDriver.for(options[:browser], **processed_options)
 
       specialize_driver
       setup_exit_handler
diff --git a/lib/capybara/selenium/nodes/firefox_node.rb b/lib/capybara/selenium/nodes/firefox_node.rb
index e1cd6bd1..dd2d65ba 100644
--- a/lib/capybara/selenium/nodes/firefox_node.rb
+++ b/lib/capybara/selenium/nodes/firefox_node.rb
@@ -40,11 +40,16 @@ class Capybara::Selenium::FirefoxNode < Capybara::Selenium::Node
     path_names.each { |path| native.send_keys(path) }
   end
 
+  def focused?
+    driver.evaluate_script('arguments[0] == document.activeElement', self)
+  end
+
   def send_keys(*args)
     # https://github.com/mozilla/geckodriver/issues/846
     return super(*args.map { |arg| arg == :space ? ' ' : arg }) if args.none?(Array)
 
-    native.click
+    native.click unless focused?
+
     _send_keys(args).perform
   end
 

From 250a9846ba510f18a59c21e23364ede2ae8dff83 Mon Sep 17 00:00:00 2001
From: Thomas Walpole <twalpole@gmail.com>
Date: Sun, 17 Jan 2021 20:55:48 -0800
Subject: [PATCH 2/2] Update History.md [ci skip]

---
 History.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.md b/History.md
index c10be18d..8ae9f491 100644
--- a/History.md
+++ b/History.md
@@ -6,6 +6,7 @@ Release date: unreleased
 * :button selector type use with `enable_aria_role` [Sean Doyle]
 * <label> elements don't associate with aria-role buttons
 * Ignore Selenium::WebDriver::Error::InvalidSessionIdError when quitting driver [Robin Daugherty]
+* Firefox: Don't click input when sending keys if already focused
 
 # Version 3.34.0
 Release date: 2020-11-26