Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New reconversion system #11211

Merged
merged 182 commits into from
Feb 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
182 commits
Select commit Hold shift + click to select a range
a7a0dfd
The elementToStructure downcast helper PoC extracted from other PoC b…
niegowski Aug 4, 2021
73af915
The elementToElement with a backward compatible reconversion support.
niegowski Aug 6, 2021
dbe5571
Simplified slot conversion.
niegowski Aug 6, 2021
0ad44b9
Reconversion could be triggered by some ancestor change.
niegowski Aug 9, 2021
490c302
Table downcast by reconversion.
niegowski Aug 9, 2021
280d2c5
Updated reconversion trigger conditions for table paragraph.
niegowski Aug 10, 2021
d0f0bd0
Removed support for legacy reconversion and simplified code for reins…
niegowski Aug 10, 2021
e8ab9b7
Cleaned DowncastDispatcher API.
niegowski Aug 12, 2021
cf242d5
Code cleanup.
niegowski Aug 12, 2021
daae0cf
Update html embed downcast conversion.
niegowski Aug 12, 2021
5bf5ad3
Merge branch 'master' into ck/10294-elementToStructure
niegowski Aug 12, 2021
34f06b3
Fixed marker double conversion.
niegowski Aug 12, 2021
4d90152
Code cleaning. Added JSDocs.
niegowski Aug 17, 2021
89d803a
Merge branch 'master' into ck/10294-elementToStructure
niegowski Aug 18, 2021
fa34826
Adding code comments.
niegowski Aug 19, 2021
614e1af
Adding JSDocs.
niegowski Aug 23, 2021
aa36632
Merge branch 'master' into ck/10294-elementToStructure
niegowski Aug 24, 2021
5a95106
Added docs.
niegowski Aug 31, 2021
01afbce
Merge branch 'master' into ck/10294-elementToStructure
niegowski Aug 31, 2021
29ac32b
API cleaning.
niegowski Aug 31, 2021
ba694cb
Removed some PoC changes.
niegowski Aug 31, 2021
b0d0b2d
Code cleaning. Added tests for DowncastDispatcher.
niegowski Aug 31, 2021
1a7e155
Ported tests for legacy "triggerBy" to test for elementToStructure.
niegowski Aug 31, 2021
bbc9e79
Added tests.
niegowski Sep 1, 2021
2e0f997
Added tests.
niegowski Sep 1, 2021
6c18937
Merge branch 'master' into ck/10358-elementToStructure
niegowski Sep 1, 2021
0053bd0
Reverted changes.
niegowski Sep 6, 2021
50bc5e5
Tuned slot conversion manual test.
niegowski Sep 6, 2021
edcdaa8
Fixed tests.
niegowski Sep 6, 2021
82f0176
Code cleanup.
niegowski Sep 7, 2021
818a93a
Code cleanup.
niegowski Sep 7, 2021
1f2df2b
Only items that need conversion should be added to ModelConsumable.
niegowski Sep 8, 2021
d6dfe5a
Merge branch 'master' into ck/10358-elementToStructure
Reinmar Sep 8, 2021
9563fb2
Fix the schema definition.
Reinmar Sep 8, 2021
f72e900
Improved errors documentation.
Reinmar Sep 8, 2021
ab03609
Wording.
Reinmar Sep 8, 2021
dadf715
Added tests for deferred unbinding.
niegowski Sep 8, 2021
6cc2c0c
Improved the docs.
Reinmar Sep 9, 2021
eeb30a3
Merge pull request #10466 from ckeditor/ck/10358-elementToStructure
Reinmar Sep 9, 2021
e10b4ea
Merge branch 'master' into ck/10294/reconversion
niegowski Sep 17, 2021
728ad02
DowncastDispatcher events for nested elements fired from the outer ev…
niegowski Sep 17, 2021
8609f32
Reverted not needed change.
niegowski Sep 17, 2021
7fbea50
WIP. Add elementToElement reconversion support
dawidurbanski Sep 20, 2021
a2cc96c
Add tests to elementToElement conversion helper.
dawidurbanski Sep 20, 2021
6117bf7
Docs cleanup. Add elementToElement reconversion example to docs.
dawidurbanski Sep 20, 2021
475bcb3
Do not fire events for reconverted element children.
niegowski Sep 20, 2021
9e330d0
Add manual test for elementToElement reconversion.
dawidurbanski Sep 21, 2021
2ab03cd
Remove console log.
dawidurbanski Sep 21, 2021
dbe3e25
Add reconversion examples in jsdocs for elementToElement helper.
dawidurbanski Sep 21, 2021
1429693
Travis trigger.
dawidurbanski Sep 21, 2021
baf4a00
Fix jsdocs.
dawidurbanski Sep 21, 2021
c1e99cf
DowncastDispatcher should not fire the same event multiple times.
niegowski Sep 21, 2021
8ca2973
Improve elementToElement helper jsdocs.
dawidurbanski Sep 22, 2021
1ce3d44
Default consumer function for insertElement. More updates to jsdoc.
dawidurbanski Sep 22, 2021
d61f306
Fixed typo.
niegowski Sep 22, 2021
f210c3a
Review fixes.
niegowski Sep 22, 2021
bc3501d
Manual tests renaming.
niegowski Sep 22, 2021
ed9afa5
Merge pull request #10557 from ckeditor/ck/10359/reconversion/element…
niegowski Sep 22, 2021
356cb32
Merge branch 'ck/10294/reconversion' into ck/10376-downcast-dispatche…
niegowski Sep 22, 2021
a53c12b
Fix typo.
niegowski Sep 22, 2021
bad002e
Merge branch 'master' into ck/10294/reconversion
niegowski Sep 22, 2021
9795508
Merge branch 'ck/10294/reconversion' into ck/10376-downcast-dispatche…
niegowski Sep 22, 2021
dbfe554
Properly consuming.
niegowski Sep 22, 2021
690e016
Updated tests.
niegowski Sep 22, 2021
2875109
Added JSDocs.
niegowski Sep 22, 2021
2b1a83b
Added JSDocs.
niegowski Sep 22, 2021
310e282
Consuming list attribute events.
niegowski Sep 22, 2021
2e040d7
Added tests.
niegowski Sep 22, 2021
fc259b5
Fixed test.
niegowski Sep 23, 2021
7ff855a
JSDoc fix.
niegowski Sep 23, 2021
2aede05
JSDoc fix.
niegowski Sep 23, 2021
baf38e5
Added tests.
niegowski Sep 23, 2021
99cbd92
Error should be thrown if not all insert events were consumed by down…
niegowski Sep 23, 2021
40e366c
Minor changes.
Reinmar Sep 24, 2021
94ac8f3
Merge pull request #10586 from ckeditor/ck/10376-downcast-dispatcher-…
Reinmar Sep 24, 2021
18de8d5
Merge branch 'ck/10294/reconversion' into ck/3818-missing-consumer-error
niegowski Sep 24, 2021
d0e5c88
Added tests.
niegowski Sep 24, 2021
0f9e649
Added JSDocs.
niegowski Sep 27, 2021
ab221ea
Table downcast by reconversion.
niegowski Sep 27, 2021
78a9f61
Changed refreshing of table cells.
niegowski Sep 29, 2021
2059903
Changed refreshing of table cells.
niegowski Sep 29, 2021
99872b9
Wording.
Reinmar Oct 4, 2021
2f15a45
Merge pull request #10611 from ckeditor/ck/3818-missing-consumer-error
Reinmar Oct 4, 2021
bea119e
Downcast should not reuse view nodes that were marked by Differ#refre…
niegowski Oct 4, 2021
f8a5625
Updated tests.
niegowski Oct 5, 2021
97b5a41
Merge branch 'master' into ck/10294/reconversion
niegowski Oct 5, 2021
8fadcb5
Merge branch 'ck/10294/reconversion' into ck/10502-table-reconversion
niegowski Oct 5, 2021
70311c0
Adjusted to upstream changes.
niegowski Oct 6, 2021
be305bb
The reconversion "children" flag is optional and implicit in some cases.
niegowski Oct 6, 2021
56e1cf2
Updated tests.
niegowski Oct 7, 2021
e1d307c
Added comments.
niegowski Oct 8, 2021
688304c
Review changes.
oleq Oct 8, 2021
26cb738
Cleanup.
dawidurbanski Oct 12, 2021
fd9ecfe
Cleanup classic editor manual test.
dawidurbanski Oct 13, 2021
375bf36
Cleanup element reconversion manual test.
dawidurbanski Oct 13, 2021
ca040ca
Bring back assertion in media-embed test.
dawidurbanski Oct 13, 2021
9814ff0
Add proper error code.
dawidurbanski Oct 13, 2021
72206a7
Extract children validation warning to separate function.
dawidurbanski Oct 13, 2021
c919257
Improve docs for new image helpers.
dawidurbanski Oct 13, 2021
cba48c3
Minor fix.
dawidurbanski Oct 13, 2021
9477a10
Update comment.
dawidurbanski Oct 13, 2021
de7f0d5
Update jsdoc.
dawidurbanski Oct 13, 2021
bbf4b49
Add tests for the warning.
dawidurbanski Oct 13, 2021
08cde2c
Test description update.
dawidurbanski Oct 13, 2021
ccdc87a
Merge pull request #10666 from ckeditor/ck/10502-table-reconversion
Reinmar Oct 13, 2021
b29f223
Merge branch 'ck/10294/reconversion' into ck/10610-e2e-throw-error
dawidurbanski Oct 14, 2021
9036823
Code cleanup.
niegowski Oct 15, 2021
4949293
Updated test.
niegowski Oct 15, 2021
bb98fc1
Merge pull request #10685 from ckeditor/ck/10610-e2e-throw-error
niegowski Oct 15, 2021
15357a5
PoC.
niegowski Oct 15, 2021
20e34bc
Added tests.
niegowski Oct 18, 2021
7f9aa7c
Merge branch 'master' into ck/10294/reconversion
niegowski Oct 18, 2021
73748cb
Merge branch 'ck/10294/reconversion' into ck/10714-createContainerEle…
niegowski Oct 18, 2021
4bf6692
Reordered params of DowncastWriter#createContainerElement().
niegowski Oct 20, 2021
60de348
Docs.
oleq Oct 22, 2021
78899af
Code refactoring.
oleq Oct 22, 2021
22bc956
Merge pull request #10716 from ckeditor/ck/10714-createContainerEleme…
oleq Oct 22, 2021
05201a0
Implemented EditingController#reconvertMarker|Item.
oleq Oct 29, 2021
80fb1e4
Log instead of throwing.
oleq Oct 29, 2021
237b2db
Merge branch 'master' into ck/10294/reconversion
oleq Oct 29, 2021
6045a52
Docs.
oleq Oct 29, 2021
e2174bd
Merge branch 'ck/10294/reconversion' into ck/10659-refresh-things
oleq Oct 29, 2021
1e9f574
Docs.
oleq Oct 29, 2021
a12391c
Tests.
oleq Oct 29, 2021
66c4cbe
Docs.
oleq Oct 29, 2021
6569e15
Merge pull request #10775 from ckeditor/ck/10659-refresh-things
arkflpc Nov 4, 2021
51ec30c
Merge branch 'master' into ck/10294/reconversion
niegowski Nov 5, 2021
af1d177
Restructuring ckeditor5-list package (splitting into subdirectories).
niegowski Nov 15, 2021
999cfaa
Updated links in docs.
niegowski Nov 15, 2021
680fd07
Merge pull request #10844 from ckeditor/ck/10811-list-package-restruc…
niegowski Nov 17, 2021
8c3ff7d
Merge branch 'master' into ck/10294/reconversion
niegowski Nov 24, 2021
e4343ed
Merge branch 'master' into ck/10294/reconversion
niegowski Dec 10, 2021
4457464
Merge branch 'master' into ck/10294/reconversion
niegowski Dec 30, 2021
c4695ea
Merge branch 'master' into ck/10294/reconversion
niegowski Jan 20, 2022
acfb3e0
Updated copyright header.
niegowski Jan 20, 2022
88f5e08
Add decoupled editor to engine package dev dependencies.
dawidurbanski Jan 19, 2022
d13bdb0
Add redirects for obsolete pages.
dawidurbanski Jan 19, 2022
98bf874
Remodel url structure. Fix links. Update mini inspector.
dawidurbanski Jan 25, 2022
5b091f6
Package.json cleanup.
dawidurbanski Jan 25, 2022
7e73caa
Ported new pages for helpers and updated existing ones.
Feb 1, 2022
88b5447
Structure conversion snippet. Upcast structure snippet.
dawidurbanski Feb 3, 2022
6d6ac2e
Update pre-built mini inspector version.
dawidurbanski Feb 3, 2022
2b1e4de
Update snippet comments.
dawidurbanski Feb 3, 2022
a18f657
Update mini inspector. Add comment to structure upcast snippet.
dawidurbanski Feb 3, 2022
ba6bcca
Update snippets. Polishing.
dawidurbanski Feb 3, 2022
3451bed
Attribute upcast snippet.
dawidurbanski Feb 3, 2022
ef6cd6c
Add infoboxes.
dawidurbanski Feb 3, 2022
153613e
Explain lack of structureToElement() helper.
dawidurbanski Feb 3, 2022
ab06323
Content refactoring.
dawidurbanski Feb 3, 2022
2532a88
Remove old manual test.
dawidurbanski Feb 3, 2022
584e972
Imported mini inspector from npm (@ckeditor/ckeditor5-inspector). Fin…
oleq Feb 3, 2022
6a5bdbf
Added colorful diagrams to conversion docs.
oleq Feb 3, 2022
0baad9d
Tuned mini inspector in coversion docs to match colors of diagrams an…
oleq Feb 3, 2022
556bdbf
Typo in upcast.md.
Feb 3, 2022
fd4d576
Review fixes, mostly license updates and formatting.
Feb 3, 2022
5b89eae
Docs: Used SVGs instead of PNGs for conversion diagrams.
oleq Feb 4, 2022
bc384ec
Merge pull request #11133 from ckeditor/ck/10911/conversion-docs
dawidurbanski Feb 4, 2022
fd67983
Refactored slotFor API.
niegowski Feb 6, 2022
0e5f4a0
Updated docs.
niegowski Feb 6, 2022
59a608c
Merge master branch. Resolve conflicts.
dawidurbanski Feb 7, 2022
b080257
Added tests.
niegowski Feb 7, 2022
778b548
Fix list utils import paths.
dawidurbanski Feb 7, 2022
994c885
elementToStructure() should throw when invoked for an element that al…
oleq Feb 7, 2022
8400bdf
Code refactoring.
oleq Feb 7, 2022
0562598
Merge pull request #11228 from ckeditor/ck/11179-slot-for
oleq Feb 7, 2022
5d0a984
Merge branch 'ck/10294/reconversion' into ck/11163-disallowed-text-in…
oleq Feb 7, 2022
03fa4d0
Merge pull request #11229 from ckeditor/ck/11163-disallowed-text-in-e…
niegowski Feb 7, 2022
58dde34
Revert "elementToStructure() should throw when invoked for an element…
oleq Feb 7, 2022
92595b2
Merge pull request #11233 from ckeditor/revert-11229-ck/11163-disallo…
oleq Feb 7, 2022
b5b1046
Merge remote-tracking branch 'origin/master' into ck/10294/reconversion
dawidurbanski Feb 8, 2022
e7b45cb
Fix list style properties docs links.
dawidurbanski Feb 8, 2022
8f4a87a
Fix failing html comments test.
dawidurbanski Feb 8, 2022
dd22ba6
Refactor createBlockImageViewElement() helper function.
dawidurbanski Feb 8, 2022
eb18f4a
Revert "Revert "elementToStructure() should throw when invoked for an…
oleq Feb 8, 2022
50dd19a
Docs: Extended docs of the conversion-element-to-structure-disallowed…
oleq Feb 8, 2022
5c4c1fb
Removed warning from elementToElement() helper logged when multiple c…
oleq Feb 8, 2022
669b780
Tests: Used elementToElement() in widget tests where elementToStructu…
oleq Feb 8, 2022
15f202d
Docs.
oleq Feb 8, 2022
2a237b7
Merge pull request #11239 from ckeditor/revert-11233-revert-11229-ck/…
oleq Feb 8, 2022
85974c1
Docs cleaning.
niegowski Feb 9, 2022
77ee918
Merge pull request #11236 from ckeditor/ck/10294/reconversion-create-…
niegowski Feb 9, 2022
91112d8
Merge remote-tracking branch 'origin/master' into ck/10294/reconversion
dawidurbanski Feb 9, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion docs/builds/guides/migration/migration-from-ckeditor-4.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ Note: The number of options was reduced on purpose. We understood that configuri
<td>
<p>Extending the list of HTML tags or attributes that CKEditor should support can be achieved via the {@link features/general-html-support General HTML Support feature}. The GHS allows adding HTML markup not covered by official CKEditor 5 features into the editor's content. Such elements can be loaded, pasted, or output. It does not, however, provide a dedicated UI for the extended HTML markup.</p>
<p> Having full-fledged HTML support can be achieved by writing a plugin that (ideally) provides also means to control (insert, edit, delete) such markup. For more information on how to create plugins check the {@link framework/guides/creating-simple-plugin Creating a simple plugin} article. Looking at the source code of CKEditor 5 plugins may also give you a lot of inspiration.</p>
<p>Note that only content that is explicitly converted between the model and the view by the editor plugins will be preserved in CKEditor 5. Check the {@link framework/guides/deep-dive/conversion-introduction conversion tutorials} to learn how to extend the conversion rules.</p>
<p>Note that only content that is explicitly converted between the model and the view by the editor plugins will be preserved in CKEditor 5. Check the {@link framework/guides/deep-dive/conversion/intro conversion tutorials} to learn how to extend the conversion rules.</p>
</td>
</tr>
<tr>
Expand Down
2 changes: 1 addition & 1 deletion docs/builds/guides/migration/migration-to-26.md
Original file line number Diff line number Diff line change
Expand Up @@ -216,7 +216,7 @@ Command name changes (before → after):
* `forwardDelete` → `deleteForward`
* `todoListCheck` → `checkTodoList`

The `TodoListCheckCommand` module was moved to {@link module:list/checktodolistcommand~CheckTodoListCommand `CheckTodoListCommand`}.
The `TodoListCheckCommand` module was moved to {@link module:list/todolist/checktodolistcommand~CheckTodoListCommand `CheckTodoListCommand`}.

The `ImageInsertCommand` module was moved to {@link module:image/image/insertimagecommand~InsertImageCommand `InsertImageCommand`}.

Expand Down
17 changes: 15 additions & 2 deletions docs/umberto.json
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,12 @@
"framework/guides/ui/external-ui.html": "framework/guides/deep-dive/ui/external-ui.html",
"framework/guides/ui/theme-customization.html": "framework/guides/deep-dive/ui/theme-customization.html",
"framework/guides/creating-simple-plugin.html": "framework/guides/plugins/creating-simple-plugin.html",
"examples/builds/custom-build.html": "examples/builds-custom/full-featured-editor.html"
"examples/builds/custom-build.html": "examples/builds-custom/full-featured-editor.html",
"framework/guides/deep-dive/conversion/conversion-introduction.html": "framework/guides/deep-dive/conversion/intro.html",
"framework/guides/deep-dive/conversion/conversion-extending-output.html": "framework/guides/deep-dive/conversion/intro.html",
"framework/guides/deep-dive/conversion/conversion-preserving-custom-content.html": "framework/guides/deep-dive/conversion/intro.html",
"framework/guides/deep-dive/conversion/custom-element-conversion.html": "framework/guides/deep-dive/conversion/intro.html",
"framework/guides/deep-dive/conversion/element-reconversion.html": "framework/guides/deep-dive/conversion/intro.html"
},
"scripts": {
"snippet-adapter": "../scripts/docs/snippetadapter",
Expand Down Expand Up @@ -201,7 +206,15 @@
"name": "Conversion",
"id": "framework-deep-dive-conversion",
"slug": "conversion",
"order": 100
"order": 100,
"categories": [
{
"name": "Conversion helpers",
"id": "framework-deep-dive-conversion-helpers",
"slug": "helpers",
"order": 100
}
]
},
{
"name": "User interface",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
"@ckeditor/ckeditor5-dev-webpack-plugin": "^28.0.1",
"@ckeditor/ckeditor5-export-pdf": ">=1.0.0",
"@ckeditor/ckeditor5-export-word": ">=1.0.0",
"@ckeditor/ckeditor5-inspector": "^2.2.2",
"@ckeditor/ckeditor5-inspector": "^3.0.0",
"@ckeditor/ckeditor5-pagination": ">=1.0.0",
"@ckeditor/ckeditor5-react": "^3.0.0",
"@ckeditor/ckeditor5-real-time-collaboration": ">=28.0.0",
Expand Down
2 changes: 1 addition & 1 deletion packages/ckeditor5-alignment/tests/alignmentediting.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import AlignmentEditing from '../src/alignmentediting';
import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
import ImageCaptionEditing from '@ckeditor/ckeditor5-image/src/imagecaption/imagecaptionediting';
import ListEditing from '@ckeditor/ckeditor5-list/src/listediting';
import ListEditing from '@ckeditor/ckeditor5-list/src/list/listediting';
import HeadingEditing from '@ckeditor/ckeditor5-heading/src/headingediting';
import VirtualTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/virtualtesteditor';
import { getData as getModelData, setData as setModelData } from '@ckeditor/ckeditor5-engine/src/dev-utils/model';
Expand Down
4 changes: 2 additions & 2 deletions packages/ckeditor5-autoformat/tests/autoformat.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
import Autoformat from '../src/autoformat';

import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
import ListEditing from '@ckeditor/ckeditor5-list/src/listediting';
import TodoListEditing from '@ckeditor/ckeditor5-list/src/todolistediting';
import ListEditing from '@ckeditor/ckeditor5-list/src/list/listediting';
import TodoListEditing from '@ckeditor/ckeditor5-list/src/todolist/todolistediting';
import HeadingEditing from '@ckeditor/ckeditor5-heading/src/headingediting';
import BoldEditing from '@ckeditor/ckeditor5-basic-styles/src/bold/boldediting';
import StrikethroughEditing from '@ckeditor/ckeditor5-basic-styles/src/strikethrough/strikethroughediting';
Expand Down
2 changes: 1 addition & 1 deletion packages/ckeditor5-autoformat/tests/undointegration.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import Autoformat from '../src/autoformat';

import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
import ListEditing from '@ckeditor/ckeditor5-list/src/listediting';
import ListEditing from '@ckeditor/ckeditor5-list/src/list/listediting';
import HeadingEditing from '@ckeditor/ckeditor5-heading/src/headingediting';
import BoldEditing from '@ckeditor/ckeditor5-basic-styles/src/bold/boldediting';
import CodeEditing from '@ckeditor/ckeditor5-basic-styles/src/code/codeediting';
Expand Down
2 changes: 1 addition & 1 deletion packages/ckeditor5-block-quote/tests/blockquoteediting.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import BlockQuoteEditing from '../src/blockquoteediting';
import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
import ListEditing from '@ckeditor/ckeditor5-list/src/listediting';
import ListEditing from '@ckeditor/ckeditor5-list/src/list/listediting';
import BoldEditing from '@ckeditor/ckeditor5-basic-styles/src/bold/boldediting';

import VirtualTestEditor from '@ckeditor/ckeditor5-core/tests/_utils/virtualtesteditor';
Expand Down
2 changes: 1 addition & 1 deletion packages/ckeditor5-clipboard/tests/pasteplaintext.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ describe( 'PastePlainText', () => {
isInline: true
} );

editor.conversion.for( 'upcast' ).elementToElement( {
editor.conversion.elementToElement( {
model: 'softBreak',
view: 'br'
} );
Expand Down
4 changes: 2 additions & 2 deletions packages/ckeditor5-code-block/src/converters.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,12 @@ export function modelToViewCodeBlockInsertion( model, languageDefs, useLabels =
preAttributes.spellcheck = 'false';
}

const pre = writer.createContainerElement( 'pre', preAttributes );
const code = writer.createContainerElement( 'code', {
class: languagesToClasses[ codeBlockLanguage ] || null
} );

writer.insert( writer.createPositionAt( pre, 0 ), code );
const pre = writer.createContainerElement( 'pre', preAttributes, code );

writer.insert( targetViewPosition, pre );
mapper.bindElements( data.item, code );
};
Expand Down
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>
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 );
} );
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>
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 );
} );
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>
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 );
} );
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>
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 );
} );
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>
Loading