Merge pull request elastic#7976 from tsullivan/render-directive-contr…

…oller-context

render directive: add controller context

Former-commit-id: 7b1ac98

src/ui/public/render_directive/render_directive.js

@@ -38,16 +38,24 @@ uiModules
     template: function ($el, $attrs) {
       return $el.html();
     },
-    controller: function ($scope, $element, $attrs, $transclude) {
+    controller: function ($scope, $element, $attrs, $transclude, $injector) {
       if (!$scope.definition) throw new Error('render-directive must have a definition attribute');
 
       const { controller, controllerAs, scope } = $scope.definition;
 
       applyScopeBindings(scope, $scope, $attrs);
 
       if (controller) {
-        if (controllerAs) $scope[controllerAs] = this;
-        $scope.$eval(controller, { $scope, $element, $attrs, $transclude });
+        if (controllerAs) {
+          $scope[controllerAs] = this;
+        }
+
+        const locals = { $scope, $element, $attrs, $transclude };
+        const controllerInstance = $injector.invoke(controller, this, locals) || this;
+
+        if (controllerAs) {
+          $scope[controllerAs] = controllerInstance;
+        }
       }
     },
     link: {