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

Commit ac750c7

Browse files
authored
Merge pull request #551 from ckeditor/i/6548
Other: Removed the obsolete `DropdownView#focusTracker`. Closes ckeditor/ckeditor5#6548. MINOR BREAKING CHANGE: The `DropdownView#focusTracker` property has been removed as it served no purpose.
2 parents 5d86638 + 43b2e3c commit ac750c7

File tree

2 files changed

+0
-31
lines changed

2 files changed

+0
-31
lines changed

src/dropdown/dropdownview.js

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
*/
99

1010
import View from '../view';
11-
import FocusTracker from '@ckeditor/ckeditor5-utils/src/focustracker';
1211
import KeystrokeHandler from '@ckeditor/ckeditor5-utils/src/keystrokehandler';
1312

1413
import '../../theme/components/dropdown/dropdown.css';
@@ -155,14 +154,6 @@ export default class DropdownView extends View {
155154
*/
156155
this.set( 'panelPosition', 'auto' );
157156

158-
/**
159-
* Tracks information about DOM focus in the dropdown.
160-
*
161-
* @readonly
162-
* @member {module:utils/focustracker~FocusTracker}
163-
*/
164-
this.focusTracker = new FocusTracker();
165-
166157
/**
167158
* Instance of the {@link module:utils/keystrokehandler~KeystrokeHandler}. It manages
168159
* keystrokes of the dropdown:
@@ -277,9 +268,6 @@ export default class DropdownView extends View {
277268
// Listen for keystrokes coming from within #element.
278269
this.keystrokes.listenTo( this.element );
279270

280-
// Register #element in the focus tracker.
281-
this.focusTracker.add( this.element );
282-
283271
const closeDropdown = ( data, cancel ) => {
284272
if ( this.isOpen ) {
285273
this.buttonView.focus();

tests/dropdown/dropdownview.js

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import DropdownView from '../../src/dropdown/dropdownview';
77
import KeystrokeHandler from '@ckeditor/ckeditor5-utils/src/keystrokehandler';
8-
import FocusTracker from '@ckeditor/ckeditor5-utils/src/focustracker';
98
import { keyCodes } from '@ckeditor/ckeditor5-utils/src/keyboard';
109
import ButtonView from '../../src/button/buttonview';
1110
import DropdownPanelView from '../../src/dropdown/dropdownpanelview';
@@ -72,10 +71,6 @@ describe( 'DropdownView', () => {
7271
expect( view.panelPosition ).to.equal( 'auto' );
7372
} );
7473

75-
it( 'creates #focusTracker instance', () => {
76-
expect( view.focusTracker ).to.be.instanceOf( FocusTracker );
77-
} );
78-
7974
it( 'creates #keystrokeHandler instance', () => {
8075
expect( view.keystrokes ).to.be.instanceOf( KeystrokeHandler );
8176
} );
@@ -214,20 +209,6 @@ describe( 'DropdownView', () => {
214209
view.element.remove();
215210
} );
216211

217-
it( 'adds #element to #focusTracker', () => {
218-
const view = new DropdownView( locale,
219-
new ButtonView( locale ),
220-
new DropdownPanelView( locale ) );
221-
222-
const spy = sinon.spy( view.focusTracker, 'add' );
223-
224-
view.render();
225-
sinon.assert.calledOnce( spy );
226-
sinon.assert.calledWithExactly( spy, view.element );
227-
228-
view.element.remove();
229-
} );
230-
231212
describe( 'activates keyboard navigation for the dropdown', () => {
232213
it( 'so "arrowdown" opens the #panelView', () => {
233214
const keyEvtData = {

0 commit comments

Comments
 (0)