Merge pull request #490 from infinum/origin/conditional-tags

5.9.7

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 
 This projects adheres to [Semantic Versioning](https://semver.org/) and [Keep a CHANGELOG](https://keepachangelog.com/).
 
+## [5.9.7]
+
+### Fixed
+
+- Conditional tags for `select`, `select multiple`, `country` and `country multiple` fields.
+
 ## [5.9.6]
 
 ### Added
@@ -1023,6 +1029,7 @@ This projects adheres to [Semantic Versioning](https://semver.org/) and [Keep a
 
 - Initial production release.
 
+[5.9.7]: https://github.com/infinum/eightshift-forms/compare/5.9.6...5.9.7
 [5.9.6]: https://github.com/infinum/eightshift-forms/compare/5.9.5...5.9.6
 [5.9.5]: https://github.com/infinum/eightshift-forms/compare/5.9.4...5.9.5
 [5.9.4]: https://github.com/infinum/eightshift-forms/compare/5.9.3...5.9.4

eightshift-forms.php

@@ -6,7 +6,7 @@
  * Description: Eightshift Forms is a complete form builder plugin that utilizes modern Block editor features with multiple third-party integrations, bringing your project to a new level.
  * Author: WordPress team @Infinum
  * Author URI: https://eightshift.com/
- * Version: 5.9.6
+ * Version: 5.9.7
  * Text Domain: eightshift-forms
  *
  * @package EightshiftForms

src/Blocks/components/conditional-tags/components/conditional-tags-labels.js

@@ -9,6 +9,7 @@ export const CONDITIONAL_TAGS_OPERATORS_LABELS = {
 	[globalManifest.comparator.LT]: __('less than', 'eightshift-forms'),
 	[globalManifest.comparator.LTE]: __('less than or equal', 'eightshift-forms'),
 	[globalManifest.comparator.C]: __('contains', 'eightshift-forms'),
+	[globalManifest.comparator.CN]: __('not contains', 'eightshift-forms'),
 	[globalManifest.comparator.SW]: __('starts with', 'eightshift-forms'),
 	[globalManifest.comparator.EW]: __('ends with', 'eightshift-forms'),
 };

src/Blocks/components/form/assets/conditional-tags.js

@@ -20,6 +20,10 @@ export class ConditionalTags {
 		this.HIDE = globalManifest.comparatorActions.HIDE;
 		this.OR = globalManifest.comparatorLogic.OR;
 		this.AND = globalManifest.comparatorLogic.AND;
+		this.IS = globalManifest.comparator.IS;
+		this.ISN = globalManifest.comparator.ISN;
+		this.C = globalManifest.comparator.C;
+		this.CN = globalManifest.comparator.CN;
 
 		// Map all conditional logic as a object.
 		this.OPERATORS = this.utils.getComparator();
@@ -707,6 +711,25 @@ export class ConditionalTags {
 							value = this.state.getStateElementValue(inner[0], formId)[inner[2]] === inner[2] ? inner[2] : '';
 						}
 						break;
+					case 'select':
+					case 'country':
+						value = this.state.getStateElementValue(inner[0], formId).map((item) => item?.value);
+
+						if (value.length === 0) {
+							value = '';
+						}
+
+						if (inner[1] === this.IS) {
+							inner[1] = this.C;
+						}
+
+						if (inner[1] === this.ISN) {
+							inner[1] = this.CN;
+						}
+						break;
+					case 'phone':
+						value = this.utils.getPhoneCombinedValue(formId, inner[0]);
+						break;
 					default:
 						// Get element value by name.
 						value = this.state.getStateElementValue(inner[0], formId);
@@ -742,7 +765,7 @@ export class ConditionalTags {
 	 * 
 	 * @returns {vodi}
 	 */
-	removeEvents(formId) {
+	removeEvents() {
 		window?.removeEventListener(
 			this.state.getStateEvent('formJsLoaded'),
 			this.onInitEvent

src/Blocks/components/form/assets/enrichment.js

@@ -525,7 +525,7 @@ export class Enrichment {
 	 * 
 	 * @returns {vodi}
 	 */
-	removeEvents(formId) {
+	removeEvents() {
 		window?.removeEventListener(
 			this.state.getStateEvent('formJsLoaded'),
 			this.onLocalstoragePrefillEvent

src/Blocks/components/form/assets/geolocation.js

@@ -47,7 +47,7 @@ export class Geolocation {
 	 * 
 	 * @returns {vodi}
 	 */
-	removeEvents(formId) {
+	removeEvents() {
 		window?.removeEventListener(
 			this.state.getStateEvent('formJsLoaded'),
 			this.onSetSelectField

src/Blocks/components/form/assets/utils.js

@@ -1440,6 +1440,7 @@ export class Utils {
 	 * lt  - less than                        - if value is less than.
 	 * lte - less/equal than                  - if value is less/equal than.
 	 * c   - contains                         - if value contains value.
+	 * cn  - contains not                     - if value doesn't contain value.
 	 * sw  - starts with                      - if value starts with value.
 	 * ew  - ends with                        - if value ends with value.
 	 * b   - between range                    - if value is between two values.
@@ -1458,6 +1459,7 @@ export class Utils {
 			[globalManifest.comparator.LT]: (start, value) => parseFloat(String(start)) < parseFloat(String(value)),
 			[globalManifest.comparator.LTE]: (start, value) => parseFloat(String(start)) <= parseFloat(String(value)),
 			[globalManifest.comparator.C]: (start, value) => start.includes(value),
+			[globalManifest.comparator.CN]: (start, value) => !start.includes(value),
 			[globalManifest.comparator.SW]: (start, value) => start.startsWith(value),
 			[globalManifest.comparator.EW]: (start, value) => start.endsWith(value),
 			[globalManifest.comparatorExtended.B]: (start, value, end) => 

src/Blocks/manifest.json

@@ -467,6 +467,7 @@
 		"LT": "lt",
 		"LTE": "lte",
 		"C": "c",
+		"CN": "cn",
 		"SW": "sw",
 		"EW": "ew"
 	},