@@ -380,13 +380,13 @@ import RootController from '../../lib/controllers/root-controller';
380
380
381
381
const FAKE_PANE_ITEM = Symbol ( 'fake pane item' ) ;
382
382
mockDockItem = {
383
- visible : false ,
383
+ active : false ,
384
384
reveal ( ) {
385
- this . visible = true ;
385
+ this . active = true ;
386
386
return Promise . resolve ( ) ;
387
387
} ,
388
388
hide ( ) {
389
- this . visible = false ;
389
+ this . active = false ;
390
390
return Promise . resolve ( ) ;
391
391
} ,
392
392
getDockItem ( ) {
@@ -399,114 +399,114 @@ import RootController from '../../lib/controllers/root-controller';
399
399
400
400
sinon . stub ( workspace . getRightDock ( ) , 'isVisible' ) . returns ( true ) ;
401
401
sinon . stub ( workspace . getRightDock ( ) , 'getPanes' ) . callsFake ( ( ) => [ {
402
- getActiveItem ( ) { return mockDockItem . visible ? FAKE_PANE_ITEM : null ; } ,
402
+ getActiveItem ( ) { return mockDockItem . active ? FAKE_PANE_ITEM : null ; } ,
403
403
} ] ) ;
404
404
}
405
405
} ) ;
406
406
407
- function assertTabState ( { rendered, visible } ) {
407
+ function assertTabState ( { rendered, active } ) {
408
408
if ( useDocks ( ) ) {
409
409
const isRendered = wrapper . find ( 'DockItem' ) . find ( { stubItemSelector : `${ tabName } -tab-controller` } ) . exists ( ) ;
410
- const isVisible = mockDockItem . visible ;
410
+ const isActive = mockDockItem . active ;
411
411
412
412
assert . equal ( isRendered , rendered ) ;
413
- assert . equal ( isVisible , visible ) ;
413
+ assert . equal ( isActive , active ) ;
414
414
} else {
415
415
// Legacy panels API.
416
416
// Legacy panels are always rendered, so disregard "rendered" assertions.
417
417
const title = { git : 'Git' , github : 'GitHub (preview)' } [ tabName ] ;
418
418
419
- const isVisible = wrapper . find ( 'Panel' ) . find ( { visible : true } )
419
+ const isActive = wrapper . find ( 'Panel' ) . find ( { visible : true } )
420
420
. find ( 'Tabs' ) . find ( { activeIndex : tabIndex } )
421
421
. find ( 'TabPanel' ) . find ( { title} )
422
422
. exists ( ) ;
423
423
424
- assert . equal ( isVisible , visible ) ;
424
+ assert . equal ( isActive , active ) ;
425
425
}
426
426
}
427
427
428
428
describe ( 'toggle()' , function ( ) {
429
429
it ( `renders and reveals the ${ tabName } tab when item is not rendered` , async function ( ) {
430
- assertTabState ( { rendered : false , visible : false } ) ;
430
+ assertTabState ( { rendered : false , active : false } ) ;
431
431
432
432
await tabTracker . toggle ( ) ;
433
433
434
- assertTabState ( { rendered : true , visible : true } ) ;
434
+ assertTabState ( { rendered : true , active : true } ) ;
435
435
} ) ;
436
436
437
437
if ( ! useLegacyPanels ) {
438
- it ( `reveals the ${ tabName } tab when the item is rendered but not visible ` , async function ( ) {
438
+ it ( `reveals the ${ tabName } tab when the item is rendered but not active ` , async function ( ) {
439
439
wrapper . setState ( { [ stateKey ] : true } ) ;
440
440
441
- assertTabState ( { rendered : true , visible : false } ) ;
441
+ assertTabState ( { rendered : true , active : false } ) ;
442
442
443
443
await tabTracker . toggle ( ) ;
444
444
445
- assertTabState ( { rendered : true , visible : true } ) ;
445
+ assertTabState ( { rendered : true , active : true } ) ;
446
446
} ) ;
447
447
}
448
448
449
449
it ( `hides the ${ tabName } tab when open` , async function ( ) {
450
450
wrapper . setState ( { [ stateKey ] : true , activeTab : tabIndex } ) ;
451
- mockDockItem . visible = true ;
451
+ mockDockItem . active = true ;
452
452
453
- assertTabState ( { rendered : true , visible : true } ) ;
453
+ assertTabState ( { rendered : true , active : true } ) ;
454
454
455
455
await tabTracker . toggle ( ) ;
456
456
457
- assertTabState ( { rendered : true , visible : false } ) ;
457
+ assertTabState ( { rendered : true , active : false } ) ;
458
458
} ) ;
459
459
} ) ;
460
460
461
461
describe ( 'toggleFocus()' , function ( ) {
462
462
it ( `opens and focuses the ${ tabName } tab when it is initially closed` , async function ( ) {
463
- assertTabState ( { rendered : false , visible : false } ) ;
463
+ assertTabState ( { rendered : false , active : false } ) ;
464
464
sinon . stub ( tabTracker , 'hasFocus' ) . returns ( false ) ;
465
465
466
466
await tabTracker . toggleFocus ( ) ;
467
467
468
- assertTabState ( { rendered : true , visible : true } ) ;
468
+ assertTabState ( { rendered : true , active : true } ) ;
469
469
assert . isTrue ( tabTracker . focus . called ) ;
470
470
assert . isFalse ( workspace . getActivePane ( ) . activate . called ) ;
471
471
} ) ;
472
472
473
473
it ( `focuses the ${ tabName } tab when it is already open, but blurred` , async function ( ) {
474
474
await tabTracker . ensureVisible ( ) ;
475
- assertTabState ( { rendered : true , visible : true } ) ;
475
+ assertTabState ( { rendered : true , active : true } ) ;
476
476
sinon . stub ( tabTracker , 'hasFocus' ) . returns ( false ) ;
477
477
478
478
await tabTracker . toggleFocus ( ) ;
479
479
480
- assertTabState ( { rendered : true , visible : true } ) ;
480
+ assertTabState ( { rendered : true , active : true } ) ;
481
481
assert . isTrue ( tabTracker . focus . called ) ;
482
482
assert . isFalse ( workspace . getActivePane ( ) . activate . called ) ;
483
483
} ) ;
484
484
485
485
it ( `blurs the ${ tabName } tab when it is already open and focused` , async function ( ) {
486
486
await tabTracker . ensureVisible ( ) ;
487
- assertTabState ( { rendered : true , visible : true } ) ;
487
+ assertTabState ( { rendered : true , active : true } ) ;
488
488
sinon . stub ( tabTracker , 'hasFocus' ) . returns ( true ) ;
489
489
490
490
await tabTracker . toggleFocus ( ) ;
491
491
492
- assertTabState ( { rendered : true , visible : true } ) ;
492
+ assertTabState ( { rendered : true , active : true } ) ;
493
493
assert . isFalse ( tabTracker . focus . called ) ;
494
494
assert . isTrue ( workspace . getActivePane ( ) . activate . called ) ;
495
495
} ) ;
496
496
} ) ;
497
497
498
498
describe ( 'ensureVisible()' , function ( ) {
499
499
it ( `opens the ${ tabName } tab when it is initially closed` , async function ( ) {
500
- assertTabState ( { rendered : false , visible : false } ) ;
500
+ assertTabState ( { rendered : false , active : false } ) ;
501
501
assert . isTrue ( await tabTracker . ensureVisible ( ) ) ;
502
- assertTabState ( { rendered : true , visible : true } ) ;
502
+ assertTabState ( { rendered : true , active : true } ) ;
503
503
} ) ;
504
504
505
505
it ( `does nothing when the ${ tabName } tab is already open` , async function ( ) {
506
506
await tabTracker . toggle ( ) ;
507
- assertTabState ( { rendered : true , visible : true } ) ;
507
+ assertTabState ( { rendered : true , active : true } ) ;
508
508
assert . isFalse ( await tabTracker . ensureVisible ( ) ) ;
509
- assertTabState ( { rendered : true , visible : true } ) ;
509
+ assertTabState ( { rendered : true , active : true } ) ;
510
510
} ) ;
511
511
} ) ;
512
512
} ) ;
0 commit comments