From ec48fac67ba05180a7e48fd9f50d45ac261b5f50 Mon Sep 17 00:00:00 2001
From: Lax Mariappan <lax.mariappan@webdevstudios.com>
Date: Mon, 3 Jul 2023 05:33:37 +0530
Subject: [PATCH 1/2] :bug: fix issue-3 improve steps accessibility

---
 build/index.asset.php               |  2 +-
 build/index.js                      |  2 +-
 lib/WPCOTool/Frontend/Shortcode.php |  4 ++--
 src/js/form.js                      | 10 ++++++++++
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/build/index.asset.php b/build/index.asset.php
index 98305e5..3b6680c 100644
--- a/build/index.asset.php
+++ b/build/index.asset.php
@@ -1 +1 @@
-<?php return array('dependencies' => array(), 'version' => '92afa7b49854cb1ce35e');
+<?php return array('dependencies' => array(), 'version' => 'c3ad20dfab6b0989e5bf');
diff --git a/build/index.js b/build/index.js
index 8d1994b..728480a 100644
--- a/build/index.js
+++ b/build/index.js
@@ -1 +1 @@
-(()=>{"use strict";var t,e={680:()=>{function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},t(e)}function e(t,e){var n="undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(!n){if(Array.isArray(t)||(n=function(t,e){if(t){if("string"==typeof t)return r(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);return"Object"===n&&t.constructor&&(n=t.constructor.name),"Map"===n||"Set"===n?Array.from(t):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?r(t,e):void 0}}(t))||e&&t&&"number"==typeof t.length){n&&(t=n);var i=0,o=function(){};return{s:o,n:function(){return i>=t.length?{done:!0}:{done:!1,value:t[i++]}},e:function(t){throw t},f:o}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var s,a=!0,c=!1;return{s:function(){n=n.call(t)},n:function(){var t=n.next();return a=t.done,t},e:function(t){c=!0,s=t},f:function(){try{a||null==n.return||n.return()}finally{if(c)throw s}}}}function r(t,e){(null==e||e>t.length)&&(e=t.length);for(var r=0,n=new Array(e);r<e;r++)n[r]=t[r];return n}function n(e,r){for(var n=0;n<r.length;n++){var i=r[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,(void 0,o=function(e,r){if("object"!==t(e)||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var i=n.call(e,"string");if("object"!==t(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(e)}(i.key),"symbol"===t(o)?o:String(o)),i)}var o}var i,o=function(){function t(e){var r=this;!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.form=e,this.allSectionsWrapper=this.form.find(".wpcot__questions"),this.sections=this.allSectionsWrapper.find("section"),this.sectionActiveClass="wpcot__section--active",this.steps=this.form.find(".wpcot__steps li"),this.stepsActiveClass="wpcot__steps--active",this.buttonNextClass="wpcot__button-next",this.buttonPrevClass="wpcot__button-prev",this.inputGroupClass="wpcot__input-group",this.inputGroupActiveClass="wpcot__input-group--visible",this.timeout=null,this.errorMessage=wpcotData.errorMessage,this.form.find("section .".concat(this.buttonNextClass)).on("click",(function(t){return r.next(t)})),this.form.find("section .".concat(this.buttonPrevClass)).on("click",(function(t){return r.prev(t)})),window.addEventListener("orientationchange",(function(){return r.resize()})),this.activateFirstSection()}var r,i;return r=t,(i=[{key:"resize",value:function(){var t=this;clearTimeout(this.timeout),this.timeout=setTimeout((function(){var e=t.form.find(".".concat(t.sectionActiveClass));t.move(e.index()*e.outerWidth()*-1)}),500)}},{key:"activateFirstSection",value:function(){this.allSectionsWrapper.find("section:first-of-type").find(".".concat(this.inputGroupClass)).addClass(this.inputGroupActiveClass)}},{key:"prev",value:function(t){var e=jQuery(t.currentTarget).parents("section"),r=e.outerWidth(),n=e.prev("section");return!(n.length<1||(e.find(".".concat(this.inputGroupClass)).removeClass(this.inputGroupActiveClass),this.maybeSkipSection(n,!1)||(this.move((e.index()-1)*r*-1),this.addActiveClass(n)),0))}},{key:"next",value:function(t){var r,n=jQuery(t.currentTarget).parents("section"),i=n.outerWidth(),o=n.next("section"),s=n.find('input[type="checkbox"]:checked'),a=new Set,c=e(s);try{for(c.s();!(r=c.n()).done;){var u,l=e(r.value.value.split(","));try{for(l.s();!(u=l.n()).done;){var f=u.value;a.add(f)}}catch(t){l.e(t)}finally{l.f()}}}catch(t){c.e(t)}finally{c.f()}if(a.size<=0)return this.displayError(n,this.errorMessage,!0),!1;if(o.length<1)return!1;this.displayError(n,"",!1);var p,v=e(o.find('input[type="checkbox"]'));try{for(v.s();!(p=v.n()).done;){var h=p.value;h.checked=!1;var d,y=new Set(h.value.split(",")),m=!1,b=e(y);try{for(b.s();!(d=b.n()).done;){var C=d.value;a.has(C)&&(m=!0)}}catch(t){b.e(t)}finally{b.f()}var w=jQuery(h).parent(".".concat(this.inputGroupClass));m?w.addClass(this.inputGroupActiveClass):w.removeClass(this.inputGroupActiveClass)}}catch(t){v.e(t)}finally{v.f()}if(this.maybeSkipSection(o,!0))return!0;this.move(o.index()*i*-1),this.addActiveClass(o)}},{key:"move",value:function(t){this.allSectionsWrapper.css({"-webkit-transform":"translate(".concat(t,"px, 0)"),"-moz-transform":"translate(".concat(t,"px, 0)"),"-ms-transform":"translate(".concat(t,"px, 0)"),"-o-transform":"translate(".concat(t,"px, 0)"),transform:"translate(".concat(t,"px, 0)")})}},{key:"maybeSkipSection",value:function(t,e){var r=e?this.buttonNextClass:this.buttonPrevClass,n=t.find("div.".concat(this.inputGroupActiveClass));return n.length<=1&&!t.attr("id").endsWith("teams")&&(n.find('input[type="checkbox"]').attr("checked","checked"),t.find(".".concat(r)).trigger("click"),!0)}},{key:"addActiveClass",value:function(t){this.sections.removeClass(this.sectionActiveClass),t.addClass(this.sectionActiveClass),this.steps.removeClass(this.stepsActiveClass),this.steps.eq(t.index()).addClass(this.stepsActiveClass)}},{key:"displayError",value:function(t,e,r){var n=t.find(".wpcot__section-error"),i="wpcot__section-error--active";r?n.addClass(i):n.removeClass(i),n.text(e)}}])&&n(r.prototype,i),Object.defineProperty(r,"prototype",{writable:!1}),t}();(i=jQuery)(window).load((function(){new o(i("#wpcot form"))}))}},r={};function n(t){var i=r[t];if(void 0!==i)return i.exports;var o=r[t]={exports:{}};return e[t](o,o.exports,n),o.exports}n.m=e,t=[],n.O=(e,r,i,o)=>{if(!r){var s=1/0;for(l=0;l<t.length;l++){for(var[r,i,o]=t[l],a=!0,c=0;c<r.length;c++)(!1&o||s>=o)&&Object.keys(n.O).every((t=>n.O[t](r[c])))?r.splice(c--,1):(a=!1,o<s&&(s=o));if(a){t.splice(l--,1);var u=i();void 0!==u&&(e=u)}}return e}o=o||0;for(var l=t.length;l>0&&t[l-1][2]>o;l--)t[l]=t[l-1];t[l]=[r,i,o]},n.o=(t,e)=>Object.prototype.hasOwnProperty.call(t,e),(()=>{var t={826:0,431:0};n.O.j=e=>0===t[e];var e=(e,r)=>{var i,o,[s,a,c]=r,u=0;if(s.some((e=>0!==t[e]))){for(i in a)n.o(a,i)&&(n.m[i]=a[i]);if(c)var l=c(n)}for(e&&e(r);u<s.length;u++)o=s[u],n.o(t,o)&&t[o]&&t[o][0](),t[o]=0;return n.O(l)},r=globalThis.webpackChunkcontributor_orientation_tool=globalThis.webpackChunkcontributor_orientation_tool||[];r.forEach(e.bind(null,0)),r.push=e.bind(null,r.push.bind(r))})();var i=n.O(void 0,[431],(()=>n(680)));i=n.O(i)})();
\ No newline at end of file
+(()=>{"use strict";var t,e={680:()=>{function t(e){return t="function"==typeof Symbol&&"symbol"==typeof Symbol.iterator?function(t){return typeof t}:function(t){return t&&"function"==typeof Symbol&&t.constructor===Symbol&&t!==Symbol.prototype?"symbol":typeof t},t(e)}function e(t,e){var n="undefined"!=typeof Symbol&&t[Symbol.iterator]||t["@@iterator"];if(!n){if(Array.isArray(t)||(n=function(t,e){if(t){if("string"==typeof t)return r(t,e);var n=Object.prototype.toString.call(t).slice(8,-1);return"Object"===n&&t.constructor&&(n=t.constructor.name),"Map"===n||"Set"===n?Array.from(t):"Arguments"===n||/^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)?r(t,e):void 0}}(t))||e&&t&&"number"==typeof t.length){n&&(t=n);var i=0,o=function(){};return{s:o,n:function(){return i>=t.length?{done:!0}:{done:!1,value:t[i++]}},e:function(t){throw t},f:o}}throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.")}var s,a=!0,c=!1;return{s:function(){n=n.call(t)},n:function(){var t=n.next();return a=t.done,t},e:function(t){c=!0,s=t},f:function(){try{a||null==n.return||n.return()}finally{if(c)throw s}}}}function r(t,e){(null==e||e>t.length)&&(e=t.length);for(var r=0,n=new Array(e);r<e;r++)n[r]=t[r];return n}function n(e,r){for(var n=0;n<r.length;n++){var i=r[n];i.enumerable=i.enumerable||!1,i.configurable=!0,"value"in i&&(i.writable=!0),Object.defineProperty(e,(void 0,o=function(e,r){if("object"!==t(e)||null===e)return e;var n=e[Symbol.toPrimitive];if(void 0!==n){var i=n.call(e,"string");if("object"!==t(i))return i;throw new TypeError("@@toPrimitive must return a primitive value.")}return String(e)}(i.key),"symbol"===t(o)?o:String(o)),i)}var o}var i,o=function(){function t(e){var r=this;!function(t,e){if(!(t instanceof e))throw new TypeError("Cannot call a class as a function")}(this,t),this.form=e,this.allSectionsWrapper=this.form.find(".wpcot__questions"),this.sections=this.allSectionsWrapper.find("section"),this.sectionActiveClass="wpcot__section--active",this.steps=this.form.find(".wpcot__steps li"),this.stepsActiveClass="wpcot__steps--active",this.buttonNextClass="wpcot__button-next",this.buttonPrevClass="wpcot__button-prev",this.inputGroupClass="wpcot__input-group",this.inputGroupActiveClass="wpcot__input-group--visible",this.timeout=null,this.errorMessage=wpcotData.errorMessage,this.form.find("section .".concat(this.buttonNextClass)).on("click",(function(t){return r.next(t)})),this.form.find("section .".concat(this.buttonPrevClass)).on("click",(function(t){return r.prev(t)})),window.addEventListener("orientationchange",(function(){return r.resize()})),this.activateFirstSection()}var r,i;return r=t,(i=[{key:"resize",value:function(){var t=this;clearTimeout(this.timeout),this.timeout=setTimeout((function(){var e=t.form.find(".".concat(t.sectionActiveClass));t.move(e.index()*e.outerWidth()*-1)}),500)}},{key:"activateFirstSection",value:function(){this.allSectionsWrapper.find("section:first-of-type").find(".".concat(this.inputGroupClass)).addClass(this.inputGroupActiveClass)}},{key:"prev",value:function(t){var e=jQuery(t.currentTarget).parents("section"),r=e.outerWidth(),n=e.prev("section");return!(n.length<1||(e.find(".".concat(this.inputGroupClass)).removeClass(this.inputGroupActiveClass),this.maybeSkipSection(n,!1)||(this.move((e.index()-1)*r*-1),this.addActiveClass(n)),0))}},{key:"next",value:function(t){var r,n=jQuery(t.currentTarget).parents("section"),i=n.outerWidth(),o=n.next("section"),s=n.find('input[type="checkbox"]:checked'),a=new Set,c=e(s);try{for(c.s();!(r=c.n()).done;){var u,l=e(r.value.value.split(","));try{for(l.s();!(u=l.n()).done;){var p=u.value;a.add(p)}}catch(t){l.e(t)}finally{l.f()}}}catch(t){c.e(t)}finally{c.f()}if(a.size<=0)return this.displayError(n,this.errorMessage,!0),!1;if(o.length<1)return!1;this.displayError(n,"",!1);var f,v=e(o.find('input[type="checkbox"]'));try{for(v.s();!(f=v.n()).done;){var h=f.value;h.checked=!1;var d,y=new Set(h.value.split(",")),m=!1,b=e(y);try{for(b.s();!(d=b.n()).done;){var C=d.value;a.has(C)&&(m=!0)}}catch(t){b.e(t)}finally{b.f()}var g=jQuery(h).parent(".".concat(this.inputGroupClass));m?g.addClass(this.inputGroupActiveClass):g.removeClass(this.inputGroupActiveClass)}}catch(t){v.e(t)}finally{v.f()}if(this.maybeSkipSection(o,!0))return!0;this.move(o.index()*i*-1),this.addActiveClass(o)}},{key:"move",value:function(t){this.allSectionsWrapper.css({"-webkit-transform":"translate(".concat(t,"px, 0)"),"-moz-transform":"translate(".concat(t,"px, 0)"),"-ms-transform":"translate(".concat(t,"px, 0)"),"-o-transform":"translate(".concat(t,"px, 0)"),transform:"translate(".concat(t,"px, 0)")})}},{key:"maybeSkipSection",value:function(t,e){var r=e?this.buttonNextClass:this.buttonPrevClass,n=t.find("div.".concat(this.inputGroupActiveClass));return n.length<=1&&!t.attr("id").endsWith("teams")&&(n.find('input[type="checkbox"]').attr("checked","checked"),t.find(".".concat(r)).trigger("click"),!0)}},{key:"addActiveClass",value:function(t){this.sections.removeClass(this.sectionActiveClass),t.addClass(this.sectionActiveClass),this.steps.removeClass(this.stepsActiveClass),this.steps.eq(t.index()).addClass(this.stepsActiveClass);var e=document.getElementsByClassName(this.stepsActiveClass)[0];document.querySelector('[aria-current="page"]').removeAttribute("aria-current"),e.setAttribute("aria-current","page")}},{key:"displayError",value:function(t,e,r){var n=t.find(".wpcot__section-error"),i="wpcot__section-error--active";r?n.addClass(i):n.removeClass(i),n.text(e)}}])&&n(r.prototype,i),Object.defineProperty(r,"prototype",{writable:!1}),t}();(i=jQuery)(window).load((function(){new o(i("#wpcot form"))}))}},r={};function n(t){var i=r[t];if(void 0!==i)return i.exports;var o=r[t]={exports:{}};return e[t](o,o.exports,n),o.exports}n.m=e,t=[],n.O=(e,r,i,o)=>{if(!r){var s=1/0;for(l=0;l<t.length;l++){for(var[r,i,o]=t[l],a=!0,c=0;c<r.length;c++)(!1&o||s>=o)&&Object.keys(n.O).every((t=>n.O[t](r[c])))?r.splice(c--,1):(a=!1,o<s&&(s=o));if(a){t.splice(l--,1);var u=i();void 0!==u&&(e=u)}}return e}o=o||0;for(var l=t.length;l>0&&t[l-1][2]>o;l--)t[l]=t[l-1];t[l]=[r,i,o]},n.o=(t,e)=>Object.prototype.hasOwnProperty.call(t,e),(()=>{var t={826:0,431:0};n.O.j=e=>0===t[e];var e=(e,r)=>{var i,o,[s,a,c]=r,u=0;if(s.some((e=>0!==t[e]))){for(i in a)n.o(a,i)&&(n.m[i]=a[i]);if(c)var l=c(n)}for(e&&e(r);u<s.length;u++)o=s[u],n.o(t,o)&&t[o]&&t[o][0](),t[o]=0;return n.O(l)},r=globalThis.webpackChunkcontributor_orientation_tool=globalThis.webpackChunkcontributor_orientation_tool||[];r.forEach(e.bind(null,0)),r.push=e.bind(null,r.push.bind(r))})();var i=n.O(void 0,[431],(()=>n(680)));i=n.O(i)})();
\ No newline at end of file
diff --git a/lib/WPCOTool/Frontend/Shortcode.php b/lib/WPCOTool/Frontend/Shortcode.php
index d11cf81..ba661c8 100644
--- a/lib/WPCOTool/Frontend/Shortcode.php
+++ b/lib/WPCOTool/Frontend/Shortcode.php
@@ -389,9 +389,9 @@ private function get_form_header() {
 					</span>
 					<span class="%5$s">%4$d</span>
 				</li>',
-				$i === 1 ? sprintf( ' class="%s"', sprintf( '%s__steps--active', $this->prefix ) ) : '', // %1$s
+				$i === 1 ? sprintf( ' aria-current="page" class="%s"', sprintf( '%s__steps--active', $this->prefix ) ) : '', // %1$s
 				sprintf( '%s__steps-text', $this->prefix ), // %2$s
-				sprintf( esc_html__( 'Step %d :', 'contributor-orientation-tool' ), $i ), // %3$s
+				sprintf( esc_html__( 'Step %d: ', 'contributor-orientation-tool' ), $i ), // %3$s
 				$i, // %4$d
 				sprintf( '%s__steps-responsive', $this->prefix ), // %5$d
 				$this->steps[ $i ] // %6$d
diff --git a/src/js/form.js b/src/js/form.js
index 8c7d2cc..3d06b61 100644
--- a/src/js/form.js
+++ b/src/js/form.js
@@ -220,6 +220,16 @@ export default class Form {
 		this.steps.removeClass(this.stepsActiveClass);
 		this.steps.eq(section.index()).addClass(this.stepsActiveClass);
 
+		// Accessibility improvement for steps.
+
+		let currentStep = document.getElementsByClassName(this.stepsActiveClass)[0];
+
+		document
+			.querySelector('[aria-current="page"]')
+			.removeAttribute("aria-current");
+
+		currentStep.setAttribute("aria-current", "page");
+
 	}
 
 	/**

From 7ae7c70936d8af3d8e0a65a62e9e57128b02880a Mon Sep 17 00:00:00 2001
From: Lax Mariappan <lax.mariappan@webdevstudios.com>
Date: Tue, 4 Jul 2023 05:13:59 +0530
Subject: [PATCH 2/2] remove link on team title

---
 lib/WPCOTool/Frontend/Shortcode.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/WPCOTool/Frontend/Shortcode.php b/lib/WPCOTool/Frontend/Shortcode.php
index ba661c8..2d4db07 100644
--- a/lib/WPCOTool/Frontend/Shortcode.php
+++ b/lib/WPCOTool/Frontend/Shortcode.php
@@ -262,7 +262,7 @@ private function get_section( $id, $headline, $content, $button_next = '', $butt
 
 	    return sprintf(
 		    '<section id="%1$s" class="%6$s%7$s">
-				<h3>%2$s</h3>
+				<h2>%2$s</h2>
 				<div class="%11$s">
 					%3$s
 					<div class="%9$s"></div>
@@ -341,7 +341,7 @@ private function get_team_checkbox_field( $name, $value, $team_icon, $team_name,
 		return sprintf(
 			'<div class="%9$s">
 				<input id="%1$s" type="checkbox" name="%2$s[]" value="%3$s" />
-				<label for="%1$s"><a href="%7$s" title="%5$s" target="_blank">%4$s%5$s</a></label>
+				<label for="%1$s">%4$s%5$s</label>
 				<p>%6$s</p>
 				<a href="%7$s" title="%5$s" target="_blank">%8$s</a>
 			</div>',