Renamed HeadingCommand's private method _updateValue to public refres…

…hValue. Removed schema.objects checking from _checkEnabled method.

src/headingcommand.js

@@ -42,7 +42,7 @@ export default class HeadingCommand extends Command {
 
 		// Update current value each time changes are done on document.
 		this.listenTo( editor.document, 'changesDone', () => {
-			this._updateValue();
+			this.refreshValue();
 			this.refreshState();
 		} );
 
@@ -112,10 +112,8 @@ export default class HeadingCommand extends Command {
 
 	/**
 	 * Updates command's {@link #value value} based on current selection.
-	 *
-	 * @private
 	 */
-	_updateValue() {
+	refreshValue() {
 		const block = first( this.editor.document.selection.getSelectedBlocks() );
 
 		this.value = !!block && block.is( this.modelElement );
@@ -127,17 +125,10 @@ export default class HeadingCommand extends Command {
 	_checkEnabled() {
 		const block = first( this.editor.document.selection.getSelectedBlocks() );
 
-		if ( !block ) {
-			return false;
-		}
-
-		const schema = this.editor.document.schema;
-		const isAllowed = schema.check( {
+		return !!block && this.editor.document.schema.check( {
 			name: this.modelElement,
 			inside: Position.createBefore( block )
 		} );
-
-		return isAllowed && !schema.objects.has( block.name );
 	}
 }
 

tests/headingcommand.js

@@ -37,11 +37,6 @@ describe( 'HeadingCommand', () => {
 			schema.allow( { name: 'notBlock', inside: '$root' } );
 			schema.allow( { name: '$text', inside: 'notBlock' } );
 
-			schema.registerItem( 'object' );
-			schema.allow( { name: 'object', inside: '$root' } );
-			schema.allow( { name: '$text', inside: 'object' } );
-			schema.objects.add( 'object' );
-
 			root = document.getRoot();
 		} );
 	} );
@@ -96,6 +91,19 @@ describe( 'HeadingCommand', () => {
 
 				expect( commands[ modelElement ].value ).to.be.false;
 			} );
+
+			it( 'should be refreshed after calling refreshValue()', () => {
+				const command = commands[ modelElement ];
+				setData( document, `<${ modelElement }>[foo]</${ modelElement }><notBlock>foo</notBlock>` );
+				const element = document.getRoot().getChild( 1 );
+
+				// Purposely not putting it in `document.enqueueChanges` to update command manually.
+				document.selection.setRanges( [ Range.createIn( element ) ] );
+
+				expect( command.value ).to.be.true;
+				command.refreshValue();
+				expect( command.value ).to.be.false;
+			} );
 		}
 	} );
 
@@ -243,14 +251,8 @@ describe( 'HeadingCommand', () => {
 					expect( command.isEnabled ).to.be.false;
 				} );
 
-				it( 'should be disabled if inside object', () => {
-					setData( document, '<object>f{}oo</object>' );
-
-					expect( command.isEnabled ).to.be.false;
-				} );
-
-				it( 'should be disabled if selection is placed on object', () => {
-					setData( document, '[<object>foo</object>]' );
+				it( 'should be disabled if selection is placed on non-block', () => {
+					setData( document, '[<notBlock>foo</notBlock>]' );
 
 					expect( command.isEnabled ).to.be.false;
 				} );