fix(document): check path exists before checking for required

Fix #6974
Automattic · Sep 23, 2018 · 05aa04d · 05aa04d
1 parent 2221d72
commit 05aa04d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/lib/document.js b/lib/document.js
@@ -1628,7 +1628,7 @@ function _evaluateRequiredFunctions(doc) {
   Object.keys(doc.$__.activePaths.states.require).forEach(path => {
     const p = doc.schema.path(path);
 
-    if (typeof p.originalRequiredValue === 'function') {
+    if (p != null && typeof p.originalRequiredValue === 'function') {
       doc.$__.cachedRequired[path] = p.originalRequiredValue.call(doc);
     }
   });

diff --git a/lib/schematype.js b/lib/schematype.js
@@ -636,6 +636,7 @@ SchemaType.prototype.required = function(required, message) {
     }, this);
 
     this.isRequired = false;
+    delete this.originalRequiredValue;
     return this;
   }