Skip to content

Commit ebc1021

Browse files
author
Zoran Liu
committed
upgrade
1 parent 67f988e commit ebc1021

54 files changed

Lines changed: 67 additions & 64 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

apps/docs/src/app/react-components/react-dot/react-dot.component.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import { ReactWrapperComponent } from '@angular-react/core';
3838
</ReactDot>
3939
`,
4040
changeDetection: ChangeDetectionStrategy.OnPush,
41-
styles: ['react-renderer'],
41+
styles: ['react-renderer {}'],
4242
})
4343
export class ReactDotComponent extends ReactWrapperComponent<ReactDotProps> {
4444
@ViewChild('reactNode', { static: true }) protected reactNodeRef: ElementRef;

libs/core/src/lib/renderer/renderer.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,13 @@ export class AngularReactRendererFactory extends ɵDomRendererFactory2 {
4141
}
4242

4343
createRenderer(element: any, type: RendererType2 | null): Renderer2 {
44-
if (type && type.styles.length && type.styles[0] === 'react-renderer') {
44+
if (
45+
type?.styles?.length
46+
&& (
47+
type.styles[0] === 'react-renderer'
48+
|| type.styles[0] === 'react-renderer {}'
49+
)
50+
) {
4551
return this.defaultReactRenderer;
4652
}
4753

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ import { Styled } from '@angular-react/fabric/lib/utils';
4040
>
4141
</Breadcrumb>
4242
`,
43-
styles: ['react-renderer'],
43+
styles: ['react-renderer {}'],
4444
changeDetection: ChangeDetectionStrategy.OnPush,
4545
})
4646
export class FabBreadcrumbComponent extends ReactWrapperComponent<IBreadcrumbProps> implements OnInit {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ import { Styled } from '@angular-react/fabric/lib/utils';
6565
<ReactContent><ng-content></ng-content></ReactContent>
6666
</ActionButton>
6767
`,
68-
styles: ['react-renderer'],
68+
styles: ['react-renderer {}'],
6969
changeDetection: ChangeDetectionStrategy.OnPush,
7070
})
7171
export class FabActionButtonComponent extends FabBaseButtonComponent {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ export abstract class FabBaseButtonComponent extends ReactWrapperComponent<IButt
110110
}),
111111
this._changeableItemsHelper.onChildItemChanged.subscribe(({ key, changes }: CommandBarItemChangedPayload) => {
112112
const newItems = this.menuItemsDirectives.map(item =>
113-
item.key === key ? mergeItemChanges(item, changes) : item
113+
item.key === key ? mergeItemChanges<ContextualMenuItemDirective>(item, changes) : item
114114
);
115115
setItems(newItems);
116116

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ import { Styled } from '@angular-react/fabric/lib/utils';
6565
<ReactContent><ng-content></ng-content></ReactContent>
6666
</CommandBarButton>
6767
`,
68-
styles: ['react-renderer'],
68+
styles: ['react-renderer {}'],
6969
changeDetection: ChangeDetectionStrategy.OnPush,
7070
})
7171
export class FabCommandBarButtonComponent extends FabBaseButtonComponent {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ import { Styled } from '@angular-react/fabric/lib/utils';
6565
<ReactContent><ng-content></ng-content></ReactContent>
6666
</CompoundButton>
6767
`,
68-
styles: ['react-renderer'],
68+
styles: ['react-renderer {}'],
6969
changeDetection: ChangeDetectionStrategy.OnPush,
7070
})
7171
export class FabCompoundButtonComponent extends FabBaseButtonComponent {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ import { Styled } from '@angular-react/fabric/lib/utils';
6565
<ReactContent><ng-content></ng-content></ReactContent>
6666
</DefaultButton>
6767
`,
68-
styles: ['react-renderer'],
68+
styles: ['react-renderer {}'],
6969
changeDetection: ChangeDetectionStrategy.OnPush,
7070
})
7171
export class FabDefaultButtonComponent extends FabBaseButtonComponent {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ import { Styled } from '@angular-react/fabric/lib/utils';
6565
<ReactContent><ng-content></ng-content></ReactContent>
6666
</IconButton>
6767
`,
68-
styles: ['react-renderer'],
68+
styles: ['react-renderer {}'],
6969
changeDetection: ChangeDetectionStrategy.OnPush,
7070
})
7171
export class FabIconButtonComponent extends FabBaseButtonComponent {

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ import { Styled } from '@angular-react/fabric/lib/utils';
6565
<ReactContent><ng-content></ng-content></ReactContent>
6666
</MessageBarButton>
6767
`,
68-
styles: ['react-renderer'],
68+
styles: ['react-renderer {}'],
6969
changeDetection: ChangeDetectionStrategy.OnPush,
7070
})
7171
export class FabMessageBarButtonComponent extends FabBaseButtonComponent {

0 commit comments

Comments
 (0)