Skip to content

Run distinguishable in sync as only runs on dev mode #547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 1, 2019
Merged

Run distinguishable in sync as only runs on dev mode #547

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 11 additions & 42 deletions src/core/vdom.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,7 +934,6 @@ export function renderer(renderer: () => RenderResult): Renderer {
let _insertBeforeMap: undefined | WeakMap<DNodeWrapper, Node> = new WeakMap<DNodeWrapper, Node>();
let _nodeToWrapperMap = new WeakMap<VNode | WNode<any>, WNodeWrapper>();
let _renderScheduled: number | undefined;
let _idleCallbacks: Function[] = [];
let _deferredRenderCallbacks: Function[] = [];
let parentInvalidate: () => void;
let _allMergedNodes: Node[] = [];
Expand Down Expand Up @@ -1290,7 +1289,7 @@ export function renderer(renderer: () => RenderResult): Renderer {
}
}

function runDeferredRenderCallbacks() {
function _runDeferredRenderCallbacks() {
const { sync } = _mountOptions;
const callbacks = _deferredRenderCallbacks;
_deferredRenderCallbacks = [];
Expand All @@ -1309,29 +1308,6 @@ export function renderer(renderer: () => RenderResult): Renderer {
}
}

function runAfterRenderCallbacks() {
const { sync } = _mountOptions;
const callbacks = _idleCallbacks;
_idleCallbacks = [];
if (callbacks.length) {
const run = () => {
let callback: Function | undefined;
while ((callback = callbacks.shift())) {
callback();
}
};
if (sync) {
run();
} else {
if (global.requestIdleCallback) {
global.requestIdleCallback(run);
} else {
setTimeout(run);
}
}
}
}

function processProperties(next: VNodeWrapper, previousProperties: PreviousProperties) {
if (next.node.attributes && next.node.events) {
updateAttributes(
Expand Down Expand Up @@ -1391,7 +1367,7 @@ export function renderer(renderer: () => RenderResult): Renderer {
_runDomInstructionQueue();
_cleanUpMergedNodes();
_insertBeforeMap = undefined;
_runCallbacks();
_runDeferredRenderCallbacks();
}

function invalidate() {
Expand Down Expand Up @@ -1473,7 +1449,7 @@ export function renderer(renderer: () => RenderResult): Renderer {
}
_runDomInstructionQueue();
_cleanUpMergedNodes();
_runCallbacks();
_runDeferredRenderCallbacks();
}

function _cleanUpMergedNodes() {
Expand Down Expand Up @@ -1585,11 +1561,6 @@ export function renderer(renderer: () => RenderResult): Renderer {
}
}

function _runCallbacks() {
runAfterRenderCallbacks();
runDeferredRenderCallbacks();
}

function _processMergeNodes(next: DNodeWrapper, mergeNodes: Node[]) {
const { merge } = _mountOptions;
if (merge && mergeNodes.length) {
Expand All @@ -1616,11 +1587,9 @@ export function renderer(renderer: () => RenderResult): Renderer {
}
}

function registerDistinguishableCallback(childNodes: DNodeWrapper[], index: number) {
_idleCallbacks.push(() => {
const parentWNodeWrapper = getWNodeWrapper(childNodes[index].owningId);
checkDistinguishable(childNodes, index, parentWNodeWrapper);
});
function distinguishableCheck(childNodes: DNodeWrapper[], index: number) {
const parentWNodeWrapper = getWNodeWrapper(childNodes[index].owningId);
checkDistinguishable(childNodes, index, parentWNodeWrapper);
}

function createKeyMap(wrappers: DNodeWrapper[]): (string | number)[] | false {
Expand Down Expand Up @@ -1681,16 +1650,16 @@ export function renderer(renderer: () => RenderResult): Renderer {
}
instructions.push({ current: currentWrapper, next: nextWrapper });
} else if (!currentWrapper || findIndexOfChild(current, nextWrapper, oldIndex + 1) === -1) {
has('dojo-debug') && current.length && registerDistinguishableCallback(next, newIndex);
has('dojo-debug') && current.length && distinguishableCheck(next, newIndex);
instructions.push({ current: undefined, next: nextWrapper });
newIndex++;
} else if (findIndexOfChild(next, currentWrapper, newIndex + 1) === -1) {
has('dojo-debug') && registerDistinguishableCallback(current, oldIndex);
has('dojo-debug') && distinguishableCheck(current, oldIndex);
instructions.push({ current: currentWrapper, next: undefined });
oldIndex++;
} else {
has('dojo-debug') && registerDistinguishableCallback(next, newIndex);
has('dojo-debug') && registerDistinguishableCallback(current, oldIndex);
has('dojo-debug') && distinguishableCheck(next, newIndex);
has('dojo-debug') && distinguishableCheck(current, oldIndex);
instructions.push({ current: currentWrapper, next: undefined });
instructions.push({ current: undefined, next: nextWrapper });
oldIndex++;
Expand All @@ -1702,7 +1671,7 @@ export function renderer(renderer: () => RenderResult): Renderer {
}
if (currentLength > oldIndex && newIndex >= nextLength) {
for (let i = oldIndex; i < currentLength; i++) {
has('dojo-debug') && registerDistinguishableCallback(current, i);
has('dojo-debug') && distinguishableCheck(current, i);
instructions.push({ current: current[i], next: undefined });
}
}
Expand Down