Skip to content

Commit b217476

Browse files
authored
Merge pull request #844 from pnp/dev
Merge for 3.0.0
2 parents 3d1cb39 + b149947 commit b217476

File tree

63 files changed

+42607
-19133
lines changed

Some content is hidden

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

63 files changed

+42607
-19133
lines changed

.circleci/config.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
defaults: &defaults
22
working_directory: ~/sp-dev-fx-controls-react
33
docker:
4-
- image: circleci/node:10.22.0
4+
- image: circleci/node:12.15.0
55

66
version: 2
77
jobs:
@@ -29,12 +29,6 @@ jobs:
2929
- run:
3030
name: build
3131
command: npm run build
32-
- run:
33-
name: sonarcloud:config
34-
command: npm run sonarcloud:config $SONARCLOUD_TOKEN $CIRCLE_BRANCH
35-
- run:
36-
name: sonarcloud:start
37-
command: npm run sonarcloud:start
3832
- persist_to_workspace:
3933
root: .
4034
paths: .

.husky/.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
_

.husky/pre-commit

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
#!/bin/sh
2+
. "$(dirname "$0")/_/husky.sh"
3+
4+
npm run changelog

.yo-rc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"@microsoft/generator-sharepoint": {
3-
"version": "1.11.0",
3+
"version": "1.12.0",
44
"libraryName": "sp-dev-fx-controls-react",
55
"libraryId": "92b1e52c-a5fa-490a-bcf4-76080f39442c",
66
"environment": "spo",

CHANGELOG.JSON

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
{
22
"versions": [
3+
{
4+
"version": "3.0.0",
5+
"changes": {
6+
"new": [],
7+
"enhancements": [
8+
"SharePoint Framework v1.12 support (breaking change)",
9+
"Fluent UI v7 support"
10+
],
11+
"fixes": []
12+
},
13+
"contributions": []
14+
},
315
{
416
"version": "2.6.0",
517
"changes": {
@@ -20,7 +32,8 @@
2032
"`AccessibleAccordion`: documentation link is broken [#818](https://github.com/pnp/sp-dev-fx-controls-react/issues/818)",
2133
"Documentation: Controls link in the menu is broken [#821](https://github.com/pnp/sp-dev-fx-controls-react/pull/821)",
2234
"`TreeView`: Fix two potential null reference issues [#832](https://github.com/pnp/sp-dev-fx-controls-react/pull/832)",
23-
"`RichText`: Problem with bullets and number list [#795](https://github.com/pnp/sp-dev-fx-controls-react/issues/795)"
35+
"`RichText`: Problem with bullets and number list [#795](https://github.com/pnp/sp-dev-fx-controls-react/issues/795)",
36+
"`FolderPicker`: Correct FolderPicker link alignment"
2437
]
2538
},
2639
"contributions": [

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Releases
22

3+
## 3.0.0
4+
5+
### Enhancements
6+
7+
- SharePoint Framework v1.12 support (breaking change)
8+
- Fluent UI v7 support
9+
310
## 2.6.0
411

512
### New control(s)
@@ -23,6 +30,7 @@
2330
- Documentation: Controls link in the menu is broken [#821](https://github.com/pnp/sp-dev-fx-controls-react/pull/821)
2431
- `TreeView`: Fix two potential null reference issues [#832](https://github.com/pnp/sp-dev-fx-controls-react/pull/832)
2532
- `RichText`: Problem with bullets and number list [#795](https://github.com/pnp/sp-dev-fx-controls-react/issues/795)
33+
- `FolderPicker`: Correct FolderPicker link alignment
2634

2735
### Contributors
2836

docs/documentation/docs/about/release-notes.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,12 @@
11
# Releases
22

3+
## 3.0.0
4+
5+
### Enhancements
6+
7+
- SharePoint Framework v1.12 support (breaking change)
8+
- Fluent UI v7 support
9+
310
## 2.6.0
411

512
### New control(s)
@@ -23,6 +30,7 @@
2330
- Documentation: Controls link in the menu is broken [#821](https://github.com/pnp/sp-dev-fx-controls-react/pull/821)
2431
- `TreeView`: Fix two potential null reference issues [#832](https://github.com/pnp/sp-dev-fx-controls-react/pull/832)
2532
- `RichText`: Problem with bullets and number list [#795](https://github.com/pnp/sp-dev-fx-controls-react/issues/795)
33+
- `FolderPicker`: Correct FolderPicker link alignment
2634

2735
### Contributors
2836

docs/documentation/docs/controls/FilePicker.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ The FilePicker component can be configured with the following properties:
6262
buttonIconProps | IIconProps | no | In case it is provided the file picker will be rendered as an Icon the and all can define Properties for Icon |
6363
| onSave | (filePickerResult: IFilePickerResult) => void | yes | Handler when the file has been selected and picker has been closed. |
6464
| onChange | (filePickerResult: IFilePickerResult) => void | no | Handler when the file selection has been changed. |
65-
| context | ExtensionContext \| WebPartContext | yes | Current context. |
65+
| context | BaseComponentContext | yes | Current context. |
6666
| accepts | string[] | no | Array of strings containing allowed files extensions. E.g. [".gif", ".jpg", ".jpeg", ".bmp", ".dib", ".tif", ".tiff", ".ico", ".png", ".jxr", ".svg"] |
6767
| required | boolean | no | Sets the label to inform that the value is required. |
6868
| bingAPIKey | string | no | Used to execute WebSearch. If not provided SearchTab will not be available. |

docs/documentation/docs/controls/FolderExplorer.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ The `FolderExplorer` control can be configured with the following properties:
5050

5151
| Property | Type | Required | Description |
5252
| ---- | ---- | ---- | ---- |
53-
| context | WebPartContext \| ExtensionContext | yes | The context object of the SPFx loaded webpart or customizer. |
53+
| context | BaseComponentContext | yes | The context object of the SPFx loaded webpart or customizer. |
5454
| siteAbsoluteUrl | string | no | The absolute url of the target site. Only required if not the current site. |
5555
| rootFolder | IFolder | yes | The lowest level folder that can be explored. This can be the root folder of a library. If site url is provided, it will allow the user to select a document library |
5656
| defaultFolder | IFolder | yes | The default folder to be explored. |

docs/documentation/docs/controls/FolderPicker.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ The `FolderPicker` control can be configured with the following properties:
5656

5757
| Property | Type | Required | Description |
5858
| ---- | ---- | ---- | ---- |
59-
| context | WebPartContext \| ExtensionContext | yes | The context object of the SPFx loaded webpart or customizer. |
59+
| context | BaseComponentContext | yes | The context object of the SPFx loaded webpart or customizer. |
6060
| label | string | yes | The label for the control. |
6161
| rootFolder | IFolder | yes | The lowest level folder that can be explored. This can be the root folder of a library. |
6262
| defaultFolder | IFolder | no | The default folder to be selected or explored. |

0 commit comments

Comments
 (0)