Fix a bug, Restore Validation panel, more rebrand updates

vigetlabs · Jan 24, 2025 · 38f1a39 · 38f1a39
1 parent 318220f
commit 38f1a39
Show file tree

Hide file tree

Showing 14 changed files with 117 additions and 32 deletions.
diff --git a/blocks/checkbox/block.json b/blocks/checkbox/block.json
@@ -20,9 +20,9 @@
   },
   "style": "file:./style.css",
   "providesContext": {
-    "acffb/fieldId": "blockId"
+    "vgtfb/fieldId": "blockId"
   },
-  "usesContext": ["acffb/formId", "acffb/fieldsetId"],
+  "usesContext": ["vgtfb/formId", "vgtfb/fieldsetId"],
   "acf": {
     "mode": "preview"
   }

diff --git a/blocks/fieldset/block.json b/blocks/fieldset/block.json
@@ -24,9 +24,9 @@
     }
   },
   "providesContext": {
-    "acffb/fieldsetId": "blockId"
+    "vgtfb/fieldsetId": "blockId"
   },
-  "usesContext": ["acffb/formId"],
+  "usesContext": ["vgtfb/formId"],
   "styles": [
     { "name": "default", "label": "List", "isDefault": true },
     { "name": "inline", "label": "Inline" },

diff --git a/blocks/form/block.json b/blocks/form/block.json
@@ -21,7 +21,7 @@
     }
   },
   "providesContext": {
-    "acffb/formId": "blockId"
+    "vgtfb/formId": "blockId"
   },
   "acf": {
     "mode": "preview"

diff --git a/blocks/input/block.json b/blocks/input/block.json
@@ -14,7 +14,7 @@
     "anchor": true
   },
   "providesContext": {
-    "acffb/fieldId": "blockId"
+    "vgtfb/fieldId": "blockId"
   },
   "style": "file:./style.css",
   "attributes": {
@@ -142,7 +142,7 @@
       "isActive": ["data"]
     }
   ],
-  "usesContext": ["acffb/formId", "acffb/fieldsetId"],
+  "usesContext": ["vgtfb/formId", "vgtfb/fieldsetId"],
   "acf": {
     "mode": "preview"
   }

diff --git a/blocks/label/block.json b/blocks/label/block.json
@@ -21,7 +21,7 @@
     }
   },
   "style": "file:./style.css",
-  "usesContext": ["acffb/formId", "acffb/fieldId"],
+  "usesContext": ["vgtfb/formId", "vgtfb/fieldId"],
   "acf": {
     "mode": "preview"
   }

diff --git a/blocks/legend/block.json b/blocks/legend/block.json
@@ -20,7 +20,7 @@
       "default": ""
     }
   },
-  "usesContext": ["acffb/formId", "acffb/fieldsetId"],
+  "usesContext": ["vgtfb/formId", "vgtfb/fieldsetId"],
   "acf": {
     "mode": "preview"
   }

diff --git a/blocks/radios/block.json b/blocks/radios/block.json
@@ -24,9 +24,9 @@
     }
   },
   "providesContext": {
-    "acffb/fieldId": "blockId"
+    "vgtfb/fieldId": "blockId"
   },
-  "usesContext": ["acffb/formId", "acffb/fieldsetId"],
+  "usesContext": ["vgtfb/formId", "vgtfb/fieldsetId"],
   "acf": {
     "mode": "preview"
   }

diff --git a/blocks/select/block.json b/blocks/select/block.json
@@ -19,9 +19,9 @@
       "default": ""
     }
   },
-  "usesContext": ["acffb/formId", "acffb/fieldsetId"],
+  "usesContext": ["vgtfb/formId", "vgtfb/fieldsetId"],
   "providesContext": {
-    "acffb/fieldId": "blockId"
+    "vgtfb/fieldId": "blockId"
   },
   "acf": {
     "mode": "preview"

diff --git a/blocks/submit/block.json b/blocks/submit/block.json
@@ -19,7 +19,7 @@
       "default": ""
     }
   },
-  "usesContext": ["acffb/formId", "acffb/fieldsetId"],
+  "usesContext": ["vgtfb/formId", "vgtfb/fieldsetId"],
   "acf": {
     "mode": "preview"
   }

diff --git a/blocks/textarea/block.json b/blocks/textarea/block.json
@@ -22,9 +22,9 @@
       "default": ""
     }
   },
-  "usesContext": ["acffb/formId", "acffb/fieldsetId"],
+  "usesContext": ["vgtfb/formId", "vgtfb/fieldsetId"],
   "providesContext": {
-    "acffb/fieldId": "blockId"
+    "vgtfb/fieldId": "blockId"
   },
   "acf": {
     "mode": "preview"

diff --git a/classes/Elements/Field.php b/classes/Elements/Field.php
@@ -205,7 +205,7 @@ public function set_context( array $new_context ): void {
 	 * @return ?Form
 	 */
 	public function get_form(): ?Form {
-		return Form::find_form( $this->get_context( 'acffb/formId' ) );
+		return Form::find_form( $this->get_context( 'vgtfb/formId' ) );
 	}
 
 	/**
@@ -214,11 +214,11 @@ public function get_form(): ?Form {
 	 * @return ?Field
 	 */
 	public function get_fieldset(): ?Field {
-		if ( ! $this->get_context( 'acffb/fieldsetId' ) ) {
+		if ( ! $this->get_context( 'vgtfb/fieldsetId' ) ) {
 			return null;
 		}
 
-		$fieldset_id = 'acf_field_' . $this->get_context( 'acffb/fieldsetId' );
+		$fieldset_id = 'acf_field_' . $this->get_context( 'vgtfb/fieldsetId' );
 		return $this->get_form()?->get_form_object()->get_field_by_id( $fieldset_id );
 	}
 
@@ -228,11 +228,11 @@ public function get_fieldset(): ?Field {
 	 * @return ?Field
 	 */
 	public function get_parent_field(): ?Field {
-		if ( ! $this->get_context( 'acffb/fieldId' ) ) {
+		if ( ! $this->get_context( 'vgtfb/fieldId' ) ) {
 			return null;
 		}
 
-		$input_id = 'acf_field_' . $this->get_context( 'acffb/fieldId' );
+		$input_id = 'acf_field_' . $this->get_context( 'vgtfb/fieldId' );
 
 		return $this->get_form()?->get_form_object()->get_field_by_id( $input_id );
 	}

diff --git a/classes/Elements/Form.php b/classes/Elements/Form.php
@@ -307,7 +307,7 @@ public function get_all_fields( string $content = '', array $context = [] ): arr
 	public function update_field_context(): void {
 		$fields  = $this->get_all_fields();
 		$context = [
-			'acffb/formId' => $this->get_id(),
+			'vgtfb/formId' => $this->get_id(),
 		];
 
 		foreach ( $fields as $field ) {

diff --git a/classes/Form.php b/classes/Form.php
@@ -426,7 +426,11 @@ public static function get_all_forms(): array {
 	 */
 	public static function find_form( ?string $form_id = null ): ?Form {
 		if ( is_null( $form_id ) ) {
-			return self::get_instance( $form_id );
+			return self::get_instance();
+		}
+
+		if ( ! str_starts_with( $form_id, 'acf_form_' ) ) {
+			$form_id = 'acf_form_' . $form_id;
 		}
 
 		foreach ( self::get_all_forms() as $form ) {

diff --git a/includes/block-fields.php b/includes/block-fields.php
@@ -24,6 +24,87 @@ function() {
 				return;
 			}
 
+			acf_add_local_field_group( array(
+				'key' => 'group_6793a80e4d167',
+				'title' => 'Validation',
+				'fields' => array(
+					array(
+						'key' => 'field_6793a80e01b0b',
+						'label' => 'Required',
+						'name' => 'required',
+						'aria-label' => '',
+						'type' => 'true_false',
+						'instructions' => '',
+						'required' => 0,
+						'conditional_logic' => 0,
+						'wrapper' => array(
+							'width' => '',
+							'class' => '',
+							'id' => '',
+						),
+						'message' => '',
+						'default_value' => 0,
+						'allow_in_bindings' => 0,
+						'ui_on_text' => '',
+						'ui_off_text' => '',
+						'ui' => 1,
+					),
+				),
+				'location' => array(
+					array(
+						array(
+							'param' => 'block',
+							'operator' => '==',
+							'value' => 'acf/input',
+						),
+					),
+					array(
+						array(
+							'param' => 'block',
+							'operator' => '==',
+							'value' => 'acf/select',
+						),
+					),
+					array(
+						array(
+							'param' => 'block',
+							'operator' => '==',
+							'value' => 'acf/textarea',
+						),
+					),
+					array(
+						array(
+							'param' => 'block',
+							'operator' => '==',
+							'value' => 'acf/checkbox',
+						),
+					),
+					array(
+						array(
+							'param' => 'block',
+							'operator' => '==',
+							'value' => 'acf/fieldset',
+						),
+					),
+					array(
+						array(
+							'param' => 'block',
+							'operator' => '==',
+							'value' => 'acf/radios',
+						),
+					),
+				),
+				'menu_order' => 0,
+				'position' => 'normal',
+				'style' => 'default',
+				'label_placement' => 'top',
+				'instruction_placement' => 'label',
+				'hide_on_screen' => '',
+				'active' => true,
+				'description' => '',
+				'show_in_rest' => 1,
+			) );
+
 			acf_add_local_field_group( array(
 				'key' => 'group_6683facdcf97c',
 				'title' => 'Block: Field',
@@ -73,7 +154,7 @@ function() {
 				'hide_on_screen' => '',
 				'active' => true,
 				'description' => '',
-				'show_in_rest' => 0,
+				'show_in_rest' => 1,
 			) );
 
 			acf_add_local_field_group( array(
@@ -539,7 +620,7 @@ function() {
 				'hide_on_screen' => '',
 				'active' => true,
 				'description' => '',
-				'show_in_rest' => 0,
+				'show_in_rest' => 1,
 			) );
 
 			acf_add_local_field_group( array(
@@ -629,7 +710,7 @@ function() {
 				'hide_on_screen' => '',
 				'active' => true,
 				'description' => '',
-				'show_in_rest' => 0,
+				'show_in_rest' => 1,
 			) );
 
 			acf_add_local_field_group( array(
@@ -719,7 +800,7 @@ function() {
 				'hide_on_screen' => '',
 				'active' => true,
 				'description' => '',
-				'show_in_rest' => 0,
+				'show_in_rest' => 1,
 			) );
 
 			acf_add_local_field_group( array(
@@ -764,7 +845,7 @@ function() {
 				'hide_on_screen' => '',
 				'active' => true,
 				'description' => '',
-				'show_in_rest' => 0,
+				'show_in_rest' => 1,
 			) );
 
 			acf_add_local_field_group( array(
@@ -837,7 +918,7 @@ function() {
 				'hide_on_screen' => '',
 				'active' => true,
 				'description' => '',
-				'show_in_rest' => 0,
+				'show_in_rest' => 1,
 			) );
 
 			acf_add_local_field_group( array(
@@ -1065,7 +1146,7 @@ function() {
 				'hide_on_screen' => '',
 				'active' => true,
 				'description' => '',
-				'show_in_rest' => 0,
+				'show_in_rest' => 1,
 			) );
 
 			acf_add_local_field_group( array(
@@ -1213,7 +1294,7 @@ function() {
 				'hide_on_screen' => '',
 				'active' => true,
 				'description' => '',
-				'show_in_rest' => 0,
+				'show_in_rest' => 1,
 			) );
 
 			acf_add_local_field_group( array(
@@ -1460,7 +1541,7 @@ function() {
 				'hide_on_screen' => '',
 				'active' => true,
 				'description' => '',
-				'show_in_rest' => 0,
+				'show_in_rest' => 1,
 			) );
 		} );
 	}