Teun van Veggel · 2fa7b3eb
--- a/src/Plugin/Field/FieldFormatter/EditableFieldsFieldFormatter.php
+++ b/src/Plugin/Field/FieldFormatter/EditableFieldsFieldFormatter.php
        '#type' => 'select',
        '#title' => $this->t('View mode'),
        '#default_value' => $this->getSetting('view_mode'),
-        '#required' => TRUE,
        '#empty_option' => $this->t('- Select a view mode -'),
        '#options' => $this->editablefieldsHelper->getViewModesOptions($this->fieldDefinition->getTargetEntityTypeId(), $this->viewMode),
        '#states' => [
          'visible' => [
-            'input[name="fields[' . $this->fieldDefinition->getName() . '][settings_edit_form][settings][enable_toggle]"]' => ['checked' => TRUE],
+            $selector => ['checked' => TRUE],
+          ],
+          'required' => [
--- a/src/Form/EditableFieldsForm.php
+++ b/src/Form/EditableFieldsForm.php
    $items = $this->entity->get($field);
    $items->filterEmptyItems();

-    // Get a widget form.
-    $form[$field] = $widget->form($items, $form, $form_state);
-    $form[$field]['#access'] = $items->access('edit');
-
-    $form['submit'] = [
-      '#type' => 'submit',
-      '#value' => $this->t('Update'),
-      '#ajax' => [
-        'callback' => [$this, 'ajaxCallback'],
-        'wrapper' => str_replace('_', '-', $this->getFormId()),
-      ],
-    ];
+    if (!$this->enableToggle) {
--- a/src/Form/EditableFieldsForm.php
+++ b/src/Form/EditableFieldsForm.php
-    // Get a widget form.
-    $form[$field] = $widget->form($items, $form, $form_state);
-    $form[$field]['#access'] = $items->access('edit');
-
-    $form['submit'] = [
-      '#type' => 'submit',
-      '#value' => $this->t('Update'),
-      '#ajax' => [
-        'callback' => [$this, 'ajaxCallback'],
-        'wrapper' => str_replace('_', '-', $this->getFormId()),
-      ],
-    ];
+    if (!$this->showButtonToEdit) {
+      // Get a widget form.
+      $form[$field] = $widget->form($items, $form, $form_state);
+      $form[$field]['#access'] = $items->access('edit');