diff options
Diffstat (limited to 'animism-align/frontend/views/paragraph')
| -rw-r--r-- | animism-align/frontend/views/paragraph/components/paragraphTypes/index.js | 16 | ||||
| -rw-r--r-- | animism-align/frontend/views/paragraph/components/paragraphTypes/paragraphTypes.text.js (renamed from animism-align/frontend/views/paragraph/components/paragraph.types.js) | 26 | ||||
| -rw-r--r-- | animism-align/frontend/views/paragraph/components/paragraphTypes/paragraphTypes.video.js | 19 | ||||
| -rw-r--r-- | animism-align/frontend/views/paragraph/containers/paragraphList.container.js | 2 |
4 files changed, 36 insertions, 27 deletions
diff --git a/animism-align/frontend/views/paragraph/components/paragraphTypes/index.js b/animism-align/frontend/views/paragraph/components/paragraphTypes/index.js new file mode 100644 index 0000000..990c911 --- /dev/null +++ b/animism-align/frontend/views/paragraph/components/paragraphTypes/index.js @@ -0,0 +1,16 @@ +import React from 'react' + +import { + Paragraph, ParagraphHeader +} from './paragraphTypes.text' + +import { + MediaVideo +} from './paragraphTypes.video' + +export const ParagraphElementLookup = { + paragraph: React.memo(Paragraph), + blockquote: React.memo(Paragraph), + header: React.memo(ParagraphHeader), + video: React.memo(MediaVideo), +} diff --git a/animism-align/frontend/views/paragraph/components/paragraph.types.js b/animism-align/frontend/views/paragraph/components/paragraphTypes/paragraphTypes.text.js index fe8158a..5f8dbc3 100644 --- a/animism-align/frontend/views/paragraph/components/paragraph.types.js +++ b/animism-align/frontend/views/paragraph/components/paragraphTypes/paragraphTypes.text.js @@ -1,7 +1,4 @@ import React, { Component } from 'react' -import VimeoPlayer from '@u-wave/react-vimeo' - -import actions from '../../../actions' export const Paragraph = ({ paragraph, selectedParagraph, selectedAnnotation, onAnnotationClick, onDoubleClick }) => { let className = paragraph.type @@ -37,26 +34,3 @@ export const ParagraphHeader = ({ paragraph, selectedParagraph, selectedAnnotati </div> ) } - -export const MediaVideo = ({ paragraph, media, selectedParagraph, selectedAnnotation, onAnnotationClick, onDoubleClick }) => { - if (!media.lookup) return <div /> - const className = selectedParagraph ? 'media selected' : 'media' - const annotation = paragraph.annotations[0] - const item = media.lookup[annotation.settings.media_id] - if (!item) return <div>Media not found: {annotation.settings.media_id}</div> - return ( - <div - className={className} - onDoubleClick={e => onDoubleClick(e, paragraph)} - > - <VimeoPlayer video={item.url} autoplay muted width="650" /> - </div> - ) -} - -export const ParagraphElementLookup = { - paragraph: React.memo(Paragraph), - blockquote: React.memo(Paragraph), - header: React.memo(ParagraphHeader), - video: React.memo(MediaVideo), -} diff --git a/animism-align/frontend/views/paragraph/components/paragraphTypes/paragraphTypes.video.js b/animism-align/frontend/views/paragraph/components/paragraphTypes/paragraphTypes.video.js new file mode 100644 index 0000000..8e224f3 --- /dev/null +++ b/animism-align/frontend/views/paragraph/components/paragraphTypes/paragraphTypes.video.js @@ -0,0 +1,19 @@ +import React, { Component } from 'react' + +import VimeoPlayer from '@u-wave/react-vimeo' + +export const MediaVideo = ({ paragraph, media, selectedParagraph, selectedAnnotation, onAnnotationClick, onDoubleClick }) => { + if (!media.lookup) return <div /> + const className = selectedParagraph ? 'media selected' : 'media' + const annotation = paragraph.annotations[0] + const item = media.lookup[annotation.settings.media_id] + if (!item) return <div>Media not found: {annotation.settings.media_id}</div> + return ( + <div + className={className} + onDoubleClick={e => onDoubleClick(e, paragraph)} + > + <VimeoPlayer video={item.url} autoplay muted width="650" /> + </div> + ) +} diff --git a/animism-align/frontend/views/paragraph/containers/paragraphList.container.js b/animism-align/frontend/views/paragraph/containers/paragraphList.container.js index fc1a687..deeb347 100644 --- a/animism-align/frontend/views/paragraph/containers/paragraphList.container.js +++ b/animism-align/frontend/views/paragraph/containers/paragraphList.container.js @@ -4,7 +4,7 @@ import { bindActionCreators } from 'redux' import { connect } from 'react-redux' import actions from '../../../actions' -import { ParagraphElementLookup } from '../components/paragraph.types' +import { ParagraphElementLookup } from '../components/paragraphTypes' const floatLT = (a,b) => ((a*10|0) < (b*10|0)) const floatLTE = (a,b) => ((a*10|0) === (b*10|0) || floatLT(a,b)) |
