-
-
Notifications
You must be signed in to change notification settings - Fork 3.7k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #11211 from ckeditor/ck/10294/reconversion
Feature (engine): The DowncastWriter#createContainerElement() should accept a list of children so bigger view structures can be created in one call. Closes #10714. Feature (engine): The elementToElement downcast helper will log a console warning if multiple elements have been created. Closes #10610. Feature (engine): The DowncastDispatcher will throw an error if any of the model items were not consumed while converting. Closes #10377. Feature (engine): Introducing convertItem(), convertChildren() and convertAttributes() in the downcast conversion API interface. Feature (engine): Added support for reconversion in DowncastHelpers#elementToElement() downcast helper. Closes #10359. Feature (engine): Added DowncastHelpers#elementToStructure() downcast helper with reconversion support. Closes #10358. Feature (engine): It's now possible to trigger a nested conversion while downcasting an element. Docs (engine): Overhauled the conversion documentation and introduced the documentation for conversion helpers. Closes #10294. Internal (engine): elementToStructure() should throw when invoked for an element that allows $text. Closes #11163. Internal (engine): Replaced conversionApi.slotFor() in elementToStructure with writer.createSlot(). Closes #11179. Internal (engine): Reconversion helpers can coexist with Differ#refreshItem() children. Other (engine): Implemented the EditingController#reconvertMarker() method to be used instead of Writer#updateMarker() for marker reconversion purposes. Implemented the EditingController#reconvertItem() method to replace Differ#refreshItem(). Closes #10659. Other (engine): The attribute and child nodes conversion events are fired by the lowest priority handler for the insert event instead of by DowncastDispatcher itself. Closes #10376. Other (engine): Events are fired by the DowncastDispatcher even if they were previously consumed. It's the conversion handler's responsibility to check if it can be consumed or if it was already consumed by other converters. Other (engine): The DowncastDispatcher#convert() method introduced as a replacement to previously used convertInsert(). The new method handles not only nodes conversion but also markers. Internal (horizontal-line): The horizontalLine element downcast conversion has been changed from elementToElement to elementToStructure. Internal (html-support): HTML elements downcast conversion have been changed from elementToElement to elementToStructure. Internal (image): The imageBlock and imageInline elements downcast conversion have been changed from elementToElement to elementToStructure. Internal (link): Link inlineWidget element downcast conversion has been changed from elementToElement to elementToStructure. Internal (media-embed): The media element downcast conversion has been changed from elementToElement to elementToStructure. Internal (page-break): The pageBreak element downcast conversion has been changed from elementToElement to elementToStructure. Internal (widget): The blockWidget and inlineWidget elements downcast conversion have been changed from elementToElement to elementToStructure. Internal (heading): Added missing consuming converter. Internal (heading): Code adjusted to changes in DowncastDispatcher API. Internal (html-embed): Code adjusted to the removal of triggerBy conversion option. Other (list): The ckeditor5-list package was restructured into subdirectories. Closes #10811. Other (list): Downcast conversion should consume downcasted attributes. Other (table): Table downcast conversion migrated to elementToStructure() downcast helper. Closes #10502. Tests (clipboard): Added missing downcast conversion. Tests (image): Tests updated to properly handle non-consumed errors fired by the DowncastDispatcher. Tests (alignment, autoformat, block-quote, engine, html-support, image, indent, table, word-count): Tests updated after list package restructuring. Tests (html-support): Fixed test for checking if an attribute was consumed while converting. Docs (ckeditor5): Links in the migration guide point to the new conversion documentation. MAJOR BREAKING CHANGE (list): The ListEditing, ListUI, ListStyleEditing, ListStyleUI, TodoListEditing, TodoListUI plugins were moved to the dedicated subdirectories (list, liststyle, todolist). MAJOR BREAKING CHANGE (engine): Removed the Differ#refreshItem() method from the public API. Replaced by EditingController#reconvertItem() (see #10659). MAJOR BREAKING CHANGE (engine): The DowncastDispatcher will throw an error if any of the model items were not consumed while converting. Read the conversion-model-consumable-not-consumed error documentation for more information. MAJOR BREAKING CHANGE (engine): The DowncastDispatcher#conversionApi property is no longer available. The instances of DowncastConversionApi being created at the start of conversion. MAJOR BREAKING CHANGE (engine): The support for the triggerBy option for downcast helpers is removed and replaced with the new elementToStructure() options. MINOR BREAKING CHANGE (media-embed): The createMediaFigureElement helper function first argument has been changed from writer object to conversionApi object. MINOR BREAKING CHANGE (table): The downcast converters of the table feature has been rewritten with the use of elementToStructure() and the re-conversion mechanism. See #10502.
- Loading branch information
Showing
150 changed files
with
7,691 additions
and
4,762 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
5 changes: 5 additions & 0 deletions
5
packages/ckeditor5-engine/docs/_snippets/framework/mini-inspector-bold.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <div id="mini-inspector-bold" class="mini-inspector-editor"> | ||
| <p><strong>Text in bold</strong></p> | ||
| </div> | ||
|
|
||
| <div id="mini-inspector-bold-container"></div> |
20 changes: 20 additions & 0 deletions
20
packages/ckeditor5-engine/docs/_snippets/framework/mini-inspector-bold.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| /** | ||
| * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved. | ||
| * For licensing, see LICENSE.md. | ||
| */ | ||
|
|
||
| /* globals DecoupledEditor, MiniCKEditorInspector, console, window, document */ | ||
|
|
||
| DecoupledEditor | ||
| .create( document.querySelector( '#mini-inspector-bold' ) ) | ||
| .then( editor => { | ||
| window.editor = editor; | ||
|
|
||
| MiniCKEditorInspector.attach( | ||
| editor, | ||
| document.querySelector( '#mini-inspector-bold-container' ) | ||
| ); | ||
| } ) | ||
| .catch( err => { | ||
| console.error( err.stack ); | ||
| } ); |
37 changes: 37 additions & 0 deletions
37
packages/ckeditor5-engine/docs/_snippets/framework/mini-inspector-heading-interactive.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| <div id="mini-inspector-heading-interactive" class="mini-inspector-editor"> | ||
| <h1></h1> | ||
| </div> | ||
|
|
||
| <label class="mini-inspector-heading-level-dropdown"> | ||
| <strong>Update heading level:</strong> | ||
| <select id="mini-inspector-heading-interactive-dropdown"> | ||
| <option value="1">Level 1 (h1)</option> | ||
| <option value="2">Level 2 (h2)</option> | ||
| <option value="3">Level 3 (h3)</option> | ||
| <option value="4">Level 4 (h4)</option> | ||
| <option value="5">Level 5 (h5)</option> | ||
| <option value="6">Level 6 (h6)</option> | ||
| </select> | ||
| </label> | ||
|
|
||
| <div id="mini-inspector-heading-interactive-container"></div> | ||
|
|
||
| <style> | ||
| .mini-inspector-heading-level-dropdown { | ||
| display: block; | ||
| margin-bottom: 20px; | ||
| } | ||
|
|
||
| #mini-inspector-heading-interactive-dropdown { | ||
| padding: 5px; | ||
| } | ||
|
|
||
| #mini-inspector-heading-interactive-container .ck-mini-inspector > div:first-child .ck-inspector-tree-node__attribute { | ||
| background: #fdfd77; | ||
| } | ||
|
|
||
| #mini-inspector-heading-interactive-container .ck-mini-inspector > div:last-child .ck-inspector-tree-node__content .ck-inspector-tree-node__name { | ||
| display: inline; | ||
| background: #fdfd77; | ||
| } | ||
| </style> |
61 changes: 61 additions & 0 deletions
61
packages/ckeditor5-engine/docs/_snippets/framework/mini-inspector-heading-interactive.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| /** | ||
| * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved. | ||
| * For licensing, see LICENSE.md. | ||
| */ | ||
|
|
||
| /* globals DecoupledEditor, MiniCKEditorInspector, Essentials, console, window, document */ | ||
|
|
||
| function CustomHeading( editor ) { | ||
| editor.model.schema.register( 'heading', { | ||
| allowAttributes: [ 'level' ], | ||
| inheritAllFrom: '$block' | ||
| } ); | ||
|
|
||
| editor.conversion.for( 'upcast' ).elementToElement( { | ||
| view: 'h1', | ||
| model: ( viewElement, { writer } ) => { | ||
| return writer.createElement( 'heading', { level: '1' } ); | ||
| } | ||
| } ); | ||
|
|
||
| editor.conversion.for( 'downcast' ).elementToElement( { | ||
| model: { | ||
| name: 'heading', | ||
| attributes: [ 'level' ] | ||
| }, | ||
| view: ( modelElement, { writer } ) => { | ||
| return writer.createContainerElement( | ||
| 'h' + modelElement.getAttribute( 'level' ) | ||
| ); | ||
| } | ||
| } ); | ||
|
|
||
| const dropdown = document.getElementById( | ||
| 'mini-inspector-heading-interactive-dropdown' | ||
| ); | ||
|
|
||
| dropdown.addEventListener( 'change', event => { | ||
| editor.model.change( writer => { | ||
| writer.setAttribute( | ||
| 'level', | ||
| event.target.value, | ||
| editor.model.document.getRoot().getChild( 0 ) | ||
| ); | ||
| } ); | ||
| } ); | ||
| } | ||
|
|
||
| DecoupledEditor.create( document.querySelector( '#mini-inspector-heading-interactive' ), { | ||
| plugins: [ Essentials, CustomHeading ] | ||
| } ) | ||
| .then( editor => { | ||
| window.editor = editor; | ||
|
|
||
| MiniCKEditorInspector.attach( | ||
| editor, | ||
| document.querySelector( '#mini-inspector-heading-interactive-container' ) | ||
| ); | ||
| } ) | ||
| .catch( err => { | ||
| console.error( err.stack ); | ||
| } ); |
5 changes: 5 additions & 0 deletions
5
packages/ckeditor5-engine/docs/_snippets/framework/mini-inspector-heading.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <div id="mini-inspector-heading" class="mini-inspector-editor"> | ||
| <h1></h1> | ||
| </div> | ||
|
|
||
| <div id="mini-inspector-heading-container"></div> |
33 changes: 33 additions & 0 deletions
33
packages/ckeditor5-engine/docs/_snippets/framework/mini-inspector-heading.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,33 @@ | ||
| /** | ||
| * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved. | ||
| * For licensing, see LICENSE.md. | ||
| */ | ||
|
|
||
| /* globals DecoupledEditor, MiniCKEditorInspector, Essentials, console, window, document */ | ||
|
|
||
| function CustomHeading( editor ) { | ||
| editor.model.schema.register( 'heading', { | ||
| allowAttributes: [ 'level' ], | ||
| inheritAllFrom: '$block' | ||
| } ); | ||
|
|
||
| editor.conversion.elementToElement( { | ||
| model: 'heading', | ||
| view: 'h1' | ||
| } ); | ||
| } | ||
|
|
||
| DecoupledEditor.create( document.querySelector( '#mini-inspector-heading' ), { | ||
| plugins: [ Essentials, CustomHeading ] | ||
| } ) | ||
| .then( editor => { | ||
| window.editor = editor; | ||
|
|
||
| MiniCKEditorInspector.attach( | ||
| editor, | ||
| document.querySelector( '#mini-inspector-heading-container' ) | ||
| ); | ||
| } ) | ||
| .catch( err => { | ||
| console.error( err.stack ); | ||
| } ); |
5 changes: 5 additions & 0 deletions
5
packages/ckeditor5-engine/docs/_snippets/framework/mini-inspector-paragraph.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,5 @@ | ||
| <div id="mini-inspector-paragraph" class="mini-inspector-editor"> | ||
| <p></p> | ||
| </div> | ||
|
|
||
| <div id="mini-inspector-paragraph-container"></div> |
20 changes: 20 additions & 0 deletions
20
packages/ckeditor5-engine/docs/_snippets/framework/mini-inspector-paragraph.js
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,20 @@ | ||
| /** | ||
| * @license Copyright (c) 2003-2022, CKSource Holding sp. z o.o. All rights reserved. | ||
| * For licensing, see LICENSE.md. | ||
| */ | ||
|
|
||
| /* globals DecoupledEditor, MiniCKEditorInspector, console, window, document */ | ||
|
|
||
| DecoupledEditor | ||
| .create( document.querySelector( '#mini-inspector-paragraph' ) ) | ||
| .then( editor => { | ||
| window.editor = editor; | ||
|
|
||
| MiniCKEditorInspector.attach( | ||
| editor, | ||
| document.querySelector( '#mini-inspector-paragraph-container' ) | ||
| ); | ||
| } ) | ||
| .catch( err => { | ||
| console.error( err.stack ); | ||
| } ); |
11 changes: 11 additions & 0 deletions
11
packages/ckeditor5-engine/docs/_snippets/framework/mini-inspector-structure.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,11 @@ | ||
| <div id="mini-inspector-structure" class="mini-inspector-editor"> | ||
| <div class="wrapper"> | ||
| <div class="inner-wrapper"> | ||
| <p> | ||
| Example structure | ||
| </p> | ||
| </div> | ||
| </div> | ||
| </div> | ||
|
|
||
| <div id="mini-inspector-structure-container"></div> |
Oops, something went wrong.