Merge pull request #99 from systopia/initial-calculation-hidden-fields-rebuild

Don't use hidden fields to trigger event for initial calculation. Perform initial calculation on rebuild.

Author: dontub

src/Form/AbstractJsonFormsForm.php

@@ -116,6 +116,10 @@ protected function buildJsonFormsForm(
       $formState->set('$limitValidationUsed', TRUE);
     }
 
+    if ($formState->isRebuilding()) {
+      $formState->set('$hasCalcInitField', FALSE);
+    }
+
     $definition = DefinitionFactory::createDefinition($uiSchema, $jsonSchema);
     $form = $this->formArrayFactory->createFormArray($definition, $formState);
 
@@ -130,7 +134,7 @@ protected function buildJsonFormsForm(
     $form['#attached']['library'][] = 'json_forms/disable_buttons_on_ajax';
     $form['#attached']['library'][] = 'json_forms/vertical_tabs';
 
-    if (!$formState->isCached()) {
+    if (!$formState->isCached() || $formState->isRebuilding()) {
       if (TRUE === $formState->get('$calculateUsed')) {
         $form['#attached']['library'][] = 'json_forms/initial_calculation';
       }

src/Form/Control/Util/BasicFormPropertiesFactory.php

@@ -90,7 +90,7 @@ public static function createFieldProperties(ControlDefinition $definition, Form
     if ($definition->isCalculated()) {
       $formState->set('$calculateUsed', TRUE);
     }
-    elseif (!$formState->has('$hasCalcInitField')) {
+    elseif (TRUE !== $formState->get('$hasCalcInitField') && 'hidden' !== $definition->getOptionsValue('type')) {
       $formState->set('$hasCalcInitField', TRUE);
       $calcInitField = TRUE;
     }