Clear pre schema validation callbacks on form rebuild

Author: Dominic Tubach

src/Form/AbstractJsonFormsForm.php

@@ -25,6 +25,7 @@
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\json_forms\Form\Util\FieldNameUtil;
 use Drupal\json_forms\Form\Util\FormCallbackExecutor;
+use Drupal\json_forms\Form\Util\FormCallbackRegistrator;
 use Drupal\json_forms\Form\Util\FormValidationUtil;
 use Drupal\json_forms\Form\Validation\FormValidationMapperInterface;
 use Drupal\json_forms\Form\Validation\FormValidatorInterface;
@@ -122,6 +123,7 @@ protected function buildJsonFormsForm(
 
     if ($formState->isRebuilding()) {
       $formState->set('$hasCalcInitField', FALSE);
+      FormCallbackRegistrator::clearPreSchemaValidationCallbacks($formState);
     }
 
     $definition = DefinitionFactory::createDefinition($uiSchema, $jsonSchema);

src/Form/Util/FormCallbackRegistrator.php

@@ -26,6 +26,10 @@ final class FormCallbackRegistrator {
 
   public const PRE_SCHEMA_VALIDATION_CALLBACKS_PROPERTY_KEY = 'json_forms.pre_schema_validation_callbacks';
 
+  public static function clearPreSchemaValidationCallbacks(FormStateInterface $formState): void {
+    $formState->set(self::PRE_SCHEMA_VALIDATION_CALLBACKS_PROPERTY_KEY, []);
+  }
+
   /**
    * Registers a callback that is executed before JSON schema validation.
    *