@ckeditor/ckeditor5-bookmark 45.0.0-alpha.1 → 45.0.0-alpha.10

package/lang/translations/zh.po

@@ -49,16 +49,16 @@ msgstr "書籤小工具"
 
 msgctxt "The label used by assistive technologies describing an bookmark toolbar attached to a bookmark widget."
 msgid "Bookmark toolbar"
-msgstr ""
+msgstr "書籤工具列"
 
 msgctxt "Title for a feature displaying a list of bookmarks."
 msgid "Bookmarks"
-msgstr ""
+msgstr "書籤"
 
 msgctxt "A message displayed instead of a list of bookmarks if it is empty."
 msgid "No bookmarks available."
-msgstr ""
+msgstr "無可用書籤。"
 
 msgctxt "Tooltip shown after hovering the bookmark link preview."
 msgid "Scroll to bookmark"
-msgstr ""
+msgstr "捲動至書籤"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-bookmark",
-  "version": "45.0.0-alpha.1",
+  "version": "45.0.0-alpha.10",
   "description": "Bookmark feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -13,13 +13,13 @@
   "type": "module",
   "main": "src/index.js",
   "dependencies": {
-    "ckeditor5": "45.0.0-alpha.1",
-    "@ckeditor/ckeditor5-core": "45.0.0-alpha.1",
-    "@ckeditor/ckeditor5-icons": "45.0.0-alpha.1",
-    "@ckeditor/ckeditor5-widget": "45.0.0-alpha.1",
-    "@ckeditor/ckeditor5-utils": "45.0.0-alpha.1",
-    "@ckeditor/ckeditor5-ui": "45.0.0-alpha.1",
-    "@ckeditor/ckeditor5-link": "45.0.0-alpha.1"
+    "ckeditor5": "45.0.0-alpha.10",
+    "@ckeditor/ckeditor5-core": "45.0.0-alpha.10",
+    "@ckeditor/ckeditor5-icons": "45.0.0-alpha.10",
+    "@ckeditor/ckeditor5-widget": "45.0.0-alpha.10",
+    "@ckeditor/ckeditor5-utils": "45.0.0-alpha.10",
+    "@ckeditor/ckeditor5-ui": "45.0.0-alpha.10",
+    "@ckeditor/ckeditor5-link": "45.0.0-alpha.10"
   },
   "author": "CKSource (http://cksource.com/)",
   "license": "SEE LICENSE IN LICENSE.md",

package/src/bookmarkui.js

@@ -87,7 +87,7 @@ export default class BookmarkUI extends Plugin {
             ariaLabel: t('Bookmark toolbar'),
             items: editor.config.get('bookmark.toolbar'),
             getRelatedElement: getSelectedBookmarkWidget,
-            balloonClassName: 'ck-bookmark-balloon',
+            balloonClassName: 'ck-bookmark-balloon ck-toolbar-container',
             // Override positions to the same list as for balloon panel default
             // so widget toolbar will try to use same position as form view.
             positions: [
@@ -293,7 +293,10 @@ export default class BookmarkUI extends Plugin {
             icon: IconBookmark
         });
         // Execute the command.
-        this.listenTo(view, 'execute', () => this._showFormView());
+        this.listenTo(view, 'execute', () => {
+            editor.editing.view.scrollToTheSelection();
+            this._showFormView();
+        });
         view.bind('isEnabled').toMany([insertCommand, updateCommand], 'isEnabled', (...areEnabled) => areEnabled.some(isEnabled => isEnabled));
         view.bind('isOn').to(updateCommand, 'value', value => !!value);
         return view;
@@ -315,7 +318,13 @@ export default class BookmarkUI extends Plugin {
             emitter: this.formView,
             activator: () => this._isFormInPanel,
             contextElements: () => [this._balloon.view.element],
-            callback: () => this._hideFormView()
+            callback: () => {
+                // Focusing on the editable during a click outside the balloon panel might
+                // cause the selection to move to the beginning of the editable, so we avoid
+                // focusing on it during this action.
+                // See: https://github.com/ckeditor/ckeditor5/issues/18253
+                this._hideFormView(false);
+            }
         });
     }
     /**
@@ -346,7 +355,7 @@ export default class BookmarkUI extends Plugin {
     /**
      * Removes the {@link #formView} from the {@link #_balloon}.
      */
-    _removeFormView() {
+    _removeFormView(updateFocus = true) {
         // Blur the input element before removing it from DOM to prevent issues in some browsers.
         // See https://github.com/ckeditor/ckeditor5/issues/1501.
         this.formView.saveButtonView.focus();
@@ -355,7 +364,9 @@ export default class BookmarkUI extends Plugin {
         this._balloon.remove(this.formView);
         // Because the form has an input which has focus, the focus must be brought back
         // to the editor. Otherwise, it would be lost.
-        this.editor.editing.view.focus();
+        if (updateFocus) {
+            this.editor.editing.view.focus();
+        }
         this._hideFakeVisualSelection();
     }
     /**
@@ -377,7 +388,7 @@ export default class BookmarkUI extends Plugin {
     /**
      * Removes the {@link #formView} from the {@link #_balloon}.
      */
-    _hideFormView() {
+    _hideFormView(updateFocus = true) {
         if (!this._isFormInPanel) {
             return;
         }
@@ -386,9 +397,11 @@ export default class BookmarkUI extends Plugin {
         this.stopListening(this._balloon, 'change:visibleView');
         // Make sure the focus always gets back to the editable _before_ removing the focused form view.
         // Doing otherwise causes issues in some browsers. See https://github.com/ckeditor/ckeditor5-link/issues/193.
-        editor.editing.view.focus();
+        if (updateFocus) {
+            editor.editing.view.focus();
+        }
         // Remove form first because it's on top of the stack.
-        this._removeFormView();
+        this._removeFormView(updateFocus);
         this._hideFakeVisualSelection();
     }
     /**