@ckeditor/ckeditor5-block-quote 35.4.0 → 36.0.0

package/LICENSE.md

@@ -2,7 +2,7 @@ Software License Agreement
 ==========================
 
 **CKEditor 5 block quote feature** – https://github.com/ckeditor/ckeditor5-block-quote <br>
-Copyright (c) 2003-2022, [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).
 

package/build/block-quote.js

@@ -1,5 +1,5 @@
 !function(e){const t=e.en=e.en||{};t.dictionary=Object.assign(t.dictionary||{},{"Block quote":"Block quote"})}(window.CKEDITOR_TRANSLATIONS||(window.CKEDITOR_TRANSLATIONS={})),
 /*!
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md.
  */(()=>{var e={446:(e,t,o)=>{"use strict";o.d(t,{Z:()=>i});var n=o(609),r=o.n(n)()((function(e){return e[1]}));r.push([e.id,".ck-content blockquote{border-left:5px solid #ccc;font-style:italic;margin-left:0;margin-right:0;overflow:hidden;padding-left:1.5em;padding-right:1.5em}.ck-content[dir=rtl] blockquote{border-left:0;border-right:5px solid #ccc}",""]);const i=r},609:e=>{"use strict";e.exports=function(e){var t=[];return t.toString=function(){return this.map((function(t){var o=e(t);return t[2]?"@media ".concat(t[2]," {").concat(o,"}"):o})).join("")},t.i=function(e,o,n){"string"==typeof e&&(e=[[null,e,""]]);var r={};if(n)for(var i=0;i<this.length;i++){var c=this[i][0];null!=c&&(r[c]=!0)}for(var s=0;s<e.length;s++){var l=[].concat(e[s]);n&&r[l[0]]||(o&&(l[2]?l[2]="".concat(o," and ").concat(l[2]):l[2]=o),t.push(l))}},t}},62:(e,t,o)=>{"use strict";var n,r=function(){return void 0===n&&(n=Boolean(window&&document&&document.all&&!window.atob)),n},i=function(){var e={};return function(t){if(void 0===e[t]){var o=document.querySelector(t);if(window.HTMLIFrameElement&&o instanceof window.HTMLIFrameElement)try{o=o.contentDocument.head}catch(e){o=null}e[t]=o}return e[t]}}(),c=[];function s(e){for(var t=-1,o=0;o<c.length;o++)if(c[o].identifier===e){t=o;break}return t}function l(e,t){for(var o={},n=[],r=0;r<e.length;r++){var i=e[r],l=t.base?i[0]+t.base:i[0],a=o[l]||0,u="".concat(l," ").concat(a);o[l]=a+1;var d=s(u),f={css:i[1],media:i[2],sourceMap:i[3]};-1!==d?(c[d].references++,c[d].updater(f)):c.push({identifier:u,updater:v(f,t),references:1}),n.push(u)}return n}function a(e){var t=document.createElement("style"),n=e.attributes||{};if(void 0===n.nonce){var r=o.nc;r&&(n.nonce=r)}if(Object.keys(n).forEach((function(e){t.setAttribute(e,n[e])})),"function"==typeof e.insert)e.insert(t);else{var c=i(e.insert||"head");if(!c)throw new Error("Couldn't find a style target. This probably means that the value for the 'insert' parameter is invalid.");c.appendChild(t)}return t}var u,d=(u=[],function(e,t){return u[e]=t,u.filter(Boolean).join("\n")});function f(e,t,o,n){var r=o?"":n.media?"@media ".concat(n.media," {").concat(n.css,"}"):n.css;if(e.styleSheet)e.styleSheet.cssText=d(t,r);else{var i=document.createTextNode(r),c=e.childNodes;c[t]&&e.removeChild(c[t]),c.length?e.insertBefore(i,c[t]):e.appendChild(i)}}function p(e,t,o){var n=o.css,r=o.media,i=o.sourceMap;if(r?e.setAttribute("media",r):e.removeAttribute("media"),i&&"undefined"!=typeof btoa&&(n+="\n/*# sourceMappingURL=data:application/json;base64,".concat(btoa(unescape(encodeURIComponent(JSON.stringify(i))))," */")),e.styleSheet)e.styleSheet.cssText=n;else{for(;e.firstChild;)e.removeChild(e.firstChild);e.appendChild(document.createTextNode(n))}}var m=null,h=0;function v(e,t){var o,n,r;if(t.singleton){var i=h++;o=m||(m=a(t)),n=f.bind(null,o,i,!1),r=f.bind(null,o,i,!0)}else o=a(t),n=p.bind(null,o,t),r=function(){!function(e){if(null===e.parentNode)return!1;e.parentNode.removeChild(e)}(o)};return n(e),function(t){if(t){if(t.css===e.css&&t.media===e.media&&t.sourceMap===e.sourceMap)return;n(e=t)}else r()}}e.exports=function(e,t){(t=t||{}).singleton||"boolean"==typeof t.singleton||(t.singleton=r());var o=l(e=e||[],t);return function(e){if(e=e||[],"[object Array]"===Object.prototype.toString.call(e)){for(var n=0;n<o.length;n++){var r=s(o[n]);c[r].references--}for(var i=l(e,t),a=0;a<o.length;a++){var u=s(o[a]);0===c[u].references&&(c[u].updater(),c.splice(u,1))}o=i}}}},704:(e,t,o)=>{e.exports=o(79)("./src/core.js")},331:(e,t,o)=>{e.exports=o(79)("./src/enter.js")},181:(e,t,o)=>{e.exports=o(79)("./src/typing.js")},273:(e,t,o)=>{e.exports=o(79)("./src/ui.js")},209:(e,t,o)=>{e.exports=o(79)("./src/utils.js")},79:e=>{"use strict";e.exports=CKEditor5.dll}},t={};function o(n){var r=t[n];if(void 0!==r)return r.exports;var i=t[n]={id:n,exports:{}};return e[n](i,i.exports,o),i.exports}o.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return o.d(t,{a:t}),t},o.d=(e,t)=>{for(var n in t)o.o(t,n)&&!o.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:t[n]})},o.o=(e,t)=>Object.prototype.hasOwnProperty.call(e,t),o.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.nc=void 0;var n={};(()=>{"use strict";o.r(n),o.d(n,{BlockQuote:()=>g,BlockQuoteEditing:()=>u,BlockQuoteUI:()=>v});var e=o(704),t=o(331),r=o(181),i=o(209);class c extends e.Command{refresh(){this.value=this._getValue(),this.isEnabled=this._checkEnabled()}execute(e={}){const t=this.editor.model,o=t.schema,n=t.document.selection,r=Array.from(n.getSelectedBlocks()),i=void 0===e.forceValue?!this.value:e.forceValue;t.change((e=>{if(i){const t=r.filter((e=>s(e)||a(o,e)));this._applyQuote(e,t)}else this._removeQuote(e,r.filter(s))}))}_getValue(){const e=this.editor.model.document.selection,t=(0,i.first)(e.getSelectedBlocks());return!(!t||!s(t))}_checkEnabled(){if(this.value)return!0;const e=this.editor.model.document.selection,t=this.editor.model.schema,o=(0,i.first)(e.getSelectedBlocks());return!!o&&a(t,o)}_removeQuote(e,t){l(e,t).reverse().forEach((t=>{if(t.start.isAtStart&&t.end.isAtEnd)return void e.unwrap(t.start.parent);if(t.start.isAtStart){const o=e.createPositionBefore(t.start.parent);return void e.move(t,o)}t.end.isAtEnd||e.split(t.end);const o=e.createPositionAfter(t.end.parent);e.move(t,o)}))}_applyQuote(e,t){const o=[];l(e,t).reverse().forEach((t=>{let n=s(t.start);n||(n=e.createElement("blockQuote"),e.wrap(t,n)),o.push(n)})),o.reverse().reduce(((t,o)=>t.nextSibling==o?(e.merge(e.createPositionAfter(t)),t):o))}}function s(e){return"blockQuote"==e.parent.name?e.parent:null}function l(e,t){let o,n=0;const r=[];for(;n<t.length;){const i=t[n],c=t[n+1];o||(o=e.createPositionBefore(i)),c&&i.nextSibling==c||(r.push(e.createRange(o,e.createPositionAfter(i))),o=null),n++}return r}function a(e,t){const o=e.checkChild(t.parent,"blockQuote"),n=e.checkChild(["$root","blockQuote"],t);return o&&n}class u extends e.Plugin{static get pluginName(){return"BlockQuoteEditing"}static get requires(){return[t.Enter,r.Delete]}init(){const e=this.editor,t=e.model.schema;e.commands.add("blockQuote",new c(e)),t.register("blockQuote",{inheritAllFrom:"$container"}),e.conversion.elementToElement({model:"blockQuote",view:"blockquote"}),e.model.document.registerPostFixer((o=>{const n=e.model.document.differ.getChanges();for(const e of n)if("insert"==e.type){const n=e.position.nodeAfter;if(!n)continue;if(n.is("element","blockQuote")&&n.isEmpty)return o.remove(n),!0;if(n.is("element","blockQuote")&&!t.checkChild(e.position,n))return o.unwrap(n),!0;if(n.is("element")){const e=o.createRangeIn(n);for(const n of e.getItems())if(n.is("element","blockQuote")&&!t.checkChild(o.createPositionBefore(n),n))return o.unwrap(n),!0}}else if("remove"==e.type){const t=e.position.parent;if(t.is("element","blockQuote")&&t.isEmpty)return o.remove(t),!0}return!1}));const o=this.editor.editing.view.document,n=e.model.document.selection,r=e.commands.get("blockQuote");this.listenTo(o,"enter",((t,o)=>{if(!n.isCollapsed||!r.value)return;n.getLastPosition().parent.isEmpty&&(e.execute("blockQuote"),e.editing.view.scrollToTheSelection(),o.preventDefault(),t.stop())}),{context:"blockquote"}),this.listenTo(o,"delete",((t,o)=>{if("backward"!=o.direction||!n.isCollapsed||!r.value)return;const i=n.getLastPosition().parent;i.isEmpty&&!i.previousSibling&&(e.execute("blockQuote"),e.editing.view.scrollToTheSelection(),o.preventDefault(),t.stop())}),{context:"blockquote"})}}var d=o(273),f=o(62),p=o.n(f),m=o(446),h={injectType:"singletonStyleTag",attributes:{"data-cke":!0},insert:"head",singleton:!0};p()(m.Z,h);m.Z.locals;class v extends e.Plugin{static get pluginName(){return"BlockQuoteUI"}init(){const t=this.editor,o=t.t;t.ui.componentFactory.add("blockQuote",(n=>{const r=t.commands.get("blockQuote"),i=new d.ButtonView(n);return i.set({label:o("Block quote"),icon:e.icons.quote,tooltip:!0,isToggleable:!0}),i.bind("isOn","isEnabled").to(r,"value","isEnabled"),this.listenTo(i,"execute",(()=>{t.execute("blockQuote"),t.editing.view.focus()})),i}))}}class g extends e.Plugin{static get requires(){return[u,v]}static get pluginName(){return"BlockQuote"}}})(),(window.CKEditor5=window.CKEditor5||{}).blockQuote=n})();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ckeditor/ckeditor5-block-quote",
-  "version": "35.4.0",
+  "version": "36.0.0",
   "description": "Block quote feature for CKEditor 5.",
   "keywords": [
     "ckeditor",
@@ -12,22 +12,23 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "ckeditor5": "^35.4.0"
+    "ckeditor5": "^36.0.0"
   },
   "devDependencies": {
-    "@ckeditor/ckeditor5-basic-styles": "^35.4.0",
-    "@ckeditor/ckeditor5-core": "^35.4.0",
-    "@ckeditor/ckeditor5-dev-utils": "^31.0.0",
-    "@ckeditor/ckeditor5-editor-classic": "^35.4.0",
-    "@ckeditor/ckeditor5-engine": "^35.4.0",
-    "@ckeditor/ckeditor5-enter": "^35.4.0",
-    "@ckeditor/ckeditor5-heading": "^35.4.0",
-    "@ckeditor/ckeditor5-image": "^35.4.0",
-    "@ckeditor/ckeditor5-list": "^35.4.0",
-    "@ckeditor/ckeditor5-paragraph": "^35.4.0",
-    "@ckeditor/ckeditor5-table": "^35.4.0",
-    "@ckeditor/ckeditor5-theme-lark": "^35.4.0",
-    "@ckeditor/ckeditor5-typing": "^35.4.0",
+    "@ckeditor/ckeditor5-basic-styles": "^36.0.0",
+    "@ckeditor/ckeditor5-core": "^36.0.0",
+    "@ckeditor/ckeditor5-dev-utils": "^32.0.0",
+    "@ckeditor/ckeditor5-editor-classic": "^36.0.0",
+    "@ckeditor/ckeditor5-engine": "^36.0.0",
+    "@ckeditor/ckeditor5-enter": "^36.0.0",
+    "@ckeditor/ckeditor5-heading": "^36.0.0",
+    "@ckeditor/ckeditor5-image": "^36.0.0",
+    "@ckeditor/ckeditor5-list": "^36.0.0",
+    "@ckeditor/ckeditor5-paragraph": "^36.0.0",
+    "@ckeditor/ckeditor5-table": "^36.0.0",
+    "@ckeditor/ckeditor5-theme-lark": "^36.0.0",
+    "@ckeditor/ckeditor5-typing": "^36.0.0",
+    "typescript": "^4.8.4",
     "webpack": "^5.58.1",
     "webpack-cli": "^4.9.0"
   },
@@ -46,13 +47,16 @@
   },
   "files": [
     "lang",
-    "src",
+    "src/**/*.js",
+    "src/**/*.d.ts",
     "theme",
     "build",
     "ckeditor5-metadata.json",
     "CHANGELOG.md"
   ],
   "scripts": {
-    "dll:build": "webpack"
+    "dll:build": "webpack",
+    "build": "tsc -p ./tsconfig.release.json",
+    "postversion": "npm run build"
   }
 }

package/src/blockquote.js

@@ -1,17 +1,13 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
-
 /**
  * @module block-quote/blockquote
  */
-
 import { Plugin } from 'ckeditor5/src/core';
-
 import BlockQuoteEditing from './blockquoteediting';
 import BlockQuoteUI from './blockquoteui';
-
 /**
  * The block quote plugin.
  *
@@ -23,17 +19,16 @@ import BlockQuoteUI from './blockquoteui';
  * @extends module:core/plugin~Plugin
  */
 export default class BlockQuote extends Plugin {
-	/**
-	 * @inheritDoc
-	 */
-	static get requires() {
-		return [ BlockQuoteEditing, BlockQuoteUI ];
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	static get pluginName() {
-		return 'BlockQuote';
-	}
+    /**
+     * @inheritDoc
+     */
+    static get requires() {
+        return [BlockQuoteEditing, BlockQuoteUI];
+    }
+    /**
+     * @inheritDoc
+     */
+    static get pluginName() {
+        return 'BlockQuote';
+    }
 }

package/src/blockquotecommand.js

@@ -1,232 +1,172 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
-
 /**
  * @module block-quote/blockquotecommand
  */
-
 import { Command } from 'ckeditor5/src/core';
 import { first } from 'ckeditor5/src/utils';
-
 /**
  * The block quote command plugin.
  *
  * @extends module:core/command~Command
  */
 export default class BlockQuoteCommand extends Command {
-	/**
-	 * Whether the selection starts in a block quote.
-	 *
-	 * @observable
-	 * @readonly
-	 * @member {Boolean} #value
-	 */
-
-	/**
-	 * @inheritDoc
-	 */
-	refresh() {
-		this.value = this._getValue();
-		this.isEnabled = this._checkEnabled();
-	}
-
-	/**
-	 * Executes the command. When the command {@link #value is on}, all top-most block quotes within
-	 * the selection will be removed. If it is off, all selected blocks will be wrapped with
-	 * a block quote.
-	 *
-	 * @fires execute
-	 * @param {Object} [options] Command options.
-	 * @param {Boolean} [options.forceValue] If set, it will force the command behavior. If `true`, the command will apply a block quote,
-	 * otherwise the command will remove the block quote. If not set, the command will act basing on its current value.
-	 */
-	execute( options = {} ) {
-		const model = this.editor.model;
-		const schema = model.schema;
-		const selection = model.document.selection;
-
-		const blocks = Array.from( selection.getSelectedBlocks() );
-
-		const value = ( options.forceValue === undefined ) ? !this.value : options.forceValue;
-
-		model.change( writer => {
-			if ( !value ) {
-				this._removeQuote( writer, blocks.filter( findQuote ) );
-			} else {
-				const blocksToQuote = blocks.filter( block => {
-					// Already quoted blocks needs to be considered while quoting too
-					// in order to reuse their <bQ> elements.
-					return findQuote( block ) || checkCanBeQuoted( schema, block );
-				} );
-
-				this._applyQuote( writer, blocksToQuote );
-			}
-		} );
-	}
-
-	/**
-	 * Checks the command's {@link #value}.
-	 *
-	 * @private
-	 * @returns {Boolean} The current value.
-	 */
-	_getValue() {
-		const selection = this.editor.model.document.selection;
-
-		const firstBlock = first( selection.getSelectedBlocks() );
-
-		// In the current implementation, the block quote must be an immediate parent of a block element.
-		return !!( firstBlock && findQuote( firstBlock ) );
-	}
-
-	/**
-	 * Checks whether the command can be enabled in the current context.
-	 *
-	 * @private
-	 * @returns {Boolean} Whether the command should be enabled.
-	 */
-	_checkEnabled() {
-		if ( this.value ) {
-			return true;
-		}
-
-		const selection = this.editor.model.document.selection;
-		const schema = this.editor.model.schema;
-
-		const firstBlock = first( selection.getSelectedBlocks() );
-
-		if ( !firstBlock ) {
-			return false;
-		}
-
-		return checkCanBeQuoted( schema, firstBlock );
-	}
-
-	/**
-	 * Removes the quote from given blocks.
-	 *
-	 * If blocks which are supposed to be "unquoted" are in the middle of a quote,
-	 * start it or end it, then the quote will be split (if needed) and the blocks
-	 * will be moved out of it, so other quoted blocks remained quoted.
-	 *
-	 * @private
-	 * @param {module:engine/model/writer~Writer} writer
-	 * @param {Array.<module:engine/model/element~Element>} blocks
-	 */
-	_removeQuote( writer, blocks ) {
-		// Unquote all groups of block. Iterate in the reverse order to not break following ranges.
-		getRangesOfBlockGroups( writer, blocks ).reverse().forEach( groupRange => {
-			if ( groupRange.start.isAtStart && groupRange.end.isAtEnd ) {
-				writer.unwrap( groupRange.start.parent );
-
-				return;
-			}
-
-			// The group of blocks are at the beginning of an <bQ> so let's move them left (out of the <bQ>).
-			if ( groupRange.start.isAtStart ) {
-				const positionBefore = writer.createPositionBefore( groupRange.start.parent );
-
-				writer.move( groupRange, positionBefore );
-
-				return;
-			}
-
-			// The blocks are in the middle of an <bQ> so we need to split the <bQ> after the last block
-			// so we move the items there.
-			if ( !groupRange.end.isAtEnd ) {
-				writer.split( groupRange.end );
-			}
-
-			// Now we are sure that groupRange.end.isAtEnd is true, so let's move the blocks right.
-
-			const positionAfter = writer.createPositionAfter( groupRange.end.parent );
-
-			writer.move( groupRange, positionAfter );
-		} );
-	}
-
-	/**
-	 * Applies the quote to given blocks.
-	 *
-	 * @private
-	 * @param {module:engine/model/writer~Writer} writer
-	 * @param {Array.<module:engine/model/element~Element>} blocks
-	 */
-	_applyQuote( writer, blocks ) {
-		const quotesToMerge = [];
-
-		// Quote all groups of block. Iterate in the reverse order to not break following ranges.
-		getRangesOfBlockGroups( writer, blocks ).reverse().forEach( groupRange => {
-			let quote = findQuote( groupRange.start );
-
-			if ( !quote ) {
-				quote = writer.createElement( 'blockQuote' );
-
-				writer.wrap( groupRange, quote );
-			}
-
-			quotesToMerge.push( quote );
-		} );
-
-		// Merge subsequent <bQ> elements. Reverse the order again because this time we want to go through
-		// the <bQ> elements in the source order (due to how merge works – it moves the right element's content
-		// to the first element and removes the right one. Since we may need to merge a couple of subsequent `<bQ>` elements
-		// we want to keep the reference to the first (furthest left) one.
-		quotesToMerge.reverse().reduce( ( currentQuote, nextQuote ) => {
-			if ( currentQuote.nextSibling == nextQuote ) {
-				writer.merge( writer.createPositionAfter( currentQuote ) );
-
-				return currentQuote;
-			}
-
-			return nextQuote;
-		} );
-	}
+    /**
+     * @inheritDoc
+     */
+    refresh() {
+        this.value = this._getValue();
+        this.isEnabled = this._checkEnabled();
+    }
+    /**
+     * Executes the command. When the command {@link #value is on}, all top-most block quotes within
+     * the selection will be removed. If it is off, all selected blocks will be wrapped with
+     * a block quote.
+     *
+     * @fires execute
+     * @param options Command options.
+     * @param options.forceValue If set, it will force the command behavior. If `true`, the command will apply a block quote,
+     * otherwise the command will remove the block quote. If not set, the command will act basing on its current value.
+     */
+    execute(options = {}) {
+        const model = this.editor.model;
+        const schema = model.schema;
+        const selection = model.document.selection;
+        const blocks = Array.from(selection.getSelectedBlocks());
+        const value = (options.forceValue === undefined) ? !this.value : options.forceValue;
+        model.change(writer => {
+            if (!value) {
+                this._removeQuote(writer, blocks.filter(findQuote));
+            }
+            else {
+                const blocksToQuote = blocks.filter(block => {
+                    // Already quoted blocks needs to be considered while quoting too
+                    // in order to reuse their <bQ> elements.
+                    return findQuote(block) || checkCanBeQuoted(schema, block);
+                });
+                this._applyQuote(writer, blocksToQuote);
+            }
+        });
+    }
+    /**
+     * Checks the command's {@link #value}.
+     */
+    _getValue() {
+        const selection = this.editor.model.document.selection;
+        const firstBlock = first(selection.getSelectedBlocks());
+        // In the current implementation, the block quote must be an immediate parent of a block element.
+        return !!(firstBlock && findQuote(firstBlock));
+    }
+    /**
+     * Checks whether the command can be enabled in the current context.
+     *
+     * @returns Whether the command should be enabled.
+     */
+    _checkEnabled() {
+        if (this.value) {
+            return true;
+        }
+        const selection = this.editor.model.document.selection;
+        const schema = this.editor.model.schema;
+        const firstBlock = first(selection.getSelectedBlocks());
+        if (!firstBlock) {
+            return false;
+        }
+        return checkCanBeQuoted(schema, firstBlock);
+    }
+    /**
+     * Removes the quote from given blocks.
+     *
+     * If blocks which are supposed to be "unquoted" are in the middle of a quote,
+     * start it or end it, then the quote will be split (if needed) and the blocks
+     * will be moved out of it, so other quoted blocks remained quoted.
+     */
+    _removeQuote(writer, blocks) {
+        // Unquote all groups of block. Iterate in the reverse order to not break following ranges.
+        getRangesOfBlockGroups(writer, blocks).reverse().forEach(groupRange => {
+            if (groupRange.start.isAtStart && groupRange.end.isAtEnd) {
+                writer.unwrap(groupRange.start.parent);
+                return;
+            }
+            // The group of blocks are at the beginning of an <bQ> so let's move them left (out of the <bQ>).
+            if (groupRange.start.isAtStart) {
+                const positionBefore = writer.createPositionBefore(groupRange.start.parent);
+                writer.move(groupRange, positionBefore);
+                return;
+            }
+            // The blocks are in the middle of an <bQ> so we need to split the <bQ> after the last block
+            // so we move the items there.
+            if (!groupRange.end.isAtEnd) {
+                writer.split(groupRange.end);
+            }
+            // Now we are sure that groupRange.end.isAtEnd is true, so let's move the blocks right.
+            const positionAfter = writer.createPositionAfter(groupRange.end.parent);
+            writer.move(groupRange, positionAfter);
+        });
+    }
+    /**
+     * Applies the quote to given blocks.
+     */
+    _applyQuote(writer, blocks) {
+        const quotesToMerge = [];
+        // Quote all groups of block. Iterate in the reverse order to not break following ranges.
+        getRangesOfBlockGroups(writer, blocks).reverse().forEach(groupRange => {
+            let quote = findQuote(groupRange.start);
+            if (!quote) {
+                quote = writer.createElement('blockQuote');
+                writer.wrap(groupRange, quote);
+            }
+            quotesToMerge.push(quote);
+        });
+        // Merge subsequent <bQ> elements. Reverse the order again because this time we want to go through
+        // the <bQ> elements in the source order (due to how merge works – it moves the right element's content
+        // to the first element and removes the right one. Since we may need to merge a couple of subsequent `<bQ>` elements
+        // we want to keep the reference to the first (furthest left) one.
+        quotesToMerge.reverse().reduce((currentQuote, nextQuote) => {
+            if (currentQuote.nextSibling == nextQuote) {
+                writer.merge(writer.createPositionAfter(currentQuote));
+                return currentQuote;
+            }
+            return nextQuote;
+        });
+    }
 }
-
-function findQuote( elementOrPosition ) {
-	return elementOrPosition.parent.name == 'blockQuote' ? elementOrPosition.parent : null;
+function findQuote(elementOrPosition) {
+    return elementOrPosition.parent.name == 'blockQuote' ? elementOrPosition.parent : null;
 }
-
-// Returns a minimal array of ranges containing groups of subsequent blocks.
-//
-// content:         abcdefgh
-// blocks:          [ a, b, d, f, g, h ]
-// output ranges:   [ab]c[d]e[fgh]
-//
-// @param {Array.<module:engine/model/element~Element>} blocks
-// @returns {Array.<module:engine/model/range~Range>}
-function getRangesOfBlockGroups( writer, blocks ) {
-	let startPosition;
-	let i = 0;
-	const ranges = [];
-
-	while ( i < blocks.length ) {
-		const block = blocks[ i ];
-		const nextBlock = blocks[ i + 1 ];
-
-		if ( !startPosition ) {
-			startPosition = writer.createPositionBefore( block );
-		}
-
-		if ( !nextBlock || block.nextSibling != nextBlock ) {
-			ranges.push( writer.createRange( startPosition, writer.createPositionAfter( block ) ) );
-			startPosition = null;
-		}
-
-		i++;
-	}
-
-	return ranges;
+/**
+ * Returns a minimal array of ranges containing groups of subsequent blocks.
+ *
+ * content:         abcdefgh
+ * blocks:          [ a, b, d, f, g, h ]
+ * output ranges:   [ab]c[d]e[fgh]
+ */
+function getRangesOfBlockGroups(writer, blocks) {
+    let startPosition;
+    let i = 0;
+    const ranges = [];
+    while (i < blocks.length) {
+        const block = blocks[i];
+        const nextBlock = blocks[i + 1];
+        if (!startPosition) {
+            startPosition = writer.createPositionBefore(block);
+        }
+        if (!nextBlock || block.nextSibling != nextBlock) {
+            ranges.push(writer.createRange(startPosition, writer.createPositionAfter(block)));
+            startPosition = null;
+        }
+        i++;
+    }
+    return ranges;
 }
-
-// Checks whether <bQ> can wrap the block.
-function checkCanBeQuoted( schema, block ) {
-	// TMP will be replaced with schema.checkWrap().
-	const isBQAllowed = schema.checkChild( block.parent, 'blockQuote' );
-	const isBlockAllowedInBQ = schema.checkChild( [ '$root', 'blockQuote' ], block );
-
-	return isBQAllowed && isBlockAllowedInBQ;
+/**
+ * Checks whether <bQ> can wrap the block.
+ */
+function checkCanBeQuoted(schema, block) {
+    // TMP will be replaced with schema.checkWrap().
+    const isBQAllowed = schema.checkChild(block.parent, 'blockQuote');
+    const isBlockAllowedInBQ = schema.checkChild(['$root', 'blockQuote'], block);
+    return isBQAllowed && isBlockAllowedInBQ;
 }

package/src/blockquoteediting.js

@@ -1,18 +1,14 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
-
 /**
  * @module block-quote/blockquoteediting
  */
-
 import { Plugin } from 'ckeditor5/src/core';
 import { Enter } from 'ckeditor5/src/enter';
 import { Delete } from 'ckeditor5/src/typing';
-
 import BlockQuoteCommand from './blockquotecommand';
-
 /**
  * The block quote editing.
  *
@@ -21,126 +17,102 @@ import BlockQuoteCommand from './blockquotecommand';
  * @extends module:core/plugin~Plugin
  */
 export default class BlockQuoteEditing extends Plugin {
-	/**
-	 * @inheritDoc
-	 */
-	static get pluginName() {
-		return 'BlockQuoteEditing';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	static get requires() {
-		return [ Enter, Delete ];
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	init() {
-		const editor = this.editor;
-		const schema = editor.model.schema;
-
-		editor.commands.add( 'blockQuote', new BlockQuoteCommand( editor ) );
-
-		schema.register( 'blockQuote', {
-			inheritAllFrom: '$container'
-		} );
-
-		editor.conversion.elementToElement( { model: 'blockQuote', view: 'blockquote' } );
-
-		// Postfixer which cleans incorrect model states connected with block quotes.
-		editor.model.document.registerPostFixer( writer => {
-			const changes = editor.model.document.differ.getChanges();
-
-			for ( const entry of changes ) {
-				if ( entry.type == 'insert' ) {
-					const element = entry.position.nodeAfter;
-
-					if ( !element ) {
-						// We are inside a text node.
-						continue;
-					}
-
-					if ( element.is( 'element', 'blockQuote' ) && element.isEmpty ) {
-						// Added an empty blockQuote - remove it.
-						writer.remove( element );
-
-						return true;
-					} else if ( element.is( 'element', 'blockQuote' ) && !schema.checkChild( entry.position, element ) ) {
-						// Added a blockQuote in incorrect place. Unwrap it so the content inside is not lost.
-						writer.unwrap( element );
-
-						return true;
-					} else if ( element.is( 'element' ) ) {
-						// Just added an element. Check that all children meet the scheme rules.
-						const range = writer.createRangeIn( element );
-
-						for ( const child of range.getItems() ) {
-							if (
-								child.is( 'element', 'blockQuote' ) &&
-								!schema.checkChild( writer.createPositionBefore( child ), child )
-							) {
-								writer.unwrap( child );
-
-								return true;
-							}
-						}
-					}
-				} else if ( entry.type == 'remove' ) {
-					const parent = entry.position.parent;
-
-					if ( parent.is( 'element', 'blockQuote' ) && parent.isEmpty ) {
-						// Something got removed and now blockQuote is empty. Remove the blockQuote as well.
-						writer.remove( parent );
-
-						return true;
-					}
-				}
-			}
-
-			return false;
-		} );
-
-		const viewDocument = this.editor.editing.view.document;
-		const selection = editor.model.document.selection;
-		const blockQuoteCommand = editor.commands.get( 'blockQuote' );
-
-		// Overwrite default Enter key behavior.
-		// If Enter key is pressed with selection collapsed in empty block inside a quote, break the quote.
-		this.listenTo( viewDocument, 'enter', ( evt, data ) => {
-			if ( !selection.isCollapsed || !blockQuoteCommand.value ) {
-				return;
-			}
-
-			const positionParent = selection.getLastPosition().parent;
-
-			if ( positionParent.isEmpty ) {
-				editor.execute( 'blockQuote' );
-				editor.editing.view.scrollToTheSelection();
-
-				data.preventDefault();
-				evt.stop();
-			}
-		}, { context: 'blockquote' } );
-
-		// Overwrite default Backspace key behavior.
-		// If Backspace key is pressed with selection collapsed in first empty block inside a quote, break the quote.
-		this.listenTo( viewDocument, 'delete', ( evt, data ) => {
-			if ( data.direction != 'backward' || !selection.isCollapsed || !blockQuoteCommand.value ) {
-				return;
-			}
-
-			const positionParent = selection.getLastPosition().parent;
-
-			if ( positionParent.isEmpty && !positionParent.previousSibling ) {
-				editor.execute( 'blockQuote' );
-				editor.editing.view.scrollToTheSelection();
-
-				data.preventDefault();
-				evt.stop();
-			}
-		}, { context: 'blockquote' } );
-	}
+    /**
+     * @inheritDoc
+     */
+    static get pluginName() {
+        return 'BlockQuoteEditing';
+    }
+    /**
+     * @inheritDoc
+     */
+    static get requires() {
+        return [Enter, Delete];
+    }
+    /**
+     * @inheritDoc
+     */
+    init() {
+        const editor = this.editor;
+        const schema = editor.model.schema;
+        editor.commands.add('blockQuote', new BlockQuoteCommand(editor));
+        schema.register('blockQuote', {
+            inheritAllFrom: '$container'
+        });
+        editor.conversion.elementToElement({ model: 'blockQuote', view: 'blockquote' });
+        // Postfixer which cleans incorrect model states connected with block quotes.
+        editor.model.document.registerPostFixer(writer => {
+            const changes = editor.model.document.differ.getChanges();
+            for (const entry of changes) {
+                if (entry.type == 'insert') {
+                    const element = entry.position.nodeAfter;
+                    if (!element) {
+                        // We are inside a text node.
+                        continue;
+                    }
+                    if (element.is('element', 'blockQuote') && element.isEmpty) {
+                        // Added an empty blockQuote - remove it.
+                        writer.remove(element);
+                        return true;
+                    }
+                    else if (element.is('element', 'blockQuote') && !schema.checkChild(entry.position, element)) {
+                        // Added a blockQuote in incorrect place. Unwrap it so the content inside is not lost.
+                        writer.unwrap(element);
+                        return true;
+                    }
+                    else if (element.is('element')) {
+                        // Just added an element. Check that all children meet the scheme rules.
+                        const range = writer.createRangeIn(element);
+                        for (const child of range.getItems()) {
+                            if (child.is('element', 'blockQuote') &&
+                                !schema.checkChild(writer.createPositionBefore(child), child)) {
+                                writer.unwrap(child);
+                                return true;
+                            }
+                        }
+                    }
+                }
+                else if (entry.type == 'remove') {
+                    const parent = entry.position.parent;
+                    if (parent.is('element', 'blockQuote') && parent.isEmpty) {
+                        // Something got removed and now blockQuote is empty. Remove the blockQuote as well.
+                        writer.remove(parent);
+                        return true;
+                    }
+                }
+            }
+            return false;
+        });
+        const viewDocument = this.editor.editing.view.document;
+        const selection = editor.model.document.selection;
+        const blockQuoteCommand = editor.commands.get('blockQuote');
+        // Overwrite default Enter key behavior.
+        // If Enter key is pressed with selection collapsed in empty block inside a quote, break the quote.
+        this.listenTo(viewDocument, 'enter', (evt, data) => {
+            if (!selection.isCollapsed || !blockQuoteCommand.value) {
+                return;
+            }
+            const positionParent = selection.getLastPosition().parent;
+            if (positionParent.isEmpty) {
+                editor.execute('blockQuote');
+                editor.editing.view.scrollToTheSelection();
+                data.preventDefault();
+                evt.stop();
+            }
+        }, { context: 'blockquote' });
+        // Overwrite default Backspace key behavior.
+        // If Backspace key is pressed with selection collapsed in first empty block inside a quote, break the quote.
+        this.listenTo(viewDocument, 'delete', (evt, data) => {
+            if (data.direction != 'backward' || !selection.isCollapsed || !blockQuoteCommand.value) {
+                return;
+            }
+            const positionParent = selection.getLastPosition().parent;
+            if (positionParent.isEmpty && !positionParent.previousSibling) {
+                editor.execute('blockQuote');
+                editor.editing.view.scrollToTheSelection();
+                data.preventDefault();
+                evt.stop();
+            }
+        }, { context: 'blockquote' });
+    }
 }

package/src/blockquoteui.js

@@ -1,17 +1,13 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
-
 /**
  * @module block-quote/blockquoteui
  */
-
 import { Plugin, icons } from 'ckeditor5/src/core';
 import { ButtonView } from 'ckeditor5/src/ui';
-
 import '../theme/blockquote.css';
-
 /**
  * The block quote UI plugin.
  *
@@ -20,41 +16,35 @@ import '../theme/blockquote.css';
  * @extends module:core/plugin~Plugin
  */
 export default class BlockQuoteUI extends Plugin {
-	/**
-	 * @inheritDoc
-	 */
-	static get pluginName() {
-		return 'BlockQuoteUI';
-	}
-
-	/**
-	 * @inheritDoc
-	 */
-	init() {
-		const editor = this.editor;
-		const t = editor.t;
-
-		editor.ui.componentFactory.add( 'blockQuote', locale => {
-			const command = editor.commands.get( 'blockQuote' );
-			const buttonView = new ButtonView( locale );
-
-			buttonView.set( {
-				label: t( 'Block quote' ),
-				icon: icons.quote,
-				tooltip: true,
-				isToggleable: true
-			} );
-
-			// Bind button model to command.
-			buttonView.bind( 'isOn', 'isEnabled' ).to( command, 'value', 'isEnabled' );
-
-			// Execute command.
-			this.listenTo( buttonView, 'execute', () => {
-				editor.execute( 'blockQuote' );
-				editor.editing.view.focus();
-			} );
-
-			return buttonView;
-		} );
-	}
+    /**
+     * @inheritDoc
+     */
+    static get pluginName() {
+        return 'BlockQuoteUI';
+    }
+    /**
+     * @inheritDoc
+     */
+    init() {
+        const editor = this.editor;
+        const t = editor.t;
+        editor.ui.componentFactory.add('blockQuote', locale => {
+            const command = editor.commands.get('blockQuote');
+            const buttonView = new ButtonView(locale);
+            buttonView.set({
+                label: t('Block quote'),
+                icon: icons.quote,
+                tooltip: true,
+                isToggleable: true
+            });
+            // Bind button model to command.
+            buttonView.bind('isOn', 'isEnabled').to(command, 'value', 'isEnabled');
+            // Execute command.
+            this.listenTo(buttonView, 'execute', () => {
+                editor.execute('blockQuote');
+                editor.editing.view.focus();
+            });
+            return buttonView;
+        });
+    }
 }

package/src/index.js

@@ -1,12 +1,10 @@
 /**
- * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * @license Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */
-
 /**
  * @module block-quote
  */
-
 export { default as BlockQuote } from './blockquote';
 export { default as BlockQuoteEditing } from './blockquoteediting';
 export { default as BlockQuoteUI } from './blockquoteui';

package/theme/blockquote.css

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved.
+ * Copyright (c) 2003-2023, CKSource Holding sp. z o.o. All rights reserved.
  * For licensing, see LICENSE.md or https://ckeditor.com/legal/ckeditor-oss-license
  */