@ckeditor/ckeditor5-widget 39.0.2 → 40.1.0

package/LICENSE.md

@@ -2,7 +2,7 @@ Software License Agreement
 ==========================
 
 **CKEditor&nbsp;5 widget API** – https://github.com/ckeditor/ckeditor5-image <br>
-Copyright (c) 2003-2023, [CKSource Holding sp. z o.o.](https://cksource.com) All rights reserved.
+Copyright (c) 2003–2023, [CKSource Holding sp. z o.o.](https://cksource.com) All rights reserved.
 
 Licensed under the terms of [GNU General Public License Version 2 or later](http://www.gnu.org/licenses/gpl.html).
 
@@ -13,9 +13,9 @@ Where not otherwise indicated, all CKEditor content is authored by CKSource engi
 
 The following libraries are included in CKEditor under the [MIT license](https://opensource.org/licenses/MIT):
 
-* lodash - Copyright (c) JS Foundation and other contributors https://js.foundation/. Based on Underscore.js, copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors http://underscorejs.org/.
+* Lodash - Copyright (c) JS Foundation and other contributors https://js.foundation/. Based on Underscore.js, copyright Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors http://underscorejs.org/.
 
 Trademarks
 ----------
 
-**CKEditor** is a trademark of [CKSource Holding sp. z o.o.](https://cksource.com) All other brand and product names are trademarks, registered trademarks or service marks of their respective holders.
+**CKEditor** is a trademark of [CKSource Holding sp. z o.o.](https://cksource.com) All other brand and product names are trademarks, registered trademarks, or service marks of their respective holders.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-widget",
-  "version": "39.0.2",
+  "version": "40.1.0",
   "description": "Widget API for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -11,12 +11,12 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "@ckeditor/ckeditor5-core": "39.0.2",
-    "@ckeditor/ckeditor5-engine": "39.0.2",
-    "@ckeditor/ckeditor5-enter": "39.0.2",
-    "@ckeditor/ckeditor5-ui": "39.0.2",
-    "@ckeditor/ckeditor5-utils": "39.0.2",
-    "@ckeditor/ckeditor5-typing": "39.0.2",
+    "@ckeditor/ckeditor5-core": "40.1.0",
+    "@ckeditor/ckeditor5-engine": "40.1.0",
+    "@ckeditor/ckeditor5-enter": "40.1.0",
+    "@ckeditor/ckeditor5-ui": "40.1.0",
+    "@ckeditor/ckeditor5-utils": "40.1.0",
+    "@ckeditor/ckeditor5-typing": "40.1.0",
     "lodash-es": "4.17.21"
   },
   "author": "CKSource (http://cksource.com/)",

package/src/widget.d.ts

@@ -44,6 +44,10 @@ export default class Widget extends Plugin {
      * Handles {@link module:engine/view/document~Document#event:mousedown mousedown} events on widget elements.
      */
     private _onMousedown;
+    /**
+     * Selects entire block content, e.g. on triple click it selects entire paragraph.
+     */
+    private _selectBlockContent;
     /**
      * Handles {@link module:engine/view/document~Document#event:keydown keydown} events and changes
      * the model selection when:

package/src/widget.js

@@ -6,7 +6,7 @@
  * @module widget/widget
  */
 import { Plugin } from '@ckeditor/ckeditor5-core';
-import { MouseObserver } from '@ckeditor/ckeditor5-engine';
+import { MouseObserver, TreeWalker } from '@ckeditor/ckeditor5-engine';
 import { Delete } from '@ckeditor/ckeditor5-typing';
 import { env, getLocalizedArrowKeyCodeDirection } from '@ckeditor/ckeditor5-utils';
 import WidgetTypeAround from './widgettypearound/widgettypearound';
@@ -154,23 +154,17 @@ export default class Widget extends Plugin {
         const view = editor.editing.view;
         const viewDocument = view.document;
         let element = domEventData.target;
-        // Do nothing for single or double click inside nested editable.
-        if (isInsideNestedEditable(element)) {
-            // But at least triple click inside nested editable causes broken selection in Safari.
-            // For such event, we select the entire nested editable element.
-            // See: https://github.com/ckeditor/ckeditor5/issues/1463.
-            if ((env.isSafari || env.isGecko) && domEventData.domEvent.detail >= 3) {
-                const mapper = editor.editing.mapper;
-                const viewElement = element.is('attributeElement') ?
-                    element.findAncestor(element => !element.is('attributeElement')) : element;
-                const modelElement = mapper.toModelElement(viewElement);
+        // If triple click should select entire paragraph.
+        if (domEventData.domEvent.detail >= 3) {
+            if (this._selectBlockContent(element)) {
                 domEventData.preventDefault();
-                this.editor.model.change(writer => {
-                    writer.setSelection(modelElement, 'in');
-                });
             }
             return;
         }
+        // Do nothing for single or double click inside nested editable.
+        if (isInsideNestedEditable(element)) {
+            return;
+        }
         // If target is not a widget element - check if one of the ancestors is.
         if (!isWidget(element)) {
             element = element.findAncestor(isWidget);
@@ -191,6 +185,31 @@ export default class Widget extends Plugin {
         const modelElement = editor.editing.mapper.toModelElement(element);
         this._setSelectionOverElement(modelElement);
     }
+    /**
+     * Selects entire block content, e.g. on triple click it selects entire paragraph.
+     */
+    _selectBlockContent(element) {
+        const editor = this.editor;
+        const model = editor.model;
+        const mapper = editor.editing.mapper;
+        const schema = model.schema;
+        const viewElement = mapper.findMappedViewAncestor(this.editor.editing.view.createPositionAt(element, 0));
+        const modelElement = findTextBlockAncestor(mapper.toModelElement(viewElement), model.schema);
+        if (!modelElement) {
+            return false;
+        }
+        model.change(writer => {
+            const nextTextBlock = !schema.isLimit(modelElement) ?
+                findNextTextBlock(writer.createPositionAfter(modelElement), schema) :
+                null;
+            const start = writer.createPositionAt(modelElement, 0);
+            const end = nextTextBlock ?
+                writer.createPositionAt(nextTextBlock, 0) :
+                writer.createPositionAt(modelElement, 'end');
+            writer.setSelection(writer.createRange(start, end));
+        });
+        return true;
+    }
     /**
      * Handles {@link module:engine/view/document~Document#event:keydown keydown} events and changes
      * the model selection when:
@@ -378,3 +397,33 @@ function isChild(element, parent) {
     }
     return Array.from(element.getAncestors()).includes(parent);
 }
+/**
+ * Returns nearest text block ancestor.
+ */
+function findTextBlockAncestor(modelElement, schema) {
+    for (const element of modelElement.getAncestors({ includeSelf: true, parentFirst: true })) {
+        if (schema.checkChild(element, '$text')) {
+            return element;
+        }
+        // Do not go beyond nested editable.
+        if (schema.isLimit(element) && !schema.isObject(element)) {
+            break;
+        }
+    }
+    return null;
+}
+/**
+ * Returns next text block where could put selection.
+ */
+function findNextTextBlock(position, schema) {
+    const treeWalker = new TreeWalker({ startPosition: position });
+    for (const { item } of treeWalker) {
+        if (schema.isLimit(item) || !item.is('element')) {
+            return null;
+        }
+        if (schema.checkChild(item, '$text')) {
+            return item;
+        }
+    }
+    return null;
+}