Merge remote-tracking branch 'upstream/dev' into dev

Piotr Siatka · Piotr Siatka · commit a686dd064867 · 2020-01-10T09:18:03.000+01:00
diff --git a/.github/workflows/greetings.yml b/.github/workflows/greetings.yml
@@ -0,0 +1,13 @@
+name: Greetings
+
+on: [pull_request, issues]
+
+jobs:
+  greeting:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/first-interaction@v1
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        issue-message: 'Thank you for submitting your first issue to this project.'
+        pr-message: 'Thank you for the first contribution to this project.'
diff --git a/CHANGELOG.JSON b/CHANGELOG.JSON
@@ -1,13 +1,29 @@
 {
   "versions": [
+    {
+      "version": "1.17.0",
+      "changes": {
+        "new": [],
+        "enhancements": [
+          "`TaxonomyPicker`: Possibility to hide deprecated and \"Available for Tagging\"= false terms [#421](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/421)"
+          ],
+        "fixes": [
+          "`RichText`: problem with edit mode [#445](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/445)"
+          ]
+      },
+      "contributions": [
+        "[JonasBjerke89](https://github.com/JonasBjerke89)"
+        ]
+    },
     {
       "version": "1.16.0",
       "changes": {
         "new": [],
         "enhancements": [
           "`FilePicker`: Fixes for OneDrive CORS issues [#407](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/407)",
           "`ListItemPicker`: added new control property `filter` [#392](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/392)",
-          "allowing to use context from any type of SPFx extensions: [#419](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/419)"
+          "allowing to use context from any type of SPFx extensions: [#419](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/419)",
+          "`Placeholder`: remove unused and vendor specific CSS [#426](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/426)"
         ],
         "fixes": [
           "Documentation fix for `FilePicker`: updated `accepts` value in props [#404](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/404)",
@@ -16,7 +32,13 @@
           "Documentation fix to include new components from v 1.15.0 [#394](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/394)",
           "`DateTimePicker`: dropdown for time not handling AM/PM correctly [#405](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/409)",
           "Documentation fix for `index` page: updated link to Chart controls [#417](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/417)",
-          "Documentation update for SPFx On Premises notice: [#418](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/418)"
+          "Documentation update for SPFx On Premises notice: [#418](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/418)",
+          "Documentation update for `ListItemPicker`: `valueColumnInternalName` should be `keyColumnInternalName`",
+          "`RichText`: Fix \"Align Left\" button [#429](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/429)",
+          "Documentation update for `FilePicker`: misspelling [#432](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/432)",
+          "`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)",
+          "`PeoplePicker`: `errorMessage` not showing [#420](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/420)",
+          "`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)"
         ]
       },
       "contributions": [
@@ -26,7 +48,12 @@
         "[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)"
+        "[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)"
       ]
     },
     {
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,10 +5,29 @@
 ### Enhancements
 
 - `FilePicker`: Fixes for OneDrive CORS issues [#407](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/407)
+- `ListItemPicker`: added new control property `filter` [#392](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/392)
+- allowing to use context from any type of SPFx extensions: [#419](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/419)
+- `Placeholder`: remove unused and vendor specific CSS [#426](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/426)
+
+### Fixes
+
+- Documentation fix for `FilePicker`: updated `accepts` value in props [#404](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/404)
+- 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)
+- Documentation fix for broken links of Property Controls landing page [#388](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/388)
+- Documentation fix to include new components from v 1.15.0 [#394](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/394)
+- `DateTimePicker`: dropdown for time not handling AM/PM correctly [#405](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/409)
+- Documentation fix for `index` page: updated link to Chart controls [#417](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/417)
+- Documentation update for SPFx On Premises notice: [#418](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/418)
+- Documentation update for `ListItemPicker`: `valueColumnInternalName` should be `keyColumnInternalName`
+- `RichText`: Fix "Align Left" button [#429](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/429)
+- Documentation update for `FilePicker`: misspelling [#432](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/432)
+- `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)
+- `PeoplePicker`: `errorMessage` not showing [#420](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/420)
+- `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)
 
 ### Contributors
 
-Special thanks to our contributor: [Piotr Siatka](https://github.com/siata13).
+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).
 
 ## 1.15.0
 
diff --git a/docs/documentation/docs/about/release-notes.md b/docs/documentation/docs/about/release-notes.md
@@ -5,10 +5,29 @@
 ### Enhancements
 
 - `FilePicker`: Fixes for OneDrive CORS issues [#407](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/407)
+- `ListItemPicker`: added new control property `filter` [#392](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/392)
+- allowing to use context from any type of SPFx extensions: [#419](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/419)
+- `Placeholder`: remove unused and vendor specific CSS [#426](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/426)
+
+### Fixes
+
+- Documentation fix for `FilePicker`: updated `accepts` value in props [#404](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/404)
+- 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)
+- Documentation fix for broken links of Property Controls landing page [#388](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/388)
+- Documentation fix to include new components from v 1.15.0 [#394](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/394)
+- `DateTimePicker`: dropdown for time not handling AM/PM correctly [#405](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/409)
+- Documentation fix for `index` page: updated link to Chart controls [#417](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/417)
+- Documentation update for SPFx On Premises notice: [#418](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/418)
+- Documentation update for `ListItemPicker`: `valueColumnInternalName` should be `keyColumnInternalName`
+- `RichText`: Fix "Align Left" button [#429](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/429)
+- Documentation update for `FilePicker`: misspelling [#432](https://github.com/SharePoint/sp-dev-fx-controls-react/pull/432)
+- `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)
+- `PeoplePicker`: `errorMessage` not showing [#420](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/420)
+- `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)
 
 ### Contributors
 
-Special thanks to our contributor: [Piotr Siatka](https://github.com/siata13).
+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).
 
 ## 1.15.0
 
diff --git a/docs/documentation/docs/controls/FilePicker.md b/docs/documentation/docs/controls/FilePicker.md
@@ -80,8 +80,8 @@ interface `IFilePickerResult`
 Provides options for carousel buttons location.
 
 | Value | Type | Description |
-| ---- | ---- |
-| fileName | string | File namr of the result with the extension. |
+| ---- | ---- | ---- |
+| fileName | string | File name of the result with the extension. |
 | fileNameWithoutExtension | string | File name of the result without the extension. |
 | fileAbsoluteUrl | string | Absolute URL of the file. Null in case of file upload. |
 | downloadFileContent | () => Promise<File> | Function allows to download file content. Returns File object. |
diff --git a/docs/documentation/docs/controls/ListItemPicker.md b/docs/documentation/docs/controls/ListItemPicker.md
@@ -23,7 +23,7 @@ import { ListItemPicker } from '@pnp/spfx-controls-react/lib/listItemPicker';
 ```TypeScript
 <ListItemPicker listId='da8daf15-d84f-4ab1-9800-7568f82fed3f'
                 columnInternalName='Title'
-                valueColumnInternalName='Id'
+                keyColumnInternalName='Id'
                 filter="Title eq 'SPFx'"
                 itemLimit={2}
                 onSelectedItem={this.onSelectedItem}
diff --git a/docs/documentation/docs/controls/TaxonomyPicker.md b/docs/documentation/docs/controls/TaxonomyPicker.md
@@ -115,6 +115,8 @@ The TaxonomyPicker control can be configured with the following properties:
 | disableChildrenOfDisabledParents | boolean | no | Specify if you want to disable the child terms when their parent is disabled. |
 | anchorId | string | no | Set the anchorid to a child term in the TermSet to be able to select terms from that level and below. |
 | termActions | ITermActions | no | Allows to execute custom action on the term like e.g. get other term labelsITermActions. |
+| hideTagsNotAvailableForTagging | boolean | no | Specifies if the tags marked with 'Available for tagging' = false should be hidden |
+| hideDeprecatedTags | boolean | no | Specifies if deprecated tags  should be hidden |
 
 Interface `IPickerTerm`
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@pnp/spfx-controls-react",
   "description": "Reusable React controls for SharePoint Framework solutions",
-  "version": "1.16.0",
+  "version": "1.17.0",
   "engines": {
     "node": ">=0.10.0"
   },
diff --git a/src/controls/iFrameDialog/IFrameDialogContent.tsx b/src/controls/iFrameDialog/IFrameDialogContent.tsx
@@ -40,6 +40,8 @@ export class IFrameDialogContent extends React.Component<IIFrameDialogContentPro
         try { // for cross origin requests we can have issues with accessing frameElement
             this._iframe.contentWindow.frameElement.cancelPopUp = this.props.close;
             this._iframe.contentWindow.frameElement.commitPopUp = this.props.close;
+            // SP.UI.Dialog has misspelling of commitPopUp
+            this._iframe.contentWindow.frameElement.commitPopup = this.props.close;
         }
         catch (err) {
             if (err.name !== 'SecurityError') {
diff --git a/src/controls/iFramePanel/IFramePanelContent.tsx b/src/controls/iFramePanel/IFramePanelContent.tsx
@@ -27,14 +27,14 @@ export class IFramePanelContent extends React.Component<IIFramePanelContentProps
       if (this._iframe) {
         const mainDiv = this.findParent(this._iframe, "ms-Panel-main");
         const commandsDiv = mainDiv.querySelector(".ms-Panel-commands") as HTMLDivElement;
-        const headerDiv = mainDiv.querySelector("ms-Panel-header") as HTMLDivElement;
-        const footerDiv = mainDiv.querySelector("ms-Panel-footer") as HTMLDivElement;
+        const headerDiv = mainDiv.querySelector(".ms-Panel-header") as HTMLDivElement;
+        const footerDiv = mainDiv.querySelector(".ms-Panel-footer") as HTMLDivElement;
 
         let height = this.getTrueHeight(mainDiv);
         height = height - this.getTrueHeight(commandsDiv);
         height = height - this.getTrueHeight(headerDiv);
         height = height - this.getTrueHeight(footerDiv);
-        height = height - 20;  // padding on content div
+        height = height - 25;  // padding on content div
 
         this._iframe.height = height.toString() + 'px';
       }
@@ -59,9 +59,9 @@ export class IFramePanelContent extends React.Component<IIFramePanelContentProps
    */
   private getTrueHeight(elm: HTMLElement): number {
     if (elm) {
-      const style = elm.style || window.getComputedStyle(elm);
+      const style = window.getComputedStyle && window.getComputedStyle(elm) || elm.style;
       let marginTop = parseInt((style.marginTop as string).replace("px", ""));
-      let marginBottom = parseInt((style.marginTop as string).replace("px", ""));
+      let marginBottom = parseInt((style.marginBottom as string).replace("px", ""));
       if (isNaN(marginTop)) {
         marginTop = 0;
       }
@@ -80,6 +80,9 @@ export class IFramePanelContent extends React.Component<IIFramePanelContentProps
   private iframeOnLoad = () => {
     try { // for cross origin requests we can have issues with accessing frameElement
       this._iframe.contentWindow.frameElement.cancelPopUp = this.props.close;
+      this._iframe.contentWindow.frameElement.commitPopUp = this.props.close;
+      // SP.UI.Dialog has misspelling of commitPopUp
+      this._iframe.contentWindow.frameElement.commitPopup = this.props.close;
     }
     catch (err) {
       if (err.name !== 'SecurityError') {
diff --git a/src/controls/peoplepicker/PeoplePickerComponent.tsx b/src/controls/peoplepicker/PeoplePickerComponent.tsx
@@ -225,7 +225,7 @@ export class PeoplePicker extends React.Component<IPeoplePickerProps, IPeoplePic
         }
 
         {
-          (this.props.isRequired && this.state.showRequiredError) || (this.state.errorMessage) && (
+          ((this.props.isRequired && this.state.showRequiredError) || (this.state.errorMessage)) && (
             <p className={`ms-TextField-errorMessage ${styles.errorMessage} ${this.props.errorMessageClassName ? this.props.errorMessageClassName : ''}`}>
               <Icon iconName='Error' className={styles.errorIcon} />
               {
diff --git a/src/controls/placeholder/PlaceholderComponent.module.scss b/src/controls/placeholder/PlaceholderComponent.module.scss
@@ -1,14 +1,9 @@
 @import '~office-ui-fabric-react/dist/sass/References.scss';
 
 .placeholder {
-    display: -webkit-box;
-    display: -ms-flexbox;
     display: flex;
 
     .placeholderContainer {
-        -webkit-box-align: center;
-        -ms-flex-align: center;
-        -ms-grid-row-align: center;
         align-items: center;
         color: "[theme:neutralSecondary, default: #666666]";
         background-color: "[theme:neutralLighter, default: #f4f4f4]";
@@ -97,15 +92,3 @@
         }
     }
 }
-
-.placeholderOverlay {
-    position: relative;
-    height: 100%;
-    z-index: 1;
-
-    .placeholderSpinnerContainer {
-        position: relative;
-        width: 100%;
-        margin: 164px 0
-    }
-}
diff --git a/src/controls/richText/RichText.tsx b/src/controls/richText/RichText.tsx
@@ -186,7 +186,7 @@ export class RichText extends React.Component<IRichTextProps, IRichTextState> {
    */
   public shouldComponentUpdate(nextProps: IRichTextProps, nextState: IRichTextState): boolean {
     // Checks if the value coming in is the same
-    if (isEqual(nextState, this.state)) {
+    if (isEqual(nextState, this.state) && isEqual(nextProps, this.props)) {
       return false;
     }
 
@@ -403,7 +403,7 @@ export class RichText extends React.Component<IRichTextProps, IRichTextState> {
     // If we're not in edit mode, display read-only version of the html
     if (!isEditMode) {
       return (
-        <div className={`ql-editor ${styles.richtext} ${this.props.className}`}
+        <div className={`ql-editor ${styles.richtext} ${this.props.className || ''}`}
              dangerouslySetInnerHTML={{ __html: text }}>
         </div>
       );
@@ -578,7 +578,7 @@ id="DropDownStyles"
                               editor={this.getEditor()}
                               isOpen={this.state.morePaneVisible}
                               onClose={this.handleClosePanel}
-                              onLink={this.showInsertLinkDialog} 
+                              onLink={this.showInsertLinkDialog}
                               customColors={this.props.customColors}/>
 
         {
diff --git a/src/controls/richText/RichTextPropertyPane.tsx b/src/controls/richText/RichTextPropertyPane.tsx
@@ -369,7 +369,7 @@ export default class RichTextPropertyPane extends React.Component<IRichTextPrope
                          id="left-propertyPaneButton"
                          calloutProps={{ gapSpace: 0 }}>
               <IconButton checked={this.state.formats!.align === undefined}
-                          onClick={() => this.applyFormat('align', 'left')}
+                          onClick={() => this.applyFormat('align', undefined)}
                           className={styles.propertyPaneButton}
                           aria-describedby="left-propertyPaneButton"
                           iconProps={{
diff --git a/src/controls/taxonomyPicker/ITaxonomyPicker.ts b/src/controls/taxonomyPicker/ITaxonomyPicker.ts
@@ -64,6 +64,16 @@ export interface ITaxonomyPickerProps  {
    */
   termActions?: ITermActions;
 
+  /**
+   * Specifies if the tags marked with 'Available for tagging' = false should be hidden
+   */
+  hideTagsNotAvailableForTagging?: boolean;
+
+  /**
+   * Specifies if deprecated tags  should be hidden
+   */
+  hideDeprecatedTags?: boolean;
+
   /**
    * The method is used to get the validation error message and determine whether the input value is valid or not.
    *
diff --git a/src/controls/taxonomyPicker/TaxonomyPicker.tsx b/src/controls/taxonomyPicker/TaxonomyPicker.tsx
@@ -90,7 +90,7 @@ export class TaxonomyPicker extends React.Component<ITaxonomyPickerProps, ITaxon
       // });
     }
 
-    this.termsService.getAllTerms(this.props.termsetNameOrID).then((response: ITermSet) => {
+    this.termsService.getAllTerms(this.props.termsetNameOrID, this.props.hideDeprecatedTags, this.props.hideTagsNotAvailableForTagging).then((response: ITermSet) => {
       // Check if a response was retrieved
       let termSetAndTerms = response ? response : null;
       this.setState({
@@ -104,7 +104,7 @@ export class TaxonomyPicker extends React.Component<ITaxonomyPickerProps, ITaxon
    * Force update of the taxonomy tree - required by term action in case the term has been added, deleted or moved.
    */
   private async updateTaxonomyTree(): Promise<void> {
-    const termSetAndTerms = await this.termsService.getAllTerms(this.props.termsetNameOrID);
+    const termSetAndTerms = await this.termsService.getAllTerms(this.props.termsetNameOrID, this.props.hideDeprecatedTags, this.props.hideTagsNotAvailableForTagging);
 
     this.setState({
       termSetAndTerms
diff --git a/src/services/SPTermStorePickerService.ts b/src/services/SPTermStorePickerService.ts
diff --git a/src/webparts/controlsTest/components/ControlsTest.tsx b/src/webparts/controlsTest/components/ControlsTest.tsx

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@pnp/spfx-controls-react",`
`3`	`3`	`"description": "Reusable React controls for SharePoint Framework solutions",`
`4`		`- "version": "1.16.0",`
	`4`	`+ "version": "1.17.0",`
`5`	`5`	`"engines": {`
`6`	`6`	`"node": ">=0.10.0"`
`7`	`7`	`},`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,8 @@ export class IFrameDialogContent extends React.Component<IIFrameDialogContentPro`
`40`	`40`	`try { // for cross origin requests we can have issues with accessing frameElement`
`41`	`41`	`this._iframe.contentWindow.frameElement.cancelPopUp = this.props.close;`
`42`	`42`	`this._iframe.contentWindow.frameElement.commitPopUp = this.props.close;`
	`43`	`+ // SP.UI.Dialog has misspelling of commitPopUp`
	`44`	`+ this._iframe.contentWindow.frameElement.commitPopup = this.props.close;`
`43`	`45`	`}`
`44`	`46`	`catch (err) {`
`45`	`47`	`if (err.name !== 'SecurityError') {`