Merge pull request #334 from rvsia/addFlagsToPatternValidator

fix(renderer): add flags for pattern validator
data-driven-forms · Feb 27, 2020 · ed1d7e2 · ed1d7e2
2 parents a66e433 + c50403d
commit ed1d7e2
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/packages/react-form-renderer/src/tests/validators/validators.test.js b/packages/react-form-renderer/src/tests/validators/validators.test.js
@@ -116,6 +116,10 @@ describe('New validators', () => {
       expect(validatorMapper(validators.PATTERN_VALIDATOR)({ pattern: '^Foo$' })('Foo')).toBeUndefined();
     });
 
+    it('should pass pattern validation with configured regexp pattern as string and with flags', () => {
+      expect(validatorMapper(validators.PATTERN_VALIDATOR)({ pattern: '^Foo$', flags: 'i' })('foo')).toBeUndefined();
+    });
+
     it('should fail pattern validation with configured regexp pattern as string', () => {
       expect(validatorMapper(validators.PATTERN_VALIDATOR)({ pattern: '^Foo$' })('Bar')).toBe('Value does not match pattern: ^Foo$.');
     });

diff --git a/packages/react-form-renderer/src/validators/index.js b/packages/react-form-renderer/src/validators/index.js
@@ -43,8 +43,8 @@ export const length = memoize(({
   });
 });
 
-export const pattern = memoize(({ pattern, message } = {}) => {
-  const verifiedPattern = typeof pattern === 'string' ? new RegExp(pattern) : pattern;
+export const pattern = memoize(({ pattern, message, flags } = {}) => {
+  const verifiedPattern = typeof pattern === 'string' ? new RegExp(pattern, flags) : pattern;
   return prepare(value => {
     if (!value) {
       return;

diff --git a/packages/react-renderer-demo/src/app/src/doc-components/validators/pattern-validator.js b/packages/react-renderer-demo/src/app/src/doc-components/validators/pattern-validator.js
@@ -11,7 +11,7 @@ const schema = {
     helperText: 'Value must be equal to Foo',
     validate: [{
       type: validatorTypes.PATTERN_VALIDATOR,
-      pattern: /^Foo$/,
+      pattern: /^Foo$/i,
     }],
   }, {
     component: componentTypes.TEXT_FIELD,
@@ -21,6 +21,7 @@ const schema = {
     validate: [{
       type: validatorTypes.PATTERN_VALIDATOR,
       pattern: '^Foo$',
+      flags: 'i',
     }],
   }],
 };