Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
33 changes: 28 additions & 5 deletions docs/3rdpartylicenses.txt
Original file line number Diff line number Diff line change
Expand Up @@ -243,7 +243,27 @@ The above copyright notice and this permission notice shall be included in all c

THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Note: Usage of the fonts and icons referenced in Office UI Fabric is subject to the terms listed at http://aka.ms/fabric-assets-license
Note: Usage of the fonts and icons referenced in Office UI Fabric is subject to the terms listed at https://aka.ms/fabric-assets-license


@uifabric/set-version
MIT
@uifabric/set-version

Copyright (c) Microsoft Corporation

All rights reserved.

MIT License

Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ""Software""), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Note: Usage of the fonts and icons referenced in Office UI Fabric is subject to the terms listed at https://aka.ms/fabric-assets-license


@uifabric/styling
MIT
Expand All @@ -261,7 +281,8 @@ The above copyright notice and this permission notice shall be included in all c

THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Note: Usage of the fonts and icons referenced in Office UI Fabric is subject to the terms listed at http://aka.ms/fabric-assets-license
Note: Usage of the fonts and icons referenced in Office UI Fabric is subject to the terms listed at https://aka.ms/fabric-assets-license


@uifabric/utilities
MIT
Expand All @@ -279,7 +300,8 @@ The above copyright notice and this permission notice shall be included in all c

THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Note: Usage of the fonts and icons referenced in Office UI Fabric is subject to the terms listed at http://aka.ms/fabric-assets-license
Note: Usage of the fonts and icons referenced in Office UI Fabric is subject to the terms listed at https://aka.ms/fabric-assets-license


angular-react
MIT
Expand Down Expand Up @@ -505,7 +527,7 @@ SOFTWARE.

lodash
MIT
Copyright JS Foundation and other contributors <https://js.foundation/>
Copyright OpenJS Foundation and other contributors <https://openjsf.org/>

Based on Underscore.js, copyright Jeremy Ashkenas,
DocumentCloud and Investigative Reporters & Editors <http://underscorejs.org/>
Expand Down Expand Up @@ -595,7 +617,8 @@ The above copyright notice and this permission notice shall be included in all c

THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Note: Usage of the fonts and icons referenced in Office UI Fabric is subject to the terms listed at http://aka.ms/fabric-assets-license
Note: Usage of the fonts and icons referenced in Office UI Fabric is subject to the terms listed at https://aka.ms/fabric-assets-license


prop-types
MIT
Expand Down
41 changes: 11 additions & 30 deletions docs/demo/3rdpartylicenses.txt
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,8 @@ The above copyright notice and this permission notice shall be included in all c

THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Note: Usage of the fonts and icons referenced in Office UI Fabric is subject to the terms listed at http://aka.ms/fabric-assets-license
Note: Usage of the fonts and icons referenced in Office UI Fabric is subject to the terms listed at https://aka.ms/fabric-assets-license


@uifabric/merge-styles
MIT
Expand All @@ -137,7 +138,8 @@ The above copyright notice and this permission notice shall be included in all c

THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Note: Usage of the fonts and icons referenced in Office UI Fabric is subject to the terms listed at http://aka.ms/fabric-assets-license
Note: Usage of the fonts and icons referenced in Office UI Fabric is subject to the terms listed at https://aka.ms/fabric-assets-license


@uifabric/set-version
MIT
Expand All @@ -155,7 +157,8 @@ The above copyright notice and this permission notice shall be included in all c

THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Note: Usage of the fonts and icons referenced in Office UI Fabric is subject to the terms listed at http://aka.ms/fabric-assets-license
Note: Usage of the fonts and icons referenced in Office UI Fabric is subject to the terms listed at https://aka.ms/fabric-assets-license


@uifabric/styling
MIT
Expand All @@ -173,7 +176,8 @@ The above copyright notice and this permission notice shall be included in all c

THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Note: Usage of the fonts and icons referenced in Office UI Fabric is subject to the terms listed at http://aka.ms/fabric-assets-license
Note: Usage of the fonts and icons referenced in Office UI Fabric is subject to the terms listed at https://aka.ms/fabric-assets-license


@uifabric/utilities
MIT
Expand All @@ -191,7 +195,8 @@ The above copyright notice and this permission notice shall be included in all c

THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Note: Usage of the fonts and icons referenced in Office UI Fabric is subject to the terms listed at http://aka.ms/fabric-assets-license
Note: Usage of the fonts and icons referenced in Office UI Fabric is subject to the terms listed at https://aka.ms/fabric-assets-license


angular-react
MIT
Expand Down Expand Up @@ -396,31 +401,7 @@ The above copyright notice and this permission notice shall be included in all c

THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Note: Usage of the fonts and icons referenced in Office UI Fabric is subject to the terms listed at http://aka.ms/fabric-assets-license

prop-types
MIT
MIT License

Copyright (c) 2013-present, Facebook, Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Note: Usage of the fonts and icons referenced in Office UI Fabric is subject to the terms listed at https://aka.ms/fabric-assets-license


react
Expand Down
2 changes: 1 addition & 1 deletion docs/demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@
<link rel="stylesheet" href="styles.280e991c5992f8630bc9.css"></head>
<body>
<app-root></app-root>
<script src="runtime.741402d1d47331ce975c.js"></script><script src="polyfills-es5.713635137766a4d7e797.js" nomodule></script><script src="polyfills.43056ed83dfe3a68c125.js"></script><script src="main.02c92f793ad5dbf03fff.js"></script></body>
<script src="runtime.741402d1d47331ce975c.js"></script><script src="polyfills-es5.713635137766a4d7e797.js" nomodule></script><script src="polyfills.43056ed83dfe3a68c125.js"></script><script src="main.7f3440c407cfd2964ed9.js"></script></body>
</html>
1 change: 0 additions & 1 deletion docs/demo/main.02c92f793ad5dbf03fff.js

This file was deleted.

2 changes: 1 addition & 1 deletion docs/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,5 +28,5 @@
<!-- /Github Pages hack. -->

<app-root class="mat-typography"></app-root>
<script src="runtime.741402d1d47331ce975c.js"></script><script src="polyfills-es5.713635137766a4d7e797.js" nomodule></script><script src="polyfills.f0298b90f4936f78a809.js"></script><script src="main.7f1f1e1a62996fe7e366.js"></script></body>
<script src="runtime.741402d1d47331ce975c.js"></script><script src="polyfills-es5.713635137766a4d7e797.js" nomodule></script><script src="polyfills.f0298b90f4936f78a809.js"></script><script src="main.6dff1cc87ec15766d28a.js"></script></body>
</html>
1 change: 0 additions & 1 deletion docs/main.7f1f1e1a62996fe7e366.js

This file was deleted.

2 changes: 1 addition & 1 deletion libs/core/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "../../node_modules/ng-packagr/package.schema.json",
"name": "@angular-react/core",
"version": "2.0.0-rc0",
"version": "2.0.5",
"ngPackage": {
"deleteDestPath": true,
"whitelistedNonPeerDependencies": [
Expand Down
4 changes: 2 additions & 2 deletions libs/fabric/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$schema": "../../node_modules/ng-packagr/package.schema.json",
"name": "@angular-react/fabric",
"version": "2.0.0-rc0",
"version": "2.0.5",
"ngPackage": {
"lib": {
"entryFile": "public-api.ts",
Expand Down Expand Up @@ -49,7 +49,7 @@
"@angular/core": "^8.0.2",
"@angular/platform-browser-dynamic": "^8.0.2",
"@angular/platform-browser": "^8.0.2",
"office-ui-fabric-react": "7.71.0",
"office-ui-fabric-react": "7.82.2",
"react-dom": "~16.8.6",
"react": "^16.8.6"
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ import { DetailsListGroupsDirective } from './directives/details-list-groups.dir
[constrainMode]="constrainMode"
[disableSelectionZone]="disableSelectionZone"
[dragDropEvents]="dragDropEvents"
[enableShimmer]="enableShimmer"
[enableUpdateAnimations]="enableUpdateAnimations"
[enterModalSelectionOnTouch]="enterModalSelectionOnTouch"
[getCellValueKey]="getCellValueKey"
Expand Down
162 changes: 80 additions & 82 deletions libs/fabric/src/lib/components/nav/nav.component.ts
Original file line number Diff line number Diff line change
@@ -1,82 +1,80 @@
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

import { ReactWrapperComponent } from '@angular-react/core';
import { INavProps, INavLink, INav } from 'office-ui-fabric-react';
import {
Component,
ChangeDetectionStrategy,
Input,
ViewChild,
ElementRef,
ChangeDetectorRef,
Renderer2,
Output,
EventEmitter,
} from '@angular/core';

@Component({
selector: 'fab-nav',
exportAs: 'fabNav',
template: `
<Nav
#reactNode
[groups]="groups"
[LinkClick]="onLinkClickHandler"
[selectedKey]="selectedKey"
[expandButtonAriaLabel]="expandButtonAriaLabel"
[expandedStateText]="expandedStateText"
[collapsedStateText]="collapsedStateText"
[LinkExpandClick]="onLinkExpandClickHandler"
[isOnTop]="isOnTop"
[initialSelectedKey]="initialSelectedKey"
[ariaLabel]="ariaLabel"
[selectedAriaLabel]="selectedAriaLabel"
>
</Nav>
`,
styles: ['react-renderer'],
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class FabNavComponent extends ReactWrapperComponent<INavProps> {
@ViewChild('reactNode', { static: true })
protected reactNodeRef: ElementRef;

@Input() componentRef?: INavProps['componentRef'];
@Input() groups: INavProps["groups"];
@Input() selectedKey?: INavProps["selectedKey"];
@Input() isOnTop?: INavProps["isOnTop"];
@Input() initialSelectedKey?: INavProps["initialSelectedKey"];
@Input() ariaLabel?: INavProps["ariaLabel"];
@Input() expandButtonAriaLabel?: INavProps["expandButtonAriaLabel"];
@Input() selectedAriaLabel?: INavProps["selectedAriaLabel"];

@Output() readonly onLinkClick = new EventEmitter<{
event: Event,
link: INavLink
}>();
@Output() readonly onLinkExpandClick = new EventEmitter<{
event: Event,
link: INavLink
}>();

constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, renderer: Renderer2) {
super(elementRef, changeDetectorRef, renderer);
this.onLinkClickHandler = this.onLinkClickHandler.bind(this);
this.onLinkExpandClickHandler = this.onLinkExpandClickHandler.bind(this);
}

onLinkClickHandler(event: React.MouseEvent<HTMLElement>, link?: INavLink): void {
this.onLinkClick.emit({
event: event.nativeEvent,
link: link
});
}

onLinkExpandClickHandler(event: React.MouseEvent<HTMLElement>, link?: INavLink): void {
this.onLinkExpandClick.emit({
event: event.nativeEvent,
link: link
});
}
}
// Copyright (c) Microsoft Corporation. All rights reserved.
// Licensed under the MIT License.

import { ReactWrapperComponent } from '@angular-react/core';
import { INavProps, INavLink, INav } from 'office-ui-fabric-react';
import {
Component,
ChangeDetectionStrategy,
Input,
ViewChild,
ElementRef,
ChangeDetectorRef,
Renderer2,
Output,
EventEmitter,
} from '@angular/core';

@Component({
selector: 'fab-nav',
exportAs: 'fabNav',
template: `
<Nav
#reactNode
[groups]="groups"
[LinkClick]="onLinkClickHandler"
[selectedKey]="selectedKey"
[expandButtonAriaLabel]="expandButtonAriaLabel"
[LinkExpandClick]="onLinkExpandClickHandler"
[isOnTop]="isOnTop"
[initialSelectedKey]="initialSelectedKey"
[ariaLabel]="ariaLabel"
[selectedAriaLabel]="selectedAriaLabel"
>
</Nav>
`,
styles: ['react-renderer'],
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class FabNavComponent extends ReactWrapperComponent<INavProps> {
@ViewChild('reactNode', { static: true })
protected reactNodeRef: ElementRef;

@Input() componentRef?: INavProps['componentRef'];
@Input() groups: INavProps["groups"];
@Input() selectedKey?: INavProps["selectedKey"];
@Input() isOnTop?: INavProps["isOnTop"];
@Input() initialSelectedKey?: INavProps["initialSelectedKey"];
@Input() ariaLabel?: INavProps["ariaLabel"];
@Input() expandButtonAriaLabel?: INavProps["expandButtonAriaLabel"];
@Input() selectedAriaLabel?: INavProps["selectedAriaLabel"];

@Output() readonly onLinkClick = new EventEmitter<{
event: Event,
link: INavLink
}>();
@Output() readonly onLinkExpandClick = new EventEmitter<{
event: Event,
link: INavLink
}>();

constructor(elementRef: ElementRef, changeDetectorRef: ChangeDetectorRef, renderer: Renderer2) {
super(elementRef, changeDetectorRef, renderer);
this.onLinkClickHandler = this.onLinkClickHandler.bind(this);
this.onLinkExpandClickHandler = this.onLinkExpandClickHandler.bind(this);
}

onLinkClickHandler(event: React.MouseEvent<HTMLElement>, link?: INavLink): void {
this.onLinkClick.emit({
event: event.nativeEvent,
link: link
});
}

onLinkExpandClickHandler(event: React.MouseEvent<HTMLElement>, link?: INavLink): void {
this.onLinkExpandClick.emit({
event: event.nativeEvent,
link: link
});
}
}
Loading