Commit 07abb9e

authored

fix(renderer): order not preserved (#2261)

1 parent 1dca81b commit 07abb9eCopy full SHA for 07abb9e

File tree

3 files changed

+15

-13

lines changed

nativescript-angular

3 files changed

+15

-13

lines changed

`‎nativescript-angular/element-registry.ts`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@ export interface ViewExtensions {`
`9`	`9`	`nodeName: string;`
`10`	`10`	`parentNode: NgView;`
`11`	`11`	`nextSibling: NgView;`
	`12`	`+ previousSibling: NgView;`
`12`	`13`	`firstChild: NgView;`
`13`	`14`	`lastChild: NgView;`
`14`	`15`	`ngCssClasses: Map<string, boolean>;`
`@@ -22,6 +23,7 @@ export abstract class InvisibleNode extends View implements NgView {`
`22`	`23`	`nodeName: string;`
`23`	`24`	`parentNode: NgView;`
`24`	`25`	`nextSibling: NgView;`
	`26`	`+ previousSibling: NgView;`
`25`	`27`	`firstChild: NgView;`
`26`	`28`	`lastChild: NgView;`
`27`	`29`	`ngCssClasses: Map<string, boolean>;`

`‎nativescript-angular/renderer.ts`

Lines changed: 4 additions & 12 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,11 +6,6 @@ import { ViewUtil } from './view-util';`
`6`	`6`	`import { NgView, InvisibleNode } from './element-registry';`
`7`	`7`	`import { NativeScriptDebug } from './trace';`
`8`	`8`
`9`		`-export interface ElementReference {`
`10`		`- previous: NgView;`
`11`		`- next: NgView;`
`12`		`-}`
`13`		`-`
`14`	`9`	`@Injectable()`
`15`	`10`	`export class NativeScriptRenderer extends Renderer2 {`
`16`	`11`	`data: { [key: string]: any } = Object.create(null);`
`@@ -31,8 +26,8 @@ export class NativeScriptRenderer extends Renderer2 {`
`31`	`26`	`}`
`32`	`27`
`33`	`28`	`@profile`
`34`		`- insertBefore(parent: NgView, newChild: NgView, refChild: NgView\|ElementReference): void {`
`35`		`- let { previous, next } = refChild instanceof View ? this.nextSibling(refChild): refChild;`
	`29`	`+ insertBefore(parent: NgView, newChild: NgView, refChild: NgView): void {`
	`30`	`+ let { previous, next } = refChild instanceof View ? {previous: refChild.previousSibling,next: refChild} : {previous: null,next: null};`
`36`	`31`	`if (NativeScriptDebug.isLogEnabled()) {`
`37`	`32`	NativeScriptDebug.rendererLog(`NativeScriptRenderer.insertBefore child: ${newChild} ` + `parent: ${parent} previous: ${previous} next: ${next}`);
`38`	`33`	`}`
`@@ -68,15 +63,12 @@ export class NativeScriptRenderer extends Renderer2 {`
`68`	`63`	`}`
`69`	`64`
`70`	`65`	`@profile`
`71`		`- nextSibling(node: NgView): ElementReference {`
	`66`	`+ nextSibling(node: NgView): NgView {`
`72`	`67`	`if (NativeScriptDebug.isLogEnabled()) {`
`73`	`68`	NativeScriptDebug.rendererLog(`NativeScriptRenderer.nextSibling of ${node} is ${node.nextSibling}`);
`74`	`69`	`}`
`75`	`70`
`76`		`- return {`
`77`		`- previous: node,`
`78`		`- next: node.nextSibling,`
`79`		`- };`
	`71`	`+ return node.nextSibling;`
`80`	`72`	`}`
`81`	`73`
`82`	`74`	`@profile`

`‎nativescript-angular/view-util.ts`

Lines changed: 9 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -63,12 +63,14 @@ export class ViewUtil {`
`63`	`63`
`64`	`64`	`if (previous) {`
`65`	`65`	`previous.nextSibling = child;`
	`66`	`+ child.previousSibling = previous;`
`66`	`67`	`} else {`
`67`	`68`	`parent.firstChild = child;`
`68`	`69`	`}`
`69`	`70`
`70`	`71`	`if (next) {`
`71`	`72`	`child.nextSibling = next;`
	`73`	`+ next.previousSibling = child;`
`72`	`74`	`} else {`
`73`	`75`	`this.appendToQueue(parent, child);`
`74`	`76`	`}`
`@@ -81,6 +83,7 @@ export class ViewUtil {`
`81`	`83`
`82`	`84`	`if (parent.lastChild) {`
`83`	`85`	`parent.lastChild.nextSibling = view;`
	`86`	`+ view.previousSibling = parent.lastChild;`
`84`	`87`	`}`
`85`	`88`
`86`	`89`	`parent.lastChild = view;`
`@@ -152,23 +155,28 @@ export class ViewUtil {`
`152`	`155`	`parent.firstChild = null;`
`153`	`156`	`parent.lastChild = null;`
`154`	`157`	`child.nextSibling = null;`
	`158`	`+ child.previousSibling = null;`
`155`	`159`	`return;`
`156`	`160`	`}`
`157`	`161`
`158`	`162`	`if (parent.firstChild === child) {`
`159`	`163`	`parent.firstChild = child.nextSibling;`
`160`	`164`	`}`
`161`	`165`
`162`		`- const previous = this.findPreviousElement(parent,child);`
	`166`	`+ const previous = child.previousSibling;`
`163`	`167`	`if (parent.lastChild === child) {`
`164`	`168`	`parent.lastChild = previous;`
`165`	`169`	`}`
`166`	`170`
`167`	`171`	`if (previous) {`
`168`	`172`	`previous.nextSibling = child.nextSibling;`
	`173`	`+ if (child.nextSibling) {`
	`174`	`+ child.nextSibling.previousSibling = previous;`
	`175`	`+ }`
`169`	`176`	`}`
`170`	`177`
`171`	`178`	`child.nextSibling = null;`
	`179`	`+ child.previousSibling = null;`
`172`	`180`	`}`
`173`	`181`
`174`	`182`	`// NOTE: This one is O(n) - use carefully`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 07abb9e

File tree

3 files changed

3 files changed

`‎nativescript-angular/element-registry.ts`

`‎nativescript-angular/renderer.ts`

`‎nativescript-angular/view-util.ts`

0 commit comments