@uiw/react-md-editor 3.23.6 → 3.24.1

package/esm/components/TextArea/handleKeyDown.js

@@ -1,6 +1,6 @@
 import { insertTextAtPosition } from '../../utils/InsertTextAtPosition';
+import { insertBeforeEachLine, selectLine } from '../../utils/markdownUtils';
 import { TextAreaTextApi } from '../../commands';
-import { insertBeforeEachLine } from '../../commands/list';
 
 /**
  * - `13` - `Enter`
@@ -10,6 +10,60 @@ function stopPropagation(e) {
   e.stopPropagation();
   e.preventDefault();
 }
+function handleLineMove(e, direction) {
+  stopPropagation(e);
+  var target = e.target;
+  var textArea = new TextAreaTextApi(target);
+  var selection = {
+    start: target.selectionStart,
+    end: target.selectionEnd
+  };
+  selection = selectLine({
+    text: target.value,
+    selection
+  });
+  if (direction < 0 && selection.start <= 0 || direction > 0 && selection.end >= target.value.length) {
+    return;
+  }
+  var blockText = target.value.slice(selection.start, selection.end);
+  if (direction < 0) {
+    var prevLineSelection = selectLine({
+      text: target.value,
+      selection: {
+        start: selection.start - 1,
+        end: selection.start - 1
+      }
+    });
+    var prevLineText = target.value.slice(prevLineSelection.start, prevLineSelection.end);
+    textArea.setSelectionRange({
+      start: prevLineSelection.start,
+      end: selection.end
+    });
+    insertTextAtPosition(target, blockText + "\n" + prevLineText);
+    textArea.setSelectionRange({
+      start: prevLineSelection.start,
+      end: prevLineSelection.start + blockText.length
+    });
+  } else {
+    var nextLineSelection = selectLine({
+      text: target.value,
+      selection: {
+        start: selection.end + 1,
+        end: selection.end + 1
+      }
+    });
+    var nextLineText = target.value.slice(nextLineSelection.start, nextLineSelection.end);
+    textArea.setSelectionRange({
+      start: selection.start,
+      end: nextLineSelection.end
+    });
+    insertTextAtPosition(target, nextLineText + "\n" + blockText);
+    textArea.setSelectionRange({
+      start: nextLineSelection.end - blockText.length,
+      end: nextLineSelection.end
+    });
+  }
+}
 export default function handleKeyDown(e, tabSize, defaultTabEnable) {
   if (tabSize === void 0) {
     tabSize = 2;
@@ -60,7 +114,7 @@ export default function handleKeyDown(e, tabSize, defaultTabEnable) {
     } else {
       return insertTextAtPosition(target, space);
     }
-  } else if (e.keyCode === 13 && e.code.toLowerCase() === 'enter' && (/^(-|\*)\s/.test(currentLineStr) || /^\d+.\s/.test(currentLineStr))) {
+  } else if (e.keyCode === 13 && e.code.toLowerCase() === 'enter' && (/^(-|\*)\s/.test(currentLineStr) || /^\d+.\s/.test(currentLineStr)) && !e.shiftKey) {
     /**
      * `13` - `Enter`
      */
@@ -69,14 +123,38 @@ export default function handleKeyDown(e, tabSize, defaultTabEnable) {
     if (currentLineStr.startsWith('*')) {
       startStr = '\n* ';
     }
-    if (currentLineStr.startsWith('- [ ]')) {
+    if (currentLineStr.startsWith('- [ ]') || currentLineStr.startsWith('- [X]') || currentLineStr.startsWith('- [x]')) {
       startStr = '\n- [ ] ';
-    } else if (currentLineStr.startsWith('- [X]')) {
-      startStr = '\n- [X] ';
     }
     if (/^\d+.\s/.test(currentLineStr)) {
       startStr = "\n" + (parseInt(currentLineStr) + 1) + ". ";
     }
     return insertTextAtPosition(target, startStr);
+  } else if (e.code && e.code.toLowerCase() === 'keyd' && e.ctrlKey) {
+    // Duplicate lines
+    stopPropagation(e);
+    var selection = {
+      start: target.selectionStart,
+      end: target.selectionEnd
+    };
+    var savedSelection = selection;
+    selection = selectLine({
+      text: target.value,
+      selection
+    });
+    var textToDuplicate = target.value.slice(selection.start, selection.end);
+    textArea.setSelectionRange({
+      start: selection.end,
+      end: selection.end
+    });
+    insertTextAtPosition(target, "\n" + textToDuplicate);
+    textArea.setSelectionRange({
+      start: savedSelection.start,
+      end: savedSelection.end
+    });
+  } else if (e.code && e.code.toLowerCase() === 'arrowup' && e.altKey) {
+    handleLineMove(e, -1);
+  } else if (e.code && e.code.toLowerCase() === 'arrowdown' && e.altKey) {
+    handleLineMove(e, 1);
   }
 }

package/esm/utils/InsertTextAtPosition.d.ts

@@ -3,13 +3,6 @@
  * Copyright (c) 2018 Dmitriy Kubyshkin
  * Copied from https://github.com/grassator/insert-text-at-cursor
  */
-/**
- * @param {string} val
- * @param {number} cursorIdx
- * @param {HTMLTextAreaElement|HTMLInputElement} input
- * @return {void}
- */
-export declare const insertAtLineStart: (val: string, cursorIdx: number, input: HTMLTextAreaElement | HTMLInputElement) => void;
 /**
  * @param {HTMLTextAreaElement|HTMLInputElement} input
  * @param {string} text

package/esm/utils/InsertTextAtPosition.js

@@ -22,29 +22,6 @@ function canManipulateViaTextNodes(input) {
   return browserSupportsTextareaTextNodes;
 }
 
-/**
- * @param {string} val
- * @param {number} cursorIdx
- * @param {HTMLTextAreaElement|HTMLInputElement} input
- * @return {void}
- */
-export var insertAtLineStart = (val, cursorIdx, input) => {
-  var content = input.value;
-  var startIdx = 0;
-  while (cursorIdx--) {
-    var char = content[cursorIdx];
-    if (char === '\n') {
-      startIdx = cursorIdx + 1;
-      break;
-    }
-  }
-  input.focus();
-  input.setRangeText(val, startIdx, startIdx);
-  input.dispatchEvent(new Event('input', {
-    bubbles: true
-  }));
-};
-
 /**
  * @param {HTMLTextAreaElement|HTMLInputElement} input
  * @param {string} text
@@ -66,7 +43,12 @@ export function insertTextAtPosition(input, text) {
   }
 
   // Webkit + Edge
-  var isSuccess = document.execCommand && document.execCommand('insertText', false, text);
+  var isSuccess = false;
+  if (text !== '') {
+    isSuccess = document.execCommand && document.execCommand('insertText', false, text);
+  } else {
+    isSuccess = document.execCommand && document.execCommand('delete', false);
+  }
   if (!isSuccess) {
     var start = input.selectionStart;
     var end = input.selectionEnd;

package/esm/utils/markdownUtils.d.ts

@@ -1,9 +1,16 @@
 import { TextRange } from '../commands';
+import { TextAreaTextApi } from '../commands';
 export interface TextSection {
     text: string;
     selection: TextRange;
 }
-export declare function selectWord({ text, selection }: TextSection): TextRange;
+export declare function selectWord({ text, selection, prefix, suffix, }: {
+    text: string;
+    selection: TextRange;
+    prefix: string;
+    suffix?: string;
+}): TextRange;
+export declare function selectLine({ text, selection }: TextSection): TextRange;
 /**
  *  Gets the number of line-breaks that would have to be inserted before the given 'startPosition'
  *  to make sure there's an empty line between 'startPosition' and the previous text
@@ -15,3 +22,18 @@ export declare function getBreaksNeededForEmptyLineBefore(text: string | undefin
  */
 export declare function getBreaksNeededForEmptyLineAfter(text: string | undefined, startPosition: number): number;
 export declare function getSurroundingWord(text: string, position: number): TextRange;
+export declare function executeCommand({ api, selectedText, selection, prefix, suffix, }: {
+    api: TextAreaTextApi;
+    selectedText: string;
+    selection: TextRange;
+    prefix: string;
+    suffix?: string;
+}): void;
+export type AlterLineFunction = (line: string, index: number) => string;
+/**
+ * Inserts insertionString before each line
+ */
+export declare function insertBeforeEachLine(selectedText: string, insertBefore: string | AlterLineFunction): {
+    modifiedText: string;
+    insertionLength: number;
+};

package/esm/utils/markdownUtils.js

@@ -1,13 +1,39 @@
 export function selectWord(_ref) {
   var {
     text,
-    selection
+    selection,
+    prefix,
+    suffix = prefix
   } = _ref;
+  var result = selection;
   if (text && text.length && selection.start === selection.end) {
-    // the user is pointing to a word
-    return getSurroundingWord(text, selection.start);
+    result = getSurroundingWord(text, selection.start);
+  }
+  if (result.start >= prefix.length && result.end <= text.length - suffix.length) {
+    var selectedTextContext = text.slice(result.start - prefix.length, result.end + suffix.length);
+    if (selectedTextContext.startsWith(prefix) && selectedTextContext.endsWith(suffix)) {
+      return {
+        start: result.start - prefix.length,
+        end: result.end + suffix.length
+      };
+    }
   }
-  return selection;
+  return result;
+}
+export function selectLine(_ref2) {
+  var {
+    text,
+    selection
+  } = _ref2;
+  var start = text.slice(0, selection.start).lastIndexOf('\n') + 1;
+  var end = text.slice(selection.end).indexOf('\n') + selection.end;
+  if (end === selection.end - 1) {
+    end = text.length;
+  }
+  return {
+    start,
+    end
+  };
 }
 
 /**
@@ -105,4 +131,57 @@ export function getSurroundingWord(text, position) {
     start,
     end
   };
+}
+export function executeCommand(_ref3) {
+  var {
+    api,
+    selectedText,
+    selection,
+    prefix,
+    suffix = prefix
+  } = _ref3;
+  if (selectedText.length >= prefix.length + suffix.length && selectedText.startsWith(prefix) && selectedText.endsWith(suffix)) {
+    api.replaceSelection(selectedText.slice(prefix.length, suffix.length ? -suffix.length : undefined));
+    api.setSelectionRange({
+      start: selection.start - prefix.length,
+      end: selection.end - prefix.length
+    });
+  } else {
+    api.replaceSelection("" + prefix + selectedText + suffix);
+    api.setSelectionRange({
+      start: selection.start + prefix.length,
+      end: selection.end + prefix.length
+    });
+  }
+}
+/**
+ * Inserts insertionString before each line
+ */
+export function insertBeforeEachLine(selectedText, insertBefore) {
+  var lines = selectedText.split(/\n/);
+  var insertionLength = 0;
+  var modifiedText = lines.map((item, index) => {
+    if (typeof insertBefore === 'string') {
+      if (item.startsWith(insertBefore)) {
+        insertionLength -= insertBefore.length;
+        return item.slice(insertBefore.length);
+      }
+      insertionLength += insertBefore.length;
+      return insertBefore + item;
+    }
+    if (typeof insertBefore === 'function') {
+      if (item.startsWith(insertBefore(item, index))) {
+        insertionLength -= insertBefore(item, index).length;
+        return item.slice(insertBefore(item, index).length);
+      }
+      var insertionResult = insertBefore(item, index);
+      insertionLength += insertionResult.length;
+      return insertBefore(item, index) + item;
+    }
+    throw Error('insertion is expected to be either a string or a function');
+  }).join('\n');
+  return {
+    modifiedText,
+    insertionLength
+  };
 }

package/lib/Context.js

@@ -11,7 +11,6 @@ var _react = _interopRequireDefault(require("react"));
 function reducer(state, action) {
   return (0, _objectSpread2["default"])((0, _objectSpread2["default"])({}, state), action);
 }
-var EditorContext = /*#__PURE__*/_react["default"].createContext({
+var EditorContext = exports.EditorContext = /*#__PURE__*/_react["default"].createContext({
   markdown: ''
-});
-exports.EditorContext = EditorContext;
+});

package/lib/Editor.js

@@ -313,6 +313,5 @@ var InternalMDEditor = /*#__PURE__*/_react["default"].forwardRef(function (props
 });
 var Editor = InternalMDEditor;
 Editor.Markdown = _reactMarkdownPreview["default"];
-var _default = Editor;
-exports["default"] = _default;
+var _default = exports["default"] = Editor;
 module.exports = exports.default;

package/lib/commands/bold.js

@@ -8,11 +8,11 @@ exports.bold = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _markdownUtils = require("../utils/markdownUtils");
 var _jsxRuntime = require("react/jsx-runtime");
-var bold = {
+var bold = exports.bold = {
   name: 'bold',
   keyCommand: 'bold',
   shortcuts: 'ctrlcmd+b',
-  value: '**{{text}}**',
+  prefix: '**',
   buttonProps: {
     'aria-label': 'Add bold text (ctrl + b)',
     title: 'Add bold text (ctrl + b)'
@@ -28,22 +28,17 @@ var bold = {
     })
   }),
   execute: function execute(state, api) {
-    // Adjust the selection to encompass the whole word if the caret is inside one
     var newSelectionRange = (0, _markdownUtils.selectWord)({
       text: state.text,
-      selection: state.selection
+      selection: state.selection,
+      prefix: state.command.prefix
     });
     var state1 = api.setSelectionRange(newSelectionRange);
-    // Replaces the current selection with the bold mark up
-    var val = state.command.value || '';
-    api.replaceSelection(val.replace(/({{text}})/gi, state1.selectedText));
-    var start = state1.selection.start + val.indexOf('{{text}}');
-    var end = state1.selection.start + val.indexOf('{{text}}') + (state1.selection.end - state1.selection.start);
-    // Adjust the selection to not contain the **
-    api.setSelectionRange({
-      start: start,
-      end: end
+    (0, _markdownUtils.executeCommand)({
+      api: api,
+      selectedText: state1.selectedText,
+      selection: state.selection,
+      prefix: state.command.prefix
     });
   }
-};
-exports.bold = bold;
+};

package/lib/commands/code.d.ts

@@ -1,3 +1,3 @@
 import { ICommand } from './';
-export declare const code: ICommand;
 export declare const codeBlock: ICommand;
+export declare const code: ICommand;

package/lib/commands/code.js

@@ -8,96 +8,101 @@ exports.codeBlock = exports.code = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _markdownUtils = require("../utils/markdownUtils");
 var _jsxRuntime = require("react/jsx-runtime");
-var code = {
-  name: 'code',
-  keyCommand: 'code',
-  shortcuts: 'ctrlcmd+j',
-  value: '``',
+var codeBlock = exports.codeBlock = {
+  name: 'codeBlock',
+  keyCommand: 'codeBlock',
+  shortcuts: 'ctrlcmd+shift+j',
+  prefix: '```',
   buttonProps: {
-    'aria-label': 'Insert code (ctrl + j)',
-    title: 'Insert code (ctrl + j)'
+    'aria-label': 'Insert Code Block (ctrl + shift + j)',
+    title: 'Insert Code Block (ctrl + shift +j)'
   },
   icon: /*#__PURE__*/(0, _jsxRuntime.jsx)("svg", {
-    width: "14",
-    height: "14",
+    width: "13",
+    height: "13",
     role: "img",
-    viewBox: "0 0 640 512",
+    viewBox: "0 0 156 156",
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("path", {
       fill: "currentColor",
-      d: "M278.9 511.5l-61-17.7c-6.4-1.8-10-8.5-8.2-14.9L346.2 8.7c1.8-6.4 8.5-10 14.9-8.2l61 17.7c6.4 1.8 10 8.5 8.2 14.9L293.8 503.3c-1.9 6.4-8.5 10.1-14.9 8.2zm-114-112.2l43.5-46.4c4.6-4.9 4.3-12.7-.8-17.2L117 256l90.6-79.7c5.1-4.5 5.5-12.3.8-17.2l-43.5-46.4c-4.5-4.8-12.1-5.1-17-.5L3.8 247.2c-5.1 4.7-5.1 12.8 0 17.5l144.1 135.1c4.9 4.6 12.5 4.4 17-.5zm327.2.6l144.1-135.1c5.1-4.7 5.1-12.8 0-17.5L492.1 112.1c-4.8-4.5-12.4-4.3-17 .5L431.6 159c-4.6 4.9-4.3 12.7.8 17.2L523 256l-90.6 79.7c-5.1 4.5-5.5 12.3-.8 17.2l43.5 46.4c4.5 4.9 12.1 5.1 17 .6z"
+      d: "M110.85 120.575 43.7 120.483333 43.7083334 110.091667 110.85 110.191667 110.841667 120.583333 110.85 120.575ZM85.1333334 87.1916666 43.625 86.7083332 43.7083334 76.3166666 85.2083334 76.7916666 85.1333334 87.1916666 85.1333334 87.1916666ZM110.841667 53.4166666 43.7 53.3166666 43.7083334 42.925 110.85 43.025 110.841667 53.4166666ZM36 138C27.2916666 138 20.75 136.216667 16.4 132.666667 12.1333334 129.2 10 124.308333 10 118L10 95.3333332C10 91.0666666 9.25 88.1333332 7.7333334 86.5333332 6.3166668 84.8416666 3.7333334 84 0 84L0 72C3.7333334 72 6.3083334 71.2 7.7333334 69.6 9.2416668 67.9083334 10 64.9333334 10 60.6666666L10 38C10 31.775 12.1333334 26.8833334 16.4 23.3333332 20.7583334 19.7749998 27.2916666 18 36 18L40.6666668 18 40.6666668 30 36 30C34.0212222 29.9719277 32.1263151 30.7979128 30.8 32.2666666 29.3605875 33.8216362 28.5938182 35.8823287 28.6666668 38L28.6666668 60.6666666C28.6666668 67.5083332 26.6666668 72.4 22.6666668 75.3333332 20.9317416 76.7274684 18.8640675 77.6464347 16.6666668 78 18.8916668 78.35 20.8916668 79.2416666 22.6666668 80.6666666 26.6666668 83.95 28.6666668 88.8416666 28.6666668 95.3333332L28.6666668 118C28.6666668 120.308333 29.3750002 122.216667 30.8 123.733333 32.2166666 125.241667 33.9583334 126 36 126L40.6666668 126 40.6666668 138 36 138 36 138ZM114.116667 126 118.783333 126C120.833333 126 122.566667 125.241667 123.983333 123.733333 125.422746 122.178364 126.189515 120.117671 126.116667 118L126.116667 95.3333332C126.116667 88.8333332 128.116667 83.9499998 132.116667 80.6666666 133.9 79.2416666 135.9 78.35 138.116667 78 135.919156 77.6468047 133.851391 76.7277979 132.116667 75.3333332 128.116667 72.3999998 126.116667 67.5 126.116667 60.6666666L126.116667 38C126.189515 35.8823287 125.422746 33.8216361 123.983333 32.2666666 122.657018 30.7979128 120.762111 29.9719277 118.783333 30L114.116667 30 114.116667 18 118.783333 18C127.5 18 133.983333 19.775 138.25 23.3333332 142.608333 26.8833332 144.783333 31.7749998 144.783333 38L144.783333 60.6666666C144.783333 64.9333332 145.5 67.9083332 146.916667 69.6 148.433333 71.2 151.05 72 154.783333 72L154.783333 84C151.05 84 148.433333 84.8333334 146.916667 86.5333332 145.5 88.1333332 144.783333 91.0666666 144.783333 95.3333332L144.783333 118C144.783333 124.308333 142.616667 129.2 138.25 132.666667 133.983333 136.216667 127.5 138 118.783333 138L114.116667 138 114.116667 126 114.116667 126Z"
     })
   }),
-  execute: function execute(tate, api) {
-    // Adjust the selection to encompass the whole word if the caret is inside one
+  execute: function execute(state, api) {
     var newSelectionRange = (0, _markdownUtils.selectWord)({
-      text: tate.text,
-      selection: tate.selection
+      text: state.text,
+      selection: state.selection,
+      prefix: '```\n',
+      suffix: '\n```'
     });
     var state1 = api.setSelectionRange(newSelectionRange);
-    // when there's no breaking line
-    if (state1.selectedText.indexOf('\n') === -1) {
-      api.replaceSelection("`".concat(state1.selectedText, "`"));
-      // Adjust the selection to not contain the **
 
-      var _selectionStart = state1.selection.start + 1;
-      var _selectionEnd = _selectionStart + state1.selectedText.length;
-      api.setSelectionRange({
-        start: _selectionStart,
-        end: _selectionEnd
-      });
-      return;
+    // Based on context determine if new line is needed or not
+    var prefix = '\n```\n';
+    var suffix = '\n```\n';
+    if (state1.selectedText.length >= prefix.length + suffix.length - 2 && state1.selectedText.startsWith(prefix) && state1.selectedText.endsWith(suffix)) {
+      // Remove code block
+      prefix = '```\n';
+      suffix = '\n```';
+    } else {
+      // Add code block
+      if (state1.selection.start >= 1 && state.text.slice(state1.selection.start - 1, state1.selection.start) === '\n' || state1.selection.start === 0) {
+        prefix = '```\n';
+      }
+      if (state1.selection.end <= state.text.length - 1 && state.text.slice(state1.selection.end, state1.selection.end + 1) === '\n' || state1.selection.end === state.text.length) {
+        suffix = '\n```';
+      }
     }
-    var breaksBeforeCount = (0, _markdownUtils.getBreaksNeededForEmptyLineBefore)(state1.text, state1.selection.start);
-    var breaksBefore = Array(breaksBeforeCount + 1).join('\n');
-    var breaksAfterCount = (0, _markdownUtils.getBreaksNeededForEmptyLineAfter)(state1.text, state1.selection.end);
-    var breaksAfter = Array(breaksAfterCount + 1).join('\n');
-    api.replaceSelection("".concat(breaksBefore, "```\n").concat(state1.selectedText, "\n```").concat(breaksAfter));
-    var selectionStart = state1.selection.start + breaksBeforeCount + 4;
-    var selectionEnd = selectionStart + state1.selectedText.length;
-    api.setSelectionRange({
-      start: selectionStart,
-      end: selectionEnd
+    var newSelectionRange2 = (0, _markdownUtils.selectWord)({
+      text: state.text,
+      selection: state.selection,
+      prefix: prefix,
+      suffix: suffix
+    });
+    var state2 = api.setSelectionRange(newSelectionRange2);
+    (0, _markdownUtils.executeCommand)({
+      api: api,
+      selectedText: state2.selectedText,
+      selection: state.selection,
+      prefix: prefix,
+      suffix: suffix
     });
   }
 };
-exports.code = code;
-var codeBlock = {
-  name: 'codeBlock',
-  keyCommand: 'codeBlock',
-  shortcuts: 'ctrlcmd+shift+j',
-  value: '```\n```',
+var code = exports.code = {
+  name: 'code',
+  keyCommand: 'code',
+  shortcuts: 'ctrlcmd+j',
+  prefix: '`',
+  buttonProps: {
+    'aria-label': 'Insert code (ctrl + j)',
+    title: 'Insert code (ctrl + j)'
+  },
   icon: /*#__PURE__*/(0, _jsxRuntime.jsx)("svg", {
-    width: "13",
-    height: "13",
+    width: "14",
+    height: "14",
     role: "img",
-    viewBox: "0 0 156 156",
+    viewBox: "0 0 640 512",
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("path", {
       fill: "currentColor",
-      d: "M110.85 120.575 43.7 120.483333 43.7083334 110.091667 110.85 110.191667 110.841667 120.583333 110.85 120.575ZM85.1333334 87.1916666 43.625 86.7083332 43.7083334 76.3166666 85.2083334 76.7916666 85.1333334 87.1916666 85.1333334 87.1916666ZM110.841667 53.4166666 43.7 53.3166666 43.7083334 42.925 110.85 43.025 110.841667 53.4166666ZM36 138C27.2916666 138 20.75 136.216667 16.4 132.666667 12.1333334 129.2 10 124.308333 10 118L10 95.3333332C10 91.0666666 9.25 88.1333332 7.7333334 86.5333332 6.3166668 84.8416666 3.7333334 84 0 84L0 72C3.7333334 72 6.3083334 71.2 7.7333334 69.6 9.2416668 67.9083334 10 64.9333334 10 60.6666666L10 38C10 31.775 12.1333334 26.8833334 16.4 23.3333332 20.7583334 19.7749998 27.2916666 18 36 18L40.6666668 18 40.6666668 30 36 30C34.0212222 29.9719277 32.1263151 30.7979128 30.8 32.2666666 29.3605875 33.8216362 28.5938182 35.8823287 28.6666668 38L28.6666668 60.6666666C28.6666668 67.5083332 26.6666668 72.4 22.6666668 75.3333332 20.9317416 76.7274684 18.8640675 77.6464347 16.6666668 78 18.8916668 78.35 20.8916668 79.2416666 22.6666668 80.6666666 26.6666668 83.95 28.6666668 88.8416666 28.6666668 95.3333332L28.6666668 118C28.6666668 120.308333 29.3750002 122.216667 30.8 123.733333 32.2166666 125.241667 33.9583334 126 36 126L40.6666668 126 40.6666668 138 36 138 36 138ZM114.116667 126 118.783333 126C120.833333 126 122.566667 125.241667 123.983333 123.733333 125.422746 122.178364 126.189515 120.117671 126.116667 118L126.116667 95.3333332C126.116667 88.8333332 128.116667 83.9499998 132.116667 80.6666666 133.9 79.2416666 135.9 78.35 138.116667 78 135.919156 77.6468047 133.851391 76.7277979 132.116667 75.3333332 128.116667 72.3999998 126.116667 67.5 126.116667 60.6666666L126.116667 38C126.189515 35.8823287 125.422746 33.8216361 123.983333 32.2666666 122.657018 30.7979128 120.762111 29.9719277 118.783333 30L114.116667 30 114.116667 18 118.783333 18C127.5 18 133.983333 19.775 138.25 23.3333332 142.608333 26.8833332 144.783333 31.7749998 144.783333 38L144.783333 60.6666666C144.783333 64.9333332 145.5 67.9083332 146.916667 69.6 148.433333 71.2 151.05 72 154.783333 72L154.783333 84C151.05 84 148.433333 84.8333334 146.916667 86.5333332 145.5 88.1333332 144.783333 91.0666666 144.783333 95.3333332L144.783333 118C144.783333 124.308333 142.616667 129.2 138.25 132.666667 133.983333 136.216667 127.5 138 118.783333 138L114.116667 138 114.116667 126 114.116667 126Z"
+      d: "M278.9 511.5l-61-17.7c-6.4-1.8-10-8.5-8.2-14.9L346.2 8.7c1.8-6.4 8.5-10 14.9-8.2l61 17.7c6.4 1.8 10 8.5 8.2 14.9L293.8 503.3c-1.9 6.4-8.5 10.1-14.9 8.2zm-114-112.2l43.5-46.4c4.6-4.9 4.3-12.7-.8-17.2L117 256l90.6-79.7c5.1-4.5 5.5-12.3.8-17.2l-43.5-46.4c-4.5-4.8-12.1-5.1-17-.5L3.8 247.2c-5.1 4.7-5.1 12.8 0 17.5l144.1 135.1c4.9 4.6 12.5 4.4 17-.5zm327.2.6l144.1-135.1c5.1-4.7 5.1-12.8 0-17.5L492.1 112.1c-4.8-4.5-12.4-4.3-17 .5L431.6 159c-4.6 4.9-4.3 12.7.8 17.2L523 256l-90.6 79.7c-5.1 4.5-5.5 12.3-.8 17.2l43.5 46.4c4.5 4.9 12.1 5.1 17 .6z"
     })
   }),
-  buttonProps: {
-    'aria-label': 'Insert Code Block (ctrl + shift + j)',
-    title: 'Insert Code Block (ctrl + shift +j)'
-  },
-  execute: function execute(tate, api) {
-    // Adjust the selection to encompass the whole word if the caret is inside one
-    var newSelectionRange = (0, _markdownUtils.selectWord)({
-      text: tate.text,
-      selection: tate.selection
-    });
-    var state1 = api.setSelectionRange(newSelectionRange);
-    var breaksBeforeCount = (0, _markdownUtils.getBreaksNeededForEmptyLineBefore)(state1.text, state1.selection.start);
-    var breaksBefore = Array(breaksBeforeCount + 1).join('\n');
-    var breaksAfterCount = (0, _markdownUtils.getBreaksNeededForEmptyLineAfter)(state1.text, state1.selection.end);
-    var breaksAfter = Array(breaksAfterCount + 1).join('\n');
-    api.replaceSelection("".concat(breaksBefore, "```\n").concat(state1.selectedText, "\n```").concat(breaksAfter));
-    var selectionStart = state1.selection.start + breaksBeforeCount + 4;
-    var selectionEnd = selectionStart + state1.selectedText.length;
-    api.setSelectionRange({
-      start: selectionStart,
-      end: selectionEnd
-    });
+  execute: function execute(state, api) {
+    if (state.selectedText.indexOf('\n') === -1) {
+      var newSelectionRange = (0, _markdownUtils.selectWord)({
+        text: state.text,
+        selection: state.selection,
+        prefix: state.command.prefix
+      });
+      var state1 = api.setSelectionRange(newSelectionRange);
+      (0, _markdownUtils.executeCommand)({
+        api: api,
+        selectedText: state1.selectedText,
+        selection: state.selection,
+        prefix: state.command.prefix
+      });
+    } else {
+      codeBlock.execute(state, api);
+    }
   }
-};
-exports.codeBlock = codeBlock;
+};

package/lib/commands/comment.js

@@ -8,30 +8,16 @@ exports.comment = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _markdownUtils = require("../utils/markdownUtils");
 var _jsxRuntime = require("react/jsx-runtime");
-var comment = {
+var comment = exports.comment = {
   name: 'comment',
   keyCommand: 'comment',
   shortcuts: 'ctrlcmd+/',
-  value: '<!-- -->',
+  prefix: '<!-- ',
+  suffix: ' -->',
   buttonProps: {
     'aria-label': 'Insert comment (ctrl + /)',
     title: 'Insert comment (ctrl + /)'
   },
-  execute: function execute(state, api) {
-    // Adjust the selection to encompass the whole word if the caret is inside one
-    var newSelectionRange = (0, _markdownUtils.selectWord)({
-      text: state.text,
-      selection: state.selection
-    });
-    var state1 = api.setSelectionRange(newSelectionRange);
-    // Replaces the current selection with the bold mark up
-    var state2 = api.replaceSelection("<!-- ".concat(state1.selectedText, " -->"));
-    // Adjust the selection to not contain the **
-    api.setSelectionRange({
-      start: state2.selection.end - 4 - state1.selectedText.length,
-      end: state2.selection.end - 4
-    });
-  },
   icon: /*#__PURE__*/(0, _jsxRuntime.jsx)("svg", {
     height: "1em",
     width: "1em",
@@ -55,6 +41,21 @@ var comment = {
         d: "M10.625,8.54545455 L7.25,11.3333333 L10.625,14.1212121 M15.6875,8.54545455 L19.0625,11.3333333 L15.6875,14.1212121"
       })]
     })
-  })
-};
-exports.comment = comment;
+  }),
+  execute: function execute(state, api) {
+    var newSelectionRange = (0, _markdownUtils.selectWord)({
+      text: state.text,
+      selection: state.selection,
+      prefix: state.command.prefix,
+      suffix: state.command.suffix
+    });
+    var state1 = api.setSelectionRange(newSelectionRange);
+    (0, _markdownUtils.executeCommand)({
+      api: api,
+      selectedText: state1.selectedText,
+      selection: state.selection,
+      prefix: state.command.prefix,
+      suffix: state.command.suffix
+    });
+  }
+};

package/lib/commands/divider.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.divider = void 0;
-var divider = {
+var divider = exports.divider = {
   keyCommand: 'divider'
-};
-exports.divider = divider;
+};