Added 'Done' button to multi arity registrants element.

Closes #119

Author: dpi

css/elements/registrants.layout.css

@@ -27,12 +27,19 @@
   .entities {
     &> .details-wrapper {
       display: flex;
+
+      > .person-controls {
+        display: flex;
+        flex-direction: column;
+      }
     }
   }
 
   fieldset.person-type {
     /* Need fieldset selector since you cannot define different attributes for
        the container and each child radio */
+    flex: 1;
+
     div.form-type-radio {
       position: relative;
 

sass/elements/registrants.layout.scss

@@ -274,7 +274,15 @@ public static function processIdentityElement(array &$element, FormStateInterfac
       ],
     ];
 
-    $element['entities']['for_bundle'] = [
+    $element['entities']['controls'] = [
+      '#type' => 'container',
+      '#tree' => TRUE,
+      '#attributes' => [
+        'class' => ['person-controls'],
+      ],
+    ];
+
+    $element['entities']['controls']['for_bundle'] = [
       '#type' => 'radios',
       '#title' => t('Person type'),
       '#options' => $for_bundles,
@@ -294,8 +302,33 @@ public static function processIdentityElement(array &$element, FormStateInterfac
       '#attributes' => [
         'class' => ['person-type'],
       ],
+      '#parents' => array_merge($parents, ['entities', 'for_bundle']),
     ];
 
+    $element['entities']['controls']['actions'] = [
+      '#type' => 'actions',
+      '#tree' => TRUE,
+    ];
+
+    // Display a close button if there are people and arity is multiple.
+    if ($arity_is_multiple && count($people) > 0) {
+      $element['entities']['controls']['actions']['done'] = [
+        '#type' => 'submit',
+        '#value' => t('Done'),
+        '#ajax' => [
+          'callback' => [static::class, 'ajaxElementRoot'],
+          'wrapper' => $ajax_wrapper_id_root,
+        ],
+        '#limit_validation_errors' => [],
+        '#validate' => [
+          [static::class, 'decoyValidator'],
+        ],
+        '#submit' => [
+          [static::class, 'submitClose'],
+        ],
+      ];
+    }
+
     $element['entities']['person'] = [
       '#type' => 'container',
       '#tree' => TRUE,
@@ -801,6 +834,24 @@ public static function submitChangeDefault(array $form, FormStateInterface $form
     }
   }
 
+  /**
+   * Submission callback to close the selection interface.
+   *
+   * @param array $form
+   *   The complete form.
+   * @param \Drupal\Core\Form\FormStateInterface $form_state
+   *   The current state of the form.
+   */
+  public static function submitClose(array $form, FormStateInterface $form_state) {
+    $form_state->setRebuild();
+
+    $element = RegistrantsElement::findElement($form, $form_state);
+    $utility = new RegistrantsElement($element, $form_state);
+
+    $utility->setChangeIt(FALSE);
+    $utility->clearPeopleFormInput();
+  }
+
   /**
    * For_arity radios submission handler.
    *