Merge branch 'MarkusLanger-improve-error-message' into dev

Author: AJIXuMuK

src/controls/listItemPicker/ComboBoxListItemPicker.tsx

@@ -96,7 +96,8 @@ export class ComboBoxListItemPicker extends React.Component<IComboBoxListItemPic
                   className={className}
                   disabled={disabled} />
 
-        <Label style={{ color: '#FF0000' }}> {this.state.errorMessage} </Label>
+        {!!this.state.errorMessage &&
+          (<Label style={{ color: '#FF0000' }}> {this.state.errorMessage} </Label>)}
       </div>) : <span>Loading...</span>
     );
   }

src/controls/listItemPicker/ListItemPicker.tsx

@@ -1,7 +1,6 @@
 import * as strings from 'ControlStrings';
 import * as React from "react";
 import SPservice from "../../services/SPService";
-import { escape } from "@microsoft/sp-lodash-subset";
 import { TagPicker } from "office-ui-fabric-react/lib/components/pickers/TagPicker/TagPicker";
 import { Label } from "office-ui-fabric-react/lib/Label";
 import { IListItemPickerProps, IListItemPickerState } from ".";
@@ -61,7 +60,8 @@ export class ListItemPicker extends React.Component<IListItemPickerProps, IListI
                     placeholder: placeholder
                   }} />
 
-        <Label style={{color:'#FF0000'}}> {this.state.errorMessage} </Label>
+        {!!this.state.errorMessage &&
+          (<Label style={{color:'#FF0000'}}> {this.state.errorMessage} </Label>)}
       </div>
     );
   }