feature(directive_injector): add View to DirectiveInjector

vsavkin · chirayuk · commit 27a086d50fea · 2014-08-07T19:58:18.000-07:00
Some directives require access to the current view. Add the view field to the DirectiveInjector class, so it can be injected. Closes #1293
diff --git a/lib/core_dom/directive_injector.dart b/lib/core_dom/directive_injector.dart
@@ -107,6 +107,7 @@ class DirectiveInjector implements DirectiveBinder {
   final Animate _animate;
   final EventHandler _eventHandler;
   Scope scope;  //TODO(misko): this should be final after we get rid of controller
+  final View _view;
 
   NgElement _ngElement;
   ElementProbe _elementProbe;
@@ -141,7 +142,7 @@ class DirectiveInjector implements DirectiveBinder {
   static Binding _tempBinding = new Binding();
 
   DirectiveInjector(parent, appInjector, this._node, this._nodeAttrs, this._eventHandler,
-                    this.scope, this._animate)
+                    this.scope, this._view, this._animate)
       : appInjector = appInjector,
         parent = parent == null ? new DefaultDirectiveInjector(appInjector) : parent;
 
@@ -150,6 +151,7 @@ class DirectiveInjector implements DirectiveBinder {
         _nodeAttrs = null,
         _eventHandler = null,
         scope = null,
+        _view = null,
         _animate = null;
 
   void bind(key, {dynamic toValue: DEFAULT_VALUE,
@@ -266,6 +268,7 @@ class DirectiveInjector implements DirectiveBinder {
       case NG_ELEMENT_KEY_ID:         return ngElement;
       case EVENT_HANDLER_KEY_ID:      return _eventHandler;
       case CONTENT_PORT_KEY_ID:       return parent._getById(keyId);
+      case VIEW_KEY_ID:               return _view;
       default: new NoProviderError(_KEYS[keyId]);
     }
   }
@@ -345,8 +348,8 @@ class TemplateDirectiveInjector extends DirectiveInjector {
 
   TemplateDirectiveInjector(DirectiveInjector parent, Injector appInjector,
                        Node node, NodeAttrs nodeAttrs, EventHandler eventHandler,
-                       Scope scope, Animate animate, this._viewFactory)
-    : super(parent, appInjector, node, nodeAttrs, eventHandler, scope, animate);
+                       Scope scope, View view, Animate animate, this._viewFactory)
+    : super(parent, appInjector, node, nodeAttrs, eventHandler, scope, view, animate);
 
 
   Object _getById(int keyId) {
@@ -368,10 +371,10 @@ abstract class ComponentDirectiveInjector extends DirectiveInjector {
   final ShadowRoot _shadowRoot;
 
   ComponentDirectiveInjector(DirectiveInjector parent, Injector appInjector,
-                        EventHandler eventHandler, Scope scope,
+                        EventHandler eventHandler, Scope scope, View view,
                         this._templateLoader, this._shadowRoot)
       : super(parent, appInjector, parent._node, parent._nodeAttrs, eventHandler, scope,
-              parent._animate);
+              view, parent._animate);
 
   Object _getById(int keyId) {
     switch(keyId) {
@@ -389,9 +392,9 @@ class ShadowlessComponentDirectiveInjector extends ComponentDirectiveInjector {
   final ContentPort _contentPort;
 
   ShadowlessComponentDirectiveInjector(DirectiveInjector parent, Injector appInjector,
-                                  EventHandler eventHandler, Scope scope,
+                                  EventHandler eventHandler, Scope scope, View view,
                                   templateLoader, shadowRoot, this._contentPort)
-      : super(parent, appInjector, eventHandler, scope, templateLoader, shadowRoot);
+      : super(parent, appInjector, eventHandler, scope, view, templateLoader, shadowRoot);
 
   Object _getById(int keyId) {
     switch(keyId) {
@@ -403,11 +406,11 @@ class ShadowlessComponentDirectiveInjector extends ComponentDirectiveInjector {
 
 class ShadowDomComponentDirectiveInjector extends ComponentDirectiveInjector {
   ShadowDomComponentDirectiveInjector(DirectiveInjector parent, Injector appInjector,
-                                 Scope scope, templateLoader, shadowRoot)
+                                 Scope scope, View view, templateLoader, shadowRoot)
       : super(parent, appInjector, new ShadowRootEventHandler(shadowRoot,
                                                parent.getByKey(EXPANDO_KEY),
                                                parent.getByKey(EXCEPTION_HANDLER_KEY)),
-            scope, templateLoader, shadowRoot);
+            scope, view, templateLoader, shadowRoot);
 
   ElementProbe get elementProbe {
     if (_elementProbe == null) {
diff --git a/lib/core_dom/element_binder.dart b/lib/core_dom/element_binder.dart
@@ -256,11 +256,11 @@ class ElementBinder {
     DirectiveInjector nodeInjector;
     if (this is TemplateElementBinder) {
       nodeInjector = new TemplateDirectiveInjector(parentInjector, parentInjector.appInjector,
-          node, nodeAttrs, eventHandler, scope, animate,
+          node, nodeAttrs, eventHandler, scope, view, animate,
           (this as TemplateElementBinder).templateViewFactory);
     } else {
       nodeInjector = new DirectiveInjector(parentInjector, parentInjector.appInjector,
-          node, nodeAttrs, eventHandler, scope, animate);
+          node, nodeAttrs, eventHandler, scope, view, animate);
     }
 
     for(var i = 0; i < directiveRefs.length; i++) {
diff --git a/lib/core_dom/shadow_dom_component_factory.dart b/lib/core_dom/shadow_dom_component_factory.dart
@@ -119,11 +119,11 @@ class BoundShadowDomComponentFactory implements BoundComponentFactory {
   }
 
   List<Key> get callArgs => _CALL_ARGS;
-  static final _CALL_ARGS = [DIRECTIVE_INJECTOR_KEY, SCOPE_KEY, NG_BASE_CSS_KEY,
+  static final _CALL_ARGS = [DIRECTIVE_INJECTOR_KEY, SCOPE_KEY, VIEW_KEY, NG_BASE_CSS_KEY,
                              EVENT_HANDLER_KEY];
   Function call(dom.Element element) {
-    return (DirectiveInjector injector, Scope scope, NgBaseCss baseCss,
-            EventHandler eventHandler) {
+    return (DirectiveInjector injector, Scope scope, View view,
+            NgBaseCss baseCss, EventHandler eventHandler) {
       var shadowDom = element.createShadowRoot()
         ..applyAuthorStyles = _component.applyAuthorStyles
         ..resetStyleInheritance = _component.resetStyleInheritance;
@@ -165,7 +165,7 @@ class BoundShadowDomComponentFactory implements BoundComponentFactory {
 
       var probe;
       shadowInjector = new ShadowDomComponentDirectiveInjector(injector, injector.appInjector,
-          shadowScope, templateLoader, shadowDom);
+          shadowScope, view, templateLoader, shadowDom);
       shadowInjector.bindByKey(_ref.typeKey, _ref.factory, _ref.paramKeys, _ref.annotation.visibility);
 
       if (_f.config.elementProbeEnabled) {
diff --git a/lib/core_dom/transcluding_component_factory.dart b/lib/core_dom/transcluding_component_factory.dart
@@ -97,7 +97,7 @@ class BoundTranscludingComponentFactory implements BoundComponentFactory {
   }
 
   List<Key> get callArgs => _CALL_ARGS;
-  static var _CALL_ARGS = [ DIRECTIVE_INJECTOR_KEY, SCOPE_KEY,
+  static var _CALL_ARGS = [ DIRECTIVE_INJECTOR_KEY, SCOPE_KEY, VIEW_KEY,
                             VIEW_CACHE_KEY, HTTP_KEY, TEMPLATE_CACHE_KEY,
                             DIRECTIVE_MAP_KEY, NG_BASE_CSS_KEY, EVENT_HANDLER_KEY];
   Function call(dom.Node node) {
@@ -106,7 +106,7 @@ class BoundTranscludingComponentFactory implements BoundComponentFactory {
            _component.cssUrls.isEmpty);
 
     var element = node as dom.Element;
-    return (DirectiveInjector injector, Scope scope,
+    return (DirectiveInjector injector, Scope scope, View view,
             ViewCache viewCache, Http http, TemplateCache templateCache,
             DirectiveMap directives, NgBaseCss baseCss, EventHandler eventHandler) {
 
@@ -143,7 +143,7 @@ class BoundTranscludingComponentFactory implements BoundComponentFactory {
       Scope shadowScope = scope.createChild(new HashMap());
 
       childInjector = new ShadowlessComponentDirectiveInjector(injector, injector.appInjector,
-          eventHandler, shadowScope, templateLoader, new ShadowlessShadowRoot(element),
+          eventHandler, shadowScope, view, templateLoader, new ShadowlessShadowRoot(element),
           contentPort);
       childInjector.bindByKey(_ref.typeKey, _ref.factory, _ref.paramKeys, _ref.annotation.visibility);
 
diff --git a/test/core_dom/directive_injector_spec.dart b/test/core_dom/directive_injector_spec.dart
@@ -14,6 +14,7 @@ void main() {
     describe('base', () {
       DirectiveInjector injector;
       Scope scope;
+      View view;
       Animate animate;
 
       addDirective(Type type, [Visibility visibility]) {
@@ -29,7 +30,9 @@ void main() {
       beforeEach((Scope _scope, Animate _animate) {
         scope = _scope;
         animate = _animate;
-        injector = new DirectiveInjector(null, appInjector, div, new NodeAttrs(div), eventHandler, scope, animate);
+        view = new View([], scope, eventHandler);
+        injector = new DirectiveInjector(null, appInjector, div, new NodeAttrs(div), eventHandler,
+            scope, view, animate);
       });
 
       it('should return basic types', () {
@@ -39,6 +42,7 @@ void main() {
         expect(injector.get(Injector)).toBe(appInjector);
         expect(injector.get(DirectiveInjector)).toBe(injector);
         expect(injector.get(Scope)).toBe(scope);
+        expect((injector.get(View))).toBe(view);
         expect(injector.get(Node)).toBe(div);
         expect(injector.get(Element)).toBe(div);
         expect((injector.get(NodeAttrs) as NodeAttrs).element).toBe(div);
@@ -71,8 +75,8 @@ void main() {
         DirectiveInjector leafInjector;
 
         beforeEach(() {
-          childInjector = new DirectiveInjector(injector, appInjector, span, null, null, null, null);
-          leafInjector = new DirectiveInjector(childInjector, appInjector, span, null, null, null, null);
+          childInjector = new DirectiveInjector(injector, appInjector, span, null, null, null, null, null);
+          leafInjector = new DirectiveInjector(childInjector, appInjector, span, null, null, null, null, null);
         });
 
         it('should not allow reseting visibility', () {
diff --git a/test/directive/ng_model_spec.dart b/test/directive/ng_model_spec.dart
@@ -47,7 +47,7 @@ void main() {
 
     beforeEach((TestBed tb) {
       _ = tb;
-      dirInjector = new DirectiveInjector(null, _.injector, null, null, null, null, null);
+      dirInjector = new DirectiveInjector(null, _.injector, null, null, null, null, null, null);
     });
 
     describe('type="text" like', () {
