diff --git a/composer.json b/composer.json index 4ef91ae..4b9ced2 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "drupal/diff": "~1.0", "drupal/replicate": "~1.0", "drupal/inline_entity_form": "~1.0", - "drupal/field_group": "~1.0", + "drupal/field_group": "~3.0", "drupal/block_field": "~1.0", "drupal/ctools": "3.x-dev", "drupal/entity_browser": "2.x-dev", diff --git a/src/Plugin/Field/FieldWidget/InlineParagraphsWidget.php b/src/Plugin/Field/FieldWidget/InlineParagraphsWidget.php index ce8d108..caac58a 100644 --- a/src/Plugin/Field/FieldWidget/InlineParagraphsWidget.php +++ b/src/Plugin/Field/FieldWidget/InlineParagraphsWidget.php @@ -643,7 +643,12 @@ class InlineParagraphsWidget extends WidgetBase { ]; field_group_attach_groups($element['subform'], $context); - $element['subform']['#pre_render'][] = 'field_group_form_pre_render'; + if (function_exists('field_group_form_pre_render')) { + $element['subform']['#pre_render'][] = 'field_group_form_pre_render'; + } + if (function_exists('field_group_form_process')) { + $element['subform']['#process'][] = 'field_group_form_process'; + } } if ($item_mode == 'edit') { @@ -1320,8 +1325,9 @@ class InlineParagraphsWidget extends WidgetBase { $item['target_revision_id'] = $paragraphs_entity->getRevisionId(); } // If our mode is remove don't save or reference this entity. + // The check to see if mode is present is due to field group tabs. // @todo: Maybe we should actually delete it here? - elseif($widget_state['paragraphs'][$item['_original_delta']]['mode'] == 'remove' || $widget_state['paragraphs'][$item['_original_delta']]['mode'] == 'removed') { + elseif(isset($widget_state['paragraphs'][$item['_original_delta']]['mode']) && ($widget_state['paragraphs'][$item['_original_delta']]['mode'] === 'remove' || $widget_state['paragraphs'][$item['_original_delta']]['mode'] === 'removed')) { $item['target_id'] = NULL; $item['target_revision_id'] = NULL; } diff --git a/src/Plugin/Field/FieldWidget/ParagraphsWidget.php b/src/Plugin/Field/FieldWidget/ParagraphsWidget.php index edb24b9..347dd16 100644 --- a/src/Plugin/Field/FieldWidget/ParagraphsWidget.php +++ b/src/Plugin/Field/FieldWidget/ParagraphsWidget.php @@ -758,7 +758,12 @@ class ParagraphsWidget extends WidgetBase { ]; field_group_attach_groups($element['subform'], $context); - $element['subform']['#pre_render'][] = 'field_group_form_pre_render'; + if (function_exists('field_group_form_pre_render')) { + $element['subform']['#pre_render'][] = 'field_group_form_pre_render'; + } + if (function_exists('field_group_form_process')) { + $element['subform']['#process'][] = 'field_group_form_process'; + } } if ($item_mode == 'edit') {