@uiw/react-md-editor 3.19.0 → 3.19.2

package/lib/utils/markdownUtils.js

@@ -7,118 +7,107 @@ exports.getBreaksNeededForEmptyLineAfter = getBreaksNeededForEmptyLineAfter;
 exports.getBreaksNeededForEmptyLineBefore = getBreaksNeededForEmptyLineBefore;
 exports.getSurroundingWord = getSurroundingWord;
 exports.selectWord = selectWord;
-
 function selectWord(_ref) {
   var text = _ref.text,
-      selection = _ref.selection;
-
+    selection = _ref.selection;
   if (text && text.length && selection.start === selection.end) {
     // the user is pointing to a word
     return getSurroundingWord(text, selection.start);
   }
-
   return selection;
 }
+
 /**
  *  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
  */
-
-
 function getBreaksNeededForEmptyLineBefore() {
   var text = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   var startPosition = arguments.length > 1 ? arguments[1] : undefined;
-  if (startPosition === 0) return 0; // rules:
+  if (startPosition === 0) return 0;
+
+  // rules:
   // - If we're in the first line, no breaks are needed
   // - Otherwise there must be 2 breaks before the previous character. Depending on how many breaks exist already, we
   //      may need to insert 0, 1 or 2 breaks
 
   var neededBreaks = 2;
   var isInFirstLine = true;
-
   for (var i = startPosition - 1; i >= 0 && neededBreaks >= 0; i--) {
     switch (text.charCodeAt(i)) {
       case 32:
         // blank space
         continue;
-
       case 10:
         // line break
         neededBreaks--;
         isInFirstLine = false;
         break;
-
       default:
         return neededBreaks;
     }
   }
-
   return isInFirstLine ? 0 : neededBreaks;
 }
+
 /**
  *  Gets the number of line-breaks that would have to be inserted after the given 'startPosition'
  *  to make sure there's an empty line between 'startPosition' and the next text
  */
-
-
 function getBreaksNeededForEmptyLineAfter() {
   var text = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
   var startPosition = arguments.length > 1 ? arguments[1] : undefined;
-  if (startPosition === text.length - 1) return 0; // rules:
+  if (startPosition === text.length - 1) return 0;
+
+  // rules:
   // - If we're in the first line, no breaks are needed
   // - Otherwise there must be 2 breaks before the previous character. Depending on how many breaks exist already, we
   //      may need to insert 0, 1 or 2 breaks
 
   var neededBreaks = 2;
   var isInLastLine = true;
-
   for (var i = startPosition; i < text.length && neededBreaks >= 0; i++) {
     switch (text.charCodeAt(i)) {
       case 32:
         continue;
-
       case 10:
         {
           neededBreaks--;
           isInLastLine = false;
           break;
         }
-
       default:
         return neededBreaks;
     }
   }
-
   return isInLastLine ? 0 : neededBreaks;
 }
-
 function getSurroundingWord(text, position) {
   if (!text) throw Error("Argument 'text' should be truthy");
-
   var isWordDelimiter = function isWordDelimiter(c) {
     return c === ' ' || c.charCodeAt(0) === 10;
-  }; // leftIndex is initialized to 0 because if selection is 0, it won't even enter the iteration
-
-
-  var start = 0; // rightIndex is initialized to text.length because if selection is equal to text.length it won't even enter the interation
+  };
 
-  var end = text.length; // iterate to the left
+  // leftIndex is initialized to 0 because if selection is 0, it won't even enter the iteration
+  var start = 0;
+  // rightIndex is initialized to text.length because if selection is equal to text.length it won't even enter the interation
+  var end = text.length;
 
+  // iterate to the left
   for (var i = position; i - 1 > -1; i--) {
     if (isWordDelimiter(text[i - 1])) {
       start = i;
       break;
     }
-  } // iterate to the right
-
+  }
 
+  // iterate to the right
   for (var _i = position; _i < text.length; _i++) {
     if (isWordDelimiter(text[_i])) {
       end = _i;
       break;
     }
   }
-
   return {
     start: start,
     end: end

package/lib/utils/markdownUtils.js.map

@@ -27,5 +27,5 @@
   "sourcesContent": [
     "import { TextRange } from '../commands';\n\nexport interface TextSection {\n  text: string;\n  selection: TextRange;\n}\n\nexport function selectWord({ text, selection }: TextSection): TextRange {\n  if (text && text.length && selection.start === selection.end) {\n    // the user is pointing to a word\n    return getSurroundingWord(text, selection.start);\n  }\n  return selection;\n}\n\n/**\n *  Gets the number of line-breaks that would have to be inserted before the given 'startPosition'\n *  to make sure there's an empty line between 'startPosition' and the previous text\n */\nexport function getBreaksNeededForEmptyLineBefore(text = '', startPosition: number): number {\n  if (startPosition === 0) return 0;\n\n  // rules:\n  // - If we're in the first line, no breaks are needed\n  // - Otherwise there must be 2 breaks before the previous character. Depending on how many breaks exist already, we\n  //      may need to insert 0, 1 or 2 breaks\n\n  let neededBreaks = 2;\n  let isInFirstLine = true;\n  for (let i = startPosition - 1; i >= 0 && neededBreaks >= 0; i--) {\n    switch (text.charCodeAt(i)) {\n      case 32: // blank space\n        continue;\n      case 10: // line break\n        neededBreaks--;\n        isInFirstLine = false;\n        break;\n      default:\n        return neededBreaks;\n    }\n  }\n  return isInFirstLine ? 0 : neededBreaks;\n}\n\n/**\n *  Gets the number of line-breaks that would have to be inserted after the given 'startPosition'\n *  to make sure there's an empty line between 'startPosition' and the next text\n */\nexport function getBreaksNeededForEmptyLineAfter(text = '', startPosition: number): number {\n  if (startPosition === text.length - 1) return 0;\n\n  // rules:\n  // - If we're in the first line, no breaks are needed\n  // - Otherwise there must be 2 breaks before the previous character. Depending on how many breaks exist already, we\n  //      may need to insert 0, 1 or 2 breaks\n\n  let neededBreaks = 2;\n  let isInLastLine = true;\n  for (let i = startPosition; i < text.length && neededBreaks >= 0; i++) {\n    switch (text.charCodeAt(i)) {\n      case 32:\n        continue;\n      case 10: {\n        neededBreaks--;\n        isInLastLine = false;\n        break;\n      }\n      default:\n        return neededBreaks;\n    }\n  }\n  return isInLastLine ? 0 : neededBreaks;\n}\n\nexport function getSurroundingWord(text: string, position: number): TextRange {\n  if (!text) throw Error(\"Argument 'text' should be truthy\");\n\n  const isWordDelimiter = (c: string) => c === ' ' || c.charCodeAt(0) === 10;\n\n  // leftIndex is initialized to 0 because if selection is 0, it won't even enter the iteration\n  let start = 0;\n  // rightIndex is initialized to text.length because if selection is equal to text.length it won't even enter the interation\n  let end = text.length;\n\n  // iterate to the left\n  for (let i = position; i - 1 > -1; i--) {\n    if (isWordDelimiter(text[i - 1])) {\n      start = i;\n      break;\n    }\n  }\n\n  // iterate to the right\n  for (let i = position; i < text.length; i++) {\n    if (isWordDelimiter(text[i])) {\n      end = i;\n      break;\n    }\n  }\n\n  return { start, end };\n}\n"
   ],
-  "mappings": "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"
+  "mappings": ";;;;;;;;;AAOO,SAASA,UAAU,OAA8C;EAAA,IAA3CC,IAAI,QAAJA,IAAI;IAAEC,SAAS,QAATA,SAAS;EAC1C,IAAID,IAAI,IAAIA,IAAI,CAACE,MAAM,IAAID,SAAS,CAACE,KAAK,KAAKF,SAAS,CAACG,GAAG,EAAE;IAC5D;IACA,OAAOC,kBAAkB,CAACL,IAAI,EAAEC,SAAS,CAACE,KAAK,CAAC;EAClD;EACA,OAAOF,SAAS;AAClB;;AAEA;AACA;AACA;AACA;AACO,SAASK,iCAAiC,GAA2C;EAAA,IAA1CN,IAAI,uEAAG,EAAE;EAAA,IAAEO,aAAqB;EAChF,IAAIA,aAAa,KAAK,CAAC,EAAE,OAAO,CAAC;;EAEjC;EACA;EACA;EACA;;EAEA,IAAIC,YAAY,GAAG,CAAC;EACpB,IAAIC,aAAa,GAAG,IAAI;EACxB,KAAK,IAAIC,CAAC,GAAGH,aAAa,GAAG,CAAC,EAAEG,CAAC,IAAI,CAAC,IAAIF,YAAY,IAAI,CAAC,EAAEE,CAAC,EAAE,EAAE;IAChE,QAAQV,IAAI,CAACW,UAAU,CAACD,CAAC,CAAC;MACxB,KAAK,EAAE;QAAE;QACP;MACF,KAAK,EAAE;QAAE;QACPF,YAAY,EAAE;QACdC,aAAa,GAAG,KAAK;QACrB;MACF;QACE,OAAOD,YAAY;IAAC;EAE1B;EACA,OAAOC,aAAa,GAAG,CAAC,GAAGD,YAAY;AACzC;;AAEA;AACA;AACA;AACA;AACO,SAASI,gCAAgC,GAA2C;EAAA,IAA1CZ,IAAI,uEAAG,EAAE;EAAA,IAAEO,aAAqB;EAC/E,IAAIA,aAAa,KAAKP,IAAI,CAACE,MAAM,GAAG,CAAC,EAAE,OAAO,CAAC;;EAE/C;EACA;EACA;EACA;;EAEA,IAAIM,YAAY,GAAG,CAAC;EACpB,IAAIK,YAAY,GAAG,IAAI;EACvB,KAAK,IAAIH,CAAC,GAAGH,aAAa,EAAEG,CAAC,GAAGV,IAAI,CAACE,MAAM,IAAIM,YAAY,IAAI,CAAC,EAAEE,CAAC,EAAE,EAAE;IACrE,QAAQV,IAAI,CAACW,UAAU,CAACD,CAAC,CAAC;MACxB,KAAK,EAAE;QACL;MACF,KAAK,EAAE;QAAE;UACPF,YAAY,EAAE;UACdK,YAAY,GAAG,KAAK;UACpB;QACF;MACA;QACE,OAAOL,YAAY;IAAC;EAE1B;EACA,OAAOK,YAAY,GAAG,CAAC,GAAGL,YAAY;AACxC;AAEO,SAASH,kBAAkB,CAACL,IAAY,EAAEc,QAAgB,EAAa;EAC5E,IAAI,CAACd,IAAI,EAAE,MAAMe,KAAK,CAAC,kCAAkC,CAAC;EAE1D,IAAMC,eAAe,GAAG,SAAlBA,eAAe,CAAIC,CAAS;IAAA,OAAKA,CAAC,KAAK,GAAG,IAAIA,CAAC,CAACN,UAAU,CAAC,CAAC,CAAC,KAAK,EAAE;EAAA;;EAE1E;EACA,IAAIR,KAAK,GAAG,CAAC;EACb;EACA,IAAIC,GAAG,GAAGJ,IAAI,CAACE,MAAM;;EAErB;EACA,KAAK,IAAIQ,CAAC,GAAGI,QAAQ,EAAEJ,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,EAAEA,CAAC,EAAE,EAAE;IACtC,IAAIM,eAAe,CAAChB,IAAI,CAACU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;MAChCP,KAAK,GAAGO,CAAC;MACT;IACF;EACF;;EAEA;EACA,KAAK,IAAIA,EAAC,GAAGI,QAAQ,EAAEJ,EAAC,GAAGV,IAAI,CAACE,MAAM,EAAEQ,EAAC,EAAE,EAAE;IAC3C,IAAIM,eAAe,CAAChB,IAAI,CAACU,EAAC,CAAC,CAAC,EAAE;MAC5BN,GAAG,GAAGM,EAAC;MACP;IACF;EACF;EAEA,OAAO;IAAEP,KAAK,EAALA,KAAK;IAAEC,GAAG,EAAHA;EAAI,CAAC;AACvB"
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uiw/react-md-editor",
-  "version": "3.19.0",
+  "version": "3.19.2",
   "description": "A markdown editor with preview, implemented with React.js and TypeScript.",
   "homepage": "https://uiwjs.github.io/react-md-editor/",
   "author": "kenny wang <wowohoo@qq.com>",
@@ -36,7 +36,7 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.14.6",
-    "@uiw/react-markdown-preview": "^4.0.24",
+    "@uiw/react-markdown-preview": "^4.1.4",
     "rehype": "~12.0.1"
   },
   "keywords": [

package/src/commands/fullscreen.tsx

@@ -21,10 +21,11 @@ export const fullscreen: ICommand = {
     api: TextAreaTextApi,
     dispatch?: React.Dispatch<ContextStore>,
     executeCommandState?: ExecuteCommandState,
+    shortcuts?: string[],
   ) => {
     api.textArea.focus();
-    if (dispatch && executeCommandState && executeCommandState.fullscreen) {
-      dispatch({ fullscreen: false });
+    if (shortcuts && dispatch && executeCommandState) {
+      dispatch({ fullscreen: !executeCommandState.fullscreen });
     }
   },
 };

package/src/commands/index.ts

@@ -62,6 +62,7 @@ export interface ICommandBase<T> {
     api: TextAreaTextApi,
     dispatch?: React.Dispatch<ContextStore>,
     executeCommandState?: ExecuteCommandState,
+    shortcuts?: string[],
   ) => void;
 }
 
@@ -161,8 +162,9 @@ class TextAreaCommandOrchestrator implements CommandOrchestrator {
     command: ICommand<string>,
     dispatch?: React.Dispatch<ContextStore>,
     state?: ExecuteCommandState,
+    shortcuts?: string[],
   ): void {
-    command.execute && command.execute(getStateFromTextArea(this.textArea), this.textApi, dispatch, state);
+    command.execute && command.execute(getStateFromTextArea(this.textArea), this.textApi, dispatch, state, shortcuts);
   }
 }
 

package/src/commands/preview.tsx

@@ -1,5 +1,6 @@
 import * as React from 'react';
-import { ICommand } from './';
+import { ICommand, TextState, TextAreaTextApi } from './';
+import { ContextStore, ExecuteCommandState } from '../Context';
 
 export const codePreview: ICommand = {
   name: 'preview',
@@ -19,7 +20,17 @@ export const codePreview: ICommand = {
       />
     </svg>
   ),
-  execute: () => {},
+  execute: (
+    state: TextState,
+    api: TextAreaTextApi,
+    dispatch?: React.Dispatch<ContextStore>,
+    executeCommandState?: ExecuteCommandState,
+    shortcuts?: string[],
+  ) => {
+    if (shortcuts && dispatch && executeCommandState) {
+      dispatch({ preview: 'preview' });
+    }
+  },
 };
 
 export const codeEdit: ICommand = {
@@ -37,7 +48,17 @@ export const codeEdit: ICommand = {
       />
     </svg>
   ),
-  execute: () => {},
+  execute: (
+    state: TextState,
+    api: TextAreaTextApi,
+    dispatch?: React.Dispatch<ContextStore>,
+    executeCommandState?: ExecuteCommandState,
+    shortcuts?: string[],
+  ) => {
+    if (shortcuts && dispatch && executeCommandState) {
+      dispatch({ preview: 'edit' });
+    }
+  },
 };
 
 export const codeLive: ICommand = {
@@ -55,5 +76,15 @@ export const codeLive: ICommand = {
       />
     </svg>
   ),
-  execute: () => {},
+  execute: (
+    state: TextState,
+    api: TextAreaTextApi,
+    dispatch?: React.Dispatch<ContextStore>,
+    executeCommandState?: ExecuteCommandState,
+    shortcuts?: string[],
+  ) => {
+    if (shortcuts && dispatch && executeCommandState) {
+      dispatch({ preview: 'live' });
+    }
+  },
 };

package/src/components/TextArea/shortcuts.ts

@@ -20,7 +20,7 @@ export default function shortcutsHandle(
   state?: ExecuteCommandState,
 ) {
   const data = getCommands(commands || []);
-  const shortcuts: (string | number)[] = [];
+  const shortcuts: string[] = [];
   if (e.altKey) {
     shortcuts.push('alt');
   }
@@ -60,7 +60,7 @@ export default function shortcutsHandle(
   if (command && commandOrchestrator) {
     e.stopPropagation();
     e.preventDefault();
-    commandOrchestrator.executeCommand(command, dispatch, state);
+    commandOrchestrator.executeCommand(command, dispatch, state, shortcuts);
     return;
   }
 }