@@ -11,7 +11,13 @@ import type {Fiber} from 'react-reconciler/src/ReactFiber';
11
11
import type { FiberRoot } from 'react-reconciler/src/ReactFiberRoot' ;
12
12
import type { Instance , TextInstance } from './ReactTestHostConfig' ;
13
13
14
- import * as TestRenderer from 'react-reconciler/inline.test' ;
14
+ import {
15
+ getPublicRootInstance ,
16
+ createContainer ,
17
+ updateContainer ,
18
+ flushSync ,
19
+ injectIntoDevTools ,
20
+ } from 'react-reconciler/inline.test' ;
15
21
import { batchedUpdates } from 'events/ReactGenericBatching' ;
16
22
import { findCurrentFiberUsingSlowPath } from 'react-reconciler/reflection' ;
17
23
import {
@@ -34,8 +40,14 @@ import {
34
40
import invariant from 'shared/invariant' ;
35
41
import ReactVersion from 'shared/ReactVersion' ;
36
42
37
- import * as ReactTestHostConfig from './ReactTestHostConfig' ;
38
- import * as TestRendererScheduling from './ReactTestRendererScheduling' ;
43
+ import { getPublicInstance } from './ReactTestHostConfig' ;
44
+ import {
45
+ flushAll ,
46
+ flushNumberOfYields ,
47
+ clearYields ,
48
+ setNowImplementation ,
49
+ yieldValue ,
50
+ } from './ReactTestRendererScheduling' ;
39
51
40
52
type TestRendererOptions = {
41
53
createNodeMock : ( element : React$Element < any > ) => any ,
@@ -277,7 +289,7 @@ class ReactTestInstance {
277
289
278
290
get instance ( ) {
279
291
if ( this . _fiber . tag === HostComponent ) {
280
- return ReactTestHostConfig . getPublicInstance ( this . _fiber . stateNode ) ;
292
+ return getPublicInstance ( this . _fiber . stateNode ) ;
281
293
} else {
282
294
return this . _fiber . stateNode ;
283
295
}
@@ -428,13 +440,13 @@ const ReactTestRendererFiber = {
428
440
createNodeMock ,
429
441
tag : 'CONTAINER ',
430
442
} ;
431
- let root : FiberRoot | null = TestRenderer . createContainer (
443
+ let root : FiberRoot | null = createContainer (
432
444
container ,
433
445
isConcurrent ,
434
446
false ,
435
447
) ;
436
448
invariant ( root != null , 'something went wrong ') ;
437
- TestRenderer . updateContainer ( element , root , null , null ) ;
449
+ updateContainer ( element , root , null , null ) ;
438
450
439
451
const entry = {
440
452
root : undefined , // makes flow happy
@@ -475,30 +487,30 @@ const ReactTestRendererFiber = {
475
487
if ( root == null || root . current == null ) {
476
488
return ;
477
489
}
478
- TestRenderer . updateContainer ( newElement , root , null , null ) ;
490
+ updateContainer ( newElement , root , null , null ) ;
479
491
} ,
480
492
unmount ( ) {
481
493
if ( root == null || root . current == null ) {
482
494
return ;
483
495
}
484
- TestRenderer . updateContainer ( null , root , null , null ) ;
496
+ updateContainer ( null , root , null , null ) ;
485
497
container = null ;
486
498
root = null ;
487
499
} ,
488
500
getInstance ( ) {
489
501
if ( root == null || root . current == null ) {
490
502
return null ;
491
503
}
492
- return TestRenderer . getPublicRootInstance ( root ) ;
504
+ return getPublicRootInstance ( root ) ;
493
505
} ,
494
506
495
- unstable_flushAll: TestRendererScheduling . flushAll ,
507
+ unstable_flushAll : flushAll ,
496
508
unstable_flushSync < T > ( fn : ( ) = > T ) : T {
497
- TestRendererScheduling . clearYields ( ) ;
498
- return TestRenderer . flushSync ( fn ) ;
509
+ clearYields ( ) ;
510
+ return flushSync ( fn ) ;
499
511
} ,
500
- unstable_flushNumberOfYields: TestRendererScheduling . flushNumberOfYields ,
501
- unstable_clearYields : TestRendererScheduling . clearYields ,
512
+ unstable_flushNumberOfYields : flushNumberOfYields ,
513
+ unstable_clearYields : clearYields ,
502
514
} ;
503
515
504
516
Object . defineProperty (
@@ -529,14 +541,14 @@ const ReactTestRendererFiber = {
529
541
return entry ;
530
542
} ,
531
543
532
- unstable_yield: TestRendererScheduling . yieldValue ,
533
- unstable_clearYields : TestRendererScheduling . clearYields ,
544
+ unstable_yield: yieldValue ,
545
+ unstable_clearYields : clearYields ,
534
546
535
547
/* eslint-disable camelcase */
536
548
unstable_batchedUpdates : batchedUpdates ,
537
549
/* eslint-enable camelcase */
538
550
539
- unstable_setNowImplementation : TestRendererScheduling . setNowImplementation ,
551
+ unstable_setNowImplementation : setNowImplementation ,
540
552
} ;
541
553
542
554
const fiberToWrapper = new WeakMap ( ) ;
@@ -553,7 +565,7 @@ function wrapFiber(fiber: Fiber): ReactTestInstance {
553
565
}
554
566
555
567
// Enable ReactTestRenderer to be used to test DevTools integration.
556
- TestRenderer . injectIntoDevTools ( {
568
+ injectIntoDevTools ( {
557
569
findFiberByHostInstance : ( ( ) => {
558
570
throw new Error ( 'TestRenderer does not support findFiberByHostInstance()' ) ;
559
571
} : any ) ,
0 commit comments