fix(components): TranscludingComponentFactory passes a wrong element …

…to onShadowRoot Closes dart-archive#1435
vsavkin · Sep 8, 2014 · 20ef6b0 · 20ef6b0
1 parent f14cc71
commit 20ef6b0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/lib/core_dom/transcluding_component_factory.dart b/lib/core_dom/transcluding_component_factory.dart
@@ -53,7 +53,8 @@ class BoundTranscludingComponentFactory implements BoundComponentFactory {
       var childInjectorCompleter; // Used if the ViewFuture is available before the childInjector.
 
       var component = _component;
-      var lightDom = new LightDom(element, scope);
+      final shadowRoot = new EmulatedShadowRoot(element);
+      final lightDom = new LightDom(element, scope);
 
       // Append the component's template as children
       var elementFuture;
@@ -64,12 +65,12 @@ class BoundTranscludingComponentFactory implements BoundComponentFactory {
 
           if (childInjector != null) {
             lightDom.shadowDomView = viewFactory.call(childInjector.scope, childInjector);
-            return element;
+            return shadowRoot;
           } else {
             childInjectorCompleter = new async.Completer();
             return childInjectorCompleter.future.then((childInjector) {
               lightDom.shadowDomView = viewFactory.call(childInjector.scope, childInjector);
-              return element;
+              return shadowRoot;
             });
           }
         });
@@ -81,7 +82,7 @@ class BoundTranscludingComponentFactory implements BoundComponentFactory {
       Scope shadowScope = scope.createChild(new HashMap());
 
       childInjector = new ComponentDirectiveInjector(injector, this._injector,
-          eventHandler, shadowScope, templateLoader, new EmulatedShadowRoot(element), lightDom, view);
+          eventHandler, shadowScope, templateLoader, shadowRoot, lightDom, view);
 
       childInjector.bindByKey(_ref.typeKey, _ref.factory, _ref.paramKeys, _ref.annotation.visibility);
 

diff --git a/test/core_dom/compiler_spec.dart b/test/core_dom/compiler_spec.dart
@@ -1403,7 +1403,7 @@ class AttachDetachComponent implements AttachAware, DetachAware, ShadowRootAware
 
   attach() => logger('attach:@$attrValue; =>$exprValue; =>!$onceValue');
   detach() => logger('detach');
-  onShadowRoot(shadowRoot) {
+  onShadowRoot(ShadowRoot shadowRoot) {
     scope.rootScope.context['shadowRoot'] = shadowRoot;
     logger(shadowRoot);
   }