@ckeditor/ckeditor5-engine 47.4.0 → 47.5.0-alpha.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-engine",
-  "version": "47.4.0",
+  "version": "47.5.0-alpha.1",
   "description": "The editing engine of CKEditor 5 – the best browser-based rich text editor.",
   "keywords": [
     "wysiwyg",
@@ -24,7 +24,7 @@
   "type": "module",
   "main": "src/index.js",
   "dependencies": {
-    "@ckeditor/ckeditor5-utils": "47.4.0",
+    "@ckeditor/ckeditor5-utils": "47.5.0-alpha.1",
     "es-toolkit": "1.39.5"
   },
   "author": "CKSource (http://cksource.com/)",
@@ -64,4 +64,4 @@
     "./theme/*": "./theme/*",
     "./package.json": "./package.json"
   }
-}
+}

package/src/model/schema.d.ts

@@ -492,9 +492,14 @@ export declare class ModelSchema extends /* #__PURE__ */ ModelSchema_base {
      *
      * @param ranges Ranges to be validated.
      * @param attribute The name of the attribute to check.
+     * @param options Optional configuration.
+     * @param options.includeEmptyRanges When `true`, empty ranges that allow the attribute are also included
+     * in the returned ranges.
      * @returns Ranges in which the attribute is allowed.
      */
-    getValidRanges(ranges: Iterable<ModelRange>, attribute: string): IterableIterator<ModelRange>;
+    getValidRanges(ranges: Iterable<ModelRange>, attribute: string, options?: {
+        includeEmptyRanges?: boolean;
+    }): IterableIterator<ModelRange>;
     /**
      * Basing on given `position`, finds and returns a {@link module:engine/model/range~ModelRange range} which is
      * nearest to that `position` and is a correct range for selection.

package/src/model/schema.js

@@ -722,12 +722,15 @@ export class ModelSchema extends /* #__PURE__ */ ObservableMixin() {
      *
      * @param ranges Ranges to be validated.
      * @param attribute The name of the attribute to check.
+     * @param options Optional configuration.
+     * @param options.includeEmptyRanges When `true`, empty ranges that allow the attribute are also included
+     * in the returned ranges.
      * @returns Ranges in which the attribute is allowed.
      */
-    *getValidRanges(ranges, attribute) {
+    *getValidRanges(ranges, attribute, options = {}) {
         ranges = convertToMinimalFlatRanges(ranges);
         for (const range of ranges) {
-            yield* this._getValidRangesForRange(range, attribute);
+            yield* this._getValidRangesForRange(range, attribute, options);
         }
     }
     /**
@@ -1004,12 +1007,22 @@ export class ModelSchema extends /* #__PURE__ */ ObservableMixin() {
      * @param attribute The name of the attribute to check.
      * @returns Ranges in which the attribute is allowed.
      */
-    *_getValidRangesForRange(range, attribute) {
+    *_getValidRangesForRange(range, attribute, options) {
         let start = range.start;
         let end = range.start;
         for (const item of range.getItems({ shallow: true })) {
             if (item.is('element')) {
-                yield* this._getValidRangesForRange(ModelRange._createIn(item), attribute);
+                if (options.includeEmptyRanges && item.isEmpty) {
+                    // In empty block check if it accepts text with the given attribute.
+                    const context = this.createContext(item);
+                    if (this.checkChild(context, '$text') &&
+                        this.checkAttribute(context.push('$text'), attribute)) {
+                        yield ModelRange._createIn(item);
+                    }
+                }
+                else {
+                    yield* this._getValidRangesForRange(ModelRange._createIn(item), attribute, options);
+                }
             }
             if (!this.checkAttribute(item, attribute)) {
                 if (!start.isEqual(end)) {