Skip to content

Commit 47ca476

Browse files
author
Ben Grynhaus
committed
Fix breaking API change in ReactWrapperComponent in Fabric
1 parent 35fe590 commit 47ca476

28 files changed

+297
-88
lines changed

libs/fabric/src/lib/components/breadcrumb/breadcrumb.component.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,16 @@
22
// Licensed under the MIT License.
33

44
import { InputRendererOptions, JsxRenderFunc, ReactWrapperComponent } from '@angular-react/core';
5-
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Input, OnInit, Renderer2, ViewChild } from '@angular/core';
5+
import {
6+
ChangeDetectionStrategy,
7+
ChangeDetectorRef,
8+
Component,
9+
ElementRef,
10+
Input,
11+
OnInit,
12+
Renderer2,
13+
ViewChild,
14+
} from '@angular/core';
615
import { IBreadcrumbItem, IBreadcrumbProps } from 'office-ui-fabric-react/lib/Breadcrumb';
716

817
@Component({
@@ -22,8 +31,7 @@ import { IBreadcrumbItem, IBreadcrumbProps } from 'office-ui-fabric-react/lib/Br
2231
[styles]="styles"
2332
[theme]="theme"
2433
[RenderItem]="renderItem && onRenderItem"
25-
[ReduceData]="onReduceData"
26-
>
34+
[ReduceData]="onReduceData">
2735
</Breadcrumb>
2836
`,
2937
styles: ['react-renderer'],

libs/fabric/src/lib/components/button/action-button.component.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Renderer2, ViewChild } from '@angular/core';
4+
import {
5+
ChangeDetectionStrategy,
6+
ChangeDetectorRef,
7+
Component,
8+
ElementRef,
9+
NgZone,
10+
Renderer2,
11+
ViewChild,
12+
} from '@angular/core';
513
import { FabBaseButtonComponent } from './base-button.component';
614

715
@Component({
@@ -57,7 +65,7 @@ export class FabActionButtonComponent extends FabBaseButtonComponent {
5765
@ViewChild('reactNode')
5866
reactNodeRef: ElementRef;
5967

60-
constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, renderer: Renderer2) {
61-
super(elementRef, changeDetectorRef, renderer);
68+
constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, renderer: Renderer2, ngZone: NgZone) {
69+
super(elementRef, changeDetectorRef, renderer, ngZone);
6270
}
6371
}

libs/fabric/src/lib/components/button/base-button.component.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Licensed under the MIT License.
33

44
import { InputRendererOptions, JsxRenderFunc, ReactWrapperComponent } from '@angular-react/core';
5-
import { ChangeDetectorRef, ElementRef, EventEmitter, Input, OnInit, Output, Renderer2 } from '@angular/core';
5+
import { ChangeDetectorRef, ElementRef, EventEmitter, Input, NgZone, OnInit, Output, Renderer2 } from '@angular/core';
66
import { IButtonProps } from 'office-ui-fabric-react/lib/Button';
77

88
export abstract class FabBaseButtonComponent extends ReactWrapperComponent<IButtonProps> implements OnInit {
@@ -90,8 +90,8 @@ export abstract class FabBaseButtonComponent extends ReactWrapperComponent<IButt
9090
onRenderChildren: (props?: IButtonProps, defaultRender?: JsxRenderFunc<IButtonProps>) => JSX.Element;
9191
onRenderMenuIcon: (props?: IButtonProps, defaultRender?: JsxRenderFunc<IButtonProps>) => JSX.Element;
9292

93-
constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, renderer: Renderer2) {
94-
super(elementRef, changeDetectorRef, renderer, true);
93+
constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, renderer: Renderer2, ngZone: NgZone) {
94+
super(elementRef, changeDetectorRef, renderer, { ngZone, setHostDisplay: true });
9595

9696
// coming from React context - we need to bind to this so we can access the Angular Component properties
9797
this.onMenuClickHandler = this.onMenuClickHandler.bind(this);

libs/fabric/src/lib/components/button/command-bar-button.component.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Renderer2, ViewChild } from '@angular/core';
4+
import {
5+
ChangeDetectionStrategy,
6+
ChangeDetectorRef,
7+
Component,
8+
ElementRef,
9+
NgZone,
10+
Renderer2,
11+
ViewChild,
12+
} from '@angular/core';
513
import { FabBaseButtonComponent } from './base-button.component';
614

715
@Component({
@@ -57,7 +65,7 @@ export class FabCommandBarButtonComponent extends FabBaseButtonComponent {
5765
@ViewChild('reactNode')
5866
reactNodeRef: ElementRef;
5967

60-
constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, renderer: Renderer2) {
61-
super(elementRef, changeDetectorRef, renderer);
68+
constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, renderer: Renderer2, ngZone: NgZone) {
69+
super(elementRef, changeDetectorRef, renderer, ngZone);
6270
}
6371
}

libs/fabric/src/lib/components/button/compound-button.component.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Renderer2, ViewChild } from '@angular/core';
4+
import {
5+
ChangeDetectionStrategy,
6+
ChangeDetectorRef,
7+
Component,
8+
ElementRef,
9+
NgZone,
10+
Renderer2,
11+
ViewChild,
12+
} from '@angular/core';
513
import { FabBaseButtonComponent } from './base-button.component';
614

715
@Component({
@@ -57,7 +65,7 @@ export class FabCompoundButtonComponent extends FabBaseButtonComponent {
5765
@ViewChild('reactNode')
5866
reactNodeRef: ElementRef;
5967

60-
constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, renderer: Renderer2) {
61-
super(elementRef, changeDetectorRef, renderer);
68+
constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, renderer: Renderer2, ngZone: NgZone) {
69+
super(elementRef, changeDetectorRef, renderer, ngZone);
6270
}
6371
}

libs/fabric/src/lib/components/button/default-button.component.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Renderer2, ViewChild } from '@angular/core';
4+
import {
5+
ChangeDetectionStrategy,
6+
ChangeDetectorRef,
7+
Component,
8+
ElementRef,
9+
NgZone,
10+
Renderer2,
11+
ViewChild,
12+
} from '@angular/core';
513
import { FabBaseButtonComponent } from './base-button.component';
614

715
@Component({
@@ -57,7 +65,7 @@ export class FabDefaultButtonComponent extends FabBaseButtonComponent {
5765
@ViewChild('reactNode')
5866
reactNodeRef: ElementRef;
5967

60-
constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, renderer: Renderer2) {
61-
super(elementRef, changeDetectorRef, renderer);
68+
constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, renderer: Renderer2, ngZone: NgZone) {
69+
super(elementRef, changeDetectorRef, renderer, ngZone);
6270
}
6371
}

libs/fabric/src/lib/components/button/icon-button.component.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Renderer2, ViewChild } from '@angular/core';
4+
import {
5+
ChangeDetectionStrategy,
6+
ChangeDetectorRef,
7+
Component,
8+
ElementRef,
9+
NgZone,
10+
Renderer2,
11+
ViewChild,
12+
} from '@angular/core';
513
import { FabBaseButtonComponent } from './base-button.component';
614

715
@Component({
@@ -57,7 +65,7 @@ export class FabIconButtonComponent extends FabBaseButtonComponent {
5765
@ViewChild('reactNode')
5866
reactNodeRef: ElementRef;
5967

60-
constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, renderer: Renderer2) {
61-
super(elementRef, changeDetectorRef, renderer);
68+
constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, renderer: Renderer2, ngZone: NgZone) {
69+
super(elementRef, changeDetectorRef, renderer, ngZone);
6270
}
6371
}

libs/fabric/src/lib/components/button/messagebar-button.component.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Renderer2, ViewChild } from '@angular/core';
4+
import {
5+
ChangeDetectionStrategy,
6+
ChangeDetectorRef,
7+
Component,
8+
ElementRef,
9+
NgZone,
10+
Renderer2,
11+
ViewChild,
12+
} from '@angular/core';
513
import { FabBaseButtonComponent } from './base-button.component';
614

715
@Component({
@@ -57,7 +65,7 @@ export class FabMessageBarButtonComponent extends FabBaseButtonComponent {
5765
@ViewChild('reactNode')
5866
reactNodeRef: ElementRef;
5967

60-
constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, renderer: Renderer2) {
61-
super(elementRef, changeDetectorRef, renderer);
68+
constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, renderer: Renderer2, ngZone: NgZone) {
69+
super(elementRef, changeDetectorRef, renderer, ngZone);
6270
}
6371
}

libs/fabric/src/lib/components/button/primary-button.component.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Renderer2, ViewChild } from '@angular/core';
4+
import {
5+
ChangeDetectionStrategy,
6+
ChangeDetectorRef,
7+
Component,
8+
ElementRef,
9+
NgZone,
10+
Renderer2,
11+
ViewChild,
12+
} from '@angular/core';
513
import { FabBaseButtonComponent } from './base-button.component';
614

715
@Component({
@@ -57,7 +65,7 @@ export class FabPrimaryButtonComponent extends FabBaseButtonComponent {
5765
@ViewChild('reactNode')
5866
reactNodeRef: ElementRef;
5967

60-
constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, renderer: Renderer2) {
61-
super(elementRef, changeDetectorRef, renderer);
68+
constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, renderer: Renderer2, ngZone: NgZone) {
69+
super(elementRef, changeDetectorRef, renderer, ngZone);
6270
}
6371
}

libs/fabric/src/lib/components/button/split-button.component.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,15 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT License.
33

4-
import { ChangeDetectionStrategy, ChangeDetectorRef, Component, ElementRef, Renderer2, ViewChild } from '@angular/core';
4+
import {
5+
ChangeDetectionStrategy,
6+
ChangeDetectorRef,
7+
Component,
8+
ElementRef,
9+
NgZone,
10+
Renderer2,
11+
ViewChild,
12+
} from '@angular/core';
513
import { FabBaseButtonComponent } from './base-button.component';
614

715
@Component({
@@ -57,7 +65,7 @@ export class FabSplitButtonComponent extends FabBaseButtonComponent {
5765
@ViewChild('reactNode')
5866
reactNodeRef: ElementRef;
5967

60-
constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, renderer: Renderer2) {
61-
super(elementRef, changeDetectorRef, renderer);
68+
constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, renderer: Renderer2, ngZone: NgZone) {
69+
super(elementRef, changeDetectorRef, renderer, ngZone);
6270
}
6371
}

0 commit comments

Comments
 (0)