From 79259b593a5bf99ec332f67b9ec6be3584908f34 Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Mon, 11 Jan 2021 15:58:56 +1300
Subject: [PATCH] FIX Visibility of subsequent form fields and step buttons

---
 code/Control/UserDefinedFormController.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/code/Control/UserDefinedFormController.php b/code/Control/UserDefinedFormController.php
index 6ef9b7d..1e73ad6 100644
--- a/code/Control/UserDefinedFormController.php
+++ b/code/Control/UserDefinedFormController.php
@@ -548,6 +548,7 @@ JS
             $operations = implode(" {$conjunction} ", $rule['operations']);
             $target = $rule['targetFieldID'];
             $holder = $rule['holder'];
+            $isFormStep = strpos($target, 'EditableFormStep') !== false;
 
             $result .= <<<EOS
 \n
@@ -562,8 +563,26 @@ JS
             {$holder}.{$rule['opposite']}.trigger('{$rule['holder_event_opposite']}');
         }
     });
+EOS;
+            if ($isFormStep) {
+                // Hide the step jump button if the FormStep has is initially hidden.
+                // This is particularly important beacause the next/prev page buttons logic is controlled by
+                // the visibility of the FormStep buttons
+                // The HTML for the FormStep buttons is defined in UserFormProgress.ss
+                $id = str_replace('#', '', $target);
+                $result .= <<<EOS
+    $('.step-button-wrapper[data-for="{$id}"]').addClass('hide');
+EOS;
+            } else {
+                // If a field's initial state is set to be hidden, a '.hide' class will be added to the field as well
+                // as the fieldholder. Afterwards, JS only removes it from the fieldholder, thus the field stays hidden.
+                // We'll update update the JS so that the '.hide' class is removed from the field from the beginning,
+                // though we need to ensure we don't do this on FormSteps (page breaks) otherwise we'll mistakenly
+                // target fields contained within the formstep
+                $result .= <<<EOS
     $("{$target}").find('.hide').removeClass('hide');
 EOS;
+            }
         }
 
         return $result;