decap-cms-widget-markdown 3.12.0 → 3.13.0

package/dist/esm/MarkdownControl/plugins/shortcodes/insertShortcode.js

@@ -1,14 +1,63 @@
-import { Transforms } from 'slate';
+import { Editor, Range, Transforms } from 'slate';
 import isCursorInEmptyParagraph from './locations/isCursorInEmptyParagraph';
-function insertShortcode(editor, pluginConfig) {
-  const defaultValues = pluginConfig.fields.toMap().mapKeys((_, field) => field.get('name')).map(field => field.get('default', ''));
+async function insertShortcode(editor, pluginConfig, cmsContext = {}) {
+  if (pluginConfig.type === 'inline') {
+    const selectionRef = editor.selection ? Editor.rangeRef(editor, editor.selection) : null;
+    let selectedText = '';
+    if (editor.selection && Range.isRange(editor.selection)) {
+      selectedText = Editor.string(editor, editor.selection);
+    }
+    let shortcodeData = {};
+    if (typeof pluginConfig.onInsert === 'function') {
+      try {
+        const result = await pluginConfig.onInsert({
+          selectedText,
+          cmsContext
+        });
+        if (result === null || result === undefined) {
+          selectionRef?.unref();
+          return;
+        }
+        shortcodeData = result;
+      } catch (err) {
+        selectionRef?.unref();
+        console.error(`Error in onInsert for inline component '${pluginConfig.id}':`, err);
+        return;
+      }
+    } else if (pluginConfig.fields) {
+      const defaultValues = pluginConfig.fields.toMap().mapKeys((_, field) => field.get('name')).map(field => field.get('default', ''));
+      shortcodeData = defaultValues.toJS();
+    }
+    const nodeData = {
+      type: 'inline-shortcode',
+      id: pluginConfig.id,
+      data: {
+        shortcode: pluginConfig.id,
+        shortcodeNew: true,
+        shortcodeData,
+        isVoid: true
+      },
+      children: [{
+        text: ''
+      }]
+    };
+    const at = selectionRef?.unref();
+    if (selectionRef && !at) {
+      return;
+    }
+    Transforms.insertNodes(editor, nodeData, at ? {
+      at
+    } : undefined);
+    return;
+  }
+  const defaultValues = pluginConfig.fields ? pluginConfig.fields.toMap().mapKeys((_, field) => field.get('name')).map(field => field.get('default', '')).toJS() : {};
   const nodeData = {
     type: 'shortcode',
     id: pluginConfig.id,
     data: {
       shortcode: pluginConfig.id,
       shortcodeNew: true,
-      shortcodeData: defaultValues.toJS()
+      shortcodeData: defaultValues
     },
     children: [{
       text: ''

package/dist/esm/MarkdownControl/plugins/shortcodes/withShortcodes.js

@@ -3,10 +3,20 @@ import defaultEmptyBlock from '../blocks/defaultEmptyBlock';
 function withShortcodes(editor) {
   const {
     isVoid,
+    isInline,
     normalizeNode
   } = editor;
   editor.isVoid = element => {
-    return element.type === 'shortcode' ? true : isVoid(element);
+    if (element.type === 'shortcode') {
+      return true;
+    }
+    if (element.type === 'inline-shortcode') {
+      return true;
+    }
+    return isVoid(element);
+  };
+  editor.isInline = element => {
+    return element.type === 'inline-shortcode' ? true : isInline(element);
   };
 
   // Prevent empty editor after deleting shortcode theat was only child