From e1a0b49fb4334dfb0ba8cced5a5231aff80f5dfe Mon Sep 17 00:00:00 2001 From: olfedias Date: Wed, 5 Dec 2018 14:04:59 +0200 Subject: [PATCH 1/8] breaking(Divider): remove `type` prop --- .../Chat/Types/ChatExample.shorthand.tsx | 2 +- .../components/Chat/Types/ChatExample.tsx | 2 +- .../Types/DividerExamplePrimary.shorthand.tsx | 6 -- .../Divider/Types/DividerExamplePrimary.tsx | 6 -- .../DividerExampleSecondary.shorthand.tsx | 6 -- .../Divider/Types/DividerExampleSecondary.tsx | 6 -- .../components/Divider/Types/index.tsx | 10 --- .../chatPane/services/messageFactoryMock.tsx | 6 +- docs/src/views/Theming.tsx | 10 +-- docs/src/views/ThemingExamples.tsx | 88 ++++++------------- src/components/Divider/Divider.tsx | 4 - .../components/Divider/dividerVariables.ts | 4 +- .../components/Divider/dividerVariables.ts | 4 +- .../teams/components/Divider/dividerStyles.ts | 10 +-- .../components/Divider/dividerVariables.ts | 8 +- 15 files changed, 47 insertions(+), 125 deletions(-) delete mode 100644 docs/src/examples/components/Divider/Types/DividerExamplePrimary.shorthand.tsx delete mode 100644 docs/src/examples/components/Divider/Types/DividerExamplePrimary.tsx delete mode 100644 docs/src/examples/components/Divider/Types/DividerExampleSecondary.shorthand.tsx delete mode 100644 docs/src/examples/components/Divider/Types/DividerExampleSecondary.tsx diff --git a/docs/src/examples/components/Chat/Types/ChatExample.shorthand.tsx b/docs/src/examples/components/Chat/Types/ChatExample.shorthand.tsx index e7e9e64430..7204a22562 100644 --- a/docs/src/examples/components/Chat/Types/ChatExample.shorthand.tsx +++ b/docs/src/examples/components/Chat/Types/ChatExample.shorthand.tsx @@ -47,7 +47,7 @@ const items = [ key: 'message-id-4', }, { - content: , + content: , key: 'message-id-5', }, { diff --git a/docs/src/examples/components/Chat/Types/ChatExample.tsx b/docs/src/examples/components/Chat/Types/ChatExample.tsx index 2ffaf98d08..2e1d220815 100644 --- a/docs/src/examples/components/Chat/Types/ChatExample.tsx +++ b/docs/src/examples/components/Chat/Types/ChatExample.tsx @@ -36,7 +36,7 @@ const ChatExample = () => ( /> - + - -export default DividerExamplePrimary diff --git a/docs/src/examples/components/Divider/Types/DividerExamplePrimary.tsx b/docs/src/examples/components/Divider/Types/DividerExamplePrimary.tsx deleted file mode 100644 index 66121b6ad2..0000000000 --- a/docs/src/examples/components/Divider/Types/DividerExamplePrimary.tsx +++ /dev/null @@ -1,6 +0,0 @@ -import React from 'react' -import { Divider } from '@stardust-ui/react' - -const DividerExamplePrimary = () => Primary Divider - -export default DividerExamplePrimary diff --git a/docs/src/examples/components/Divider/Types/DividerExampleSecondary.shorthand.tsx b/docs/src/examples/components/Divider/Types/DividerExampleSecondary.shorthand.tsx deleted file mode 100644 index 19c7d53821..0000000000 --- a/docs/src/examples/components/Divider/Types/DividerExampleSecondary.shorthand.tsx +++ /dev/null @@ -1,6 +0,0 @@ -import React from 'react' -import { Divider } from '@stardust-ui/react' - -const DividerExampleSecondary = () => - -export default DividerExampleSecondary diff --git a/docs/src/examples/components/Divider/Types/DividerExampleSecondary.tsx b/docs/src/examples/components/Divider/Types/DividerExampleSecondary.tsx deleted file mode 100644 index 98e37702ce..0000000000 --- a/docs/src/examples/components/Divider/Types/DividerExampleSecondary.tsx +++ /dev/null @@ -1,6 +0,0 @@ -import React from 'react' -import { Divider } from '@stardust-ui/react' - -const DividerExampleSecondary = () => Secondary Divider - -export default DividerExampleSecondary diff --git a/docs/src/examples/components/Divider/Types/index.tsx b/docs/src/examples/components/Divider/Types/index.tsx index cb3a22f454..9118a8ba02 100644 --- a/docs/src/examples/components/Divider/Types/index.tsx +++ b/docs/src/examples/components/Divider/Types/index.tsx @@ -14,16 +14,6 @@ const Types = () => ( description="A Divider can contain text or other content displayed alongside with the line." examplePath="components/Divider/Types/DividerExampleContent" /> - - ) diff --git a/docs/src/prototypes/chatPane/services/messageFactoryMock.tsx b/docs/src/prototypes/chatPane/services/messageFactoryMock.tsx index e9b0c5cf19..20a7b5b244 100644 --- a/docs/src/prototypes/chatPane/services/messageFactoryMock.tsx +++ b/docs/src/prototypes/chatPane/services/messageFactoryMock.tsx @@ -122,8 +122,8 @@ function createMessageContentWithAttachments(content: string, messageId: string) } function generateDividerProps(props: DividerProps): Divider { - const { content, important, type = 'secondary' } = props - const dividerProps: Divider = { itemType: ChatItemTypes.divider, content, important, type } + const { content, important, color = 'secondary' } = props + const dividerProps: Divider = { itemType: ChatItemTypes.divider, content, important, color } return dividerProps } @@ -158,7 +158,7 @@ export function generateChatProps(chat: ChatData): ChatItemContentProps[] { chatProps.splice( myLastMsgIndex + 1, 0, - generateDividerProps({ content: 'Last read', type: 'primary', important: true }), + generateDividerProps({ content: 'Last read', color: 'primary', important: true }), ) } diff --git a/docs/src/views/Theming.tsx b/docs/src/views/Theming.tsx index 5a5412daa5..de7c61c748 100644 --- a/docs/src/views/Theming.tsx +++ b/docs/src/views/Theming.tsx @@ -52,18 +52,12 @@ export default () => ( `, - `
`, - ` `, - ` Branding`, - `
`, + ` `, ``, ].join('\n')} render={() => ( -
- - Branding -
+ )} /> diff --git a/docs/src/views/ThemingExamples.tsx b/docs/src/views/ThemingExamples.tsx index d35db5c187..3b6a17312e 100644 --- a/docs/src/views/ThemingExamples.tsx +++ b/docs/src/views/ThemingExamples.tsx @@ -44,7 +44,7 @@ export default () => ( `, ` `, @@ -54,9 +54,6 @@ export default () => ( ` `, - ` Branding`, ``, ` /* First nested theming */`, ` ( ` - Branding - + )} /> diff --git a/docs/src/views/ThemingExamples.tsx b/docs/src/views/ThemingExamples.tsx index 2e93270549..cb10eaac31 100644 --- a/docs/src/views/ThemingExamples.tsx +++ b/docs/src/views/ThemingExamples.tsx @@ -44,7 +44,7 @@ export default () => ( @@ -181,7 +181,7 @@ export default () => ( ( /* Default theming */
- Branding /* First nested theming */ Date: Thu, 6 Dec 2018 10:07:38 +0200 Subject: [PATCH 8/8] move to separate variant --- src/themes/teams/components/Divider/dividerVariables.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/themes/teams/components/Divider/dividerVariables.ts b/src/themes/teams/components/Divider/dividerVariables.ts index a9f4bafda0..8815f779ed 100644 --- a/src/themes/teams/components/Divider/dividerVariables.ts +++ b/src/themes/teams/components/Divider/dividerVariables.ts @@ -14,8 +14,10 @@ export interface DividerVariables { } export default (siteVars: any): DividerVariables => { + const colorVariant = '500' + return { - colors: _.mapValues({ ...siteVars.emphasisColors, ...siteVars.naturalColors }, '500'), + colors: _.mapValues({ ...siteVars.emphasisColors, ...siteVars.naturalColors }, colorVariant), dividerColor: siteVars.gray09, textColor: siteVars.gray03, textFontSize: siteVars.fontSizeSmall,