@kids-reporter/draft-renderer 0.3.0 → 0.4.0

package/lib/block-render-map.js

@@ -3,16 +3,20 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.blockRenderMapForAnnotation = exports.blockRenderMap = void 0;
+exports.blockRenderMapForInfoBoxWithHeaderBorder = exports.blockRenderMapForInfoBox = exports.blockRenderMapForAnnotation = exports.blockRenderMap = void 0;
 
 var _immutable = _interopRequireDefault(require("immutable"));
 
 var _react = _interopRequireDefault(require("react"));
 
-var _styledComponents = _interopRequireDefault(require("styled-components"));
+var _styledComponents = _interopRequireWildcard(require("styled-components"));
 
 var _draftJs = require("draft-js");
 
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 const ParagraphBlock = _styledComponents.default.div`
@@ -50,15 +54,15 @@ const HeadingBlock = _styledComponents.default.div`
   }
 
   h2 {
-    font-size: 30px;
+    font-size: 35px;
   }
 
   h3 {
-    font-size: 28px;
+    font-size: 30px;
   }
 
   h4 {
-    font-size: 26px;
+    font-size: 25px;
   }
 `;
 
@@ -138,9 +142,7 @@ const blockRenderMap = _draftJs.DefaultDraftBlockRenderMap.merge(_blockRenderMap
 
 exports.blockRenderMap = blockRenderMap;
 const HeadingForAnnotation = (0, _styledComponents.default)(Heading)`
-  h4 {
-    font-size: 20px;
-  }
+  margin: 0 auto 27px auto;
 `;
 const OrderdedListForAnnotation = (0, _styledComponents.default)(OrderdedList)`
   li {
@@ -156,7 +158,7 @@ const ParagraphForAnnotation = (0, _styledComponents.default)(Paragraph)`
   /* overwrite css */
   font-size: 16px;
   font-weight: 400;
-  margin-bottom: 0;
+  margin-bottom: 20px;
 `;
 
 const _blockRenderMapForAnnotation = _immutable.default.Map({
@@ -180,4 +182,46 @@ const _blockRenderMapForAnnotation = _immutable.default.Map({
 
 const blockRenderMapForAnnotation = _draftJs.DefaultDraftBlockRenderMap.merge(_blockRenderMapForAnnotation);
 
-exports.blockRenderMapForAnnotation = blockRenderMapForAnnotation;
+exports.blockRenderMapForAnnotation = blockRenderMapForAnnotation;
+const HeadingForInfoBox = (0, _styledComponents.default)(Heading)`
+  margin-top: 30px;
+  margin-bottom: 30px;
+`;
+const blockRenderMapForInfoBox = blockRenderMapForAnnotation.merge(_immutable.default.Map({
+  'header-four': {
+    element: 'h4',
+    wrapper: /*#__PURE__*/_react.default.createElement(HeadingForInfoBox, null)
+  }
+}));
+exports.blockRenderMapForInfoBox = blockRenderMapForInfoBox;
+const dividerStyles = (0, _styledComponents.css)`
+  content: '';
+  width: 100%;
+  height: 12px;
+  display: block;
+  background-image: url(https://kids.twreporter.org/wp-content/themes/blocksy-child/assets/js/components/rpjr-box/box2_768.png);
+  background-size: contain;
+  background-repeat: no-repeat;
+  background-position: center;
+`;
+const HeadingForInfoBoxWithHeaderBorder = (0, _styledComponents.default)(HeadingForInfoBox)`
+  h4 {
+    margin-top: 33px;
+    margin-bottom: 33px;
+  }
+
+  &::before {
+    ${dividerStyles}
+  }
+
+  &::after {
+    ${dividerStyles}
+  }
+`;
+const blockRenderMapForInfoBoxWithHeaderBorder = blockRenderMapForInfoBox.merge(_immutable.default.Map({
+  'header-four': {
+    element: 'h4',
+    wrapper: /*#__PURE__*/_react.default.createElement(HeadingForInfoBoxWithHeaderBorder, null)
+  }
+}));
+exports.blockRenderMapForInfoBoxWithHeaderBorder = blockRenderMapForInfoBoxWithHeaderBorder;

package/lib/block-renderer-fn.js

@@ -11,7 +11,7 @@ const {
   BlockquoteInArticleBody,
   EmbeddedCodeInArticleBody,
   ImageInArticleBody,
-  InfoBoxBlock,
+  InfoBoxInArticleBody,
   SlideshowInArticleBody
 } = _blockRenderers.blockRenderers;
 
@@ -51,7 +51,7 @@ const AtomicBlock = props => {
 
     case 'INFOBOX':
       {
-        return InfoBoxBlock({
+        return InfoBoxInArticleBody({
           data: entityData
         });
       }

package/lib/block-renderers/image-block.js

@@ -5,6 +5,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ImageBlock = ImageBlock;
 exports.ImageInArticleBody = ImageInArticleBody;
+exports.ImageInInfoBox = ImageInInfoBox;
 
 var _react = _interopRequireDefault(require("react"));
 
@@ -113,4 +114,39 @@ function ImageInArticleBody({
   }, /*#__PURE__*/_react.default.createElement(ImageBlock, {
     data: data
   }));
+}
+
+const InfoBoxContainer = _styledComponents.default.div`
+  /* reset browser default styles */
+  figure {
+    margin: 0;
+  }
+  margin-bottom: 30px;
+  width: fit-content;
+
+  ${props => {
+  switch (props.$alignment) {
+    case 'center':
+      {
+        return `margin-left: auto; margin-right: auto;`;
+      }
+
+    case 'right':
+      {
+        return `margin-left: auto`;
+      }
+  }
+}}
+`;
+
+function ImageInInfoBox({
+  className = '',
+  data
+}) {
+  return /*#__PURE__*/_react.default.createElement(InfoBoxContainer, {
+    $alignment: data.alignment,
+    className: className
+  }, /*#__PURE__*/_react.default.createElement(ImageBlock, {
+    data: data
+  }));
 }

package/lib/block-renderers/info-box-block.js

@@ -11,6 +11,10 @@ var _react = _interopRequireDefault(require("react"));
 
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 
+var _blockRenderMap = require("../block-render-map");
+
+var _imageBlock = require("../block-renderers/image-block");
+
 var _index = require("../entity-decorators/index");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
@@ -19,18 +23,10 @@ var InfoBoxType;
 
 (function (InfoBoxType) {
   InfoBoxType["newsChargeStation"] = "news-charge-station";
-  InfoBoxType["headerBorder"] = "with-header-border";
-  InfoBoxType["boxBorder"] = "with-box-border";
+  InfoBoxType["headerBorder"] = "header-border";
+  InfoBoxType["boxBorder"] = "box-border";
 })(InfoBoxType || (InfoBoxType = {}));
 
-var InfoBoxLabel;
-
-(function (InfoBoxLabel) {
-  InfoBoxLabel["newsChargeStation"] = "\u65B0\u805E\u5145\u96FB\u5668";
-  InfoBoxLabel["headerBorder"] = "\u7121\u908A\u6846\u677F";
-  InfoBoxLabel["boxBorder"] = "\u6709\u908A\u6846\u677F";
-})(InfoBoxLabel || (InfoBoxLabel = {}));
-
 const NewsChargeStationContainer = _styledComponents.default.div`
   padding: 40px;
   background-color: #fffcf4;
@@ -41,12 +37,13 @@ const NewsChargeStationContainer = _styledComponents.default.div`
     content: '';
     width: 300px;
     height: 80px;
+    /* TODO: change image url */
     background-image: url(https://kids.twreporter.org/wp-content/themes/blocksy-child/assets/js/components/rpjr-box/newsChargeStation.svg);
     position: absolute;
     top: -40px;
     left: 50%;
     transform: translateX(-50%);
-  }  
+  }
 `;
 
 function NewsChargeStation({
@@ -55,17 +52,61 @@ function NewsChargeStation({
   return /*#__PURE__*/_react.default.createElement(NewsChargeStationContainer, null, children);
 }
 
-function HeaderBorder() {
-  return null;
+const HeaderBorderContainer = _styledComponents.default.div`
+  padding: 40px;
+  background-color: #d2f5ff;
+  position: relative;
+  border-radius: 30px;
+
+  &::before {
+    content: '';
+    width: 120px;
+    height: 120px;
+    /* TODO: change image url */
+    background-image: url(https://kids.twreporter.org/wp-content/themes/blocksy-child/assets/js/components/rpjr-box/box2_yellow.png);
+    background-size: contain;
+    position: absolute;
+    bottom: 10px;
+    right: 10px;
+  }
+`;
+
+function HeaderBorder({
+  children
+}) {
+  return /*#__PURE__*/_react.default.createElement(HeaderBorderContainer, null, children);
 }
 
-function BoxBorder() {
-  return null;
+const BoxBorderContainer = _styledComponents.default.div`
+  padding: 40px;
+  background-color: #ebebeb;
+  position: relative;
+  border-radius: 30px;
+  border: 3px solid #232323;
+  overflow: hidden;
+
+  &::before {
+    content: '';
+    width: 100px;
+    height: 100px;
+    /* TODO: change image url */
+    background-image: url(https://kids.twreporter.org/wp-content/themes/blocksy-child/assets/js/components/rpjr-box/box2_blue-b.png);
+    background-size: contain;
+    position: absolute;
+    bottom: 0;
+    right: 0;
+  }
+`;
+
+function BoxBorder({
+  children
+}) {
+  return /*#__PURE__*/_react.default.createElement(BoxBorderContainer, null, children);
 }
 
 const ArticleBodyContainer = _styledComponents.default.div`
   max-width: 700px;
-  padding: 40px;
+  margin: 60px auto;
 `;
 
 function InfoBoxInArticleBody({
@@ -78,20 +119,22 @@ function InfoBoxInArticleBody({
   } = data;
   const contentState = (0, _draftJs.convertFromRaw)(rawContentState);
 
-  const editorState = _draftJs.EditorState.createWithContent(contentState, _index.decorators);
+  const editorState = _draftJs.EditorState.createWithContent(contentState, _index.decorator);
 
   let Component;
+  let blockRenderMap = _blockRenderMap.blockRenderMapForInfoBox;
 
   switch (type) {
-    case InfoBoxType.boxBorder:
+    case InfoBoxType.headerBorder:
       {
-        Component = BoxBorder;
+        Component = HeaderBorder;
+        blockRenderMap = _blockRenderMap.blockRenderMapForInfoBoxWithHeaderBorder;
         break;
       }
 
-    case InfoBoxType.headerBorder:
+    case InfoBoxType.boxBorder:
       {
-        Component = HeaderBorder;
+        Component = BoxBorder;
         break;
       }
 
@@ -103,5 +146,42 @@ function InfoBoxInArticleBody({
       }
   }
 
-  return /*#__PURE__*/_react.default.createElement(Component, null, "test");
+  return /*#__PURE__*/_react.default.createElement(ArticleBodyContainer, {
+    className: className
+  }, /*#__PURE__*/_react.default.createElement(Component, null, /*#__PURE__*/_react.default.createElement(_draftJs.Editor, {
+    blockRenderMap: blockRenderMap,
+    blockRendererFn: blockRendererFn,
+    editorState: editorState,
+    readOnly: true // eslint-disable-next-line @typescript-eslint/no-empty-function
+    ,
+    onChange: () => {}
+  })));
+}
+
+function AtomicBlock(props) {
+  const entity = props.contentState.getEntity(props.block.getEntityAt(0));
+  const entityType = entity.getType();
+  const entityData = entity.getData();
+
+  switch (entityType) {
+    case 'IMAGE':
+      {
+        return (0, _imageBlock.ImageInInfoBox)({
+          data: entityData
+        });
+      }
+  }
+
+  return null;
+}
+
+function blockRendererFn(block) {
+  if (block.getType() === 'atomic') {
+    return {
+      component: AtomicBlock,
+      editable: false
+    };
+  }
+
+  return null;
 }

package/lib/draft-renderer.js

@@ -32,11 +32,11 @@ const blockRendererFn = block => {
 };
 
 function DraftRenderer({
-  rawContentBlock
+  rawContentState
 }) {
-  const contentState = (0, _draftJs.convertFromRaw)(rawContentBlock);
+  const contentState = (0, _draftJs.convertFromRaw)(rawContentState);
 
-  const editorState = _draftJs.EditorState.createWithContent(contentState, _index.decorators);
+  const editorState = _draftJs.EditorState.createWithContent(contentState, _index.decorator);
 
   return /*#__PURE__*/_react.default.createElement(_draftJs.Editor, {
     editorState: editorState,

package/lib/entity-decorators/annotation-decorator.js

@@ -81,7 +81,7 @@ function AnnotationBlock(props) {
   } = props.contentState.getEntity(props.entityKey).getData();
   const contentState = (0, _draftJs.convertFromRaw)(rawContentState);
 
-  const editorState = _draftJs.EditorState.createWithContent(contentState, _index.decorators);
+  const editorState = _draftJs.EditorState.createWithContent(contentState, _index.decorator);
 
   return /*#__PURE__*/_react.default.createElement(_react.default.Fragment, null, /*#__PURE__*/_react.default.createElement(AnnotationWrapper, {
     onClick: e => {

package/lib/entity-decorators/index.js

@@ -9,7 +9,7 @@ Object.defineProperty(exports, "annotationDecorator", {
     return _annotationDecorator.annotationDecorator;
   }
 });
-exports.decorators = void 0;
+exports.decorator = void 0;
 Object.defineProperty(exports, "linkDecorator", {
   enumerable: true,
   get: function () {
@@ -23,5 +23,5 @@ var _annotationDecorator = require("./annotation-decorator");
 
 var _linkDecorator = require("./link-decorator");
 
-const decorators = new _draftJs.CompositeDecorator([_annotationDecorator.annotationDecorator, _linkDecorator.linkDecorator]);
-exports.decorators = decorators;
+const decorator = new _draftJs.CompositeDecorator([_annotationDecorator.annotationDecorator, _linkDecorator.linkDecorator]);
+exports.decorator = decorator;

package/lib/index.js

@@ -27,10 +27,10 @@ Object.defineProperty(exports, "blockRenderers", {
     return _blockRenderers.blockRenderers;
   }
 });
-Object.defineProperty(exports, "decorators", {
+Object.defineProperty(exports, "decorator", {
   enumerable: true,
   get: function () {
-    return _index.decorators;
+    return _index.decorator;
   }
 });
 exports.default = void 0;
@@ -50,6 +50,6 @@ var _default = {
   atomicBlockRenderer: _blockRendererFn.atomicBlockRenderer,
   blockRenderMap: _blockRenderMap.blockRenderMap,
   blockRenderers: _blockRenderers.blockRenderers,
-  decorators: _index.decorators
+  decorator: _index.decorator
 };
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kids-reporter/draft-renderer",
-  "version": "0.3.0",
+  "version": "0.4.0",
   "description": "",
   "main": "lib/index.js",
   "scripts": {