decap-cms-widget-markdown 3.1.6 → 3.2.0

package/dist/esm/serializers/slateRemark.js

@@ -480,7 +480,7 @@ function slateToRemark(value, {
             data
           } = node;
           return (0, _unistBuilder.default)(typeMap[node.type], _objectSpread({
-            url: data === null || data === void 0 ? void 0 : data.url,
+            url: node.url,
             title
           }, data), children);
         }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "decap-cms-widget-markdown",
   "description": "Widget for editing markdown in Decap CMS.",
-  "version": "3.1.6",
+  "version": "3.2.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": "64d91b8bb3d0a93dd36c53800cdac4ba2e435000"
+  "gitHead": "022dbe523d07bb8bc74970460cc82b259fde4041"
 }

package/src/MarkdownControl/VisualEditor.js

@@ -26,6 +26,7 @@ import { markdownToSlate, slateToMarkdown } from '../serializers';
 import withShortcodes from './plugins/shortcodes/withShortcodes';
 import insertShortcode from './plugins/shortcodes/insertShortcode';
 import defaultEmptyBlock from './plugins/blocks/defaultEmptyBlock';
+import withHtml from './plugins/html/withHtml';
 
 function visualEditorStyles({ minimal }) {
   return `
@@ -97,7 +98,9 @@ function Editor(props) {
 
   const editor = useMemo(
     () =>
-      withReact(withHistory(withShortcodes(withBlocks(withLists(withInlines(createEditor())))))),
+      withHtml(
+        withReact(withHistory(withShortcodes(withBlocks(withLists(withInlines(createEditor())))))),
+      ),
     [],
   );
 

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

@@ -0,0 +1,98 @@
+// source: https://github.com/ianstormtaylor/slate/blob/main/site/examples/ts/paste-html.tsx
+import { jsx } from 'slate-hyperscript';
+import { Transforms } from 'slate';
+
+const ELEMENT_TAGS = {
+  A: el => ({ type: 'link', url: el.getAttribute('href') }),
+  BLOCKQUOTE: () => ({ type: 'quote' }),
+  H1: () => ({ type: 'heading-one' }),
+  H2: () => ({ type: 'heading-two' }),
+  H3: () => ({ type: 'heading-three' }),
+  H4: () => ({ type: 'heading-four' }),
+  H5: () => ({ type: 'heading-five' }),
+  H6: () => ({ type: 'heading-six' }),
+  IMG: el => ({ type: 'image', url: el.getAttribute('src') }),
+  LI: () => ({ type: 'list-item' }),
+  OL: () => ({ type: 'numbered-list' }),
+  P: () => ({ type: 'paragraph' }),
+  PRE: () => ({ type: 'code' }),
+  UL: () => ({ type: 'bulleted-list' }),
+};
+
+// COMPAT: `B` is omitted here because Google Docs uses `<b>` in weird ways.
+const TEXT_TAGS = {
+  CODE: () => ({ code: true }),
+  DEL: () => ({ strikethrough: true }),
+  EM: () => ({ italic: true }),
+  I: () => ({ italic: true }),
+  S: () => ({ strikethrough: true }),
+  STRONG: () => ({ bold: true }),
+  U: () => ({ underline: true }),
+};
+
+function deserialize(el) {
+  if (el.nodeType === 3) {
+    return el.textContent;
+  } else if (el.nodeType !== 1) {
+    return null;
+  } else if (el.nodeName === 'BR') {
+    return '\n';
+  }
+
+  const { nodeName } = el;
+  let parent = el;
+
+  if (nodeName === 'PRE' && el.childNodes[0] && el.childNodes[0].nodeName === 'CODE') {
+    parent = el.childNodes[0];
+  }
+  let children = Array.from(parent.childNodes).map(deserialize).flat();
+
+  if (children.length === 0) {
+    children = [{ text: '' }];
+  }
+
+  if (el.nodeName === 'BODY') {
+    return jsx('fragment', {}, children);
+  }
+
+  if (ELEMENT_TAGS[nodeName]) {
+    const attrs = ELEMENT_TAGS[nodeName](el);
+    return jsx('element', attrs, children);
+  }
+
+  if (TEXT_TAGS[nodeName]) {
+    const attrs = TEXT_TAGS[nodeName](el);
+    return children.map(child => jsx('text', attrs, child));
+  }
+
+  return children;
+}
+
+function withHtml(editor) {
+  const { insertData, isInline, isVoid } = editor;
+
+  editor.isInline = element => {
+    return element.type === 'link' ? true : isInline(element);
+  };
+
+  editor.isVoid = element => {
+    return element.type === 'image' ? true : isVoid(element);
+  };
+
+  editor.insertData = data => {
+    const html = data.getData('text/html');
+
+    if (html) {
+      const parsed = new DOMParser().parseFromString(html, 'text/html');
+      const fragment = deserialize(parsed.body);
+      Transforms.insertFragment(editor, fragment);
+      return;
+    }
+
+    insertData(data);
+  };
+
+  return editor;
+}
+
+export default withHtml;

package/src/MarkdownControl/renderers.js

@@ -226,8 +226,8 @@ function NumberedList(props) {
 }
 
 function Link(props) {
-  const url = props.url;
-  const title = props.title || url;
+  const url = props.element.url;
+  const title = props.element.title || url;
 
   return (
     <StyledA href={url} title={title} {...props.attributes}>

package/src/serializers/slateRemark.js

@@ -450,7 +450,7 @@ export default function slateToRemark(value, { voidCodeBlock }) {
        */
       case 'link': {
         const { title, data } = node;
-        return u(typeMap[node.type], { url: data?.url, title, ...data }, children);
+        return u(typeMap[node.type], { url: node.url, title, ...data }, children);
       }
 
       /**

package/dist/esm/MarkdownControl/plugins/blocks/locations/isCursorAfterSoftBreak.js

@@ -1,16 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _slate = require("slate");
-function isCursorAfterSoftBreak(editor) {
-  const {
-    selection
-  } = editor;
-  if (!selection) return false;
-  const [previous] = _slate.Editor.previous(editor);
-  return previous && previous.type == 'break';
-}
-var _default = exports.default = isCursorAfterSoftBreak;

package/dist/esm/MarkdownControl/plugins/blocks/locations/isCursorInNonDefaultBlock copy.js

@@ -1,19 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _slate = require("slate");
-function isCursorInNonDefaultBlock(editor) {
-  const {
-    selection
-  } = editor;
-  if (!selection) return false;
-  const [match] = Array.from(_slate.Editor.nodes(editor, {
-    match: n => _slate.Element.isElement(n) && _slate.Editor.isBlock(editor, n) && n.type !== 'paragraph',
-    mode: 'lowest'
-  }));
-  return !!match && !_slate.Editor.isEditor(match[0]);
-}
-var _default = exports.default = isCursorInNonDefaultBlock;