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

estruyf · estruyf · commit deb3fb032cfb · 2018-08-09T17:15:57.000+02:00
diff --git a/src/controls/fields/fieldAttachmentsRenderer/FieldAttachmentsRenderer.tsx b/src/controls/fields/fieldAttachmentsRenderer/FieldAttachmentsRenderer.tsx
@@ -1,6 +1,7 @@
 import { override } from '@microsoft/decorators';
 import * as React from 'react';
-import { css, Icon } from 'office-ui-fabric-react';
+import { css } from 'office-ui-fabric-react/lib/Utilities';
+import { Icon } from 'office-ui-fabric-react/lib/Icon';
 import { IFieldRendererProps } from '../fieldCommon/IFieldRendererProps';
 import * as telemetry from '../../../common/telemetry';
 
diff --git a/src/controls/fields/fieldBaseTextRenderer/FieldBaseTextRenderer.tsx b/src/controls/fields/fieldBaseTextRenderer/FieldBaseTextRenderer.tsx
@@ -1,6 +1,6 @@
 import { override } from '@microsoft/decorators';
 import * as React from 'react';
-import { css } from 'office-ui-fabric-react';
+import { css } from 'office-ui-fabric-react/lib/Utilities';
 
 import styles from './FieldBaseTextRenderer.module.scss';
 import { IFieldRendererProps } from '../fieldCommon/IFieldRendererProps';
diff --git a/src/controls/fields/fieldCommon/IFieldRendererProps.ts b/src/controls/fields/fieldCommon/IFieldRendererProps.ts
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { ICssInput } from 'office-ui-fabric-react';
+import { ICssInput } from 'office-ui-fabric-react/lib/Utilities';
 
 /**
  * base properties for field renderes
diff --git a/src/controls/fields/fieldDateRenderer/FieldDateRenderer.tsx b/src/controls/fields/fieldDateRenderer/FieldDateRenderer.tsx
@@ -1,6 +1,6 @@
 import { override } from '@microsoft/decorators';
 import * as React from 'react';
-import { css } from 'office-ui-fabric-react';
+import { css } from 'office-ui-fabric-react/lib/Utilities';
 import { IFieldRendererProps } from '../fieldCommon/IFieldRendererProps';
 import { FieldBaseTextRenderer } from '../fieldBaseTextRenderer/FieldBaseTextRenderer';
 import * as telemetry from '../../../common/telemetry';
diff --git a/src/controls/fields/fieldFileTypeRenderer/FieldFileTypeRenderer.tsx b/src/controls/fields/fieldFileTypeRenderer/FieldFileTypeRenderer.tsx
@@ -1,6 +1,7 @@
 import { override } from '@microsoft/decorators';
 import * as React from 'react';
-import { css, ISerializableObject, Icon } from 'office-ui-fabric-react';
+import { css, ISerializableObject } from 'office-ui-fabric-react/lib/Utilities';
+import { Icon } from 'office-ui-fabric-react/lib/Icon';
 import { IFieldRendererProps } from '../fieldCommon/IFieldRendererProps';
 import { FileTypeIcon, IconType } from '../../fileTypeIcon';
 import * as telemetry from '../../../common/telemetry';
diff --git a/src/controls/fields/fieldLookupRenderer/FieldLookupRenderer.tsx b/src/controls/fields/fieldLookupRenderer/FieldLookupRenderer.tsx
@@ -1,6 +1,9 @@
 import { override } from '@microsoft/decorators';
 import * as React from 'react';
-import { css, Dialog, DialogType, Link, Spinner, SpinnerSize } from 'office-ui-fabric-react';
+import { css } from 'office-ui-fabric-react/lib/Utilities';
+import { Dialog, DialogType } from 'office-ui-fabric-react/lib/Dialog';
+import { Link } from 'office-ui-fabric-react/lib/Link';
+import { Spinner, SpinnerSize } from 'office-ui-fabric-react/lib/Spinner';
 
 import { ISPFieldLookupValue } from "../../../common/SPEntities";
 import { IFieldRendererProps } from '../fieldCommon/IFieldRendererProps';
@@ -106,8 +109,8 @@ export class FieldLookupRenderer extends React.Component<IFieldLookupRendererPro
                         type: DialogType.close,
                         showCloseButton: true
                     }}>
-                        <Spinner size={SpinnerSize.large} />
-                    </Dialog>}
+                    <Spinner size={SpinnerSize.large} />
+                </Dialog>}
             </div>);
     }
 
diff --git a/src/controls/fields/fieldNameRenderer/FieldNameRenderer.tsx b/src/controls/fields/fieldNameRenderer/FieldNameRenderer.tsx
@@ -1,15 +1,14 @@
 import { override } from '@microsoft/decorators';
 import * as React from 'react';
-import { css } from 'office-ui-fabric-react';
-
-import { Link, Icon } from 'office-ui-fabric-react';
+import { css } from 'office-ui-fabric-react/lib/Utilities';
+import { Icon } from 'office-ui-fabric-react/lib/Icon';
+import { Link } from 'office-ui-fabric-react/lib/Link';
 
 import { FieldBaseTextRenderer } from '../fieldBaseTextRenderer/FieldBaseTextRenderer';
 import { IFieldRendererProps } from '../fieldCommon/IFieldRendererProps';
 import * as telemetry from '../../../common/telemetry';
 
 import styles from './FieldNameRenderer.module.scss';
-import { GeneralHelper } from "../../../common/utilities/GeneralHelper";
 
 export interface IFieldNameRendererProps extends IFieldRendererProps {
     /**
diff --git a/src/controls/fields/fieldTaxonomyRenderer/FieldTaxonomyRenderer.tsx b/src/controls/fields/fieldTaxonomyRenderer/FieldTaxonomyRenderer.tsx
@@ -1,6 +1,6 @@
 import { override } from '@microsoft/decorators';
 import * as React from 'react';
-import { css } from 'office-ui-fabric-react';
+import { css } from 'office-ui-fabric-react/lib/Utilities';
 
 import { ITerm } from '../../../common/SPEntities';
 import { IFieldRendererProps } from '../fieldCommon/IFieldRendererProps';
diff --git a/src/controls/fields/fieldTextRenderer/FieldTextRenderer.tsx b/src/controls/fields/fieldTextRenderer/FieldTextRenderer.tsx
@@ -1,6 +1,6 @@
 import { override } from '@microsoft/decorators';
 import * as React from 'react';
-import { css } from 'office-ui-fabric-react';
+import { css } from 'office-ui-fabric-react/lib/Utilities';
 
 import styles from './FieldTextRenderer.module.scss';
 
diff --git a/src/controls/fields/fieldTitleRenderer/FieldTitleRenderer.tsx b/src/controls/fields/fieldTitleRenderer/FieldTitleRenderer.tsx
@@ -1,6 +1,7 @@
 import { override } from '@microsoft/decorators';
 import * as React from 'react';
-import { Link, css } from 'office-ui-fabric-react';
+import { css } from 'office-ui-fabric-react/lib/Utilities';
+import { Link } from 'office-ui-fabric-react/lib/Link';
 
 import { FieldBaseTextRenderer } from '../fieldBaseTextRenderer/FieldBaseTextRenderer';
 import { IFieldRendererProps } from '../fieldCommon/IFieldRendererProps';
diff --git a/src/controls/fields/fieldUrlRenderer/FieldUrlRenderer.tsx b/src/controls/fields/fieldUrlRenderer/FieldUrlRenderer.tsx
@@ -1,6 +1,7 @@
 import { override } from '@microsoft/decorators';
 import * as React from 'react';
-import { Link, css } from 'office-ui-fabric-react';
+import { css } from 'office-ui-fabric-react/lib/Utilities';
+import { Link } from 'office-ui-fabric-react/lib/Link';
 
 import { IFieldRendererProps } from '../fieldCommon/IFieldRendererProps';
 import * as telemetry from '../../../common/telemetry';
diff --git a/src/controls/fields/fieldUserRenderer/FieldUserHoverCard.tsx b/src/controls/fields/fieldUserRenderer/FieldUserHoverCard.tsx
@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { HoverCard, IExpandingCardProps } from 'office-ui-fabric-react';
+import { HoverCard, IExpandingCardProps } from 'office-ui-fabric-react/lib/HoverCard';
 
 import styles from './FieldUserRenderer.module.scss';
 
diff --git a/src/controls/fields/fieldUserRenderer/FieldUserRenderer.tsx b/src/controls/fields/fieldUserRenderer/FieldUserRenderer.tsx
@@ -1,8 +1,14 @@
 import { override } from '@microsoft/decorators';
 import * as React from 'react';
-import { css } from 'office-ui-fabric-react';
+import { css } from 'office-ui-fabric-react/lib/Utilities';
 import * as _ from '@microsoft/sp-lodash-subset';
-import { HoverCard, IExpandingCardProps, DirectionalHint, Persona, IconButton, Button, ButtonType, PersonaSize, Spinner, SpinnerSize, Link, Icon } from 'office-ui-fabric-react';
+import { IExpandingCardProps } from 'office-ui-fabric-react/lib/HoverCard';
+import { DirectionalHint } from 'office-ui-fabric-react/lib/common/DirectionalHint';
+import { Persona, PersonaSize } from 'office-ui-fabric-react/lib/Persona';
+import { IconButton, Button, ButtonType } from 'office-ui-fabric-react/lib/Button';
+import { Spinner, SpinnerSize } from 'office-ui-fabric-react/lib/Spinner';
+import { Link } from 'office-ui-fabric-react/lib/Link';
+import { Icon } from 'office-ui-fabric-react/lib/Icon';
 
 import { IPrincipal, IUserProfileProperties, IODataKeyValuePair } from '../../../common/SPEntities';
 import { IFieldRendererProps } from '../fieldCommon/IFieldRendererProps';
diff --git a/src/controls/iFrameDialog/IFrameDialog.tsx b/src/controls/iFrameDialog/IFrameDialog.tsx
@@ -1,6 +1,6 @@
 import * as React from "react";
 import * as ReactDOM from "react-dom";
-import { Dialog, IDialogProps } from 'office-ui-fabric-react';
+import { Dialog, IDialogProps } from 'office-ui-fabric-react/lib/Dialog';
 import { IFrameDialogContent } from './IFrameDialogContent';
 import * as telemetry from '../../common/telemetry';
 
diff --git a/src/controls/taxonomyPicker/TermParent.tsx b/src/controls/taxonomyPicker/TermParent.tsx
@@ -6,7 +6,7 @@ import { EXPANDED_IMG, COLLAPSED_IMG, TERMSET_IMG, TERM_IMG } from './TaxonomyPi
 import Term from './Term';
 
 import styles from './TaxonomyPicker.module.scss';
-import { Checkbox } from 'office-ui-fabric-react';
+import { Checkbox } from 'office-ui-fabric-react/lib/Checkbox';
 import * as strings from 'ControlStrings';
 
 /**
diff --git a/src/controls/taxonomyPicker/TermPicker.tsx b/src/controls/taxonomyPicker/TermPicker.tsx
@@ -6,7 +6,7 @@ import styles from './TaxonomyPicker.module.scss';
 import { ITaxonomyPickerProps } from './ITaxonomyPicker';
 import { IWebPartContext } from '@microsoft/sp-webpart-base';
 import * as strings from 'ControlStrings';
-import { Icon } from 'office-ui-fabric-react';
+import { Icon } from 'office-ui-fabric-react/lib/Icon';
 import { ApplicationCustomizerContext } from '@microsoft/sp-application-base';
 import { ITermSet } from '../../services/ISPTermStorePickerService';
 
