diff --git a/common/changes/@uifabric/experiments/v-vibr-ShimmerTile_2018-06-04-20-05.json b/common/changes/@uifabric/experiments/v-vibr-ShimmerTile_2018-06-04-20-05.json new file mode 100644 index 0000000000000..8a3bba3f88c36 --- /dev/null +++ b/common/changes/@uifabric/experiments/v-vibr-ShimmerTile_2018-06-04-20-05.json @@ -0,0 +1,11 @@ +{ + "changes": [ + { + "packageName": "@uifabric/experiments", + "comment": "ShimmerTile: Moves ShimmerTile to Tile component as it's only purpose is create a mock for a tile and itself alone never renders a Shimmer animation.", + "type": "minor" + } + ], + "packageName": "@uifabric/experiments", + "email": "v-vibr@microsoft.com" +} \ No newline at end of file diff --git a/packages/experiments/src/components/Shimmer/index.ts b/packages/experiments/src/components/Shimmer/index.ts index bb3df6b50c399..cfb95664f46ca 100644 --- a/packages/experiments/src/components/Shimmer/index.ts +++ b/packages/experiments/src/components/Shimmer/index.ts @@ -1,8 +1,6 @@ export * from './Shimmer'; export * from './Shimmer.base'; export * from './Shimmer.types'; -export * from './ShimmerTile/ShimmerTile'; -export * from './ShimmerTile/ShimmerTile.types'; export * from './ShimmerLine/ShimmerLine'; export * from './ShimmerLine/ShimmerLine.types'; export * from './ShimmerCircle/ShimmerCircle'; diff --git a/packages/experiments/src/components/Shimmer/ShimmerTile/ShimmerTile.base.tsx b/packages/experiments/src/components/Tile/ShimmerTile/ShimmerTile.base.tsx similarity index 94% rename from packages/experiments/src/components/Shimmer/ShimmerTile/ShimmerTile.base.tsx rename to packages/experiments/src/components/Tile/ShimmerTile/ShimmerTile.base.tsx index 5b1f8de04cb4d..6963bdfc91fe3 100644 --- a/packages/experiments/src/components/Shimmer/ShimmerTile/ShimmerTile.base.tsx +++ b/packages/experiments/src/components/Tile/ShimmerTile/ShimmerTile.base.tsx @@ -1,10 +1,11 @@ import * as React from 'react'; import { BaseComponent, classNamesFunction } from '../../../Utilities'; import { IShimmerTileProps, IShimmerTileStyleProps, IShimmerTileStyles } from './ShimmerTile.types'; -import { TileLayoutSizes, TileSize } from '../../../Tile'; -import { ShimmerGap } from '../ShimmerGap/ShimmerGap'; -import { ShimmerElementsGroup } from '../ShimmerElementsGroup/ShimmerElementsGroup'; -import { ShimmerElementType as ElemType } from '../Shimmer.types'; +import { TileSize } from '../Tile.types'; +import { TileLayoutSizes } from '../Tile'; +import { ShimmerGap } from '../../Shimmer/ShimmerGap/ShimmerGap'; +import { ShimmerElementsGroup } from '../../Shimmer/ShimmerElementsGroup/ShimmerElementsGroup'; +import { ShimmerElementType as ElemType } from '../../Shimmer/Shimmer.types'; const enum ShimmerTileLayoutValues { largeSquareWidth = 96, diff --git a/packages/experiments/src/components/Shimmer/ShimmerTile/ShimmerTile.styles.ts b/packages/experiments/src/components/Tile/ShimmerTile/ShimmerTile.styles.ts similarity index 100% rename from packages/experiments/src/components/Shimmer/ShimmerTile/ShimmerTile.styles.ts rename to packages/experiments/src/components/Tile/ShimmerTile/ShimmerTile.styles.ts diff --git a/packages/experiments/src/components/Shimmer/ShimmerTile/ShimmerTile.tsx b/packages/experiments/src/components/Tile/ShimmerTile/ShimmerTile.tsx similarity index 100% rename from packages/experiments/src/components/Shimmer/ShimmerTile/ShimmerTile.tsx rename to packages/experiments/src/components/Tile/ShimmerTile/ShimmerTile.tsx diff --git a/packages/experiments/src/components/Shimmer/ShimmerTile/ShimmerTile.types.ts b/packages/experiments/src/components/Tile/ShimmerTile/ShimmerTile.types.ts similarity index 97% rename from packages/experiments/src/components/Shimmer/ShimmerTile/ShimmerTile.types.ts rename to packages/experiments/src/components/Tile/ShimmerTile/ShimmerTile.types.ts index 352ad47a7a8a2..e52fe768b3ed0 100644 --- a/packages/experiments/src/components/Shimmer/ShimmerTile/ShimmerTile.types.ts +++ b/packages/experiments/src/components/Tile/ShimmerTile/ShimmerTile.types.ts @@ -1,7 +1,7 @@ import * as React from 'react'; import { IStyle } from '../../../Styling'; import { ISize, IStyleFunctionOrObject } from '../../../Utilities'; -import { TileSize } from '../../Tile'; +import { TileSize } from '../Tile.types'; export interface IShimmerTile {} diff --git a/packages/experiments/src/components/Tile/index.ts b/packages/experiments/src/components/Tile/index.ts index 674af0f48aa58..37874e9e0d875 100644 --- a/packages/experiments/src/components/Tile/index.ts +++ b/packages/experiments/src/components/Tile/index.ts @@ -1,2 +1,4 @@ export * from './Tile.types'; export * from './Tile'; +export * from './ShimmerTile/ShimmerTile'; +export * from './ShimmerTile/ShimmerTile.types'; \ No newline at end of file diff --git a/packages/experiments/src/components/TilesList/examples/TilesList.Document.Example.tsx b/packages/experiments/src/components/TilesList/examples/TilesList.Document.Example.tsx index 46be54adf29d2..4ead32fdeefcd 100644 --- a/packages/experiments/src/components/TilesList/examples/TilesList.Document.Example.tsx +++ b/packages/experiments/src/components/TilesList/examples/TilesList.Document.Example.tsx @@ -1,6 +1,6 @@ import * as React from 'react'; import { TilesList, ITilesGridItem, ITilesGridSegment } from '@uifabric/experiments/lib/TilesList'; -import { Tile } from '@uifabric/experiments/lib/Tile'; +import { Tile, ShimmerTile } from '@uifabric/experiments/lib/Tile'; import { Toggle } from 'office-ui-fabric-react/lib/Toggle'; import { Selection, SelectionZone } from 'office-ui-fabric-react/lib/Selection'; import { MarqueeSelection } from 'office-ui-fabric-react/lib/MarqueeSelection'; @@ -14,7 +14,7 @@ import { createShimmerGroups } from './ExampleHelpers'; import { ISize } from '@uifabric/experiments/lib/Utilities'; -import { ShimmerTile, ShimmerElementType as ElemType, ShimmerElementsGroup } from '@uifabric/experiments/lib/Shimmer'; +import { ShimmerElementType as ElemType, ShimmerElementsGroup } from '@uifabric/experiments/lib/Shimmer'; const HEADER_VERTICAL_PADDING = 13; const HEADER_FONT_SIZE = 18;