Changeset 3359056

Timestamp:

09/10/2025 09:32:02 AM (7 months ago)

Author:

satindersingh

Message:

Update to version 4.2.3 from GitHub

Location:

mask-form-elementor

Files:

• tags/4.2.3 (copied) (copied from mask-form-elementor/trunk)
• tags/4.2.3/admin/marketing (added)
• tags/4.2.3/admin/marketing/css (added)
• tags/4.2.3/admin/marketing/css/mfe-mkt.css (added)
• tags/4.2.3/admin/marketing/images (added)
• tags/4.2.3/admin/marketing/images/mfe-highlight-icon.svg (added)
• tags/4.2.3/admin/marketing/js (added)
• tags/4.2.3/admin/marketing/js/mfe-form-marketing.js (added)
• tags/4.2.3/admin/marketing/mfe-marketing-common.php (added)
• tags/4.2.3/assets/js/custom-mask-script.js (modified) (4 diffs)
• tags/4.2.3/includes/class-elementor-mask-control.php (modified) (1 diff)
• tags/4.2.3/includes/class-main-mask-form-elementor.php (modified) (2 diffs)
• tags/4.2.3/index.php (modified) (2 diffs)
• tags/4.2.3/readme.txt (modified) (2 diffs)
• trunk/admin/marketing (added)
• trunk/admin/marketing/css (added)
• trunk/admin/marketing/css/mfe-mkt.css (added)
• trunk/admin/marketing/images (added)
• trunk/admin/marketing/images/mfe-highlight-icon.svg (added)
• trunk/admin/marketing/js (added)
• trunk/admin/marketing/js/mfe-form-marketing.js (added)
• trunk/admin/marketing/mfe-marketing-common.php (added)
• trunk/assets/js/custom-mask-script.js (modified) (4 diffs)
• trunk/includes/class-elementor-mask-control.php (modified) (1 diff)
• trunk/includes/class-main-mask-form-elementor.php (modified) (2 diffs)
• trunk/index.php (modified) (2 diffs)
• trunk/readme.txt (modified) (2 diffs)

mask-form-elementor/tags/4.2.3/assets/js/custom-mask-script.js

@@ -56 +56 @@
           let moneymaskFormat = input.dataset.moneymaskFormat
           let type = (moneymaskFormat === 'dot' ? 'D' : 'C')
-          let newValue = formatMoneyInput(input.value, type,moneyPrefix,input);
+          let newValue = '';
+
+          if(input.value != '$0,00'){
+
+            newValue = formatMoneyInput(input.value, type, moneyPrefix, input);
+          }else{
+            newValue = "";
+          }
+          
           if (input.value === newValue) return;
       
@@ -211 +219 @@
               var newCaret = mapDigitIndexToCaret(newVal, digitIndex);
       
-              input.value = newVal;
+              if(newVal != '('){
+
+                input.value = newVal;
+              }else{
+                input.value = "";
+              }
               
               setCaretPosition(input, newCaret || 0); // Keep caret in place
@@ -333 +346 @@
           $(document).on("input", selector, function () {
               var input = $(this);
+              nextbtnVisibility(errorClass, input, validationFunction);
               var errorElement = input.closest('.elementor-field-group').find("." + errorClass);
       
@@ -584 +598 @@
       
         // ----------------- Form Submit -----------------
+
+
+    // start - step field mask error handling
+
+    let maskErrorArr = {};
+    let nextBtnOriginalClicks = {};
+    let clickStatus={};
+    let recaptchaEvent = {};
+    let submitBtnEvent = {};
+
+
+    const nextbtnVisibility = (errorClass, input, validationFunction) => {
+
+      const closesWidget = input.closest(".elementor-widget-form");
+      const widgetId = closesWidget.data('id');
+      const inuptId = input.attr('id');
+      const fieldStep=input.closest(".elementor-field-type-step");
+      const form = input.closest(".elementor-form");
+
+      const currectStepFields = form.find(".elementor-form-fields-wrapper.elementor-labels-above").children("div:not(.elementor-hidden)").find('input, textarea, select');
+
+      const submtBtnTag = form.find("button[type='submit']");
+
+      if (!closesWidget.length || !fieldStep.length) {
+        return;
+      }
+
+      const nextBtn = fieldStep.find(".e-form__buttons__wrapper__button[data-direction='next']");
+
+      
+
+      if ((nextBtn.length == 0 && submtBtnTag.length > 0 ) && (submtBtnTag.length == 0 && nextBtn.length == 0) ) {
+        return;
+      }
+
+
+
+      let val = input.val();
+
+      if (val.length === 1 && !/\d/.test(val)) {
+        val = '';
+      }
+
+      // Show error message if validation fails
+      if (  val !== "" && !validationFunction(val)) {
+
+
+        if (closesWidget.length > 0) {
+
+
+          if (!maskErrorArr[widgetId]) {
+            maskErrorArr[widgetId] = [];
+          }
+
+          if (!maskErrorArr[widgetId].includes(inuptId)) {
+            maskErrorArr[widgetId].push(inuptId);
+          }
+        }
+
+        if (!nextBtnOriginalClicks[widgetId] || !nextBtnOriginalClicks[widgetId].length) {
+
+
+
+          if(nextBtn.length > 0){
+
+            const origninalClicks = jQuery._data(nextBtn[0], "events");
+  
+            if (origninalClicks && (!nextBtnOriginalClicks[widgetId] || !nextBtnOriginalClicks[widgetId].length === 0)) {
+              nextBtnOriginalClicks[widgetId] = origninalClicks && origninalClicks.click ? origninalClicks.click.map(h => h.handler) : [];
+  
+            }
+          }
+
+
+        }
+      } else {
+        if (maskErrorArr[widgetId] && maskErrorArr[widgetId].includes(inuptId)) {
+          maskErrorArr[widgetId] = maskErrorArr[widgetId].filter(item => item !== inuptId);
+        }
+      }
+
+
+      if (maskErrorArr[widgetId] && maskErrorArr[widgetId].length > 0) {
+
+        if(nextBtn.length > 0){
+
+          const origninalClicks = jQuery._data(nextBtn[0], "events");
+
+        if (origninalClicks && (!nextBtnOriginalClicks[widgetId] || !nextBtnOriginalClicks[widgetId].length)) {
+
+
+          nextBtnOriginalClicks[widgetId] = origninalClicks && origninalClicks.click ? origninalClicks.click.map(h => h.handler) : [];
+
+        }
         
-
-        $(document).on("click", ".elementor-field-type-submit", function (e) {
-        var $submitBtn = $(this);
-        var $form = $submitBtn.closest("form");
-
-        // Prevent double-clicks
-        if ($submitBtn.data("clicked")) {
+        if (nextBtnOriginalClicks[widgetId] && nextBtnOriginalClicks[widgetId].length > 0) {
+          nextBtn.off("click");
+        }
+
+
+        }
+
+
+        
+      } else {
+
+
+        // when no error in mask validation
+
+        if(recaptchaEvent[widgetId]){
+
+          recaptchaEvent[widgetId].forEach(fn => {
+                  submtBtnTag.one("click", fn); // use .one instead of .on
+                });
+        }
+
+        if(submitBtnEvent[widgetId]){
+          form.on("submit", submitBtnEvent[widgetId]);
+        }
+
+
+
+        if (nextBtnOriginalClicks[widgetId] && nextBtnOriginalClicks[widgetId].length > 0) {
+
+
+
+
+          let isfieldsValid = true
+
+          for (let i = 0; i < currectStepFields.length; i++) {
+
+
+            if (currectStepFields[i].checkValidity() == false) {
+
+              isfieldsValid = false;
+              break;
+
+            }
+
+          }
+
+          if (isfieldsValid) {
+
+
+
+
+
+            if(nextBtn.length > 0){
+
+              // 2️⃣ First, clear existing handlers to avoid duplication
+              nextBtn.off("click");
+              
+              // Re-attach original click handlers only once
+              nextBtnOriginalClicks[widgetId].forEach(fn => {
+                nextBtn.one("click", fn); // use .one instead of .on
+              });
+            }
+
+
+          }
+            
+          }
+
+      }
+    }
+
+
+    
+
+    // handle next button event before click
+
+     $(document).on("mousedown", ".e-form__buttons__wrapper__button[data-direction='next']", function(e){
+
+      const form = $(this).closest(".elementor-form");
+
+      const mask_error_div = form.find(".elementor-form-fields-wrapper.elementor-labels-above").children("div:not(.elementor-hidden)").find('div.mask-error');
+
+      const closesWidget = $(this).closest(".elementor-widget-form");
+      const widgetId = closesWidget.data('id');
+
+      let mask_error = false;
+
+      // finding mask error
+      for(let i=0; i<mask_error_div.length; i++){
+        if(mask_error_div[i].value != "" && mask_error_div[i].style.display == 'flex'){
+          mask_error = true;
+          break;
+        }
+      }
+
+      // reattcach next button event when no mask error
+
+       if (maskErrorArr[widgetId] && !maskErrorArr[widgetId].length > 0 && !mask_error) {
+          // Re-attach original click handlers only once
+            
+          if (nextBtnOriginalClicks[widgetId] && nextBtnOriginalClicks[widgetId].length > 0) {
+              $(this).off("click");
+
+              nextBtnOriginalClicks[widgetId].forEach(fn => {
+                $(this).one("click", fn); // use .one instead of .on
+              });
+            }
+
+
+       }
+
+     })
+
+
+     // handling next button event when previous button click
+
+    $(document).on("click", ".e-form__buttons__wrapper__button[data-direction='previous']", function(e){
+
+      const form = $(this).closest(".elementor-form");
+      
+      const closesWidget = form.closest(".elementor-widget-form");
+      const widgetId = closesWidget.data('id');
+      maskErrorArr[widgetId] = [];
+
+      const currectStepFields = form.find(".elementor-form-fields-wrapper.elementor-labels-above").children("div:not(.elementor-hidden)")
+
+      const nextBtn = currectStepFields.find(".e-form__buttons__wrapper__button[data-direction='next']");
+
+      // attaching events to next button
+      
+      if (nextBtnOriginalClicks[widgetId] && nextBtnOriginalClicks[widgetId].length > 0) {
+        nextBtn.off("click");
+
+        nextBtnOriginalClicks[widgetId].forEach(fn => {
+                nextBtn.one("click", fn); // use .one instead of .on
+          });
+
+      }
+
+    })
+
+     // handle mask validation on submit button of step field form
+     $(document).on("mousedown", ".elementor-field-type-submit", function (e){
+
+      var $submitBtn = $(this);
+
+       var $form = $submitBtn.closest("form");
+
+       const closesWidget = $form.closest(".elementor-widget-form");
+      const widgetId = closesWidget.data('id');
+
+      const currectStepFields = $form.find(".elementor-form-fields-wrapper.elementor-labels-above").children("div:not(.elementor-hidden)")
+
+      const previousBtn = currectStepFields.find(".e-form__buttons__wrapper__button[data-direction='previous']");
+
+      const inputMaskFields = currectStepFields.find("input.fme-mask-input");
+
+      // run only first time when click on submit button 
+      // if maskerror found in the form widget this will remove submit button and form events to prevent submit
+
+
+      if(previousBtn.length && inputMaskFields.length && maskErrorArr[widgetId].length){
+
+        var $subBtnTag = $submitBtn.find("button");
+
+      
+      // getting submit button recaptcha and click events
+
+      var $form = $submitBtn.closest("form");
+
+      const origninalclick = jQuery._data($subBtnTag[0], "events");
+
+
+      if(!recaptchaEvent[widgetId]){
+
+        recaptchaEvent[widgetId]  = origninalclick && origninalclick.click ? origninalclick.click.map(h => h.handler) : [];
+      }
+
+
+
+
+      // getting form apply step events
+
+      const origninalSubmit = jQuery._data($form[0], "events");
+
+      origninalSubmit.submit.forEach((ele) => {
+        if(ele.handler.toString().trim().includes("resetForm")){
+
+          if(!submitBtnEvent[widgetId]){
+
+            submitBtnEvent[widgetId] = ele.handler;
+
+          }
+
+        }
+      })
+
+
+
+      // removing form apply step event
+      $form.off("submit", submitBtnEvent[widgetId]);
+
+      // removing submit button click events
+      $subBtnTag.off("click");
+
+
+      }
+    })
+
+    // end - step field mask error handling
+
+
+    // handling form submit of mask field in elementor form
+
+    $(document).on("click", ".elementor-field-type-submit", function (e) {
+
+      var $submitBtn = $(this);
+
+       var $subBtnTag = $submitBtn.find("button");
+
+
+      if ($submitBtn.find('button').hasClass('cfkef-prevent-submit') || $submitBtn.find('button').hasClass('confirmation-pending')
+      ) {
+        return
+      }
+
+      var $submitBtn = $(this);
+      var $form = $submitBtn.closest("form");
+
+
+      // Prevent double-clicks
+      if ($submitBtn.data("clicked")) {
+        e.preventDefault();
+        return;
+      }
+      $submitBtn.data("clicked", true); // Mark as clicked
+
+      // Trigger blur on inputs to ensure validation runs
+      $form.find("input").trigger("blur");
+
+      // Add Elementor waiting class
+      $form[0].classList.add("elementor-form-waiting");
+
+      // e.preventDefault(); // Prevent default form submission
+
+      // Wait for mask errors or blur logic to complete
+      setTimeout(() => {
+
+
+        let hasVisibleMaskError = false;
+
+        // Check for visible mask error messages
+        const $errors = $form.find(".mask-error").filter(function () {
+          return $(this).text().trim() !== "" && $(this).css("display") == "flex";
+        });
+
+        if ($errors.length > 0) {
+          hasVisibleMaskError = true;
+          const $firstError = $errors.first();
+          $("html, body").animate({
+            scrollTop: $firstError.offset().top - 200
+          }, 300);
+        }
+
+        // ✅ Check for empty required masked fields
+        const $emptyRequiredMasked = $form.find("input[required]").filter(function () {
+          const val = $(this).val().trim();
+          const isVisible = $(this).css("display") == "flex";
+          return (val === "" || /^[\s_\-\(\)\.:/]+$/.test(val));
+        });
+
+
+        if ($emptyRequiredMasked.length > 0) {
+          hasVisibleMaskError = true;
+          const $firstEmpty = $emptyRequiredMasked.first();
+          $("html, body").animate({
+            scrollTop: $firstEmpty.offset().top - 200
+          }, 300);
+          $firstEmpty.focus();
+        }
+
+        // ❌ Validation failed
+        if (hasVisibleMaskError) {
+          // $form[0].classList.remove("elementor-form-waiting");
+          $submitBtn.data("clicked", false);
           e.preventDefault();
-          return; 
-        }
-        $submitBtn.data("clicked", true); // Mark as clicked
-
-        // Trigger blur on inputs to ensure validation runs
-        $form.find("input").trigger("blur");
-
-        // Add Elementor waiting class
-        $form[0].classList.add("elementor-form-waiting");
-
-        // Wait for mask errors or blur logic to complete
-        setTimeout(() => {
-
-
-
-          let hasVisibleMaskError = false;
-
-          // Check for visible mask error messages
-          const $errors = $form.find(".mask-error").filter(function () {
-            return $(this).text().trim() !== "" && $(this).is(":visible");
-          });
-
-          if ($errors.length > 0) {
-            hasVisibleMaskError = true;
-            const $firstError = $errors.first();
-            $("html, body").animate({
-              scrollTop: $firstError.offset().top - 200
-            }, 300);
-          }
-
-          // ✅ Check for empty required masked fields
-          const $emptyRequiredMasked = $form.find("input[required]").filter(function () {
-            const val = $(this).val().trim();
-            const isVisible = $(this).is(":visible");
-            return isVisible && (val === "" || /^[\s_\-\(\)\.:/]+$/.test(val));
-          });
-
-
-          if ($emptyRequiredMasked.length > 0) {
-            hasVisibleMaskError = true;
-            const $firstEmpty = $emptyRequiredMasked.first();
-            $("html, body").animate({
-              scrollTop: $firstEmpty.offset().top - 200
-            }, 300);
-            $firstEmpty.focus();
-          }
-
-          // ❌ Validation failed
-          if (hasVisibleMaskError || !$form[0].checkValidity()) {
-            // $form[0].classList.remove("elementor-form-waiting");
-            $submitBtn.data("clicked", false);
-            e.preventDefault();
-            return;
-          }
-
-
-          if(!hasVisibleMaskError && !(!$form[0].checkValidity())){
-
-            // ✅ All good — submit the form
-            $form[0].classList.remove("elementor-form-waiting");
-            $form[0].requestSubmit();
-            $submitBtn.data("clicked", false);
-            $submitBtn.trigger("submit");
-          }
-
-        }, 500);
-      });
+          return;
+        }
+
+        if (!hasVisibleMaskError) {
+          // ✅ All good — submit the form
+          $form[0].classList.remove("elementor-form-waiting");
+          $submitBtn.data("clicked", false);
+          $submitBtn.trigger("submit");
+        }
+
+      }, 500);
+    });
+
       
     });

mask-form-elementor/tags/4.2.3/includes/class-elementor-mask-control.php

@@ -348 +348 @@
             }
         }       
-
-        if ( !is_plugin_active( 'country-code-field-for-elementor-form/country-code-field-for-elementor-form.php' ) && !is_plugin_active( 'conditional-fields-for-elementor-form/class-conditional-fields-for-elementor-form.php' ) && !is_plugin_active( 'conditional-fields-for-elementor-form-pro/class-conditional-fields-for-elementor-form-pro.php' )) {
-            $controls_to_register['fme_country_code_toggle'] = array(
-                'name'            => 'fme_country_code_toggle',
-                'label'        => esc_html__( 'Enable Country Code', 'mask-form-elementor' ),
-                'type'            => Controls_Manager::SWITCHER,
-                'tab'             => 'content',
-                'condition'       => array(
-                        'field_type' => 'tel',
-                ),
-                'inner_tab'       => 'form_fields_content_tab',
-                'tabs_wrapper'    => 'form_fields_tabs',
-            );
-
-            $controls_to_register['fme_country_code_link_button'] = array(
-                'name'            => 'fme_country_code_link_button',
-                'type'            => Controls_Manager::RAW_HTML,
-                'raw'             => "<p>To Add country code to Elementor form fields <a href='plugin-install.php?s=Country%2520Code%2520For%2520Elementor%2520Form%2520Telephone%2520Field%2520by%2520coolplugins&tab=search&type=term' target='_blank' >Activate Plugin</a></p>",
-                'content_classes' => 'get_ccfef_link',
-                'condition'       => array(
-                    'fme_country_code_toggle' => 'yes',
-                    'field_type' => 'tel'
-                ),
-                'inner_tab'       => 'form_fields_content_tab',
-                'tabs_wrapper'    => 'form_fields_tabs',
-            );
-        }
 
         if ( !is_plugin_active( 'country-code-field-for-elementor-form/country-code-field-for-elementor-form.php' ) && !is_plugin_active( 'conditional-fields-for-elementor-form/class-conditional-fields-for-elementor-form.php' ) && !is_plugin_active( 'conditional-fields-for-elementor-form-pro/class-conditional-fields-for-elementor-form-pro.php' ) ) {

mask-form-elementor/tags/4.2.3/includes/class-main-mask-form-elementor.php

@@ -50 +50 @@
 
             
-            add_filter( 'plugin_action_links_' . plugin_basename( MFE_PLUGIN_FILE ), array( $this, 'mfe_pro_plugin_demo_link' ) );
+            
+
+            add_filter( 'plugin_row_meta', array( $this, 'mfe_plugin_row_meta' ), 10, 2 );
+
+            add_action( 'plugins_loaded',array($this,'plugin_loads'));
+
+
+            $this->includes();
+
+            
+        }
+    }
+
+    public function plugin_loads(){
+
+
+        add_filter( 'plugin_action_links_' . plugin_basename( MFE_PLUGIN_FILE ), array( $this, 'mfe_pro_plugin_demo_link' ) );
 
             add_filter( 'plugin_action_links_' . plugin_basename( MFE_PLUGIN_FILE ), array( $this, 'mfe_plugin_settings_link' ) );
 
-            add_filter( 'plugin_row_meta', array( $this, 'mfe_plugin_row_meta' ), 10, 2 );
-
-            add_action( 'plugins_loaded',array($this,'plugin_loads'));
-
-
-            $this->includes();
-
-            
-        }
-    }
-
-    public function plugin_loads(){
 
         if(!class_exists('CPFM_Feedback_Notice')){
             require_once MFE_PLUGIN_PATH . 'admin/feedback/cpfm-common-notice.php';
+        }
+
+        if ( did_action( 'elementor/loaded' ) && class_exists( '\Elementor\Plugin' ) ) {
+
+            require_once MFE_PLUGIN_PATH . '/admin/marketing/mfe-marketing-common.php';
         }
 
@@ -332 +341 @@
         }
 
-        // if ( is_plugin_active( 'cool-formkit-for-elementor-forms/cool-formkit-for-elementor-forms.php' ) ) {
-        //  return false;
-        // }
-
-        // if ( ! is_plugin_active( 'elementor-pro/elementor-pro.php' ) ) {
-        //  add_action('admin_notices', array($this, 'admin_notice_missing_main_plugin'));
-        //  return false;
-        // }
+        if ( is_plugin_active( 'cool-formkit-for-elementor-forms/cool-formkit-for-elementor-forms.php' ) ) {
+            return false;
+        }
+
+        if ( ! is_plugin_active( 'elementor-pro/elementor-pro.php' ) ) {
+            add_action('admin_notices', array($this, 'admin_notice_missing_main_plugin'));
+            return false;
+        }
 
         return true;

mask-form-elementor/tags/4.2.3/index.php

@@ -6 +6 @@
  * Author: Rodrigo Bogdanowicz
  * Author URI: https://www.bogdanowicz.com.br
- * Version: 4.2.2
+ * Version: 4.2.3
  * Text Domain: mask-form-elementor
- * Elementor tested up to: 3.31.2
- * Elementor Pro tested up to: 3.31.2
+ * Elementor tested up to: 3.31.4
+ * Elementor Pro tested up to: 3.31.3
  */
 
@@ -15 +15 @@
 
 // Define plugin version and paths.
-define( 'MFE_VERSION', '4.2.2' );
+define( 'MFE_VERSION', '4.2.3' );
 define('MFE_PHP_MINIMUM_VERSION','7.4');
 define('MFE_WP_MINIMUM_VERSION','5.5');

mask-form-elementor/tags/4.2.3/readme.txt

@@ -6 +6 @@
 Tested up to: 6.8.2
 Requires PHP: 7.2
-Stable tag: 4.2.2
+Stable tag: 4.2.3
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
-Elementor tested up to: 3.31.2
-Elementor Pro tested up to: 3.31.2
+Elementor tested up to: 3.31.4
+Elementor Pro tested up to: 3.31.3
 
 Apply input masks in Elementor form widget fields - phone, date, time, credit card, CPF, CNPJ, CEP & more for valid and error-free entries.
@@ -152 +152 @@
 - [Live Demo](https://coolplugins.net/add-input-masks-elementor-form/?ref=mask&utm_source=mfe_plugin&utm_medium=readme&utm_campaign=demo&utm_content=installation)  
 
----
-
 == Changelog ==
+
+= 4.2.3 - Sep 10, 2025 =
+- Added: - Added other plugin recommendations for Elementor users.
+- Fixed: - Mask validation issue with step field form.
+- Fixed: - Conflict between mask validation and reCaptcha v3.
 
 = 4.2.2 - Aug 21, 2025 =  

mask-form-elementor/trunk/assets/js/custom-mask-script.js

@@ -56 +56 @@
           let moneymaskFormat = input.dataset.moneymaskFormat
           let type = (moneymaskFormat === 'dot' ? 'D' : 'C')
-          let newValue = formatMoneyInput(input.value, type,moneyPrefix,input);
+          let newValue = '';
+
+          if(input.value != '$0,00'){
+
+            newValue = formatMoneyInput(input.value, type, moneyPrefix, input);
+          }else{
+            newValue = "";
+          }
+          
           if (input.value === newValue) return;
       
@@ -211 +219 @@
               var newCaret = mapDigitIndexToCaret(newVal, digitIndex);
       
-              input.value = newVal;
+              if(newVal != '('){
+
+                input.value = newVal;
+              }else{
+                input.value = "";
+              }
               
               setCaretPosition(input, newCaret || 0); // Keep caret in place
@@ -333 +346 @@
           $(document).on("input", selector, function () {
               var input = $(this);
+              nextbtnVisibility(errorClass, input, validationFunction);
               var errorElement = input.closest('.elementor-field-group').find("." + errorClass);
       
@@ -584 +598 @@
       
         // ----------------- Form Submit -----------------
+
+
+    // start - step field mask error handling
+
+    let maskErrorArr = {};
+    let nextBtnOriginalClicks = {};
+    let clickStatus={};
+    let recaptchaEvent = {};
+    let submitBtnEvent = {};
+
+
+    const nextbtnVisibility = (errorClass, input, validationFunction) => {
+
+      const closesWidget = input.closest(".elementor-widget-form");
+      const widgetId = closesWidget.data('id');
+      const inuptId = input.attr('id');
+      const fieldStep=input.closest(".elementor-field-type-step");
+      const form = input.closest(".elementor-form");
+
+      const currectStepFields = form.find(".elementor-form-fields-wrapper.elementor-labels-above").children("div:not(.elementor-hidden)").find('input, textarea, select');
+
+      const submtBtnTag = form.find("button[type='submit']");
+
+      if (!closesWidget.length || !fieldStep.length) {
+        return;
+      }
+
+      const nextBtn = fieldStep.find(".e-form__buttons__wrapper__button[data-direction='next']");
+
+      
+
+      if ((nextBtn.length == 0 && submtBtnTag.length > 0 ) && (submtBtnTag.length == 0 && nextBtn.length == 0) ) {
+        return;
+      }
+
+
+
+      let val = input.val();
+
+      if (val.length === 1 && !/\d/.test(val)) {
+        val = '';
+      }
+
+      // Show error message if validation fails
+      if (  val !== "" && !validationFunction(val)) {
+
+
+        if (closesWidget.length > 0) {
+
+
+          if (!maskErrorArr[widgetId]) {
+            maskErrorArr[widgetId] = [];
+          }
+
+          if (!maskErrorArr[widgetId].includes(inuptId)) {
+            maskErrorArr[widgetId].push(inuptId);
+          }
+        }
+
+        if (!nextBtnOriginalClicks[widgetId] || !nextBtnOriginalClicks[widgetId].length) {
+
+
+
+          if(nextBtn.length > 0){
+
+            const origninalClicks = jQuery._data(nextBtn[0], "events");
+  
+            if (origninalClicks && (!nextBtnOriginalClicks[widgetId] || !nextBtnOriginalClicks[widgetId].length === 0)) {
+              nextBtnOriginalClicks[widgetId] = origninalClicks && origninalClicks.click ? origninalClicks.click.map(h => h.handler) : [];
+  
+            }
+          }
+
+
+        }
+      } else {
+        if (maskErrorArr[widgetId] && maskErrorArr[widgetId].includes(inuptId)) {
+          maskErrorArr[widgetId] = maskErrorArr[widgetId].filter(item => item !== inuptId);
+        }
+      }
+
+
+      if (maskErrorArr[widgetId] && maskErrorArr[widgetId].length > 0) {
+
+        if(nextBtn.length > 0){
+
+          const origninalClicks = jQuery._data(nextBtn[0], "events");
+
+        if (origninalClicks && (!nextBtnOriginalClicks[widgetId] || !nextBtnOriginalClicks[widgetId].length)) {
+
+
+          nextBtnOriginalClicks[widgetId] = origninalClicks && origninalClicks.click ? origninalClicks.click.map(h => h.handler) : [];
+
+        }
         
-
-        $(document).on("click", ".elementor-field-type-submit", function (e) {
-        var $submitBtn = $(this);
-        var $form = $submitBtn.closest("form");
-
-        // Prevent double-clicks
-        if ($submitBtn.data("clicked")) {
+        if (nextBtnOriginalClicks[widgetId] && nextBtnOriginalClicks[widgetId].length > 0) {
+          nextBtn.off("click");
+        }
+
+
+        }
+
+
+        
+      } else {
+
+
+        // when no error in mask validation
+
+        if(recaptchaEvent[widgetId]){
+
+          recaptchaEvent[widgetId].forEach(fn => {
+                  submtBtnTag.one("click", fn); // use .one instead of .on
+                });
+        }
+
+        if(submitBtnEvent[widgetId]){
+          form.on("submit", submitBtnEvent[widgetId]);
+        }
+
+
+
+        if (nextBtnOriginalClicks[widgetId] && nextBtnOriginalClicks[widgetId].length > 0) {
+
+
+
+
+          let isfieldsValid = true
+
+          for (let i = 0; i < currectStepFields.length; i++) {
+
+
+            if (currectStepFields[i].checkValidity() == false) {
+
+              isfieldsValid = false;
+              break;
+
+            }
+
+          }
+
+          if (isfieldsValid) {
+
+
+
+
+
+            if(nextBtn.length > 0){
+
+              // 2️⃣ First, clear existing handlers to avoid duplication
+              nextBtn.off("click");
+              
+              // Re-attach original click handlers only once
+              nextBtnOriginalClicks[widgetId].forEach(fn => {
+                nextBtn.one("click", fn); // use .one instead of .on
+              });
+            }
+
+
+          }
+            
+          }
+
+      }
+    }
+
+
+    
+
+    // handle next button event before click
+
+     $(document).on("mousedown", ".e-form__buttons__wrapper__button[data-direction='next']", function(e){
+
+      const form = $(this).closest(".elementor-form");
+
+      const mask_error_div = form.find(".elementor-form-fields-wrapper.elementor-labels-above").children("div:not(.elementor-hidden)").find('div.mask-error');
+
+      const closesWidget = $(this).closest(".elementor-widget-form");
+      const widgetId = closesWidget.data('id');
+
+      let mask_error = false;
+
+      // finding mask error
+      for(let i=0; i<mask_error_div.length; i++){
+        if(mask_error_div[i].value != "" && mask_error_div[i].style.display == 'flex'){
+          mask_error = true;
+          break;
+        }
+      }
+
+      // reattcach next button event when no mask error
+
+       if (maskErrorArr[widgetId] && !maskErrorArr[widgetId].length > 0 && !mask_error) {
+          // Re-attach original click handlers only once
+            
+          if (nextBtnOriginalClicks[widgetId] && nextBtnOriginalClicks[widgetId].length > 0) {
+              $(this).off("click");
+
+              nextBtnOriginalClicks[widgetId].forEach(fn => {
+                $(this).one("click", fn); // use .one instead of .on
+              });
+            }
+
+
+       }
+
+     })
+
+
+     // handling next button event when previous button click
+
+    $(document).on("click", ".e-form__buttons__wrapper__button[data-direction='previous']", function(e){
+
+      const form = $(this).closest(".elementor-form");
+      
+      const closesWidget = form.closest(".elementor-widget-form");
+      const widgetId = closesWidget.data('id');
+      maskErrorArr[widgetId] = [];
+
+      const currectStepFields = form.find(".elementor-form-fields-wrapper.elementor-labels-above").children("div:not(.elementor-hidden)")
+
+      const nextBtn = currectStepFields.find(".e-form__buttons__wrapper__button[data-direction='next']");
+
+      // attaching events to next button
+      
+      if (nextBtnOriginalClicks[widgetId] && nextBtnOriginalClicks[widgetId].length > 0) {
+        nextBtn.off("click");
+
+        nextBtnOriginalClicks[widgetId].forEach(fn => {
+                nextBtn.one("click", fn); // use .one instead of .on
+          });
+
+      }
+
+    })
+
+     // handle mask validation on submit button of step field form
+     $(document).on("mousedown", ".elementor-field-type-submit", function (e){
+
+      var $submitBtn = $(this);
+
+       var $form = $submitBtn.closest("form");
+
+       const closesWidget = $form.closest(".elementor-widget-form");
+      const widgetId = closesWidget.data('id');
+
+      const currectStepFields = $form.find(".elementor-form-fields-wrapper.elementor-labels-above").children("div:not(.elementor-hidden)")
+
+      const previousBtn = currectStepFields.find(".e-form__buttons__wrapper__button[data-direction='previous']");
+
+      const inputMaskFields = currectStepFields.find("input.fme-mask-input");
+
+      // run only first time when click on submit button 
+      // if maskerror found in the form widget this will remove submit button and form events to prevent submit
+
+
+      if(previousBtn.length && inputMaskFields.length && maskErrorArr[widgetId].length){
+
+        var $subBtnTag = $submitBtn.find("button");
+
+      
+      // getting submit button recaptcha and click events
+
+      var $form = $submitBtn.closest("form");
+
+      const origninalclick = jQuery._data($subBtnTag[0], "events");
+
+
+      if(!recaptchaEvent[widgetId]){
+
+        recaptchaEvent[widgetId]  = origninalclick && origninalclick.click ? origninalclick.click.map(h => h.handler) : [];
+      }
+
+
+
+
+      // getting form apply step events
+
+      const origninalSubmit = jQuery._data($form[0], "events");
+
+      origninalSubmit.submit.forEach((ele) => {
+        if(ele.handler.toString().trim().includes("resetForm")){
+
+          if(!submitBtnEvent[widgetId]){
+
+            submitBtnEvent[widgetId] = ele.handler;
+
+          }
+
+        }
+      })
+
+
+
+      // removing form apply step event
+      $form.off("submit", submitBtnEvent[widgetId]);
+
+      // removing submit button click events
+      $subBtnTag.off("click");
+
+
+      }
+    })
+
+    // end - step field mask error handling
+
+
+    // handling form submit of mask field in elementor form
+
+    $(document).on("click", ".elementor-field-type-submit", function (e) {
+
+      var $submitBtn = $(this);
+
+       var $subBtnTag = $submitBtn.find("button");
+
+
+      if ($submitBtn.find('button').hasClass('cfkef-prevent-submit') || $submitBtn.find('button').hasClass('confirmation-pending')
+      ) {
+        return
+      }
+
+      var $submitBtn = $(this);
+      var $form = $submitBtn.closest("form");
+
+
+      // Prevent double-clicks
+      if ($submitBtn.data("clicked")) {
+        e.preventDefault();
+        return;
+      }
+      $submitBtn.data("clicked", true); // Mark as clicked
+
+      // Trigger blur on inputs to ensure validation runs
+      $form.find("input").trigger("blur");
+
+      // Add Elementor waiting class
+      $form[0].classList.add("elementor-form-waiting");
+
+      // e.preventDefault(); // Prevent default form submission
+
+      // Wait for mask errors or blur logic to complete
+      setTimeout(() => {
+
+
+        let hasVisibleMaskError = false;
+
+        // Check for visible mask error messages
+        const $errors = $form.find(".mask-error").filter(function () {
+          return $(this).text().trim() !== "" && $(this).css("display") == "flex";
+        });
+
+        if ($errors.length > 0) {
+          hasVisibleMaskError = true;
+          const $firstError = $errors.first();
+          $("html, body").animate({
+            scrollTop: $firstError.offset().top - 200
+          }, 300);
+        }
+
+        // ✅ Check for empty required masked fields
+        const $emptyRequiredMasked = $form.find("input[required]").filter(function () {
+          const val = $(this).val().trim();
+          const isVisible = $(this).css("display") == "flex";
+          return (val === "" || /^[\s_\-\(\)\.:/]+$/.test(val));
+        });
+
+
+        if ($emptyRequiredMasked.length > 0) {
+          hasVisibleMaskError = true;
+          const $firstEmpty = $emptyRequiredMasked.first();
+          $("html, body").animate({
+            scrollTop: $firstEmpty.offset().top - 200
+          }, 300);
+          $firstEmpty.focus();
+        }
+
+        // ❌ Validation failed
+        if (hasVisibleMaskError) {
+          // $form[0].classList.remove("elementor-form-waiting");
+          $submitBtn.data("clicked", false);
           e.preventDefault();
-          return; 
-        }
-        $submitBtn.data("clicked", true); // Mark as clicked
-
-        // Trigger blur on inputs to ensure validation runs
-        $form.find("input").trigger("blur");
-
-        // Add Elementor waiting class
-        $form[0].classList.add("elementor-form-waiting");
-
-        // Wait for mask errors or blur logic to complete
-        setTimeout(() => {
-
-
-
-          let hasVisibleMaskError = false;
-
-          // Check for visible mask error messages
-          const $errors = $form.find(".mask-error").filter(function () {
-            return $(this).text().trim() !== "" && $(this).is(":visible");
-          });
-
-          if ($errors.length > 0) {
-            hasVisibleMaskError = true;
-            const $firstError = $errors.first();
-            $("html, body").animate({
-              scrollTop: $firstError.offset().top - 200
-            }, 300);
-          }
-
-          // ✅ Check for empty required masked fields
-          const $emptyRequiredMasked = $form.find("input[required]").filter(function () {
-            const val = $(this).val().trim();
-            const isVisible = $(this).is(":visible");
-            return isVisible && (val === "" || /^[\s_\-\(\)\.:/]+$/.test(val));
-          });
-
-
-          if ($emptyRequiredMasked.length > 0) {
-            hasVisibleMaskError = true;
-            const $firstEmpty = $emptyRequiredMasked.first();
-            $("html, body").animate({
-              scrollTop: $firstEmpty.offset().top - 200
-            }, 300);
-            $firstEmpty.focus();
-          }
-
-          // ❌ Validation failed
-          if (hasVisibleMaskError || !$form[0].checkValidity()) {
-            // $form[0].classList.remove("elementor-form-waiting");
-            $submitBtn.data("clicked", false);
-            e.preventDefault();
-            return;
-          }
-
-
-          if(!hasVisibleMaskError && !(!$form[0].checkValidity())){
-
-            // ✅ All good — submit the form
-            $form[0].classList.remove("elementor-form-waiting");
-            $form[0].requestSubmit();
-            $submitBtn.data("clicked", false);
-            $submitBtn.trigger("submit");
-          }
-
-        }, 500);
-      });
+          return;
+        }
+
+        if (!hasVisibleMaskError) {
+          // ✅ All good — submit the form
+          $form[0].classList.remove("elementor-form-waiting");
+          $submitBtn.data("clicked", false);
+          $submitBtn.trigger("submit");
+        }
+
+      }, 500);
+    });
+
       
     });

mask-form-elementor/trunk/includes/class-elementor-mask-control.php

@@ -348 +348 @@
             }
         }       
-
-        if ( !is_plugin_active( 'country-code-field-for-elementor-form/country-code-field-for-elementor-form.php' ) && !is_plugin_active( 'conditional-fields-for-elementor-form/class-conditional-fields-for-elementor-form.php' ) && !is_plugin_active( 'conditional-fields-for-elementor-form-pro/class-conditional-fields-for-elementor-form-pro.php' )) {
-            $controls_to_register['fme_country_code_toggle'] = array(
-                'name'            => 'fme_country_code_toggle',
-                'label'        => esc_html__( 'Enable Country Code', 'mask-form-elementor' ),
-                'type'            => Controls_Manager::SWITCHER,
-                'tab'             => 'content',
-                'condition'       => array(
-                        'field_type' => 'tel',
-                ),
-                'inner_tab'       => 'form_fields_content_tab',
-                'tabs_wrapper'    => 'form_fields_tabs',
-            );
-
-            $controls_to_register['fme_country_code_link_button'] = array(
-                'name'            => 'fme_country_code_link_button',
-                'type'            => Controls_Manager::RAW_HTML,
-                'raw'             => "<p>To Add country code to Elementor form fields <a href='plugin-install.php?s=Country%2520Code%2520For%2520Elementor%2520Form%2520Telephone%2520Field%2520by%2520coolplugins&tab=search&type=term' target='_blank' >Activate Plugin</a></p>",
-                'content_classes' => 'get_ccfef_link',
-                'condition'       => array(
-                    'fme_country_code_toggle' => 'yes',
-                    'field_type' => 'tel'
-                ),
-                'inner_tab'       => 'form_fields_content_tab',
-                'tabs_wrapper'    => 'form_fields_tabs',
-            );
-        }
 
         if ( !is_plugin_active( 'country-code-field-for-elementor-form/country-code-field-for-elementor-form.php' ) && !is_plugin_active( 'conditional-fields-for-elementor-form/class-conditional-fields-for-elementor-form.php' ) && !is_plugin_active( 'conditional-fields-for-elementor-form-pro/class-conditional-fields-for-elementor-form-pro.php' ) ) {

mask-form-elementor/trunk/includes/class-main-mask-form-elementor.php

@@ -50 +50 @@
 
             
-            add_filter( 'plugin_action_links_' . plugin_basename( MFE_PLUGIN_FILE ), array( $this, 'mfe_pro_plugin_demo_link' ) );
+            
+
+            add_filter( 'plugin_row_meta', array( $this, 'mfe_plugin_row_meta' ), 10, 2 );
+
+            add_action( 'plugins_loaded',array($this,'plugin_loads'));
+
+
+            $this->includes();
+
+            
+        }
+    }
+
+    public function plugin_loads(){
+
+
+        add_filter( 'plugin_action_links_' . plugin_basename( MFE_PLUGIN_FILE ), array( $this, 'mfe_pro_plugin_demo_link' ) );
 
             add_filter( 'plugin_action_links_' . plugin_basename( MFE_PLUGIN_FILE ), array( $this, 'mfe_plugin_settings_link' ) );
 
-            add_filter( 'plugin_row_meta', array( $this, 'mfe_plugin_row_meta' ), 10, 2 );
-
-            add_action( 'plugins_loaded',array($this,'plugin_loads'));
-
-
-            $this->includes();
-
-            
-        }
-    }
-
-    public function plugin_loads(){
 
         if(!class_exists('CPFM_Feedback_Notice')){
             require_once MFE_PLUGIN_PATH . 'admin/feedback/cpfm-common-notice.php';
+        }
+
+        if ( did_action( 'elementor/loaded' ) && class_exists( '\Elementor\Plugin' ) ) {
+
+            require_once MFE_PLUGIN_PATH . '/admin/marketing/mfe-marketing-common.php';
         }
 
@@ -332 +341 @@
         }
 
-        // if ( is_plugin_active( 'cool-formkit-for-elementor-forms/cool-formkit-for-elementor-forms.php' ) ) {
-        //  return false;
-        // }
-
-        // if ( ! is_plugin_active( 'elementor-pro/elementor-pro.php' ) ) {
-        //  add_action('admin_notices', array($this, 'admin_notice_missing_main_plugin'));
-        //  return false;
-        // }
+        if ( is_plugin_active( 'cool-formkit-for-elementor-forms/cool-formkit-for-elementor-forms.php' ) ) {
+            return false;
+        }
+
+        if ( ! is_plugin_active( 'elementor-pro/elementor-pro.php' ) ) {
+            add_action('admin_notices', array($this, 'admin_notice_missing_main_plugin'));
+            return false;
+        }
 
         return true;

mask-form-elementor/trunk/index.php

@@ -6 +6 @@
  * Author: Rodrigo Bogdanowicz
  * Author URI: https://www.bogdanowicz.com.br
- * Version: 4.2.2
+ * Version: 4.2.3
  * Text Domain: mask-form-elementor
- * Elementor tested up to: 3.31.2
- * Elementor Pro tested up to: 3.31.2
+ * Elementor tested up to: 3.31.4
+ * Elementor Pro tested up to: 3.31.3
  */
 
@@ -15 +15 @@
 
 // Define plugin version and paths.
-define( 'MFE_VERSION', '4.2.2' );
+define( 'MFE_VERSION', '4.2.3' );
 define('MFE_PHP_MINIMUM_VERSION','7.4');
 define('MFE_WP_MINIMUM_VERSION','5.5');

mask-form-elementor/trunk/readme.txt

@@ -6 +6 @@
 Tested up to: 6.8.2
 Requires PHP: 7.2
-Stable tag: 4.2.2
+Stable tag: 4.2.3
 License: GPLv2 or later
 License URI: https://www.gnu.org/licenses/gpl-2.0.html
-Elementor tested up to: 3.31.2
-Elementor Pro tested up to: 3.31.2
+Elementor tested up to: 3.31.4
+Elementor Pro tested up to: 3.31.3
 
 Apply input masks in Elementor form widget fields - phone, date, time, credit card, CPF, CNPJ, CEP & more for valid and error-free entries.
@@ -152 +152 @@
 - [Live Demo](https://coolplugins.net/add-input-masks-elementor-form/?ref=mask&utm_source=mfe_plugin&utm_medium=readme&utm_campaign=demo&utm_content=installation)  
 
----
-
 == Changelog ==
+
+= 4.2.3 - Sep 10, 2025 =
+- Added: - Added other plugin recommendations for Elementor users.
+- Fixed: - Mask validation issue with step field form.
+- Fixed: - Conflict between mask validation and reCaptcha v3.
 
 = 4.2.2 - Aug 21, 2025 =