- update flexible content field type to make sure there are layouts defined before looping over them

- update Repeater to return early if cloned

Author: jasonbahl

src/FieldType/FlexibleContent.php

@@ -51,33 +51,34 @@ public static function register_field_type(): void {
 					$layouts = [];
 
 					// If there are no layouts, return a NULL type
-					if ( empty( $acf_field['layouts'] ) ) {
-						return 'NULL';
-					}
+					if ( ! empty( $acf_field['layouts'] ) ) {
 
-					foreach ( $acf_field['layouts'] as $layout ) {
-						$layout_type_name              = Utils::format_type_name( $layout_interface_prefix . ' ' . $field_config->get_registry()->get_field_group_graphql_type_name( $layout ) ) . 'Layout';
-						$layout['interfaces']          = [ $layout_interface_name ];
-						$layout['eagerlyLoadType']     = true;
-						$layout['isFlexLayout']        = true;
-						$layout['parent_layout_group'] = $layout;
-						$layout['graphql_type_name']   = $layout_type_name;
-
-						$sub_fields = array_filter(
-							array_map(
-								static function ( $field ) use ( $layout ) {
-									$field['graphql_types']       = [];
-									$field['parent_layout_group'] = $layout;
-									$field['isFlexLayoutField']   = true;
-									return isset( $field['parent_layout'] ) && $layout['key'] === $field['parent_layout'] ? $field : null;
-								},
-								acf_get_raw_fields( $layout['key'] )
-							)
-						);
+						foreach ( $acf_field['layouts'] as $layout ) {
+							$layout_type_name              = Utils::format_type_name( $layout_interface_prefix . ' ' . $field_config->get_registry()->get_field_group_graphql_type_name( $layout ) ) . 'Layout';
+							$layout['interfaces']          = [ $layout_interface_name ];
+							$layout['eagerlyLoadType']     = true;
+							$layout['isFlexLayout']        = true;
+							$layout['parent_layout_group'] = $layout;
+							$layout['graphql_type_name']   = $layout_type_name;
+
+							$sub_fields = array_filter(
+								array_map(
+									static function( $field ) use ( $layout ) {
+										$field['graphql_types']       = [];
+										$field['parent_layout_group'] = $layout;
+										$field['isFlexLayoutField']   = true;
+
+										return isset( $field['parent_layout'] ) && $layout['key'] === $field['parent_layout'] ? $field : null;
+									},
+									acf_get_raw_fields( $layout['key'] )
+								)
+							);
+
+							$layout['sub_fields'] = array_merge( $sub_fields, $layout['sub_fields'] );
 
-						$layout['sub_fields'] = array_merge( $sub_fields, $layout['sub_fields'] );
+							$layouts[] = $layout;
+						}
 
-						$layouts[] = $layout;
 					}
 
 					if ( ! empty( $layouts ) ) {

src/FieldType/Repeater.php

@@ -29,6 +29,7 @@ public static function register_field_type(): void {
 						$cloned_parent = ! empty( $cloned_from ) ? $field_config->get_parent_graphql_type_name( $cloned_from ) : null;
 						if ( ! empty( $cloned_parent ) ) {
 							$type_name = Utils::format_type_name( $cloned_parent . ' ' . $field_name );
+							return [ 'list_of' => $type_name ];
 						}
 					}