Skip to content

Commit 623a8bd

Browse files
authored
Merge pull request #151 from microsoft/upgrade/fabric_7
upgrade (office-ui-fabric-react): Upgrades to fabric 7 version. Updat…
2 parents b19002b + 44ab009 commit 623a8bd

File tree

7 files changed

+146
-88
lines changed

7 files changed

+146
-88
lines changed

libs/core/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "../../node_modules/ng-packagr/package.schema.json",
33
"name": "@angular-react/core",
4-
"version": "1.0.1",
4+
"version": "2.0.0-rc0",
55
"ngPackage": {
66
"deleteDestPath": true,
77
"whitelistedNonPeerDependencies": [
@@ -55,8 +55,8 @@
5555
"@angular/platform-browser-dynamic": "^8.0.2",
5656
"@angular/platform-browser": "^8.0.2",
5757
"rxjs": "^6.5.2",
58-
"react-dom": "^16.6.3",
59-
"react": "^16.6.3"
58+
"react-dom": "~16.8.6",
59+
"react": "~16.8.6"
6060
},
6161
"dependencies": {
6262
"css-to-style": "^1.2.1",

libs/fabric/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"$schema": "../../node_modules/ng-packagr/package.schema.json",
33
"name": "@angular-react/fabric",
4-
"version": "1.2.3",
4+
"version": "2.0.0-rc0",
55
"ngPackage": {
66
"lib": {
77
"entryFile": "public-api.ts",
@@ -49,8 +49,8 @@
4949
"@angular/core": "^8.0.2",
5050
"@angular/platform-browser-dynamic": "^8.0.2",
5151
"@angular/platform-browser": "^8.0.2",
52-
"office-ui-fabric-react": "6.201.1",
53-
"react-dom": "^16.6.3",
54-
"react": "^16.6.3"
52+
"office-ui-fabric-react": "7.71.0",
53+
"react-dom": "~16.8.6",
54+
"react": "^16.8.6"
5555
}
5656
}

libs/fabric/src/lib/components/details-list/details-list.component.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,6 @@ export class FabDetailsListComponent extends ReactWrapperComponent<IDetailsListP
143143
@Input() rowElementEventMap?: IDetailsListProps['rowElementEventMap'];
144144
@Input() getCellValueKey?: IDetailsListProps['getCellValueKey'];
145145
@Input() dragDropEvents?: IDetailsListProps['dragDropEvents'];
146-
@Input() enableShimmer?: IDetailsListProps['enableShimmer'];
147146
@Input() viewport?: IDetailsListProps['viewport'];
148147
@Input() ariaLabelForListHeader?: IDetailsListProps['ariaLabelForListHeader'];
149148
@Input() ariaLabelForSelectAllCheckbox?: IDetailsListProps['ariaLabelForSelectAllCheckbox'];

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@ export class FabDropdownComponent extends ReactWrapperComponent<IDropdownProps>
9797
@Input() theme?: IDropdownProps['theme'];
9898
@Input() styles?: IDropdownProps['styles'];
9999

100-
@Input() renderContainer?: InputRendererOptions<ISelectableDroppableTextProps<IDropdown>>;
101-
@Input() renderList?: InputRendererOptions<ISelectableDroppableTextProps<IDropdown>>;
100+
@Input() renderContainer?: InputRendererOptions<ISelectableDroppableTextProps<IDropdown, IDropdown>>;
101+
@Input() renderList?: InputRendererOptions<ISelectableDroppableTextProps<IDropdown, IDropdown>>;
102102
@Input() renderItem?: InputRendererOptions<ISelectableOption>;
103103
@Input() renderOption?: InputRendererOptions<ISelectableOption>;
104104
@Input() renderPlaceholder?: InputRendererOptions<IDropdownProps>;

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,6 @@ export class FabNavComponent extends ReactWrapperComponent<INavProps> {
4545
@Input() componentRef?: INavProps['componentRef'];
4646
@Input() groups: INavProps["groups"];
4747
@Input() selectedKey?: INavProps["selectedKey"];
48-
@Input() expandedStateText?: INavProps["expandedStateText"];
49-
@Input() collapsedStateText?: INavProps["collapsedStateText"];
5048
@Input() isOnTop?: INavProps["isOnTop"];
5149
@Input() initialSelectedKey?: INavProps["initialSelectedKey"];
5250
@Input() ariaLabel?: INavProps["ariaLabel"];

package-lock.json

Lines changed: 132 additions & 71 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@
7171
"@ngrx/store-devtools": "~8.0.1",
7272
"core-js": "^2.5.4",
7373
"ngrx-store-freeze": "^0.2.4",
74-
"office-ui-fabric-react": "6.201.1",
75-
"react": "^16.6.3",
76-
"react-dom": "^16.6.3",
74+
"office-ui-fabric-react": "7.71.0",
75+
"react": "~16.8.6",
76+
"react-dom": "~16.8.6",
7777
"rxjs": "6.5.2",
7878
"semantic-ui-react": "^0.82.1",
7979
"web-animations-js": "^2.3.1",
@@ -94,8 +94,8 @@
9494
"@types/jasmine": "~3.3.1",
9595
"@types/jasminewd2": "~2.0.6",
9696
"@types/node": "~10.12.9",
97-
"@types/react": "~16.7.13",
98-
"@types/react-dom": "^16.0.11",
97+
"@types/react": "~16.8.25",
98+
"@types/react-dom": "^16.8.5",
9999
"@types/stylenames": "^1.1.0",
100100
"classnames": "^2.2.6",
101101
"codelyzer": "~5.1.0",

0 commit comments

Comments
 (0)