@uiw/react-md-editor 4.1.1 → 4.1.3

package/dist/mdeditor.min.js.LICENSE.txt

@@ -9,7 +9,7 @@
  */
 
 /**! 
- * @uiw/copy-to-clipboard v1.0.20 
+ * @uiw/copy-to-clipboard v1.0.21 
  * Copy to clipboard. 
  * 
  * Copyright (c) 2026 Kenny Wang 

package/esm/components/TextArea/handleKeyDown.js

@@ -113,7 +113,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)) && !e.shiftKey) {
+  } else if (e.keyCode === 13 && e.code.toLowerCase() === 'enter' && (/^(-|\*)\s/.test(currentLineStr) || /^\d+\.\s/.test(currentLineStr)) && !e.shiftKey) {
     /**
      * `13` - `Enter`
      */
@@ -125,7 +125,7 @@ export default function handleKeyDown(e, tabSize, defaultTabEnable) {
     if (currentLineStr.startsWith('- [ ]') || currentLineStr.startsWith('- [X]') || currentLineStr.startsWith('- [x]')) {
       startStr = '\n- [ ] ';
     }
-    if (/^\d+.\s/.test(currentLineStr)) {
+    if (/^\d+\.\s/.test(currentLineStr)) {
       startStr = "\n" + (parseInt(currentLineStr) + 1) + ". ";
     }
     return insertTextAtPosition(target, startStr);

package/esm/components/TextArea/index.css

@@ -1,8 +1,11 @@
 .w-md-editor-area {
+  display: flex;
+  flex-direction: column;
   overflow: auto;
   border-radius: 5px;
 }
 .w-md-editor-text {
+  flex: 1 0 auto;
   min-height: 100%;
   position: relative;
   text-align: left;

package/esm/components/TextArea/index.less

@@ -1,11 +1,14 @@
-@md-editor:~ "w-md-editor";
+@md-editor: ~'w-md-editor';
 
 .@{md-editor} {
   &-area {
+    display: flex;
+    flex-direction: column;
     overflow: auto;
     border-radius: 5px;
   }
   &-text {
+    flex: 1 0 auto;
     min-height: 100%;
     position: relative;
     text-align: left;

package/esm/index.css

@@ -27,7 +27,6 @@
   text-align: right !important;
 }
 .w-md-editor-toolbar {
-  height: -webkit-fit-content;
   height: fit-content;
 }
 .w-md-editor-content {

package/esm/utils/markdownUtils.js

@@ -1,3 +1,25 @@
+// `*` is a prefix of `**`, so `**text**` is bold-only and `***text***` is bold+italic.
+function isItalicInsideBoldOnly(text, start, end) {
+  var insideBold = start >= 2 && end + 2 <= text.length && text.slice(start - 2, start) === '**' && text.slice(end, end + 2) === '**';
+  if (!insideBold) {
+    return false;
+  }
+  var insideBoldItalic = start >= 3 && end + 3 <= text.length && text.slice(start - 3, start) === '***' && text.slice(end, end + 3) === '***';
+  return !insideBoldItalic;
+}
+function isAlreadyWrapped(selectedText, prefix, suffix) {
+  if (selectedText.length < prefix.length + suffix.length || !selectedText.startsWith(prefix) || !selectedText.endsWith(suffix)) {
+    return false;
+  }
+  if (prefix === '*' && suffix === '*') {
+    var isBold = selectedText.startsWith('**') && selectedText.endsWith('**');
+    var isBoldItalic = selectedText.startsWith('***') && selectedText.endsWith('***');
+    if (isBold && !isBoldItalic) {
+      return false;
+    }
+  }
+  return true;
+}
 export function selectWord(_ref) {
   var text = _ref.text,
     selection = _ref.selection,
@@ -11,6 +33,9 @@ export function selectWord(_ref) {
   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)) {
+      if (prefix === '*' && suffix === '*' && isItalicInsideBoldOnly(text, result.start, result.end)) {
+        return result;
+      }
       return {
         start: result.start - prefix.length,
         end: result.end + suffix.length
@@ -136,7 +161,7 @@ export function executeCommand(_ref3) {
     prefix = _ref3.prefix,
     _ref3$suffix = _ref3.suffix,
     suffix = _ref3$suffix === void 0 ? prefix : _ref3$suffix;
-  if (selectedText.length >= prefix.length + suffix.length && selectedText.startsWith(prefix) && selectedText.endsWith(suffix)) {
+  if (isAlreadyWrapped(selectedText, prefix, suffix)) {
     api.replaceSelection(selectedText.slice(prefix.length, suffix.length ? -suffix.length : undefined));
     api.setSelectionRange({
       start: selection.start - prefix.length,

package/lib/components/TextArea/handleKeyDown.js

@@ -117,7 +117,7 @@ function handleKeyDown(e) {
     } else {
       return (0, _InsertTextAtPosition.insertTextAtPosition)(target, space);
     }
-  } else if (e.keyCode === 13 && e.code.toLowerCase() === 'enter' && (/^(-|\*)\s/.test(currentLineStr) || /^\d+.\s/.test(currentLineStr)) && !e.shiftKey) {
+  } else if (e.keyCode === 13 && e.code.toLowerCase() === 'enter' && (/^(-|\*)\s/.test(currentLineStr) || /^\d+\.\s/.test(currentLineStr)) && !e.shiftKey) {
     /**
      * `13` - `Enter`
      */
@@ -129,7 +129,7 @@ function handleKeyDown(e) {
     if (currentLineStr.startsWith('- [ ]') || currentLineStr.startsWith('- [X]') || currentLineStr.startsWith('- [x]')) {
       startStr = '\n- [ ] ';
     }
-    if (/^\d+.\s/.test(currentLineStr)) {
+    if (/^\d+\.\s/.test(currentLineStr)) {
       startStr = "\n".concat(parseInt(currentLineStr) + 1, ". ");
     }
     return (0, _InsertTextAtPosition.insertTextAtPosition)(target, startStr);

package/lib/components/TextArea/index.less

@@ -1,11 +1,14 @@
-@md-editor:~ "w-md-editor";
+@md-editor: ~'w-md-editor';
 
 .@{md-editor} {
   &-area {
+    display: flex;
+    flex-direction: column;
     overflow: auto;
     border-radius: 5px;
   }
   &-text {
+    flex: 1 0 auto;
     min-height: 100%;
     position: relative;
     text-align: left;

package/lib/utils/markdownUtils.js

@@ -10,6 +10,28 @@ exports.getSurroundingWord = getSurroundingWord;
 exports.insertBeforeEachLine = insertBeforeEachLine;
 exports.selectLine = selectLine;
 exports.selectWord = selectWord;
+// `*` is a prefix of `**`, so `**text**` is bold-only and `***text***` is bold+italic.
+function isItalicInsideBoldOnly(text, start, end) {
+  var insideBold = start >= 2 && end + 2 <= text.length && text.slice(start - 2, start) === '**' && text.slice(end, end + 2) === '**';
+  if (!insideBold) {
+    return false;
+  }
+  var insideBoldItalic = start >= 3 && end + 3 <= text.length && text.slice(start - 3, start) === '***' && text.slice(end, end + 3) === '***';
+  return !insideBoldItalic;
+}
+function isAlreadyWrapped(selectedText, prefix, suffix) {
+  if (selectedText.length < prefix.length + suffix.length || !selectedText.startsWith(prefix) || !selectedText.endsWith(suffix)) {
+    return false;
+  }
+  if (prefix === '*' && suffix === '*') {
+    var isBold = selectedText.startsWith('**') && selectedText.endsWith('**');
+    var isBoldItalic = selectedText.startsWith('***') && selectedText.endsWith('***');
+    if (isBold && !isBoldItalic) {
+      return false;
+    }
+  }
+  return true;
+}
 function selectWord(_ref) {
   var text = _ref.text,
     selection = _ref.selection,
@@ -23,6 +45,9 @@ function selectWord(_ref) {
   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)) {
+      if (prefix === '*' && suffix === '*' && isItalicInsideBoldOnly(text, result.start, result.end)) {
+        return result;
+      }
       return {
         start: result.start - prefix.length,
         end: result.end + suffix.length
@@ -148,7 +173,7 @@ function executeCommand(_ref3) {
     prefix = _ref3.prefix,
     _ref3$suffix = _ref3.suffix,
     suffix = _ref3$suffix === void 0 ? prefix : _ref3$suffix;
-  if (selectedText.length >= prefix.length + suffix.length && selectedText.startsWith(prefix) && selectedText.endsWith(suffix)) {
+  if (isAlreadyWrapped(selectedText, prefix, suffix)) {
     api.replaceSelection(selectedText.slice(prefix.length, suffix.length ? -suffix.length : undefined));
     api.setSelectionRange({
       start: selection.start - prefix.length,

package/markdown-editor.css

@@ -17,10 +17,13 @@
   margin: 0 auto;
 }
 .w-md-editor-area {
+  display: flex;
+  flex-direction: column;
   overflow: auto;
   border-radius: 5px;
 }
 .w-md-editor-text {
+  flex: 1 0 auto;
   min-height: 100%;
   position: relative;
   text-align: left;
@@ -271,7 +274,6 @@
   text-align: right !important;
 }
 .w-md-editor-toolbar {
-  height: -webkit-fit-content;
   height: fit-content;
 }
 .w-md-editor-content {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uiw/react-md-editor",
-  "version": "4.1.1",
+  "version": "4.1.3",
   "description": "A markdown editor with preview, implemented with React.js and TypeScript.",
   "homepage": "https://uiwjs.github.io/react-md-editor/",
   "funding": "https://jaywcjlove.github.io/#/sponsor",

package/src/components/TextArea/handleKeyDown.tsx

@@ -102,7 +102,7 @@ export default function handleKeyDown(
   } else if (
     e.keyCode === 13 &&
     e.code.toLowerCase() === 'enter' &&
-    (/^(-|\*)\s/.test(currentLineStr) || /^\d+.\s/.test(currentLineStr)) &&
+    (/^(-|\*)\s/.test(currentLineStr) || /^\d+\.\s/.test(currentLineStr)) &&
     !e.shiftKey
   ) {
     /**
@@ -123,7 +123,7 @@ export default function handleKeyDown(
       startStr = '\n- [ ] ';
     }
 
-    if (/^\d+.\s/.test(currentLineStr)) {
+    if (/^\d+\.\s/.test(currentLineStr)) {
       startStr = `\n${parseInt(currentLineStr) + 1}. `;
     }
     return insertTextAtPosition(target, startStr);

package/src/components/TextArea/index.less

@@ -1,11 +1,14 @@
-@md-editor:~ "w-md-editor";
+@md-editor: ~'w-md-editor';
 
 .@{md-editor} {
   &-area {
+    display: flex;
+    flex-direction: column;
     overflow: auto;
     border-radius: 5px;
   }
   &-text {
+    flex: 1 0 auto;
     min-height: 100%;
     position: relative;
     text-align: left;

package/src/utils/markdownUtils.ts

@@ -5,6 +5,39 @@ export interface TextSection {
   selection: TextRange;
 }
 
+// `*` is a prefix of `**`, so `**text**` is bold-only and `***text***` is bold+italic.
+function isItalicInsideBoldOnly(text: string, start: number, end: number): boolean {
+  const insideBold =
+    start >= 2 && end + 2 <= text.length && text.slice(start - 2, start) === '**' && text.slice(end, end + 2) === '**';
+  if (!insideBold) {
+    return false;
+  }
+  const insideBoldItalic =
+    start >= 3 &&
+    end + 3 <= text.length &&
+    text.slice(start - 3, start) === '***' &&
+    text.slice(end, end + 3) === '***';
+  return !insideBoldItalic;
+}
+
+function isAlreadyWrapped(selectedText: string, prefix: string, suffix: string): boolean {
+  if (
+    selectedText.length < prefix.length + suffix.length ||
+    !selectedText.startsWith(prefix) ||
+    !selectedText.endsWith(suffix)
+  ) {
+    return false;
+  }
+  if (prefix === '*' && suffix === '*') {
+    const isBold = selectedText.startsWith('**') && selectedText.endsWith('**');
+    const isBoldItalic = selectedText.startsWith('***') && selectedText.endsWith('***');
+    if (isBold && !isBoldItalic) {
+      return false;
+    }
+  }
+  return true;
+}
+
 export function selectWord({
   text,
   selection,
@@ -23,6 +56,9 @@ export function selectWord({
   if (result.start >= prefix.length && result.end <= text.length - suffix.length) {
     const selectedTextContext = text.slice(result.start - prefix.length, result.end + suffix.length);
     if (selectedTextContext.startsWith(prefix) && selectedTextContext.endsWith(suffix)) {
+      if (prefix === '*' && suffix === '*' && isItalicInsideBoldOnly(text, result.start, result.end)) {
+        return result;
+      }
       return { start: result.start - prefix.length, end: result.end + suffix.length };
     }
   }
@@ -139,11 +175,7 @@ export function executeCommand({
   prefix: string;
   suffix?: string;
 }) {
-  if (
-    selectedText.length >= prefix.length + suffix.length &&
-    selectedText.startsWith(prefix) &&
-    selectedText.endsWith(suffix)
-  ) {
+  if (isAlreadyWrapped(selectedText, prefix, 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 {