From 1b8e23bfd83fc4023ceb30891cc952c38e61ec61 Mon Sep 17 00:00:00 2001 From: David Zearing Date: Sun, 1 Apr 2018 19:52:42 -0700 Subject: [PATCH 1/2] Ref updates. --- .../src/components/Coachmark/Coachmark.tsx | 4 ++-- .../PositioningContainer.tsx | 5 ++++- .../ComboBox/VirtualizedComboBox.tsx | 4 ++-- .../src/components/CommandBar/CommandBar.tsx | 18 +++++++++--------- .../DetailsList/DetailsHeader.test.tsx | 4 ++-- .../src/components/DetailsList/DetailsList.tsx | 15 ++++++++------- .../examples/DetailsList.Grouped.Example.tsx | 4 ++-- .../src/components/Dropdown/Dropdown.tsx | 7 +++---- .../src/components/HoverCard/HoverCard.tsx | 4 +--- .../src/components/List/List.types.ts | 7 ++++++- .../src/components/OverflowSet/OverflowSet.tsx | 4 ++-- .../src/components/pickers/BasePicker.tsx | 8 ++++---- .../src/utilities/selection/SelectionZone.tsx | 4 ++++ 13 files changed, 49 insertions(+), 39 deletions(-) diff --git a/packages/office-ui-fabric-react/src/components/Coachmark/Coachmark.tsx b/packages/office-ui-fabric-react/src/components/Coachmark/Coachmark.tsx index 5af5a82d6b56c3..0500dd656c5f73 100644 --- a/packages/office-ui-fabric-react/src/components/Coachmark/Coachmark.tsx +++ b/packages/office-ui-fabric-react/src/components/Coachmark/Coachmark.tsx @@ -4,7 +4,7 @@ import { BaseComponent, classNamesFunction, createRef } from '../../Utilities'; import { DefaultPalette } from '../../Styling'; // Component Dependencies -import { PositioningContainer } from './PositioningContainer/PositioningContainer'; +import { PositioningContainer, IPositioningContainer } from './PositioningContainer/index'; import { Beak } from './Beak/Beak'; // Coachmark @@ -82,7 +82,7 @@ export class Coachmark extends BaseComponent { */ private _entityInnerHostElement = createRef(); private _translateAnimationContainer = createRef(); - private _positioningContainer = createRef(); + private _positioningContainer = createRef(); constructor(props: ICoachmarkTypes) { super(props); diff --git a/packages/office-ui-fabric-react/src/components/Coachmark/PositioningContainer/PositioningContainer.tsx b/packages/office-ui-fabric-react/src/components/Coachmark/PositioningContainer/PositioningContainer.tsx index 37ca7b4635482c..0a31984b9cfb20 100644 --- a/packages/office-ui-fabric-react/src/components/Coachmark/PositioningContainer/PositioningContainer.tsx +++ b/packages/office-ui-fabric-react/src/components/Coachmark/PositioningContainer/PositioningContainer.tsx @@ -1,5 +1,6 @@ import * as React from 'react'; import { + IPositioningContainer, IPositioningContainerTypes } from './PositioningContainer.types'; import { getClassNames } from './PositioningContainer.styles'; @@ -57,7 +58,9 @@ export interface IPositioningContainerState { heightOffset?: number; } -export class PositioningContainer extends BaseComponent { +export class PositioningContainer + extends BaseComponent + implements PositioningContainer { public static defaultProps: IPositioningContainerTypes = { preventDismissOnScroll: false, diff --git a/packages/office-ui-fabric-react/src/components/ComboBox/VirtualizedComboBox.tsx b/packages/office-ui-fabric-react/src/components/ComboBox/VirtualizedComboBox.tsx index 0674d552c7261a..fc855b7ed0bde2 100644 --- a/packages/office-ui-fabric-react/src/components/ComboBox/VirtualizedComboBox.tsx +++ b/packages/office-ui-fabric-react/src/components/ComboBox/VirtualizedComboBox.tsx @@ -2,14 +2,14 @@ import * as React from 'react'; import { BaseComponent, createRef } from '../../Utilities'; import { ComboBox } from './ComboBox'; import { IComboBoxProps, IComboBox } from './ComboBox.types'; -import { List } from '../../List'; +import { IList, List } from '../../List'; import { ISelectableOption } from '../../utilities/selectableOption/SelectableOption.types'; export class VirtualizedComboBox extends BaseComponent implements IComboBox { /** The combo box element */ private _comboBox = createRef(); /** The virtualized list element */ - private _list = createRef(); + private _list = createRef(); public dismissMenu(): void { if (this._comboBox.value) { diff --git a/packages/office-ui-fabric-react/src/components/CommandBar/CommandBar.tsx b/packages/office-ui-fabric-react/src/components/CommandBar/CommandBar.tsx index 000ff7d7876391..223dc0968e366e 100644 --- a/packages/office-ui-fabric-react/src/components/CommandBar/CommandBar.tsx +++ b/packages/office-ui-fabric-react/src/components/CommandBar/CommandBar.tsx @@ -9,7 +9,7 @@ import { getNativeProps } from '../../Utilities'; import { ICommandBar, ICommandBarProps, ICommandBarItemProps } from './CommandBar.types'; -import { FocusZone, FocusZoneDirection } from '../../FocusZone'; +import { IFocusZone, FocusZone, FocusZoneDirection } from '../../FocusZone'; import { ContextualMenu, IContextualMenuProps, IContextualMenuItem } from '../../ContextualMenu'; import { hasSubmenu } from '../../utilities/contextualMenu/index'; import { DirectionalHint } from '../../common/DirectionalHint'; @@ -52,7 +52,7 @@ export class CommandBar extends BaseComponent(); private _commandBarRegion = createRef(); private _farCommandSurface = createRef(); - private _focusZone = createRef(); + private _focusZone = createRef(); private _overflow = createRef(); private _id: string; @@ -194,7 +194,7 @@ export class CommandBar extends BaseComponent { size: number, index: number ): { size: number; index: number; } => lastResize = { size, index }; - const headerRef = createRef(); + const headerRef = createRef(); const columns = []; const wrapper = mount( diff --git a/packages/office-ui-fabric-react/src/components/DetailsList/DetailsList.tsx b/packages/office-ui-fabric-react/src/components/DetailsList/DetailsList.tsx index e3cbb0439d44ac..f2ba8cb362fc19 100644 --- a/packages/office-ui-fabric-react/src/components/DetailsList/DetailsList.tsx +++ b/packages/office-ui-fabric-react/src/components/DetailsList/DetailsList.tsx @@ -23,8 +23,9 @@ import { } from '../DetailsList/DetailsList.types'; import { DetailsHeader, IDetailsHeader, SelectAllVisibility, IDetailsHeaderProps } from '../DetailsList/DetailsHeader'; import { DetailsRow, IDetailsRowProps } from '../DetailsList/DetailsRow'; -import { FocusZone, FocusZoneDirection } from '../../FocusZone'; +import { IFocusZone, FocusZone, FocusZoneDirection } from '../../FocusZone'; import { + ISelectionZone, IObjectWithKey, ISelection, Selection, @@ -33,8 +34,8 @@ import { } from '../../utilities/selection/index'; import { DragDropHelper } from '../../utilities/dragdrop/DragDropHelper'; -import { GroupedList } from '../../GroupedList'; -import { List, IListProps } from '../../List'; +import { IGroupedList, GroupedList } from '../../GroupedList'; +import { IList, List, IListProps } from '../../List'; import { withViewport } from '../../utilities/decorators/withViewport'; import { GetGroupCount } from '../../utilities/groupedList/GroupedListUtility'; @@ -73,10 +74,10 @@ export class DetailsList extends BaseComponent(); private _header = createRef(); - private _groupedList = createRef(); - private _list = createRef(); - private _focusZone = createRef(); - private _selectionZone = createRef(); + private _groupedList = createRef(); + private _list = createRef(); + private _focusZone = createRef(); + private _selectionZone = createRef(); private _selection: ISelection; private _activeRows: { [key: string]: DetailsRow }; diff --git a/packages/office-ui-fabric-react/src/components/DetailsList/examples/DetailsList.Grouped.Example.tsx b/packages/office-ui-fabric-react/src/components/DetailsList/examples/DetailsList.Grouped.Example.tsx index 1c8be6f3723d23..9db03c9fe80666 100644 --- a/packages/office-ui-fabric-react/src/components/DetailsList/examples/DetailsList.Grouped.Example.tsx +++ b/packages/office-ui-fabric-react/src/components/DetailsList/examples/DetailsList.Grouped.Example.tsx @@ -7,7 +7,7 @@ import { } from 'office-ui-fabric-react/lib/Utilities'; import { DefaultButton } from 'office-ui-fabric-react/lib/Button'; import { Fabric } from 'office-ui-fabric-react/lib/Fabric'; -import { DetailsList, IColumn } from 'office-ui-fabric-react/lib/DetailsList'; +import { IDetailsList, DetailsList, IColumn } from 'office-ui-fabric-react/lib/DetailsList'; import './DetailsList.Grouped.Example.scss'; const _columns = [ @@ -58,7 +58,7 @@ const _items = [ export class DetailsListGroupedExample extends BaseComponent<{}, { items: {}[]; }> { - private _root = createRef(); + private _root = createRef(); constructor(props: {}) { super(props); diff --git a/packages/office-ui-fabric-react/src/components/Dropdown/Dropdown.tsx b/packages/office-ui-fabric-react/src/components/Dropdown/Dropdown.tsx index 92c05c2aeec073..88f5210408b9d7 100644 --- a/packages/office-ui-fabric-react/src/components/Dropdown/Dropdown.tsx +++ b/packages/office-ui-fabric-react/src/components/Dropdown/Dropdown.tsx @@ -7,7 +7,7 @@ import { Label } from '../../Label'; import { CommandButton } from '../../Button'; import { Panel } from '../../Panel'; import { Icon } from '../../Icon'; -import { FocusZone, FocusZoneDirection } from '../../FocusZone'; +import { IFocusZone, FocusZone, FocusZoneDirection } from '../../FocusZone'; import { withResponsiveMode, ResponsiveMode } from '../../utilities/decorators/withResponsiveMode'; import { IWithResponsiveModeState } from '../../utilities/decorators/withResponsiveMode'; import { @@ -48,9 +48,8 @@ export class Dropdown extends BaseComponent(); - private _focusZone = createRef(); + private _focusZone = createRef(); private _dropDown = createRef(); - private _dropdownLabel = createRef