From 73d6239cee1e27ef70c6069a023a10d5bdec03e9 Mon Sep 17 00:00:00 2001
From: Andrew Duthie <andrew.duthie@gsa.gov>
Date: Tue, 12 Apr 2022 08:44:21 -0400
Subject: [PATCH] Revert tab placement change for password toggle checkbox

**Why**: Since it may have a negative impact on form usability, revert until we have a chance to think about this more holistically.

[skip changelog]
---
 app/components/password_toggle_component.html.erb | 13 +++++++++++--
 app/components/password_toggle_component.rb       | 14 --------------
 spec/components/password_toggle_component_spec.rb |  8 --------
 3 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/app/components/password_toggle_component.html.erb b/app/components/password_toggle_component.html.erb
index 501b7a2a4d8..5875ef810a3 100644
--- a/app/components/password_toggle_component.html.erb
+++ b/app/components/password_toggle_component.html.erb
@@ -1,5 +1,15 @@
 <%= content_tag(:'lg-password-toggle', class: css_class) do %>
-  <%= render field if toggle_position == :bottom %>
+  <%= render ValidatedFieldComponent.new(
+        form: form,
+        name: :password,
+        type: :password,
+        label: label,
+        **field_options,
+        input_html: field_options[:input_html].to_h.merge(
+          id: input_id,
+          class: ['password-toggle__input', *field_options.dig(:input_html, :class)],
+        ),
+      ) %>
   <div class="password-toggle__toggle-wrapper js">
     <input
       id="<%= toggle_id %>"
@@ -14,5 +24,4 @@
       <%= toggle_label %>
     </label>
   </div>
-  <%= render field if toggle_position == :top %>
 <% end %>
diff --git a/app/components/password_toggle_component.rb b/app/components/password_toggle_component.rb
index 5dd2117f0bb..7b693f64c6f 100644
--- a/app/components/password_toggle_component.rb
+++ b/app/components/password_toggle_component.rb
@@ -29,18 +29,4 @@ def toggle_id
   def input_id
     "password-toggle-input-#{unique_id}"
   end
-
-  def field
-    ValidatedFieldComponent.new(
-      form: form,
-      name: :password,
-      type: :password,
-      label: label,
-      **field_options,
-      input_html: field_options[:input_html].to_h.merge(
-        id: input_id,
-        class: ['password-toggle__input', *field_options.dig(:input_html, :class)],
-      ),
-    )
-  end
 end
diff --git a/spec/components/password_toggle_component_spec.rb b/spec/components/password_toggle_component_spec.rb
index 4a4d56994b1..36ae51bfec0 100644
--- a/spec/components/password_toggle_component_spec.rb
+++ b/spec/components/password_toggle_component_spec.rb
@@ -52,10 +52,6 @@
       it 'renders modifier class' do
         expect(rendered).to have_css('lg-password-toggle.password-toggle--toggle-top')
       end
-
-      it 'renders toggle before input' do
-        expect(rendered).to have_css('.password-toggle__toggle-wrapper + lg-validated-field')
-      end
     end
 
     context 'with bottom toggle position' do
@@ -64,10 +60,6 @@
       it 'renders modifier class' do
         expect(rendered).to have_css('lg-password-toggle.password-toggle--toggle-bottom')
       end
-
-      it 'renders toggle after input' do
-        expect(rendered).to have_css('lg-validated-field + .password-toggle__toggle-wrapper')
-      end
     end
   end