decap-cms-widget-markdown 3.2.0 → 3.3.0

package/dist/esm/serializers/slateRemark.js

@@ -1,20 +1,11 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = slateToRemark;
-var _omit2 = _interopRequireDefault(require("lodash/omit"));
-var _intersection2 = _interopRequireDefault(require("lodash/intersection"));
-var _map2 = _interopRequireDefault(require("lodash/map"));
-var _last2 = _interopRequireDefault(require("lodash/last"));
-var _without2 = _interopRequireDefault(require("lodash/without"));
-var _get4 = _interopRequireDefault(require("lodash/get"));
-var _unistBuilder = _interopRequireDefault(require("unist-builder"));
-var _mdastUtilToString = _interopRequireDefault(require("mdast-util-to-string"));
+import _omit from "lodash/omit";
+import _intersection from "lodash/intersection";
+import _map from "lodash/map";
+import _last from "lodash/last";
+import _without from "lodash/without";
+import _get from "lodash/get";
 const _excluded = ["lang", "code"],
   _excluded2 = ["url", "title", "alt"];
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -22,6 +13,9 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import u from 'unist-builder';
+import mdastToString from 'mdast-util-to-string';
+
 /**
  * Map of Slate node types to MDAST/Remark node types.
  */
@@ -62,7 +56,7 @@ const blockTypes = ['paragraph', 'quote', 'heading-one', 'heading-two', 'heading
 const inlineTypes = ['link', 'image', 'break'];
 const leadingWhitespaceExp = /^\s+\S/;
 const trailingWhitespaceExp = /(?!\S)\s+$/;
-function slateToRemark(value, {
+export default function slateToRemark(value, {
   voidCodeBlock
 }) {
   /**
@@ -106,7 +100,7 @@ function slateToRemark(value, {
         case 'image':
         case 'break':
           {
-            const data = (0, _omit2.default)(node.data, 'marks');
+            const data = _omit(node.data, 'marks');
             return _objectSpread(_objectSpread({}, node), {}, {
               data
             });
@@ -139,12 +133,12 @@ function slateToRemark(value, {
             }) => type !== 'code') : n.marks, delete newNode.code;
             return newNode;
           });
-          const childMarks = (0, _map2.default)(nodesWithoutCode, getNodeMarks);
-          return (0, _intersection2.default)(...childMarks);
+          const childMarks = _map(nodesWithoutCode, getNodeMarks);
+          return _intersection(...childMarks);
         }
       case 'break':
       case 'image':
-        return (0, _map2.default)((0, _get4.default)(node, ['data', 'marks']), mark => mark.type);
+        return _map(_get(node, ['data', 'marks']), mark => mark.type);
       default:
         return getNodeMarkArray(node);
     }
@@ -154,7 +148,7 @@ function slateToRemark(value, {
   }
   function getSharedMarks(marks, node) {
     const nodeMarks = getNodeMarks(node);
-    const sharedMarks = (0, _intersection2.default)(marks, nodeMarks);
+    const sharedMarks = _intersection(marks, nodeMarks);
     if (sharedMarks[0] === 'code') {
       return nodeMarks.length === 1 ? marks : [];
     }
@@ -167,7 +161,7 @@ function slateToRemark(value, {
     // If only the code mark is present, don't allow it to be shared with other
     // nodes.
     if (firstGroupMarks[0] === 'code' && firstGroupMarks.length > 1) {
-      firstGroupMarks = [...(0, _without2.default)('firstGroupMarks', 'code'), 'code'];
+      firstGroupMarks = [..._without('firstGroupMarks', 'code'), 'code'];
     }
     let splitIndex = 1;
     if (firstGroupMarks.length > 0) {
@@ -237,7 +231,7 @@ function slateToRemark(value, {
       whitespace: leadingWhitespace,
       trimmedNode: leadingNode
     } = splitWhitespace(nodes[0]);
-    const lastNode = nodes.length > 1 ? (0, _last2.default)(nodes) : leadingNode;
+    const lastNode = nodes.length > 1 ? _last(nodes) : leadingNode;
     const trailingSplitResult = splitWhitespace(lastNode, {
       trailing: true
     });
@@ -253,7 +247,7 @@ function slateToRemark(value, {
     };
   }
   function createText(text) {
-    return text && (0, _unistBuilder.default)('html', text);
+    return text && u('html', text);
   }
   function isNodeInline(node) {
     return inlineTypes.includes(node.type);
@@ -273,7 +267,7 @@ function slateToRemark(value, {
          */
         if (markType === 'code') {
           const node = markNodes[0];
-          convertedNodes.push((0, _unistBuilder.default)(markMap[markType], node.data, node.text));
+          convertedNodes.push(u(markMap[markType], node.data, node.text));
         } else if (!markType && markNodes.length === 1 && isNodeInline(nextNode)) {
           const node = markNodes[0];
           convertedNodes.push(convertInlineNode(node, convertInlineAndTextChildren(node.children)));
@@ -284,11 +278,11 @@ function slateToRemark(value, {
             centerNodes
           } = normalizeFlankingWhitespace(markNodes);
           const children = convertInlineAndTextChildren(centerNodes);
-          const markNode = (0, _unistBuilder.default)(markMap[markType], children);
+          const markNode = u(markMap[markType], children);
 
           // Filter out empty marks, otherwise their output literally by
           // remark-stringify, eg. an empty bold node becomes "****"
-          if ((0, _mdastUtilToString.default)(markNode) === '') {
+          if (mdastToString(markNode) === '') {
             remainingNodes = remainder;
             continue;
           }
@@ -301,7 +295,7 @@ function slateToRemark(value, {
         convertedNodes.push(convertInlineNode(nextNode));
       } else {
         remainingNodes.shift();
-        convertedNodes.push((0, _unistBuilder.default)('html', nextNode.text));
+        convertedNodes.push(u('html', nextNode.text));
       }
     }
     return convertedNodes;
@@ -331,7 +325,7 @@ function slateToRemark(value, {
       case 'table-row':
       case 'table-cell':
         {
-          return (0, _unistBuilder.default)(typeMap[node.type], children);
+          return u(typeMap[node.type], children);
         }
 
       /**
@@ -360,7 +354,7 @@ function slateToRemark(value, {
           const {
             data
           } = node;
-          return (0, _unistBuilder.default)(typeMap[node.type], {
+          return u(typeMap[node.type], {
             data
           });
         }
@@ -391,10 +385,10 @@ function slateToRemark(value, {
           };
           const depthText = node.type.split('-')[1];
           const depth = depthMap[depthText];
-          const mdastNode = (0, _unistBuilder.default)(typeMap[node.type], {
+          const mdastNode = u(typeMap[node.type], {
             depth
           }, children);
-          if ((0, _mdastUtilToString.default)(mdastNode)) {
+          if (mdastToString(mdastNode)) {
             return mdastNode;
           }
           return;
@@ -412,14 +406,14 @@ function slateToRemark(value, {
       case 'code-block':
         {
           var _children$;
-          const _get2 = (0, _get4.default)(node, 'data', {}),
+          const _get2 = _get(node, 'data', {}),
             {
               lang,
               code
             } = _get2,
             data = _objectWithoutProperties(_get2, _excluded);
           const value = voidCodeBlock ? code : (_children$ = children[0]) === null || _children$ === void 0 ? void 0 : _children$.value;
-          return (0, _unistBuilder.default)(typeMap[node.type], {
+          return u(typeMap[node.type], {
             lang,
             data
           }, value || '');
@@ -440,9 +434,9 @@ function slateToRemark(value, {
           const ordered = node.type === 'numbered-list';
           const props = {
             ordered,
-            start: (0, _get4.default)(node.data, 'start') || 1
+            start: _get(node.data, 'start') || 1
           };
-          return (0, _unistBuilder.default)(typeMap[node.type], props, children);
+          return u(typeMap[node.type], props, children);
         }
 
       /**
@@ -452,7 +446,7 @@ function slateToRemark(value, {
        */
       case 'thematic-break':
         {
-          return (0, _unistBuilder.default)(typeMap[node.type]);
+          return u(typeMap[node.type]);
         }
     }
   }
@@ -465,7 +459,7 @@ function slateToRemark(value, {
        */
       case 'break':
         {
-          return (0, _unistBuilder.default)(typeMap[node.type]);
+          return u(typeMap[node.type]);
         }
 
       /**
@@ -479,7 +473,7 @@ function slateToRemark(value, {
             title,
             data
           } = node;
-          return (0, _unistBuilder.default)(typeMap[node.type], _objectSpread({
+          return u(typeMap[node.type], _objectSpread({
             url: node.url,
             title
           }, data), children);
@@ -493,14 +487,14 @@ function slateToRemark(value, {
        */
       case 'image':
         {
-          const _get3 = (0, _get4.default)(node, 'data', {}),
+          const _get3 = _get(node, 'data', {}),
             {
               url,
               title,
               alt
             } = _get3,
             data = _objectWithoutProperties(_get3, _excluded2);
-          return (0, _unistBuilder.default)(typeMap[node.type], {
+          return u(typeMap[node.type], {
             url,
             title,
             alt,

package/dist/esm/styles.js

@@ -1,16 +1,9 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.editorStyleVars = exports.EditorControlBar = void 0;
-var _base = _interopRequireDefault(require("@emotion/styled/base"));
-var _decapCmsUiDefault = require("decap-cms-ui-default");
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const editorStyleVars = exports.editorStyleVars = {
+import _styled from "@emotion/styled/base";
+import { zIndex } from 'decap-cms-ui-default';
+export const editorStyleVars = {
   stickyDistanceBottom: '100px'
 };
-const EditorControlBar = exports.EditorControlBar = /*#__PURE__*/(0, _base.default)("div", {
+export const EditorControlBar = /*#__PURE__*/_styled("div", {
   target: "ehaqqzm0",
   label: "EditorControlBar"
-})("z-index:", _decapCmsUiDefault.zIndex.zIndex200, ";position:sticky;top:0;margin-bottom:", editorStyleVars.stickyDistanceBottom, ";" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdHlsZXMuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBTzBDIiwiZmlsZSI6Ii4uLy4uL3NyYy9zdHlsZXMuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgc3R5bGVkIGZyb20gJ0BlbW90aW9uL3N0eWxlZCc7XG5pbXBvcnQgeyB6SW5kZXggfSBmcm9tICdkZWNhcC1jbXMtdWktZGVmYXVsdCc7XG5cbmV4cG9ydCBjb25zdCBlZGl0b3JTdHlsZVZhcnMgPSB7XG4gIHN0aWNreURpc3RhbmNlQm90dG9tOiAnMTAwcHgnLFxufTtcblxuZXhwb3J0IGNvbnN0IEVkaXRvckNvbnRyb2xCYXIgPSBzdHlsZWQuZGl2YFxuICB6LWluZGV4OiAke3pJbmRleC56SW5kZXgyMDB9O1xuICBwb3NpdGlvbjogc3RpY2t5O1xuICB0b3A6IDA7XG4gIG1hcmdpbi1ib3R0b206ICR7ZWRpdG9yU3R5bGVWYXJzLnN0aWNreURpc3RhbmNlQm90dG9tfTtcbmA7XG4iXX0= */"));
+})("z-index:", zIndex.zIndex200, ";position:sticky;top:0;margin-bottom:", editorStyleVars.stickyDistanceBottom, ";" + (process.env.NODE_ENV === "production" ? "" : "/*# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zdHlsZXMuanMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBTzBDIiwiZmlsZSI6Ii4uLy4uL3NyYy9zdHlsZXMuanMiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgc3R5bGVkIGZyb20gJ0BlbW90aW9uL3N0eWxlZCc7XG5pbXBvcnQgeyB6SW5kZXggfSBmcm9tICdkZWNhcC1jbXMtdWktZGVmYXVsdCc7XG5cbmV4cG9ydCBjb25zdCBlZGl0b3JTdHlsZVZhcnMgPSB7XG4gIHN0aWNreURpc3RhbmNlQm90dG9tOiAnMTAwcHgnLFxufTtcblxuZXhwb3J0IGNvbnN0IEVkaXRvckNvbnRyb2xCYXIgPSBzdHlsZWQuZGl2YFxuICB6LWluZGV4OiAke3pJbmRleC56SW5kZXgyMDB9O1xuICBwb3NpdGlvbjogc3RpY2t5O1xuICB0b3A6IDA7XG4gIG1hcmdpbi1ib3R0b206ICR7ZWRpdG9yU3R5bGVWYXJzLnN0aWNreURpc3RhbmNlQm90dG9tfTtcbmA7XG4iXX0= */"));

package/dist/esm/types.js

@@ -1,8 +1,2 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.SLATE_DEFAULT_BLOCK_TYPE = exports.SLATE_BLOCK_PARENT_TYPES = void 0;
-const SLATE_DEFAULT_BLOCK_TYPE = exports.SLATE_DEFAULT_BLOCK_TYPE = 'paragraph';
-const SLATE_BLOCK_PARENT_TYPES = exports.SLATE_BLOCK_PARENT_TYPES = ['list-item', 'quote'];
+export const SLATE_DEFAULT_BLOCK_TYPE = 'paragraph';
+export const SLATE_BLOCK_PARENT_TYPES = ['list-item', 'quote'];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-widget-markdown",
   "description": "Widget for editing markdown in Decap CMS.",
-  "version": "3.2.0",
+  "version": "3.3.0",
   "homepage": "https://www.decapcms.org/docs/widgets/#markdown",
   "repository": "https://github.com/decaporg/decap-cms/tree/main/packages/decap-cms-widget-markdown",
   "bugs": "https://github.com/decaporg/decap-cms/issues",
@@ -60,5 +60,5 @@
     "commonmark-spec": "^0.30.0",
     "slate-hyperscript": "^0.77.0"
   },
-  "gitHead": "022dbe523d07bb8bc74970460cc82b259fde4041"
+  "gitHead": "e2165450e5963b2a8d76d4cf331319bf91f05d45"
 }

package/src/MarkdownControl/RawEditor.js

@@ -43,8 +43,9 @@ function RawEditor(props) {
   useEffect(() => {
     if (props.pendingFocus) {
       ReactEditor.focus(editor);
+      props.pendingFocus();
     }
-  }, []);
+  }, [props.pendingFocus]);
 
   function handleToggleMode() {
     props.onMode('rich_text');

package/src/MarkdownControl/VisualEditor.js

@@ -135,8 +135,9 @@ function Editor(props) {
   useEffect(() => {
     if (props.pendingFocus) {
       ReactEditor.focus(editor);
+      props.pendingFocus();
     }
-  }, []);
+  }, [props.pendingFocus]);
 
   function handleMarkClick(format) {
     ReactEditor.focus(editor);

package/src/MarkdownControl/index.js

@@ -67,6 +67,10 @@ export default class MarkdownControl extends React.Component {
 
   getAllowedModes = () => this.props.field.get('modes', List(['rich_text', 'raw'])).toArray();
 
+  focus() {
+    this.setState({ pendingFocus: true });
+  }
+
   render() {
     const {
       onChange,

package/src/MarkdownControl/plugins/html/withHtml.js

@@ -30,6 +30,11 @@ const TEXT_TAGS = {
   U: () => ({ underline: true }),
 };
 
+const INLINE_STYLES = {
+  'font-style': value => (value === 'italic' ? { italic: true } : {}),
+  'font-weight': value => (value === 'bold' || parseInt(value, 10) >= 600 ? { bold: true } : {}),
+};
+
 function deserialize(el) {
   if (el.nodeType === 3) {
     return el.textContent;
@@ -65,6 +70,20 @@ function deserialize(el) {
     return children.map(child => jsx('text', attrs, child));
   }
 
+  // Convert inline CSS on span elements generated by Google Docs
+  if (nodeName === 'SPAN') {
+    const attrs = {};
+    for (let i = 0; i < el.style.length; i++) {
+      const propertyName = el.style[i];
+      if (INLINE_STYLES[propertyName]) {
+        const propertyValue = el.style.getPropertyValue(propertyName);
+        const propertyStyle = INLINE_STYLES[propertyName](propertyValue);
+        Object.assign(attrs, propertyStyle);
+      }
+    }
+    return children.map(child => jsx('text', attrs, child));
+  }
+
   return children;
 }