Skip to content
This repository has been archived by the owner on Jun 26, 2020. It is now read-only.

Commit

Permalink
Merge be1ea7e into 158f473
Browse files Browse the repository at this point in the history
  • Loading branch information
@pomek
pomek committed Feb 20, 2020
2 parents 158f473 + be1ea7e commit a9795a8
Show file tree
Hide file tree
Showing 3 changed files with 47 additions and 43 deletions.
2 changes: 1 addition & 1 deletion src/utils/injecttypingmutationshandling.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class MutationHandler {
// This wouldn't be needed if DomConverter would allow to create fresh view without checking any mappings.
const freshDomConverter = new DomConverter();
const modelFromCurrentDom = this.editor.data.toModel(
freshDomConverter.domToView( domMutationCommonAncestor )
freshDomConverter.domToView( this.editing.view.document, domMutationCommonAncestor )
).getChild( 0 );

// Current model.
Expand Down
60 changes: 32 additions & 28 deletions tests/input.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ describe( 'Input feature', () => {
{
type: 'children',
oldChildren: [],
newChildren: [ new ViewText( 'x' ) ],
newChildren: [ new ViewText( viewDocument, 'x' ) ],
node: viewRoot.getChild( 0 )
}
] );
Expand All @@ -150,7 +150,7 @@ describe( 'Input feature', () => {
{
type: 'children',
oldChildren: [],
newChildren: [ new ViewText( 'x' ) ],
newChildren: [ new ViewText( viewDocument, 'x' ) ],
node: viewRoot.getChild( 0 )
}
] );
Expand Down Expand Up @@ -189,13 +189,13 @@ describe( 'Input feature', () => {
{
type: 'children',
oldChildren: [],
newChildren: [ new ViewText( 'x' ) ],
newChildren: [ new ViewText( viewDocument, 'x' ) ],
node: viewRoot.getChild( 0 )
},
{
type: 'children',
oldChildren: [],
newChildren: [ new ViewText( 'y' ) ],
newChildren: [ new ViewText( viewDocument, 'y' ) ],
node: viewRoot.getChild( 1 )
}
] );
Expand All @@ -211,7 +211,7 @@ describe( 'Input feature', () => {
{
type: 'children',
oldChildren: [],
newChildren: [ new ViewText( 'x' ), new ViewElement( 'img' ) ],
newChildren: [ new ViewText( viewDocument, 'x' ), new ViewElement( viewDocument, 'img' ) ],
node: viewRoot.getChild( 0 )
}
] );
Expand All @@ -224,8 +224,8 @@ describe( 'Input feature', () => {
viewDocument.fire( 'mutations', [
{
type: 'children',
oldChildren: [ new ViewText( 'foobar' ) ],
newChildren: [ new ViewText( 'x' ), new ViewElement( 'img' ) ],
oldChildren: [ new ViewText( viewDocument, 'foobar' ) ],
newChildren: [ new ViewText( viewDocument, 'x' ), new ViewElement( viewDocument, 'img' ) ],
node: viewRoot.getChild( 0 )
}
] );
Expand All @@ -240,8 +240,12 @@ describe( 'Input feature', () => {
viewDocument.fire( 'mutations', [
{
type: 'children',
oldChildren: [ new ViewText( 'foo' ), viewRoot.getChild( 0 ).getChild( 1 ) ],
newChildren: [ new ViewText( 'foo' ), viewRoot.getChild( 0 ).getChild( 1 ), new ViewText( 'x' ) ],
oldChildren: [ new ViewText( viewDocument, 'foo' ), viewRoot.getChild( 0 ).getChild( 1 ) ],
newChildren: [
new ViewText( viewDocument, 'foo' ),
viewRoot.getChild( 0 ).getChild( 1 ),
new ViewText( viewDocument, 'x' )
],
node: viewRoot.getChild( 0 )
}
] );
Expand All @@ -254,7 +258,7 @@ describe( 'Input feature', () => {
viewDocument.fire( 'mutations', [
{
type: 'children',
oldChildren: [ new ViewText( 'foobar' ) ],
oldChildren: [ new ViewText( viewDocument, 'foobar' ) ],
newChildren: [],
node: viewRoot.getChild( 0 )
}
Expand All @@ -271,7 +275,7 @@ describe( 'Input feature', () => {
{
type: 'children',
oldChildren: [],
newChildren: [ new ViewElement( 'img' ) ],
newChildren: [ new ViewElement( viewDocument, 'img' ) ],
node: viewRoot.getChild( 0 )
}
] );
Expand Down Expand Up @@ -510,9 +514,9 @@ describe( 'Input feature', () => {
type: 'children',
oldChildren: [ viewRoot.getChild( 0 ).getChild( 0 ) ],
newChildren: [
new ViewElement( 'strong', null, new ViewText( 'Foo' ) ),
new ViewText( ' ' ),
new ViewElement( 'br' )
new ViewElement( viewDocument, 'strong', null, new ViewText( viewDocument, 'Foo' ) ),
new ViewText( viewDocument, ' ' ),
new ViewElement( viewDocument, 'br' )
],
node: viewRoot.getChild( 0 )
}
Expand Down Expand Up @@ -541,11 +545,11 @@ describe( 'Input feature', () => {
type: 'children',
oldChildren: [ ...viewRoot.getChild( 0 ).getChildren() ],
newChildren: [
new ViewElement( 'strong', null, new ViewText( 'Foo' ) ),
new ViewElement( 'br' ),
new ViewElement( 'strong', null, new ViewText( 'Bar' ) ),
new ViewText( ' ' ),
new ViewElement( 'br' )
new ViewElement( viewDocument, 'strong', null, new ViewText( viewDocument, 'Foo' ) ),
new ViewElement( viewDocument, 'br' ),
new ViewElement( viewDocument, 'strong', null, new ViewText( viewDocument, 'Bar' ) ),
new ViewText( viewDocument, ' ' ),
new ViewElement( viewDocument, 'br' )
],
node: viewRoot.getChild( 0 )
}
Expand Down Expand Up @@ -576,7 +580,7 @@ describe( 'Input feature', () => {
type: 'children',
oldChildren: Array.from( viewRoot.getChild( 0 ).getChild( 0 ).getChildren() ),
newChildren: [
new ViewElement( 'strong', null, new ViewText( 'Fx' ) ),
new ViewElement( viewDocument, 'strong', null, new ViewText( viewDocument, 'Fx' ) ),
],
node: viewRoot.getChild( 0 ).getChild( 0 )
}
Expand Down Expand Up @@ -624,9 +628,9 @@ describe( 'Input feature', () => {
type: 'children',
oldChildren: [ ...viewRoot.getChild( 0 ).getChildren() ],
newChildren: [
new ViewText( 'Foo' ),
new ViewContainerElement( 'placeholder' ),
new ViewText( 'f' )
new ViewText( viewDocument, 'Foo' ),
new ViewContainerElement( viewDocument, 'placeholder' ),
new ViewText( viewDocument, 'f' )
],
node: viewRoot.getChild( 0 )
}
Expand Down Expand Up @@ -660,11 +664,11 @@ describe( 'Input feature', () => {
type: 'children',
oldChildren: [ ...viewRoot.getChild( 0 ).getChildren() ],
newChildren: [
new ViewText( 'foo' ),
new ViewContainerElement( 'placeholder' ),
new ViewText( 'bar' ),
new ViewContainerElement( 'placeholder' ),
new ViewText( 'baz' )
new ViewText( viewDocument, 'foo' ),
new ViewContainerElement( viewDocument, 'placeholder' ),
new ViewText( viewDocument, 'bar' ),
new ViewContainerElement( viewDocument, 'placeholder' ),
new ViewText( viewDocument, 'baz' )
],
node: viewRoot.getChild( 0 )
}
Expand Down
28 changes: 14 additions & 14 deletions tests/tickets/100.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,15 @@ describe( 'Bug ckeditor5-typing#100', () => {
type: 'children',
node: paragraph,
oldChildren: [ italic ],
newChildren: [ new ViewElement( 'i' ) ]
newChildren: [ new ViewElement( viewDocument, 'i' ) ]
},

// Third mutation - italic's new children.
{
type: 'children',
node: strong,
oldChildren: [ text ],
newChildren: [ new ViewElement( 'a', null, text._clone() ), new ViewText( 'x' ) ]
newChildren: [ new ViewElement( viewDocument, 'a', null, text._clone() ), new ViewText( viewDocument, 'x' ) ]
}
] );

Expand Down Expand Up @@ -151,15 +151,15 @@ describe( 'Bug ckeditor5-typing#100', () => {
type: 'children',
node: paragraph,
oldChildren: [ italic ],
newChildren: [ new ViewElement( 'i' ) ]
newChildren: [ new ViewElement( viewDocument, 'i' ) ]
},

// Third mutation - italic's new children.
{
type: 'children',
node: strong,
oldChildren: [ text ],
newChildren: [ new ViewText( 'x' ), new ViewElement( 'a', null, 'text' ) ]
newChildren: [ new ViewText( viewDocument, 'x' ), new ViewElement( viewDocument, 'a', null, 'text' ) ]
}
] );

Expand Down Expand Up @@ -199,15 +199,15 @@ describe( 'Bug ckeditor5-typing#100', () => {
type: 'children',
node: paragraph,
oldChildren: [ textBefore, link ],
newChildren: [ new ViewText( 'xxx' ), new ViewElement( 'i' ) ]
newChildren: [ new ViewText( viewDocument, 'xxx' ), new ViewElement( viewDocument, 'i' ) ]
},

// Third mutation - italic's new children.
{
type: 'children',
node: italic,
oldChildren: [ text ],
newChildren: [ new ViewElement( 'a', null, 'text' ), new ViewText( 'x' ) ]
newChildren: [ new ViewElement( viewDocument, 'a', null, 'text' ), new ViewText( viewDocument, 'x' ) ]
}
] );

Expand Down Expand Up @@ -237,7 +237,7 @@ describe( 'Bug ckeditor5-typing#100', () => {
type: 'children',
node: paragraph,
oldChildren: [ strong ],
newChildren: [ new ViewElement( 'b', null, 'fixed text' ) ]
newChildren: [ new ViewElement( viewDocument, 'b', null, 'fixed text' ) ]
}
] );

Expand Down Expand Up @@ -267,7 +267,7 @@ describe( 'Bug ckeditor5-typing#100', () => {
type: 'children',
node: strong,
oldChildren: [ text ],
newChildren: [ new ViewText( 'this is bar' ), new ViewText( ' text' ) ]
newChildren: [ new ViewText( viewDocument, 'this is bar' ), new ViewText( viewDocument, ' text' ) ]
}
] );

Expand Down Expand Up @@ -296,8 +296,8 @@ describe( 'Bug ckeditor5-typing#100', () => {
node: paragraph,
oldChildren: [ strong ],
newChildren: [
new ViewElement( 'strong', null, new ViewText( 'text' ) ),
new ViewElement( 'img' )
new ViewElement( viewDocument, 'strong', null, new ViewText( viewDocument, 'text' ) ),
new ViewElement( viewDocument, 'img' )
]
}
] );
Expand Down Expand Up @@ -326,7 +326,7 @@ describe( 'Bug ckeditor5-typing#100', () => {
type: 'children',
node: paragraph,
oldChildren: [ strong ],
newChildren: [ new ViewElement( 'strong', null, new ViewText( 'text' ) ) ]
newChildren: [ new ViewElement( viewDocument, 'strong', null, new ViewText( viewDocument, 'text' ) ) ]
}
] );

Expand Down Expand Up @@ -378,7 +378,7 @@ describe( 'Bug ckeditor5-typing#100', () => {
type: 'children',
node: new ViewContainerElement( 'div' ),
oldChildren: [],
newChildren: [ new ViewText( 'foo' ), new ViewText( 'bar' ) ]
newChildren: [ new ViewText( viewDocument, 'foo' ), new ViewText( viewDocument, 'bar' ) ]
}
] );

Expand Down Expand Up @@ -408,7 +408,7 @@ describe( 'Bug ckeditor5-typing#100', () => {
type: 'children',
node: paragraph,
oldChildren: [ strong ],
newChildren: [ new ViewElement( 'b', null, new ViewText( 'textx' ) ) ]
newChildren: [ new ViewElement( viewDocument, 'b', null, new ViewText( viewDocument, 'textx' ) ) ]
}
], viewSelection );

Expand Down Expand Up @@ -436,7 +436,7 @@ describe( 'Bug ckeditor5-typing#100', () => {
{
type: 'children',
oldChildren: [ strong ],
newChildren: [ strong, new ViewElement( 'b', null, new ViewText( 'apple' ) ) ],
newChildren: [ strong, new ViewElement( viewDocument, 'b', null, new ViewText( viewDocument, 'apple' ) ) ],
node: paragraph
}
], viewSelection );
Expand Down

0 comments on commit a9795a8

Please sign in to comment.