From aac2fe32f47387f16d70c168ad4537020e066d03 Mon Sep 17 00:00:00 2001 From: Vitalie Braga Date: Mon, 4 Jun 2018 13:02:29 -0700 Subject: [PATCH 1/2] Moves ShimmerTile from Shimmer to Tile. --- packages/experiments/src/components/Shimmer/index.ts | 2 -- .../{Shimmer => Tile}/ShimmerTile/ShimmerTile.base.tsx | 9 +++++---- .../{Shimmer => Tile}/ShimmerTile/ShimmerTile.styles.ts | 0 .../{Shimmer => Tile}/ShimmerTile/ShimmerTile.tsx | 0 .../{Shimmer => Tile}/ShimmerTile/ShimmerTile.types.ts | 2 +- packages/experiments/src/components/Tile/index.ts | 2 ++ .../TilesList/examples/TilesList.Document.Example.tsx | 4 ++-- 7 files changed, 10 insertions(+), 9 deletions(-) rename packages/experiments/src/components/{Shimmer => Tile}/ShimmerTile/ShimmerTile.base.tsx (94%) rename packages/experiments/src/components/{Shimmer => Tile}/ShimmerTile/ShimmerTile.styles.ts (100%) rename packages/experiments/src/components/{Shimmer => Tile}/ShimmerTile/ShimmerTile.tsx (100%) rename packages/experiments/src/components/{Shimmer => Tile}/ShimmerTile/ShimmerTile.types.ts (97%) diff --git a/packages/experiments/src/components/Shimmer/index.ts b/packages/experiments/src/components/Shimmer/index.ts index 88daed3258c1c..208238788a7c3 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 1112a5dd0f0a8..b6dbde31aaef5 100644 --- a/packages/experiments/src/components/Shimmer/ShimmerTile/ShimmerTile.base.tsx +++ b/packages/experiments/src/components/Tile/ShimmerTile/ShimmerTile.base.tsx @@ -8,10 +8,11 @@ import { 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 f087acb4491d5..32309abe7de8d 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 346b2d7f99098..0164415334e30 100644 --- a/packages/experiments/src/components/Tile/index.ts +++ b/packages/experiments/src/components/Tile/index.ts @@ -1,3 +1,5 @@ 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 1ee4ebd57ab4b..03c4fa44b2ec9 100644 --- a/packages/experiments/src/components/TilesList/examples/TilesList.Document.Example.tsx +++ b/packages/experiments/src/components/TilesList/examples/TilesList.Document.Example.tsx @@ -6,7 +6,8 @@ import { ITilesGridSegment } from '@uifabric/experiments/lib/TilesList'; import { - Tile + 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'; @@ -22,7 +23,6 @@ import { } from './ExampleHelpers'; import { ISize } from '@uifabric/experiments/lib/Utilities'; import { - ShimmerTile, ShimmerElementType as ElemType, ShimmerElementsGroup } from '@uifabric/experiments/lib/Shimmer'; From f8a252893ca0dc1d82e40b2f0a06836b1b908ebc Mon Sep 17 00:00:00 2001 From: Vitalie Braga Date: Mon, 4 Jun 2018 13:05:19 -0700 Subject: [PATCH 2/2] Rush change log. --- .../v-vibr-ShimmerTile_2018-06-04-20-05.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 common/changes/@uifabric/experiments/v-vibr-ShimmerTile_2018-06-04-20-05.json 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