#7 impliment empty conditional

CalderaWP · Apr 9, 2019 · 4acbc96 · 4acbc96
1 parent efc1a7e
commit 4acbc96
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 7 deletions.
diff --git a/packages/forms/src/CalderaForm/state/applyRule.test.js b/packages/forms/src/CalderaForm/state/applyRule.test.js
@@ -217,7 +217,7 @@ describe( 'Applying rules to conditional state', ()=> {
 		[submitButton.fieldId]: null
 	};
 
-	it.skip( "Disables an empty field", () => {
+	it( "Disables an empty field", () => {
 		let conditionalState = new ConditionalState(initialState);
 		conditionals.forEach(rule => {
 			applyRuleToState(rule, conditionalState)
@@ -227,10 +227,10 @@ describe( 'Applying rules to conditional state', ()=> {
 		expect( conditionalState.isFieldDisabled(textField.fieldId)).toBe(false);
 	});
 
-	it.skip( 'Disables both fields', () => {
+	it( 'Disables both fields', () => {
 		conditionals = [...conditionals, {
 			type: 'disable',
-			rule: createFieldRule('is', textField.fieldId, '' ),
+			rule: createFieldRule('empty', textField.fieldId, '' ),
 			fields: [
 				submitButton.fieldId
 			]

diff --git a/packages/forms/src/CalderaForm/state/createFieldRule.js b/packages/forms/src/CalderaForm/state/createFieldRule.js
@@ -84,6 +84,16 @@ export const createFieldRule = (testType,fieldId,testValue) => {
 				return values.toLowerCase().indexOf( testValue ) >= 0;
 
 			};
+		case 'empty':
+			return (fieldValues) => {
+				const value = findFieldValue(fieldId, fieldValues);
+
+				return (
+					null === value
+					|| '' === value
+					|| Array.isArray(value) && 0 === value.length
+				);
+			};
 
 		default:
 			return () => false;

diff --git a/packages/forms/src/CalderaForm/state/createFieldRule.test.js b/packages/forms/src/CalderaForm/state/createFieldRule.test.js
@@ -192,10 +192,6 @@ describe('createFieldRule', () => {
 		expect(rule(fieldValues)).toBe(true);
 	});
 
-
-
-
-
 	test('Empty conditional returns FALSE for zero', () => {
 		const fieldValues = {
 			f2: 9,
-Original file line number
+Diff line change
@@ Expand Up / @@ -192,10 +192,6 @@ describe('createFieldRule', () => { @@
     		expect(rule(fieldValues)).toBe(true);
     	});
     	test('Empty conditional returns FALSE for zero', () => {
     		const fieldValues = {
     			f2: 9,
@@ Expand Down @@