@ckeditor/ckeditor5-html-support 35.0.1 → 35.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-html-support",
-  "version": "35.0.1",
+  "version": "35.2.0",
   "description": "HTML Support feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -16,39 +16,39 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "ckeditor5": "^35.0.1",
+    "ckeditor5": "^35.2.0",
     "lodash-es": "^4.17.15"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-alignment": "^35.0.1",
-    "@ckeditor/ckeditor5-basic-styles": "^35.0.1",
-    "@ckeditor/ckeditor5-block-quote": "^35.0.1",
-    "@ckeditor/ckeditor5-cloud-services": "^35.0.1",
-    "@ckeditor/ckeditor5-code-block": "^35.0.1",
-    "@ckeditor/ckeditor5-core": "^35.0.1",
-    "@ckeditor/ckeditor5-dev-utils": "^30.0.0",
-    "@ckeditor/ckeditor5-easy-image": "^35.0.1",
-    "@ckeditor/ckeditor5-editor-classic": "^35.0.1",
-    "@ckeditor/ckeditor5-engine": "^35.0.1",
-    "@ckeditor/ckeditor5-enter": "^35.0.1",
-    "@ckeditor/ckeditor5-essentials": "^35.0.1",
-    "@ckeditor/ckeditor5-font": "^35.0.1",
-    "@ckeditor/ckeditor5-heading": "^35.0.1",
-    "@ckeditor/ckeditor5-highlight": "^35.0.1",
-    "@ckeditor/ckeditor5-horizontal-line": "^35.0.1",
-    "@ckeditor/ckeditor5-html-embed": "^35.0.1",
-    "@ckeditor/ckeditor5-image": "^35.0.1",
-    "@ckeditor/ckeditor5-indent": "^35.0.1",
-    "@ckeditor/ckeditor5-link": "^35.0.1",
-    "@ckeditor/ckeditor5-list": "^35.0.1",
-    "@ckeditor/ckeditor5-media-embed": "^35.0.1",
-    "@ckeditor/ckeditor5-page-break": "^35.0.1",
-    "@ckeditor/ckeditor5-paragraph": "^35.0.1",
-    "@ckeditor/ckeditor5-paste-from-office": "^35.0.1",
-    "@ckeditor/ckeditor5-source-editing": "^35.0.1",
-    "@ckeditor/ckeditor5-table": "^35.0.1",
-    "@ckeditor/ckeditor5-theme-lark": "^35.0.1",
-    "@ckeditor/ckeditor5-utils": "^35.0.1",
+    "@ckeditor/ckeditor5-alignment": "^35.2.0",
+    "@ckeditor/ckeditor5-basic-styles": "^35.2.0",
+    "@ckeditor/ckeditor5-block-quote": "^35.2.0",
+    "@ckeditor/ckeditor5-cloud-services": "^35.2.0",
+    "@ckeditor/ckeditor5-code-block": "^35.2.0",
+    "@ckeditor/ckeditor5-core": "^35.2.0",
+    "@ckeditor/ckeditor5-dev-utils": "^31.0.0",
+    "@ckeditor/ckeditor5-easy-image": "^35.2.0",
+    "@ckeditor/ckeditor5-editor-classic": "^35.2.0",
+    "@ckeditor/ckeditor5-engine": "^35.2.0",
+    "@ckeditor/ckeditor5-enter": "^35.2.0",
+    "@ckeditor/ckeditor5-essentials": "^35.2.0",
+    "@ckeditor/ckeditor5-font": "^35.2.0",
+    "@ckeditor/ckeditor5-heading": "^35.2.0",
+    "@ckeditor/ckeditor5-highlight": "^35.2.0",
+    "@ckeditor/ckeditor5-horizontal-line": "^35.2.0",
+    "@ckeditor/ckeditor5-html-embed": "^35.2.0",
+    "@ckeditor/ckeditor5-image": "^35.2.0",
+    "@ckeditor/ckeditor5-indent": "^35.2.0",
+    "@ckeditor/ckeditor5-link": "^35.2.0",
+    "@ckeditor/ckeditor5-list": "^35.2.0",
+    "@ckeditor/ckeditor5-media-embed": "^35.2.0",
+    "@ckeditor/ckeditor5-page-break": "^35.2.0",
+    "@ckeditor/ckeditor5-paragraph": "^35.2.0",
+    "@ckeditor/ckeditor5-paste-from-office": "^35.2.0",
+    "@ckeditor/ckeditor5-source-editing": "^35.2.0",
+    "@ckeditor/ckeditor5-table": "^35.2.0",
+    "@ckeditor/ckeditor5-theme-lark": "^35.2.0",
+    "@ckeditor/ckeditor5-utils": "^35.2.0",
     "webpack": "^5.58.1",
     "webpack-cli": "^4.9.0"
   },

package/src/datafilter.js

@@ -102,6 +102,15 @@ export default class DataFilter extends Plugin {
 		*/
 		this._allowedElements = new Set();
 
+		/**
+		 * Disallowed element names by {@link module:html-support/datafilter~DataFilter#disallowElement} method.
+		 *
+		 * @readonly
+		 * @private
+		 * @member {Set.<String>} #_disallowedElements
+		 */
+		this._disallowedElements = new Set();
+
 		/**
 		 * Indicates if {@link module:engine/controller/datacontroller~DataController editor's data controller}
 		 * data has been already initialized.
@@ -142,21 +151,46 @@ export default class DataFilter extends Plugin {
 	/**
 	 * Load a configuration of one or many elements, where their attributes should be allowed.
 	 *
+	 * **Note**: Rules will be applied just before next data pipeline data init or set.
+	 *
 	 * @param {Array.<module:engine/view/matcher~MatcherPattern>} config Configuration of elements
 	 * that should have their attributes accepted in the editor.
 	 */
 	loadAllowedConfig( config ) {
-		this._loadConfig( config, pattern => this.allowAttributes( pattern ) );
+		for ( const pattern of config ) {
+			// MatcherPattern allows omitting `name` to widen the search of elements.
+			// Let's keep it consistent and match every element if a `name` has not been provided.
+			const elementName = pattern.name || /[\s\S]+/;
+			const rules = splitRules( pattern );
+
+			this.allowElement( elementName );
+
+			rules.forEach( pattern => this.allowAttributes( pattern ) );
+		}
 	}
 
 	/**
 	 * Load a configuration of one or many elements, where their attributes should be disallowed.
 	 *
+	 * **Note**: Rules will be applied just before next data pipeline data init or set.
+	 *
 	 * @param {Array.<module:engine/view/matcher~MatcherPattern>} config Configuration of elements
 	 * that should have their attributes rejected from the editor.
 	 */
 	loadDisallowedConfig( config ) {
-		this._loadConfig( config, pattern => this.disallowAttributes( pattern ) );
+		for ( const pattern of config ) {
+			// MatcherPattern allows omitting `name` to widen the search of elements.
+			// Let's keep it consistent and match every element if a `name` has not been provided.
+			const elementName = pattern.name || /[\s\S]+/;
+			const rules = splitRules( pattern );
+
+			// Disallow element itself if there is no other rules.
+			if ( rules.length == 0 ) {
+				this.disallowElement( elementName );
+			} else {
+				rules.forEach( pattern => this.disallowAttributes( pattern ) );
+			}
+		}
 	}
 
 	/**
@@ -165,6 +199,8 @@ export default class DataFilter extends Plugin {
 	 * This method will only allow elements described by the {@link module:html-support/dataschema~DataSchema} used
 	 * to create data filter.
 	 *
+	 * **Note**: Rules will be applied just before next data pipeline data init or set.
+	 *
 	 * @param {String|RegExp} viewName String or regular expression matching view name.
 	 */
 	allowElement( viewName ) {
@@ -180,7 +216,15 @@ export default class DataFilter extends Plugin {
 			// If the data has not been initialized yet, _registerElementsAfterInit() method will take care of
 			// registering elements.
 			if ( this._dataInitialized ) {
-				this._fireRegisterEvent( definition );
+				// Defer registration to the next data pipeline data set so any disallow rules could be applied
+				// even if added after allow rule (disallowElement).
+				this.editor.data.once( 'set', () => {
+					this._fireRegisterEvent( definition );
+				}, {
+					// With the highest priority listener we are able to register elements right before
+					// running data conversion.
+					priority: priorities.get( 'highest' ) + 1
+				} );
 			}
 
 			// Reset cached map to recalculate it on the next usage.
@@ -188,6 +232,20 @@ export default class DataFilter extends Plugin {
 		}
 	}
 
+	/**
+	 * Disallow the given element in the editor context.
+	 *
+	 * This method will only disallow elements described by the {@link module:html-support/dataschema~DataSchema} used
+	 * to create data filter.
+	 *
+	 * @param {String|RegExp} viewName String or regular expression matching view name.
+	 */
+	disallowElement( viewName ) {
+		for ( const definition of this._dataSchema.getDefinitionsForView( viewName, false ) ) {
+			this._disallowedElements.add( definition.view );
+		}
+	}
+
 	/**
 	 * Allow the given attributes for view element allowed by {@link #allowElement} method.
 	 *
@@ -206,25 +264,6 @@ export default class DataFilter extends Plugin {
 		this._disallowedAttributes.add( config );
 	}
 
-	/**
-	 * Batch load of the filtering configuration.
-	 *
-	 * @private
-	 * @param {Array.<module:engine/view/matcher~MatcherPattern>} config Filtering configuration.
-	 * @param {Function} handleAttributes Callback handling the way the attributes should be processed.
-	 */
-	_loadConfig( config, handleAttributes ) {
-		for ( const pattern of config ) {
-			// MatcherPattern allows omitting `name` to widen the search of elements.
-			// Let's keep it consistent and match every element if a `name` has not been provided.
-			const elementName = pattern.name || /[\s\S]+/;
-
-			this.allowElement( elementName );
-
-			splitRules( pattern ).forEach( handleAttributes );
-		}
-	}
-
 	/**
 	 * Processes all allowed and disallowed attributes on the view element by consuming them and returning the allowed ones.
 	 *
@@ -411,6 +450,10 @@ export default class DataFilter extends Plugin {
 	 * @param {module:html-support/dataschema~DataSchemaDefinition} definition
 	 */
 	_fireRegisterEvent( definition ) {
+		if ( definition.view && this._disallowedElements.has( definition.view ) ) {
+			return;
+		}
+
 		this.fire( definition.view ? `register:${ definition.view }` : 'register', definition );
 	}
 

package/src/schemadefinitions.js

@@ -135,7 +135,7 @@ export default {
 			view: 'tbody',
 			modelSchema: {
 				allowIn: 'htmlTable',
-				isBlock: true
+				isBlock: false
 			}
 		},
 		{
@@ -143,7 +143,7 @@ export default {
 			view: 'thead',
 			modelSchema: {
 				allowIn: 'htmlTable',
-				isBlock: true
+				isBlock: false
 			}
 		},
 		{
@@ -151,7 +151,7 @@ export default {
 			view: 'tfoot',
 			modelSchema: {
 				allowIn: 'htmlTable',
-				isBlock: true
+				isBlock: false
 			}
 		},
 		{
@@ -160,14 +160,32 @@ export default {
 			modelSchema: {
 				allowIn: 'htmlTable',
 				allowChildren: '$text',
-				isBlock: true
+				isBlock: false
+			}
+		},
+		{
+			model: 'htmlColgroup',
+			view: 'colgroup',
+			modelSchema: {
+				allowIn: 'htmlTable',
+				allowChildren: 'col',
+				isBlock: false
+			}
+		},
+		{
+			model: 'htmlCol',
+			view: 'col',
+			modelSchema: {
+				allowIn: 'htmlColgroup',
+				isBlock: false
 			}
 		},
 		{
 			model: 'htmlTr',
 			view: 'tr',
 			modelSchema: {
-				allowIn: [ 'htmlTable', 'htmlThead', 'htmlTbody' ]
+				allowIn: [ 'htmlTable', 'htmlThead', 'htmlTbody' ],
+				isLimit: true
 			}
 		},
 		// TODO can also include text.
@@ -176,7 +194,9 @@ export default {
 			view: 'td',
 			modelSchema: {
 				allowIn: 'htmlTr',
-				allowContentOf: '$container'
+				allowContentOf: '$container',
+				isLimit: true,
+				isBlock: false
 			}
 		},
 		// TODO can also include text.
@@ -185,7 +205,9 @@ export default {
 			view: 'th',
 			modelSchema: {
 				allowIn: 'htmlTr',
-				allowContentOf: '$container'
+				allowContentOf: '$container',
+				isLimit: true,
+				isBlock: false
 			}
 		},
 		// TODO can also include text.
@@ -194,7 +216,7 @@ export default {
 			view: 'figure',
 			modelSchema: {
 				inheritAllFrom: '$container',
-				isBlock: true
+				isBlock: false
 			}
 		},
 		// TODO can also include other block elements.
@@ -204,7 +226,7 @@ export default {
 			modelSchema: {
 				allowIn: 'htmlFigure',
 				allowChildren: '$text',
-				isBlock: true
+				isBlock: false
 			}
 		},
 		// TODO can also include text.
@@ -213,7 +235,7 @@ export default {
 			view: 'address',
 			modelSchema: {
 				inheritAllFrom: '$container',
-				isBlock: true
+				isBlock: false
 			}
 		},
 		// TODO can also include text.
@@ -222,7 +244,7 @@ export default {
 			view: 'aside',
 			modelSchema: {
 				inheritAllFrom: '$container',
-				isBlock: true
+				isBlock: false
 			}
 		},
 		// TODO can also include text.
@@ -231,7 +253,7 @@ export default {
 			view: 'main',
 			modelSchema: {
 				inheritAllFrom: '$container',
-				isBlock: true
+				isBlock: false
 			}
 		},
 		// TODO can also include text.
@@ -240,7 +262,7 @@ export default {
 			view: 'details',
 			modelSchema: {
 				inheritAllFrom: '$container',
-				isBlock: true
+				isBlock: false
 			}
 		},
 		{
@@ -249,7 +271,7 @@ export default {
 			modelSchema: {
 				allowChildren: '$text',
 				allowIn: 'htmlDetails',
-				isBlock: true
+				isBlock: false
 			}
 		},
 		{
@@ -266,7 +288,7 @@ export default {
 			view: 'fieldset',
 			modelSchema: {
 				inheritAllFrom: '$container',
-				isBlock: true
+				isBlock: false
 			}
 		},
 		// TODO can also include h1-h6.
@@ -284,7 +306,7 @@ export default {
 			view: 'header',
 			modelSchema: {
 				inheritAllFrom: '$container',
-				isBlock: true
+				isBlock: false
 			}
 		},
 		// TODO can also include text.
@@ -293,7 +315,7 @@ export default {
 			view: 'footer',
 			modelSchema: {
 				inheritAllFrom: '$container',
-				isBlock: true
+				isBlock: false
 			}
 		},
 		// TODO can also include text.
@@ -317,7 +339,7 @@ export default {
 					'htmlH5',
 					'htmlH6'
 				],
-				isBlock: true
+				isBlock: false
 			}
 		},
 		{
@@ -367,7 +389,7 @@ export default {
 			modelSchema: {
 				allowWhere: '$container',
 				allowChildren: [ '$htmlList', 'htmlLi' ],
-				isBlock: true
+				isBlock: false
 			}
 		},
 		{
@@ -405,7 +427,7 @@ export default {
 			modelSchema: {
 				allowIn: '$htmlList',
 				allowChildren: '$text',
-				isBlock: true
+				isBlock: false
 			}
 		},
 		{
@@ -420,7 +442,7 @@ export default {
 			view: 'article',
 			modelSchema: {
 				inheritAllFrom: '$container',
-				isBlock: true
+				isBlock: false
 			}
 		},
 		{
@@ -428,7 +450,7 @@ export default {
 			view: 'section',
 			modelSchema: {
 				inheritAllFrom: '$container',
-				isBlock: true
+				isBlock: false
 			}
 		},
 		// TODO can also include text.
@@ -437,7 +459,7 @@ export default {
 			view: 'nav',
 			modelSchema: {
 				inheritAllFrom: '$container',
-				isBlock: true
+				isBlock: false
 			}
 		},
 		{
@@ -446,7 +468,7 @@ export default {
 			modelSchema: {
 				allowWhere: '$container',
 				allowChildren: [ 'htmlDt', 'htmlDd' ],
-				isBlock: true
+				isBlock: false
 			}
 		},
 		{
@@ -454,7 +476,7 @@ export default {
 			view: 'dt',
 			modelSchema: {
 				allowChildren: '$block',
-				isBlock: true
+				isBlock: false
 			}
 		},
 		{
@@ -462,7 +484,7 @@ export default {
 			view: 'dd',
 			modelSchema: {
 				allowChildren: '$block',
-				isBlock: true
+				isBlock: false
 			}
 		},
 		{
@@ -470,7 +492,7 @@ export default {
 			view: 'center',
 			modelSchema: {
 				inheritAllFrom: '$container',
-				isBlock: true
+				isBlock: false
 			}
 		}
 	],