Make didCreate and didUpdate post-order

See emberjs/ember.js#13972
glimmerjs · Sep 7, 2016 · fb5c83e · fb5c83e
1 parent 172383e
commit fb5c83e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/packages/glimmer-runtime/lib/compiled/opcodes/component.ts b/packages/glimmer-runtime/lib/compiled/opcodes/component.ts
@@ -69,7 +69,6 @@ export class OpenComponentOpcode extends Opcode {
     vm.stack().pushSimpleBlock();
     vm.pushRootScope(selfRef, layout.symbols);
     vm.invokeLayout(args, layout, templates, callerScope, component, manager, shadow);
-    vm.env.didCreate(component, manager);
 
     vm.updateWith(new UpdateComponentOpcode(definition.name, component, manager, args, dynamicScope));
   }
@@ -100,7 +99,6 @@ export class UpdateComponentOpcode extends UpdatingOpcode {
     let { component, manager, args, dynamicScope } = this;
 
     manager.update(component, args, dynamicScope);
-    vm.env.didUpdate(component, manager);
   }
 
   toJSON(): OpcodeJSON {
@@ -167,6 +165,8 @@ export class DidRenderLayoutOpcode extends Opcode {
 
     manager.didRenderLayout(component, bounds);
 
+    vm.env.didCreate(component, manager);
+
     vm.updateWith(new DidUpdateLayoutOpcode(manager, component, bounds));
   }
 }
@@ -183,9 +183,12 @@ export class DidUpdateLayoutOpcode extends UpdatingOpcode {
     super();
   }
 
-  evaluate() {
+  evaluate(vm: UpdatingVM) {
     let { manager, component, bounds } = this;
+
     manager.didUpdateLayout(component, bounds);
+
+    vm.env.didUpdate(component, manager);
   }
 }
 

diff --git a/packages/glimmer-runtime/lib/environment.ts b/packages/glimmer-runtime/lib/environment.ts
@@ -207,7 +207,7 @@ export abstract class Environment {
       manager.didCreate(component);
     }
 
-    for (let i=this.updatedComponents.length-1; i>=0; i--) {
+    for (let i=0; i<this.updatedComponents.length; i++) {
       let component = this.updatedComponents[i];
       let manager = this.updatedManagers[i];
       manager.didUpdate(component);