yystopf
/
inula
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Match-id-be8ec88f391f0dff5b761a62104e86f07dee1a42

This commit is contained in:
* 2022-02-17 14:35:14 +08:00 committed by *
parent 6f977fce7a
commit 0ff6a0bddb
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/horizon/src/renderer/diff/DiffTools.ts
View File

@ -9,10 +9,6 @@ export function isTextType(newChild: any) {
return typeof newChild === 'string' || typeof newChild === 'number'; return typeof newChild === 'string' || typeof newChild === 'number';
} }
export function isArrayType(newChild: any) {
return Array.isArray(newChild);
}
export function isIteratorType(newChild: any) { export function isIteratorType(newChild: any) {
return (typeof Symbol === 'function' && newChild[Symbol.iterator]) || newChild['@@iterator']; return (typeof Symbol === 'function' && newChild[Symbol.iterator]) || newChild['@@iterator'];
} }

9
libs/horizon/src/renderer/diff/nodeDiffComparator.ts
View File

@ -7,7 +7,6 @@ import {
isSameType, isSameType,
getIteratorFn, getIteratorFn,
isTextType, isTextType,
isArrayType,
isIteratorType, isIteratorType,
isObjectType, isObjectType,
} from './DiffTools'; } from './DiffTools';
@ -60,7 +59,7 @@ function checkCanReuseNode(oldNode: VNode | null, newChild: any): boolean {
} }
if (isObjectType(newChild)) { if (isObjectType(newChild)) {
if (isArrayType(newChild) || isIteratorType(newChild)) { if (Array.isArray(newChild) || isIteratorType(newChild)) {
return oldKey === null; return oldKey === null;
} }
if (newChild.vtype === TYPE_COMMON_ELEMENT || newChild.vtype === TYPE_PORTAL) { if (newChild.vtype === TYPE_COMMON_ELEMENT || newChild.vtype === TYPE_PORTAL) {
@ -79,7 +78,7 @@ function getNodeType(newChild: any): string | null {
return DiffCategory.TEXT_NODE; return DiffCategory.TEXT_NODE;
} }
if (isObjectType(newChild)) { if (isObjectType(newChild)) {
if (isArrayType(newChild) || isIteratorType(newChild)) { if (Array.isArray(newChild) || isIteratorType(newChild)) {
return DiffCategory.ARR_NODE; return DiffCategory.ARR_NODE;
} }
if (newChild.vtype === TYPE_COMMON_ELEMENT || newChild.vtype === TYPE_PORTAL) { if (newChild.vtype === TYPE_COMMON_ELEMENT || newChild.vtype === TYPE_PORTAL) {
@ -200,7 +199,7 @@ function getOldNodeFromMap(nodeMap: Map<string | number, VNode>, newIdx: number,
return nodeMap.get(newIdx) || null; return nodeMap.get(newIdx) || null;
} }
if (isObjectType(newChild)) { if (isObjectType(newChild)) {
if (isArrayType(newChild) || isIteratorType(newChild)) { if (Array.isArray(newChild) || isIteratorType(newChild)) {
return nodeMap.get(newIdx) || null; return nodeMap.get(newIdx) || null;
} }
if (newChild.vtype === TYPE_COMMON_ELEMENT || newChild.vtype === TYPE_PORTAL) { if (newChild.vtype === TYPE_COMMON_ELEMENT || newChild.vtype === TYPE_PORTAL) {
@ -629,7 +628,7 @@ export function createChildrenByDiff(
} }
// 3. newChild是数组类型 // 3. newChild是数组类型
if (isArrayType(newChild)) { if (Array.isArray(newChild)) {
return diffArrayNodesHandler(parentNode, firstChild, newChild, isComparing); return diffArrayNodesHandler(parentNode, firstChild, newChild, isComparing);
} }