From 107e8f7104a3571944a9f75434c7d811bb877a6c Mon Sep 17 00:00:00 2001 From: Andrey Okonetchnikov Date: Tue, 27 Sep 2016 12:57:41 +0200 Subject: [PATCH] Moved MarkupItReactRenderer to /components. Added a story for it. --- .../__tests__/MarkupItReactRenderer.spec.js | 2 +- .../MarkitupReactRenderer.spec.js.snap | 0 .../index.js} | 0 src/components/Widgets/MarkdownPreview.js | 2 +- src/components/stories/FindBar.js | 2 +- .../stories/MarkupItReactRenderer.js | 34 +++++++++++++++++++ src/components/stories/index.js | 1 + 7 files changed, 38 insertions(+), 3 deletions(-) rename src/components/{Widgets => MarkupItReactRenderer}/__tests__/MarkupItReactRenderer.spec.js (98%) rename src/components/{Widgets => MarkupItReactRenderer}/__tests__/__snapshots__/MarkitupReactRenderer.spec.js.snap (100%) rename src/components/{Widgets/MarkupItReactRenderer.js => MarkupItReactRenderer/index.js} (100%) create mode 100644 src/components/stories/MarkupItReactRenderer.js diff --git a/src/components/Widgets/__tests__/MarkupItReactRenderer.spec.js b/src/components/MarkupItReactRenderer/__tests__/MarkupItReactRenderer.spec.js similarity index 98% rename from src/components/Widgets/__tests__/MarkupItReactRenderer.spec.js rename to src/components/MarkupItReactRenderer/__tests__/MarkupItReactRenderer.spec.js index ea9fcee4..c676757f 100644 --- a/src/components/Widgets/__tests__/MarkupItReactRenderer.spec.js +++ b/src/components/MarkupItReactRenderer/__tests__/MarkupItReactRenderer.spec.js @@ -8,7 +8,7 @@ import MarkupIt from 'markup-it'; import markdownSyntax from 'markup-it/syntaxes/markdown'; import htmlSyntax from 'markup-it/syntaxes/html'; import reInline from 'markup-it/syntaxes/markdown/re/inline'; -import MarkupItReactRenderer from '../MarkupItReactRenderer'; +import MarkupItReactRenderer from '../../UI/MarkupItReactRenderer/MarkupItReactRenderer'; describe('MarkitupReactRenderer', () => { diff --git a/src/components/Widgets/__tests__/__snapshots__/MarkitupReactRenderer.spec.js.snap b/src/components/MarkupItReactRenderer/__tests__/__snapshots__/MarkitupReactRenderer.spec.js.snap similarity index 100% rename from src/components/Widgets/__tests__/__snapshots__/MarkitupReactRenderer.spec.js.snap rename to src/components/MarkupItReactRenderer/__tests__/__snapshots__/MarkitupReactRenderer.spec.js.snap diff --git a/src/components/Widgets/MarkupItReactRenderer.js b/src/components/MarkupItReactRenderer/index.js similarity index 100% rename from src/components/Widgets/MarkupItReactRenderer.js rename to src/components/MarkupItReactRenderer/index.js diff --git a/src/components/Widgets/MarkdownPreview.js b/src/components/Widgets/MarkdownPreview.js index beb1a9aa..b88435b9 100644 --- a/src/components/Widgets/MarkdownPreview.js +++ b/src/components/Widgets/MarkdownPreview.js @@ -1,6 +1,6 @@ import React, { PropTypes } from 'react'; import { getSyntaxes } from './richText'; -import MarkupItReactRenderer from './MarkupItReactRenderer'; +import MarkupItReactRenderer from '../MarkupItReactRenderer/index'; const schema = { 'mediaproxy': ({ token }) => ( diff --git a/src/components/stories/FindBar.js b/src/components/stories/FindBar.js index 812d2f8c..b2933b96 100644 --- a/src/components/stories/FindBar.js +++ b/src/components/stories/FindBar.js @@ -1,7 +1,7 @@ import React from 'react'; import { storiesOf, action } from '@kadira/storybook'; -import FindBar from '../UI/FindBar/FindBar'; +import FindBar from '../FindBar/FindBar'; const CREATE_COLLECTION = 'CREATE_COLLECTION'; const CREATE_POST = 'CREATE_POST'; diff --git a/src/components/stories/MarkupItReactRenderer.js b/src/components/stories/MarkupItReactRenderer.js new file mode 100644 index 00000000..2ba1a3ee --- /dev/null +++ b/src/components/stories/MarkupItReactRenderer.js @@ -0,0 +1,34 @@ +import React from 'react'; +import markdownSyntax from 'markup-it/syntaxes/markdown'; +import htmlSyntax from 'markup-it/syntaxes/html'; +import MarkupItReactRenderer from '../MarkupItReactRenderer'; +import { storiesOf } from '@kadira/storybook'; + +const mdContent = ` +# Title + +* List 1 +* List 2 +`; + +const htmlContent = ` +

Title

+
    +
  1. List item 1
  2. +
  3. List item 2
  4. +
+`; + +storiesOf('MarkupItReactRenderer', module) + .add('Markdown', () => ( + + + )).add('HTML', () => ( + + )); diff --git a/src/components/stories/index.js b/src/components/stories/index.js index aef4bed3..30acb086 100644 --- a/src/components/stories/index.js +++ b/src/components/stories/index.js @@ -2,3 +2,4 @@ import './Card'; import './Icon'; import './Toast'; import './FindBar'; +import './MarkupItReactRenderer';