Skip to content

Commit 807aa71

Browse files
AJIXuMuKAJIXuMuK
committed
Merge branch 'dev' into v2
2 parents 05e24ea + 28a445d commit 807aa71

File tree

12 files changed

+104
-12
lines changed

12 files changed

+104
-12
lines changed

‎.github/workflows/greetings.yml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
name: Greetings
2+
3+
on: [pull_request, issues]
4+
5+
jobs:
6+
greeting:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/first-interaction@v1
10+
with:
11+
repo-token: ${{ secrets.GITHUB_TOKEN }}
12+
issue-message: 'Thank you for submitting your first issue to this project.'
13+
pr-message: 'Thank you for the first contribution to this project.'

‎CHANGELOG.JSON

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
{
22
"versions": [
3+
{
4+
"version": "1.17.0",
5+
"changes": {
6+
"new": [],
7+
"enhancements": [
8+
"`TaxonomyPicker`: Possibility to hide deprecated and \"Available for Tagging\"= false terms [#421](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/421)"
9+
],
10+
"fixes": [
11+
"`TaxonomyPicker`: suggestions are not working [#425](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/425)",
12+
"`RichText`: problem with edit mode [#445](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/445)"
13+
]
14+
},
15+
"contributions": [
16+
"[JonasBjerke89](https://github.com/JonasBjerke89)"
17+
]
18+
},
319
{
420
"version": "1.16.0",
521
"changes": {

‎CHANGELOG.md

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,29 @@
55
### Enhancements
66

77
- `FilePicker`: Fixes for OneDrive CORS issues [#407](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/407)
8+
- `ListItemPicker`: added new control property `filter` [#392](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/392)
9+
- allowing to use context from any type of SPFx extensions: [#419](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/419)
10+
- `Placeholder`: remove unused and vendor specific CSS [#426](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/426)
11+
12+
### Fixes
13+
14+
- Documentation fix for `FilePicker`: updated `accepts` value in props [#404](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/404)
15+
- The `FilePicker` control doesn't work in many languages due to missing localization keys [#412](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/412)
16+
- Documentation fix for broken links of Property Controls landing page [#388](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/388)
17+
- Documentation fix to include new components from v 1.15.0 [#394](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/394)
18+
- `DateTimePicker`: dropdown for time not handling AM/PM correctly [#405](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/409)
19+
- Documentation fix for `index` page: updated link to Chart controls [#417](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/417)
20+
- Documentation update for SPFx On Premises notice: [#418](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/418)
21+
- Documentation update for `ListItemPicker`: `valueColumnInternalName` should be `keyColumnInternalName`
22+
- `RichText`: Fix "Align Left" button [#429](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/429)
23+
- Documentation update for `FilePicker`: misspelling [#432](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/432)
24+
- `IFramePanel`: Fix doubled scroll issue when iframe content is higher than frame height [#431](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/431)
25+
- `PeoplePicker`: `errorMessage` not showing [#420](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/420)
26+
- `IFrameDialog`: `commitPopUp` typo causes popups with classic forms to not close after hitting save [#433](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/433)
827

928
### Contributors
1029

11-
Special thanks to our contributor: [Piotr Siatka](https://github.com/siata13).
30+
Special thanks to our contributors (in alphabetical order): [Piotr Siatka](https://github.com/siata13), [Dani Domínguez](https://github.com/danidz96), [Siddharth Vaghasia](https://github.com/siddharth-vaghasia), [João Mendes](https://github.com/joaojmendes), [PrasadKasireddy](https://github.com/PrasadKasireddy), [Chad Eiserloh](https://github.com/c-eiser13), [Koen Zomers](https://github.com/KoenZomers), [Dmitry Rogozhny](https://github.com/dmitryrogozhny), [Alexander Kleshcheov](https://github.com/SharePickle), [Hugo Bernier](https://github.com/hugoabernier), [Beniamin](https://github.com/bbronisz), [Giovani Martini](https://github.com/giovanibm).
1231

1332
## 1.15.0
1433

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

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,29 @@
55
### Enhancements
66

77
- `FilePicker`: Fixes for OneDrive CORS issues [#407](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/407)
8+
- `ListItemPicker`: added new control property `filter` [#392](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/392)
9+
- allowing to use context from any type of SPFx extensions: [#419](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/419)
10+
- `Placeholder`: remove unused and vendor specific CSS [#426](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/426)
11+
12+
### Fixes
13+
14+
- Documentation fix for `FilePicker`: updated `accepts` value in props [#404](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/404)
15+
- The `FilePicker` control doesn't work in many languages due to missing localization keys [#412](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/412)
16+
- Documentation fix for broken links of Property Controls landing page [#388](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/388)
17+
- Documentation fix to include new components from v 1.15.0 [#394](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/394)
18+
- `DateTimePicker`: dropdown for time not handling AM/PM correctly [#405](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/409)
19+
- Documentation fix for `index` page: updated link to Chart controls [#417](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/417)
20+
- Documentation update for SPFx On Premises notice: [#418](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/418)
21+
- Documentation update for `ListItemPicker`: `valueColumnInternalName` should be `keyColumnInternalName`
22+
- `RichText`: Fix "Align Left" button [#429](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/429)
23+
- Documentation update for `FilePicker`: misspelling [#432](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/432)
24+
- `IFramePanel`: Fix doubled scroll issue when iframe content is higher than frame height [#431](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/431)
25+
- `PeoplePicker`: `errorMessage` not showing [#420](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/420)
26+
- `IFrameDialog`: `commitPopUp` typo causes popups with classic forms to not close after hitting save [#433](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/433)
827

928
### Contributors
1029

11-
Special thanks to our contributor: [Piotr Siatka](https://github.com/siata13).
30+
Special thanks to our contributors (in alphabetical order): [Piotr Siatka](https://github.com/siata13), [Dani Domínguez](https://github.com/danidz96), [Siddharth Vaghasia](https://github.com/siddharth-vaghasia), [João Mendes](https://github.com/joaojmendes), [PrasadKasireddy](https://github.com/PrasadKasireddy), [Chad Eiserloh](https://github.com/c-eiser13), [Koen Zomers](https://github.com/KoenZomers), [Dmitry Rogozhny](https://github.com/dmitryrogozhny), [Alexander Kleshcheov](https://github.com/SharePickle), [Hugo Bernier](https://github.com/hugoabernier), [Beniamin](https://github.com/bbronisz), [Giovani Martini](https://github.com/giovanibm).
1231

1332
## 1.15.0
1433

‎docs/documentation/docs/controls/TaxonomyPicker.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,8 @@ The TaxonomyPicker control can be configured with the following properties:
115115
| disableChildrenOfDisabledParents | boolean | no | Specify if you want to disable the child terms when their parent is disabled. |
116116
| anchorId | string | no | Set the anchorid to a child term in the TermSet to be able to select terms from that level and below. |
117117
| termActions | ITermActions | no | Allows to execute custom action on the term like e.g. get other term labelsITermActions. |
118+
| hideTagsNotAvailableForTagging | boolean | no | Specifies if the tags marked with 'Available for tagging' = false should be hidden |
119+
| hideDeprecatedTags | boolean | no | Specifies if deprecated tags should be hidden |
118120

119121
Interface `IPickerTerm`
120122

‎package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@pnp/spfx-controls-react",
33
"description": "Reusable React controls for SharePoint Framework solutions",
4-
"version": "1.16.0",
4+
"version": "1.17.0",
55
"engines": {
66
"node": ">=0.10.0"
77
},

‎src/controls/richText/RichText.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ export class RichText extends React.Component<IRichTextProps, IRichTextState> {
185185
*/
186186
public shouldComponentUpdate(nextProps: IRichTextProps, nextState: IRichTextState): boolean {
187187
// Checks if the value coming in is the same
188-
if (isEqual(nextState, this.state)) {
188+
if (isEqual(nextState, this.state) && isEqual(nextProps, this.props)) {
189189
return false;
190190
}
191191

@@ -402,7 +402,7 @@ export class RichText extends React.Component<IRichTextProps, IRichTextState> {
402402
// If we're not in edit mode, display read-only version of the html
403403
if (!isEditMode) {
404404
return (
405-
<div className={`ql-editor ${styles.richtext} ${this.props.className}`}
405+
<div className={`ql-editor ${styles.richtext} ${this.props.className || ''}`}
406406
dangerouslySetInnerHTML={{ __html: text }}>
407407
</div>
408408
);

‎src/controls/taxonomyPicker/ITaxonomyPicker.ts

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,16 @@ export interface ITaxonomyPickerProps {
6464
*/
6565
termActions?: ITermActions;
6666

67+
/**
68+
* Specifies if the tags marked with 'Available for tagging' = false should be hidden
69+
*/
70+
hideTagsNotAvailableForTagging?: boolean;
71+
72+
/**
73+
* Specifies if deprecated tags should be hidden
74+
*/
75+
hideDeprecatedTags?: boolean;
76+
6777
/**
6878
* The method is used to get the validation error message and determine whether the input value is valid or not.
6979
*

‎src/controls/taxonomyPicker/TaxonomyPicker.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ export class TaxonomyPicker extends React.Component<ITaxonomyPickerProps, ITaxon
9090
// });
9191
}
9292

93-
this.termsService.getAllTerms(this.props.termsetNameOrID).then((response: ITermSet) => {
93+
this.termsService.getAllTerms(this.props.termsetNameOrID, this.props.hideDeprecatedTags, this.props.hideTagsNotAvailableForTagging).then((response: ITermSet) => {
9494
// Check if a response was retrieved
9595
let termSetAndTerms = response ? response : null;
9696
this.setState({
@@ -104,7 +104,7 @@ export class TaxonomyPicker extends React.Component<ITaxonomyPickerProps, ITaxon
104104
* Force update of the taxonomy tree - required by term action in case the term has been added, deleted or moved.
105105
*/
106106
private async updateTaxonomyTree(): Promise<void> {
107-
const termSetAndTerms = await this.termsService.getAllTerms(this.props.termsetNameOrID);
107+
const termSetAndTerms = await this.termsService.getAllTerms(this.props.termsetNameOrID, this.props.hideDeprecatedTags, this.props.hideTagsNotAvailableForTagging);
108108

109109
this.setState({
110110
termSetAndTerms

0 commit comments

Comments
 (0)