Fix: The indentBlock command will now operate only on selected top-…

…most blocks. Closes #11.

src/indentblockcommand.js

@@ -53,9 +53,8 @@ export default class IndentBlockCommand extends Command {
 		const editor = this.editor;
 		const model = editor.model;
 
-		const block = first( model.document.selection.getSelectedBlocks() );
+		const block = first( model.document.selection.getTopMostBlocks() );
 
-		// If selection is not in a list item, the command is disabled.
 		if ( !block || !model.schema.checkAttribute( block, 'blockIndent' ) ) {
 			this.isEnabled = false;
 
@@ -95,7 +94,7 @@ export default class IndentBlockCommand extends Command {
 function getBlocksToChange( model ) {
 	const selection = model.document.selection;
 	const schema = model.schema;
-	const blocksInSelection = Array.from( selection.getSelectedBlocks() );
+	const blocksInSelection = Array.from( selection.getTopMostBlocks() );
 
 	return blocksInSelection.filter( block => schema.checkAttribute( block, 'blockIndent' ) );
 }

tests/indentblockcommand.js

@@ -20,11 +20,22 @@ describe( 'IndentBlockCommand', () => {
 				editor = newEditor;
 				model = editor.model;
 
+				model.schema.register( 'parentBlock', {
+					allowWhere: '$block',
+					isLimit: true,
+					isObject: true,
+					isBlock: true
+				} );
+
 				model.schema.register( 'paragraph', {
 					inheritAllFrom: '$block',
-					allowAttributes: [ 'blockIndent' ]
+					allowAttributes: [ 'blockIndent' ],
+					allowIn: 'parentBlock'
+				} );
+
+				model.schema.register( 'block', {
+					inheritAllFrom: '$block'
 				} );
-				model.schema.register( 'block', { inheritAllFrom: '$block' } );
 			} );
 	} );
 
@@ -46,6 +57,14 @@ describe( 'IndentBlockCommand', () => {
 			command = new IndentBlockCommand( editor, indentBehavior );
 		} );
 
+		describe( 'refresh()', () => {
+			it( 'should be disabled if a top-most block disallows indentBlock attribute', () => {
+				setData( model, '[<parentBlock><paragraph>foo</paragraph></parentBlock>]' );
+				command.refresh();
+				expect( command.isEnabled ).to.be.false;
+			} );
+		} );
+
 		describe( 'execute()', () => {
 			it( 'should be executed for all selected blocks', () => {
 				setData( model,
@@ -66,6 +85,16 @@ describe( 'IndentBlockCommand', () => {
 				command.execute();
 				sinon.assert.calledTwice( indentBehavior.getNextIndent );
 			} );
+
+			it( 'should be executed only for top-most blocks that can have indentBlock attribute', () => {
+				setData( model,
+					'<paragraph>f[oo</paragraph>' +
+					'<parentBlock><paragraph>foo</paragraph><paragraph>foo</paragraph></parentBlock>' +
+					'<paragraph>f]oo</paragraph>'
+				);
+				command.execute();
+				sinon.assert.calledTwice( indentBehavior.getNextIndent );
+			} );
 		} );
 	} );
 
@@ -117,6 +146,20 @@ describe( 'IndentBlockCommand', () => {
 					command.execute();
 					expect( getData( model ) ).to.equal( '<paragraph blockIndent="indent-3">f[]oo</paragraph>' );
 				} );
+
+				it( 'should be executed only for top-most blocks that can have indentBlock attribute', () => {
+					setData( model,
+						'<paragraph>f[oo</paragraph>' +
+						'<parentBlock><paragraph>foo</paragraph><paragraph>foo</paragraph></parentBlock>' +
+						'<paragraph>f]oo</paragraph>'
+					);
+					command.execute();
+					expect( getData( model ) ).to.equal(
+						'<paragraph blockIndent="indent-1">f[oo</paragraph>' +
+						'<parentBlock><paragraph>foo</paragraph><paragraph>foo</paragraph></parentBlock>' +
+						'<paragraph blockIndent="indent-1">f]oo</paragraph>'
+					);
+				} );
 			} );
 		} );