Use acf object, fix some version numbers

Author: cbravobernal

.gitignore

@@ -41,6 +41,7 @@ jspm_packages/
 *.njsproj
 *.sln
 .cursorrules
+.cursorignore
 
 # Assets build directory
 assets/build/**/*.css

assets/src/js/_acf-experiments.ts

@@ -1,63 +1,67 @@
 /**
- * Experiments TypeScript
+ * Admin experiments.
  *
  * @package    Secure Custom Fields
- * @subpackage Admin
- * @since      6.4.2
+ * @since      6.4.3
  */
 
 // Define interfaces for our data structures
 interface ExperimentsData {
   [key: string]: boolean; // Just store enabled status
 }
 
-interface ScfExperiments {
-  data: ExperimentsData;
+// Define the experiments object structure
+interface ExperimentsObject {
+  [key: string]: boolean | ((name: string) => boolean);
+  isEnabled: (name: string) => boolean;
+}
+
+// Define a more complete ACF interface
+interface ACF {
+  experiments?: ExperimentsObject;
+  [key: string]: any;
 }
 
 // Declare global types
 declare global {
   interface Window {
-    scfExperiments?: ScfExperiments;
-    SCF?: {
-      experiments?: {
-        data: ExperimentsData;
-        init: () => void;
-        isEnabled: (name: string) => boolean;
-      };
-    };
+    acf: ACF; // Ensure acf is available on window
+    acfExperiments?: ExperimentsData; // Variable created by wp_localize_script
   }
+  var acf: ACF;
+  var acfExperiments: ExperimentsData | undefined; // Variable created by wp_localize_script
 }
 
 // Create a module to avoid global scope augmentation issues
 export {};
 
-// Initialize the SCF namespace if it doesn't exist
-if (typeof window.SCF === 'undefined') {
-  window.SCF = {};
-}
-
-// Initialize experiments module
-window.SCF.experiments = {
-  data: {},
-  init: function(): void {
-    // Get experiments data from localized script
-    this.data = window.scfExperiments ? window.scfExperiments.data : {};
-    
-    // Log experiments data to console for debugging
-    console.log('SCF Experiments initialized:', this.data);
-  },
-  isEnabled: function(name: string): boolean {
-    return !!this.data[name];
+(function() {
+  // End the function if acf doesn't exist
+  if (typeof acf !== 'object' || acf === null) {
+    return;
   }
-};
 
-// Initialize when document is ready
-document.addEventListener('DOMContentLoaded', () => {
-  if (window.SCF?.experiments) {
-    window.SCF.experiments.init();
-  }
-});
+  // Add experiments to acf object
+  acf.experiments = {
+    isEnabled: function(name: string): boolean {
+      return this.hasOwnProperty(name) && this[name] === true;
+    }
+  };
+
+  // Initialize when document is ready
+  document.addEventListener('DOMContentLoaded', function() {
+    if (!acf.experiments) return;
+    
+    // Check if acfExperiments exists (created by wp_localize_script)
+    if (typeof acfExperiments === 'undefined') {
+      return;
+    }
+    
+    // Use the experiments data from wp_localize_script
+    if (acfExperiments && acfExperiments.data) {
+      // Copy all experiment flags directly to the experiments object
+      Object.assign(acf.experiments, acfExperiments.data);
+    }
+  });
 
-// Log initial state
-console.log("SCF Experiments module loaded");
+})();

assets/src/js/acf-experiments.ts

@@ -3,7 +3,7 @@
  *
  * @package    Secure Custom Fields
  * @subpackage Admin
- * @since      6.4.2
+ * @since      6.4.3
  */
 
 // Import experiments module

includes/admin/admin-experiments.php

@@ -5,8 +5,7 @@
  * This file contains the admin experiments functionality for Secure Custom Fields.
  *
  * @package    Secure Custom Fields
- * @subpackage Admin
- * @since      6.4.2
+ * @since      6.4.3
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -126,10 +125,10 @@ public function load() {
 			// load acf scripts
 			acf_enqueue_scripts();
 
-			// Temporarily disabled. Uncomment to enable in production when ready.
+			// Temporarily disabled - Uncomment to enable in production when ready.
 			// acf_enqueue_script( 'acf-experiments' );
 
-			// Temporarily disabled. Localize experiments data. Uncomment to enable in production when ready.
+			// Temporarily disabled - Localize experiments data. Uncomment to enable in production when ready.
 			// $this->enqueue_experiments_script();
 		}
 
@@ -150,7 +149,7 @@ public function enqueue_experiments_script() {
 			// Localize the script with experiments data
 			wp_localize_script(
 				'acf-experiments',
-				'scfExperiments',
+				'acfExperiments',
 				array(
 					'data' => $experiments_data,
 				)

includes/admin/experiments/class-scf-admin-experiment-editor-sidebar.php

@@ -5,8 +5,7 @@
  * This experiment allows moving field group elements to the editor sidebar.
  *
  * @package    Secure Custom Fields
- * @subpackage Admin
- * @since      6.4.2
+ * @since      6.4.3
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -21,8 +20,7 @@
 	 * for a cleaner interface.
 	 *
 	 * @package    Secure Custom Fields
-	 * @subpackage Admin
-	 * @since      6.4.2
+	 * @since      6.4.3
 	 */
 	class SCF_Admin_Experiment_Editor_Sidebar extends SCF_Admin_Experiment {
 

includes/admin/experiments/class-scf-admin-experiment.php

@@ -5,8 +5,7 @@
  * This class serves as the base for all experiments in Secure Custom Fields.
  *
  * @package    Secure Custom Fields
- * @subpackage Admin
- * @since      6.4.2
+ * @since      6.4.3
  */
 
 if ( ! defined( 'ABSPATH' ) ) {
@@ -21,8 +20,7 @@
 	 * for managing experiment settings and UI.
 	 *
 	 * @package    Secure Custom Fields
-	 * @subpackage Admin
-	 * @since      6.4.2
+	 * @since      6.4.3
 	 */
 	class SCF_Admin_Experiment {
 

includes/admin/views/experiments/experiments.php

@@ -3,8 +3,7 @@
  * Admin Experiments View
  *
  * @package    Secure Custom Fields
- * @subpackage Admin
- * @since      6.4.2
+ * @since      6.4.3
  */
 
 if ( ! defined( 'ABSPATH' ) ) {

includes/assets.php

@@ -193,7 +193,7 @@ public function register_scripts() {
 					'handle'     => 'acf-experiments',
 					'src'        => acf_get_url( sprintf( $js_path_patterns['base'], 'acf-experiments' ) ),
 					'asset_file' => acf_get_path( sprintf( $asset_path_patterns['base'], 'acf-experiments' ) ),
-					'deps'       => array( 'jquery' ),
+					'deps'       => array( 'jquery', 'acf' ),
 					'version'    => $version,
 					'in_footer'  => true,
 				),