Merge pull request #626 from cynicaldevil/master

fix(formly-form): added originalModel and formOptions to getFormlyFie…

Author: Kent C. Dodds

src/directives/formly-form.js

@@ -369,6 +369,8 @@ function formlyForm(formlyUsability, formlyWarn, $parse, formlyConfig, $interpol
         options: field,
         index,
         formState: $scope.options.formState,
+        originalModel: $scope.model,
+        formOptions: $scope.options,
         formId: $scope.formId,
       }
     }

src/directives/formly-form.test.js

@@ -536,26 +536,85 @@ describe('formly-form', () => {
     beforeEach(() => {
       scope.model = {}
       scope.fieldModel = {}
-
-      scope.fields = [
-        {template: input, key: 'foo', model: scope.fieldModel},
-        {template: input, key: 'bar', model: scope.fieldModel, hideExpression: () => !!scope.fieldModel.foo},
-      ]
     })
+    describe('behaviour when model changes', () => {
+
+      describe('when a string is passed to hideExpression', () => {
+        beforeEach(() => {
+          scope.fields = [
+            {template: input, key: 'foo', model: scope.fieldModel},
+            {template: input, key: 'bar', model: scope.fieldModel, hideExpression: () => !!scope.fieldModel.foo},
+          ]
+        })
 
-    it('should be called and resolve to true when field model changes', () => {
-      compileAndDigest()
-      expect(scope.fields[1].hide).be.false
-      scope.fields[0].formControl.$setViewValue('value')
-      expect(scope.fields[1].hide).be.true
+        it('should be called and should resolve to true when field model changes', () => {
+          compileAndDigest()
+          expect(scope.fields[1].hide).be.false
+          scope.fields[0].formControl.$setViewValue('value')
+          expect(scope.fields[1].hide).be.true
+        })
+
+        it('should be called and should resolve to false when field model changes', () => {
+          scope.fieldModel.foo = 'value'
+          compileAndDigest()
+          expect(scope.fields[1].hide).be.true
+          scope.fields[0].formControl.$setViewValue('')
+          expect(scope.fields[1].hide).be.false
+        })
+      })
+      describe('when a function is passed to hideExpression', () => {
+        beforeEach(() => {
+          scope.fields = [
+            {template: input, key: 'foo', model: scope.fieldModel},
+            {
+              template: input, key: 'bar',
+              model: scope.fieldModel,
+              hideExpression: ($viewValue, $modelValue, scope) => {
+                return !!scope.fields[1].data.parentScope.fieldModel.foo   //since the scope passed to the function belongs to the form,
+              },                                                           //we store the outer(parent) scope in 'data' property to access
+              data: {                                                      //the template named 'foo' stored in the fields array
+                parentScope: scope,          //the parent scope(one used to compile the form)
+              },
+            },
+          ]
+        })
+
+        it('should be called and should resolve to true when field model changes', () => {
+          compileAndDigest()
+          expect(scope.fields[1].hide).be.false
+          scope.fields[0].formControl.$setViewValue('value')
+          expect(scope.fields[1].hide).be.true
+        })
+
+        it('should be called and should resolve to false when field model changes', () => {
+          scope.fieldModel.foo = 'value'
+          compileAndDigest()
+          expect(scope.fields[1].hide).be.true
+          scope.fields[0].formControl.$setViewValue('')
+          expect(scope.fields[1].hide).be.false
+        })
+      })
     })
 
-    it('should be called and resolve to false when field model changes', () => {
-      scope.fieldModel.foo = 'value'
+    it('ensures that hideExpression has all the expressionProperties values', () => {
+      scope.options = {formState: {}}
+      scope.fields = [{
+        template: input,
+        key: 'test',
+        hideExpression: `
+        options === options.data.field &&
+        index === 0 &&
+        formState === options.data.formOptions.formState &&
+        originalModel === options.data.originalModel &&
+        formOptions === options.data.formOptions`,
+        data: {
+          originalModel: scope.model,
+          formOptions: scope.options,
+        },
+      }]
+      scope.fields[0].data.field = scope.fields[0]
       compileAndDigest()
-      expect(scope.fields[1].hide).be.true
-      scope.fields[0].formControl.$setViewValue('')
-      expect(scope.fields[1].hide).be.false
+      expect(scope.fields[0].hide).be.true
     })
   })