Skip to content

Commit

Permalink
fix(angular): ViewChild() fix (#17037)
Browse files Browse the repository at this point in the history
fixes #17034
  • Loading branch information
manucorporat authored Jan 10, 2019
1 parent 169da37 commit 27a4709
Show file tree
Hide file tree
Showing 12 changed files with 406 additions and 183 deletions.
42 changes: 21 additions & 21 deletions angular/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,30 +48,30 @@
"tslib": "^1.9.3"
},
"peerDependencies": {
"@angular-devkit/core": "^7.1.4",
"@angular-devkit/schematics": "^7.1.4",
"@angular/core": "^7.1.4",
"@angular/common": "^7.1.4",
"@angular/forms": "^7.1.4",
"@angular/router": "^7.1.4",
"@angular/compiler": "^7.1.4",
"@angular/compiler-cli": "^7.1.4",
"@angular/platform-browser": "^7.1.4",
"@angular/platform-browser-dynamic": "^7.1.4",
"@angular-devkit/core": "^7.2.0",
"@angular-devkit/schematics": "^7.2.0",
"@angular/core": "^7.2.0",
"@angular/common": "^7.2.0",
"@angular/forms": "^7.2.0",
"@angular/router": "^7.2.0",
"@angular/compiler": "^7.2.0",
"@angular/compiler-cli": "^7.2.0",
"@angular/platform-browser": "^7.2.0",
"@angular/platform-browser-dynamic": "^7.2.0",
"rxjs": ">=6.2.0",
"zone.js": "^0.8.26"
},
"devDependencies": {
"@angular-devkit/core": "^7.1.4",
"@angular-devkit/schematics": "^7.1.4",
"@angular/common": "^7.1.4",
"@angular/compiler": "^7.1.4",
"@angular/compiler-cli": "^7.1.4",
"@angular/core": "^7.1.4",
"@angular/forms": "^7.1.4",
"@angular/platform-browser": "^7.1.4",
"@angular/platform-browser-dynamic": "^7.1.4",
"@angular/router": "^7.1.4",
"@angular-devkit/core": "^7.2.0",
"@angular-devkit/schematics": "^7.2.0",
"@angular/common": "^7.2.0",
"@angular/compiler": "^7.2.0",
"@angular/compiler-cli": "^7.2.0",
"@angular/core": "^7.2.0",
"@angular/forms": "^7.2.0",
"@angular/platform-browser": "^7.2.0",
"@angular/platform-browser-dynamic": "^7.2.0",
"@angular/router": "^7.2.0",
"@types/node": "~10.12.0",
"fs-extra": "^7.0.0",
"glob": "^7.1.3",
Expand All @@ -81,7 +81,7 @@
"tsickle": "^0.34.0",
"tslint": "^5.10.0",
"tslint-ionic-rules": "0.0.21",
"typescript": "3.1.6",
"typescript": "3.2.2",
"zone.js": "^0.8.26"
},
"schematics": "./dist/schematics/collection.json"
Expand Down
19 changes: 0 additions & 19 deletions angular/src/directives/index.ts

This file was deleted.

42 changes: 35 additions & 7 deletions angular/src/index.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,39 @@
// export custom directives
export * from './directives';
// DIRECTIVES
export { BooleanValueAccessor } from './directives/control-value-accessors/boolean-value-accessor';
export { NumericValueAccessor } from './directives/control-value-accessors/numeric-value-accesssor';
export { RadioValueAccessor } from './directives/control-value-accessors/radio-value-accessor';
export { SelectValueAccessor } from './directives/control-value-accessors/select-value-accessor';
export { TextValueAccessor } from './directives/control-value-accessors/text-value-accessor';
export { IonTabs } from './directives/navigation/ion-tabs';
export { IonBackButtonDelegate } from './directives/navigation/ion-back-button';
export { NavDelegate } from './directives/navigation/nav-delegate';
export { IonRouterOutlet } from './directives/navigation/ion-router-outlet';
export { RouterLinkDelegate } from './directives/navigation/router-link-delegate';
export { NavParams } from './directives/navigation/nav-params';
export { IonVirtualScroll } from './directives/virtual-scroll/virtual-scroll';
export { VirtualItem } from './directives/virtual-scroll/virtual-item';
export { VirtualHeader } from './directives/virtual-scroll/virtual-header';
export { VirtualFooter } from './directives/virtual-scroll/virtual-footer';
export * from './directives/proxies';

// export custom providers
export * from './providers';
// PROVIDERS
export { AngularDelegate } from './providers/angular-delegate';
export { ActionSheetController } from './providers/action-sheet-controller';
export { AlertController } from './providers/alert-controller';
export { Events } from './providers/events';
export { LoadingController } from './providers/loading-controller';
export { MenuController } from './providers/menu-controller';
export { PickerController } from './providers/picker-controller';
export { ModalController } from './providers/modal-controller';
export { Platform } from './providers/platform';
export { PopoverController } from './providers/popover-controller';
export { ToastController } from './providers/toast-controller';
export { NavController } from './providers/nav-controller';
export { DomController } from './providers/dom-controller';
export { Config } from './providers/config';

// ionic route reuse strategy
export * from './util/ionic-router-reuse-strategy';
// ROUTER STRATEGY
export { IonicRouteStrategy } from './util/ionic-router-reuse-strategy';

// export module
// PACKAGE MODULE
export { IonicModule } from './ionic-module';
14 changes: 0 additions & 14 deletions angular/src/providers/index.ts

This file was deleted.

21 changes: 21 additions & 0 deletions angular/test/test-app/e2e/src/view-child.e2e-spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
import { browser, element, by } from 'protractor';
import { getProperty, setProperty, handleErrorMessages } from './utils';

describe('view-child', () => {

beforeEach(async () => {
await browser.get('/view-child');
});
afterEach(() => {
handleErrorMessages();
});

it('should get a reference to all children', async () => {
// button should be red
expect(await element(by.css('#color-button.ion-color-danger')).isPresent()).toBeTruthy();

// tabs should be found
expect(await element(by.css('#tabs-result')).getText()).toEqual('tabs found');
});

});
Loading

0 comments on commit 27a4709

Please sign in to comment.