@@ -841,7 +841,6 @@ export function renderer(renderer: () => RenderResult): Renderer {
841
841
let _insertBeforeMap : undefined | WeakMap < DNodeWrapper , Node > = new WeakMap < DNodeWrapper , Node > ( ) ;
842
842
let _nodeToWrapperMap = new WeakMap < VNode | WNode < any > , WNodeWrapper > ( ) ;
843
843
let _renderScheduled : number | undefined ;
844
- let _idleCallbacks : Function [ ] = [ ] ;
845
844
let _deferredRenderCallbacks : Function [ ] = [ ] ;
846
845
let parentInvalidate : ( ) => void ;
847
846
let _allMergedNodes : Node [ ] = [ ] ;
@@ -1197,7 +1196,7 @@ export function renderer(renderer: () => RenderResult): Renderer {
1197
1196
}
1198
1197
}
1199
1198
1200
- function runDeferredRenderCallbacks ( ) {
1199
+ function _runDeferredRenderCallbacks ( ) {
1201
1200
const { sync } = _mountOptions ;
1202
1201
const callbacks = _deferredRenderCallbacks ;
1203
1202
_deferredRenderCallbacks = [ ] ;
@@ -1216,29 +1215,6 @@ export function renderer(renderer: () => RenderResult): Renderer {
1216
1215
}
1217
1216
}
1218
1217
1219
- function runAfterRenderCallbacks ( ) {
1220
- const { sync } = _mountOptions ;
1221
- const callbacks = _idleCallbacks ;
1222
- _idleCallbacks = [ ] ;
1223
- if ( callbacks . length ) {
1224
- const run = ( ) => {
1225
- let callback : Function | undefined ;
1226
- while ( ( callback = callbacks . shift ( ) ) ) {
1227
- callback ( ) ;
1228
- }
1229
- } ;
1230
- if ( sync ) {
1231
- run ( ) ;
1232
- } else {
1233
- if ( global . requestIdleCallback ) {
1234
- global . requestIdleCallback ( run ) ;
1235
- } else {
1236
- setTimeout ( run ) ;
1237
- }
1238
- }
1239
- }
1240
- }
1241
-
1242
1218
function processProperties ( next : VNodeWrapper , previousProperties : PreviousProperties ) {
1243
1219
if ( next . node . attributes && next . node . events ) {
1244
1220
updateAttributes (
@@ -1298,7 +1274,7 @@ export function renderer(renderer: () => RenderResult): Renderer {
1298
1274
_runDomInstructionQueue ( ) ;
1299
1275
_cleanUpMergedNodes ( ) ;
1300
1276
_insertBeforeMap = undefined ;
1301
- _runCallbacks ( ) ;
1277
+ _runDeferredRenderCallbacks ( ) ;
1302
1278
}
1303
1279
1304
1280
function invalidate ( ) {
@@ -1380,7 +1356,7 @@ export function renderer(renderer: () => RenderResult): Renderer {
1380
1356
}
1381
1357
_runDomInstructionQueue ( ) ;
1382
1358
_cleanUpMergedNodes ( ) ;
1383
- _runCallbacks ( ) ;
1359
+ _runDeferredRenderCallbacks ( ) ;
1384
1360
}
1385
1361
1386
1362
function _cleanUpMergedNodes ( ) {
@@ -1492,11 +1468,6 @@ export function renderer(renderer: () => RenderResult): Renderer {
1492
1468
}
1493
1469
}
1494
1470
1495
- function _runCallbacks ( ) {
1496
- runAfterRenderCallbacks ( ) ;
1497
- runDeferredRenderCallbacks ( ) ;
1498
- }
1499
-
1500
1471
function _processMergeNodes ( next : DNodeWrapper , mergeNodes : Node [ ] ) {
1501
1472
const { merge } = _mountOptions ;
1502
1473
if ( merge && mergeNodes . length ) {
@@ -1523,11 +1494,9 @@ export function renderer(renderer: () => RenderResult): Renderer {
1523
1494
}
1524
1495
}
1525
1496
1526
- function registerDistinguishableCallback ( childNodes : DNodeWrapper [ ] , index : number ) {
1527
- _idleCallbacks . push ( ( ) => {
1528
- const parentWNodeWrapper = getWNodeWrapper ( childNodes [ index ] . owningId ) ;
1529
- checkDistinguishable ( childNodes , index , parentWNodeWrapper ) ;
1530
- } ) ;
1497
+ function distinguishableCheck ( childNodes : DNodeWrapper [ ] , index : number ) {
1498
+ const parentWNodeWrapper = getWNodeWrapper ( childNodes [ index ] . owningId ) ;
1499
+ checkDistinguishable ( childNodes , index , parentWNodeWrapper ) ;
1531
1500
}
1532
1501
1533
1502
function createKeyMap ( wrappers : DNodeWrapper [ ] ) : ( string | number ) [ ] | false {
@@ -1588,16 +1557,16 @@ export function renderer(renderer: () => RenderResult): Renderer {
1588
1557
}
1589
1558
instructions . push ( { current : currentWrapper , next : nextWrapper } ) ;
1590
1559
} else if ( ! currentWrapper || findIndexOfChild ( current , nextWrapper , oldIndex + 1 ) === - 1 ) {
1591
- has ( 'dojo-debug' ) && current . length && registerDistinguishableCallback ( next , newIndex ) ;
1560
+ has ( 'dojo-debug' ) && current . length && distinguishableCheck ( next , newIndex ) ;
1592
1561
instructions . push ( { current : undefined , next : nextWrapper } ) ;
1593
1562
newIndex ++ ;
1594
1563
} else if ( findIndexOfChild ( next , currentWrapper , newIndex + 1 ) === - 1 ) {
1595
- has ( 'dojo-debug' ) && registerDistinguishableCallback ( current , oldIndex ) ;
1564
+ has ( 'dojo-debug' ) && distinguishableCheck ( current , oldIndex ) ;
1596
1565
instructions . push ( { current : currentWrapper , next : undefined } ) ;
1597
1566
oldIndex ++ ;
1598
1567
} else {
1599
- has ( 'dojo-debug' ) && registerDistinguishableCallback ( next , newIndex ) ;
1600
- has ( 'dojo-debug' ) && registerDistinguishableCallback ( current , oldIndex ) ;
1568
+ has ( 'dojo-debug' ) && distinguishableCheck ( next , newIndex ) ;
1569
+ has ( 'dojo-debug' ) && distinguishableCheck ( current , oldIndex ) ;
1601
1570
instructions . push ( { current : currentWrapper , next : undefined } ) ;
1602
1571
instructions . push ( { current : undefined , next : nextWrapper } ) ;
1603
1572
oldIndex ++ ;
@@ -1609,7 +1578,7 @@ export function renderer(renderer: () => RenderResult): Renderer {
1609
1578
}
1610
1579
if ( currentLength > oldIndex && newIndex >= nextLength ) {
1611
1580
for ( let i = oldIndex ; i < currentLength ; i ++ ) {
1612
- has ( 'dojo-debug' ) && registerDistinguishableCallback ( current , i ) ;
1581
+ has ( 'dojo-debug' ) && distinguishableCheck ( current , i ) ;
1613
1582
instructions . push ( { current : current [ i ] , next : undefined } ) ;
1614
1583
}
1615
1584
}
0 commit comments