Skip to content

fix(viewDirective): add check for componentProvider, avoid extra trigger for $onInit (fixing #3735) #3779

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
christopherthielen merged 3 commits into from
Sep 3, 2019
Merged

fix(viewDirective): add check for componentProvider, avoid extra trigger for $onInit (fixing #3735) #3779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f087d5e
fix(viewDirective): add check for componentProvider
mlnkw Jun 9, 2019
f772928
tests(viewDirective): add check for componentProvider
mlnkw Jun 9, 2019
9ccb7c4
Merge branch 'master' into master
christopherthielen Sep 3, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/directives/viewDirective.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -465,7 +465,7 @@ function registerControllerCallbacks(
cfg: Ng1ViewConfig
) {
// Call $onInit() ASAP
if (isFunction(controllerInstance.$onInit) && !(cfg.viewDecl.component && hasComponentImpl)) {
if (isFunction(controllerInstance.$onInit) && !((cfg.viewDecl.component || cfg.viewDecl.componentProvider) && hasComponentImpl)) {
controllerInstance.$onInit();
}

Expand Down
22 changes: 22 additions & 0 deletions test/viewDirectiveSpec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1334,6 +1334,28 @@ describe('angular 1.5+ style .component()', function() {
expect(log).toBe('onInit;');
});

it('should only call $onInit() once with componentProvider', function() {
$stateProvider.state('route2cmp', {
componentProvider: () => 'ngComponent',
resolve: {
data: function() {
return 'DATA!';
},
},
});

const $state = svcs.$state,
$httpBackend = svcs.$httpBackend,
$q = svcs.$q;

$httpBackend.expectGET('/comp_tpl.html').respond('-{{ $ctrl.data }}-');
$state.transitionTo('route2cmp');
$q.flush();
$httpBackend.flush();

expect(log).toBe('onInit;');
});

it('should supply resolve data to "<", "=", "@" bindings', function() {
$stateProvider.state('bindingtypes', {
component: 'bindingTypes',
Expand Down