Manual merges + small docs changes

Author: estruyf

docs/documentation/docs/controls/FolderExplorer.md

@@ -23,19 +23,17 @@ import { FolderExplorer, IFolder } from "@pnp/spfx-controls-react/lib/FolderExpl
 - Use the `FolderExplorer` control in your code as follows:
 
 ```TypeScript
-<FolderExplorer
-              context={this.props.context}
-              rootFolder={{
-                Name: 'Documents',
-                ServerRelativeUrl: `/sites/TestSite/Shared Documents`
-              }}
-              defaultFolder={{
-                Name: 'Documents',
-                ServerRelativeUrl: `/sites/TestSite/Shared Documents`
-              }}
-              onSelect={this._onFolderSelect}
-              canCreateFolders={true}
-            />
+<FolderExplorer context={this.props.context}
+                rootFolder={{
+                  Name: 'Documents',
+                  ServerRelativeUrl: `/sites/TestSite/Shared Documents`
+                }}
+                defaultFolder={{
+                  Name: 'Documents',
+                  ServerRelativeUrl: `/sites/TestSite/Shared Documents`
+                }}
+                onSelect={this._onFolderSelect}
+                canCreateFolders={true} />
 ```
 
 - The `onSelect` change event returns the selected folder and can be implemented as follows:
@@ -60,6 +58,4 @@ The `FolderExplorer` control can be configured with the following properties:
 | hiddenFilterBox | boolean | no | Hide the filter box |
 | onSelect | (folder: IFolder): void | no | Callback function called after a folder is selected. |
 
-
-
 ![](https://telemetry.sharepointpnp.com/sp-dev-fx-controls-react/wiki/controls/FolderExplorer)

docs/documentation/docs/controls/IconPicker.md

@@ -24,11 +24,9 @@ import { IconPicker } from '@pnp/spfx-controls-react/lib/IconPicker';
 - Use the `IconPicker` control in your code as follows:
 
 ```TypeScript
-<IconPicker
-    buttonLabel={'Icon'}
-    onChange={(iconName: string) => { this.setState({icon: iconName}); }}
-    onSave={(iconName: string) => { this.setState({icon: iconName}); }}       
-/>
+<IconPicker buttonLabel={'Icon'}
+            onChange={(iconName: string) => { this.setState({icon: iconName}); }}
+            onSave={(iconName: string) => { this.setState({icon: iconName}); }} />
 ```
 
 ## Implementation

src/controls/iconPicker/IconPicker.tsx

@@ -10,12 +10,16 @@ import { IconNames } from './IconNames';
 import { Panel, PanelType, IPanelProps } from 'office-ui-fabric-react/lib/Panel';
 import { debounce } from 'lodash';
 import { IIconPickerState } from './IIconPickerState';
+import * as telemetry from '../../common/telemetry';
 
 export class IconPicker extends React.Component<IIconPickerProps, IIconPickerState> {
     private radioIdBase: string = getId("radio");
 
     constructor(props: IIconPickerProps) {
         super(props);
+
+        telemetry.track('IconPicker');
+
         this.state = {
             items: IconNames.Icons,
             isPanelOpen: false,
@@ -139,4 +143,4 @@ export class IconPicker extends React.Component<IIconPickerProps, IIconPickerSta
             </label>
         </li>;
     }
-}
+}