Merge branch 'dev' of github.com:SharePoint/sp-dev-fx-controls-react into dev

Author: estruyf

CHANGELOG.JSON

@@ -30,17 +30,21 @@
           "`TaxonomyPicker`: Suggestion/match does not work as expected [#604](https://github.com/pnp/sp-dev-fx-controls-react/issues/604)",
           "`TaxonomyPicker`: Include check for separator while filtering path of terms when anchorId is configured [#625](https://github.com/pnp/sp-dev-fx-controls-react/issues/625)",
           "`FilePicker`: Bing API search issue [#633](https://github.com/pnp/sp-dev-fx-controls-react/pull/633)",
-          "`ListView`: Sort fires selection [#621](https://github.com/pnp/sp-dev-fx-controls-react/issues/621)"
+          "`ListView`: Sort fires selection [#621](https://github.com/pnp/sp-dev-fx-controls-react/issues/621)",
+          "`Map`: A minor issue in componentWillUpdate method to get the next props rather than the current props.[#641](https://github.com/pnp/sp-dev-fx-controls-react/pull/641)",
+          "`IFrameDialog`: dialog size is incorrect when opening the dialog second time [#615](https://github.com/pnp/sp-dev-fx-controls-react/issues/615)",
+          "`FolderPicker`: imports don't work [#614](https://github.com/pnp/sp-dev-fx-controls-react/issues/614)"
         ]
       },
       "contributions": [
+        "[Alexey Sadomov](https://github.com/sadomovalex)",
+        "[Anoop Tatti](https://github.com/anoopt)",
         "[Devang Bhavsar](https://github.com/devangbhavsar89)",
+        "[Gautam Sheth](https://github.com/gautamdsheth)",
         "[geltapatio](https://github.com/geltapatio)",
         "[Joel Jeffery](https://github.com/joeljeffery)",
-        "[Victor Pollet](https://github.com/TheThor59)",
-        "[Alexey Sadomov](https://github.com/sadomovalex)",
-        "[Gautam Sheth](https://github.com/gautamdsheth)",
-        "[Piotr Siatka](https://github.com/siata13)"
+        "[Piotr Siatka](https://github.com/siata13)",
+        "[Victor Pollet](https://github.com/TheThor59)"
       ]
     },
     {

docs/documentation/docs/controls/FolderPicker.md

@@ -25,7 +25,8 @@ Here is an example of the control:
 - Import the control into your component:
 
 ```TypeScript
-import { FolderPicker, IFolder } from "@pnp/spfx-controls-react/lib/FolderPicker";
+import FolderPicker from "@pnp/spfx-controls-react/lib/controls/folderPicker/FolderPicker";
+import { IFolder } from "@pnp/spfx-controls-react/lib/FolderPicker";
 ```
 
 - Use the `FolderPicker` control in your code as follows:

src/controls/folderPicker/index.ts

@@ -1,3 +1,4 @@
 export * from './FolderPicker';
 export * from './IFolderPickerProps';
 export * from './IFolderPickerState';
+export { IFolder } from '../../services/IFolderExplorerService';

src/controls/iFrameDialog/IFrameDialog.tsx

@@ -94,6 +94,14 @@ export class IFrameDialog extends React.Component<IFrameDialogProps, IFrameDialo
     this.setDialogStyling();
   }
 
+  public componentWillReceiveProps(nextProps: IFrameDialogProps) {
+    if (nextProps.hidden && nextProps.hidden !== this.props.hidden) {
+      this.setState({
+        isStylingSet: false
+      });
+    }
+  }
+
   public componentDidUpdate(prevProps: IFrameDialogProps, prevState: IFrameDialogState): void {
     this.setDialogStyling();
   }

src/controls/map/Map.tsx

@@ -48,7 +48,7 @@ export class Map extends React.Component<IMapProps, IMapState> {
   public componentWillUpdate(nextProps: IMapProps, nextState: IMapState): void {
     if (!isEqual(this.props.coordinates, nextProps.coordinates)) {
       this.setState({
-        coordinates: this.props.coordinates
+        coordinates: nextProps.coordinates
       });
     }
   }