Fix schema marks validation (#1483)

packages/slate/src/models/schema.js

@@ -287,10 +287,8 @@ class Schema extends Record(DEFAULTS) {
       const marks = node.getMarks().toArray()
 
       for (const mark of marks) {
-        for (const def of rule.marks) {
+        if (!rule.marks.some(def => def.type === mark.type)) {
-          if (def.type != mark.type) {
+          return this.fail(NODE_MARK_INVALID, { ...ctx, mark })
-            return this.fail(NODE_MARK_INVALID, { ...ctx, mark })
-          }
         }
       }
     }

packages/slate/test/schema/custom/node-mark-invalid-custom.js

@@ -5,7 +5,7 @@ import h from '../../helpers/h'
 export const schema = {
   blocks: {
     paragraph: {
-      marks: ['bold'],
+      marks: [{ type: 'bold' }],
       normalize: (change, reason, { node }) => {
         if (reason == 'node_mark_invalid') {
           node.nodes.forEach(n => change.removeNodeByKey(n.key))

packages/slate/test/schema/custom/node-mark-invalid-default.js

@@ -5,7 +5,7 @@ import h from '../../helpers/h'
 export const schema = {
   blocks: {
     paragraph: {
-      marks: ['bold'],
+      marks: [{ type: 'bold' }, { type: 'underline' }],
     }
   }
 }

packages/slate/test/schema/custom/node-mark-valid-default.js

@@ -0,0 +1,31 @@
+/** @jsx h */
+
+import h from '../../helpers/h'
+
+export const schema = {
+  blocks: {
+    paragraph: {
+      marks: [{ type: 'bold' }, { type: 'underline' }],
+    }
+  }
+}
+
+export const input = (
+  <value>
+    <document>
+      <paragraph>
+        one <b>two</b> three
+      </paragraph>
+    </document>
+  </value>
+)
+
+export const output = (
+  <value>
+    <document>
+      <paragraph>
+        one <b>two</b> three
+      </paragraph>
+    </document>
+  </value>
+)