@zzish/math-rich-input 0.1.35 → 0.1.36

package/dist/index.js

@@ -20534,10 +20534,10 @@ var Toolbar = /*#__PURE__*/function (_React$Component) {
 
 var INLINE_LATEX_REG_EXP = /\$\$[\s\S]+?\$\$|\\\[[\s\S]+?\\\]|\\\([\s\S]+?\\\)|\$[^$\\]*(?:\\.[^$\\]*)*\$/g;
 var BLOCL_LATEX_REG_EXP = /\$\$[\s\S]+?\$\$|\\\[[\s\S]+?\\\]/g;
-var MIME_TYPE_PLAIN_TEXT$2 = "text/plain";
-var MIME_TYPE_HTML$2 = "text/html";
-var MIME_TYPE_TEX$2 = "application/x-tex";
-var MIME_TYPE_ZZISH_HTML_MATH$2 = "application/x-zzish-html-math";
+var MIME_TYPE_PLAIN_TEXT$2 = 'text/plain';
+var MIME_TYPE_HTML$2 = 'text/html';
+var MIME_TYPE_TEX$2 = 'application/x-tex';
+var MIME_TYPE_ZZISH_HTML_MATH$2 = 'application/x-zzish-html-math';
 var LATEX_COMMAND_REG_EXP = /\\[a-zA-Z]/g;
 var HTML_CODES_REG_EXP = /&(#36|quot|apos|lt|gt|amp);/;
 var HTML_TAGS_REG_EXP = /<(br|basefont|hr|input|source|frame|param|area|meta|!--|col|link|option|base|img|wbr|!DOCTYPE).*?>|<(a|abbr|acronym|address|applet|article|aside|audio|b|bdi|bdo|big|blockquote|body|button|canvas|caption|center|cite|code|colgroup|command|datalist|dd|del|details|dfn|dialog|dir|div|dl|dt|em|embed|fieldset|figcaption|figure|font|footer|form|frameset|head|header|hgroup|h1|h2|h3|h4|h5|h6|html|i|iframe|ins|kbd|keygen|label|legend|li|map|mark|menu|meter|nav|noframes|noscript|object|ol|optgroup|output|p|pre|progress|q|rp|rt|ruby|s|samp|script|section|select|small|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|track|tt|u|ul|var|video).*?<\/\2>/i;
@@ -20545,16 +20545,16 @@ var HTML_MATH_TAGS_REC_EXP = /<math>/i;
 var WORDS_REG_EXP = /^[a-zA-Z]*[,."';:?!]*$/i;
 
 function stripDollars$1(stringToStrip) {
-  return stringToStrip[0] === "$" && stringToStrip[1] !== "$" ? stringToStrip.slice(1, -1) : stringToStrip.slice(2, -2);
+  return stringToStrip[0] === '$' && stringToStrip[1] !== '$' ? stringToStrip.slice(1, -1) : stringToStrip.slice(2, -2);
 }
 
 function isTextLatexMath(text) {
   // We need at least two dollar signs to be latex
-  var i = text.indexOf("$");
+  var i = text.indexOf('$');
   if (i < 0) return false;
-  var j = text.indexOf("\\$");
+  var j = text.indexOf('\\$');
   if (j >= 0) return true;
-  i = text.indexOf("$", i + 1);
+  i = text.indexOf('$', i + 1);
   if (i < 0) return false; // Lets try and extract the potentially latex nodes
 
   var latexMatch = text.match(BLOCL_LATEX_REG_EXP);
@@ -20566,7 +20566,7 @@ function isTextLatexMath(text) {
   } // If all dollar signs are followed by a number, it probably is not latex
 
 
-  i = text.indexOf("$");
+  i = text.indexOf('$');
   var probablyLatex = false;
 
   while (i >= 0) {
@@ -20577,14 +20577,14 @@ function isTextLatexMath(text) {
 
     var c = text.charAt(i + 1);
 
-    if (c < "0" || c > "9") {
+    if (c < '0' || c > '9') {
       probablyLatex = true;
       break;
     }
 
-    i = text.indexOf("$", i + 1);
+    i = text.indexOf('$', i + 1);
   } // Note that there are other uses of a dollar sign, that couold potentially be
-  // entered.  For example, if someone created a question about the use of the 
+  // entered.  For example, if someone created a question about the use of the
   // $ sign in excel cells or the use of the $ sign in regular expressions.
 
 
@@ -20603,14 +20603,14 @@ function isTextLatexMath(text) {
     var allEmpty = true;
 
     for (var _i2 = 0; _i2 < latexMatch.length; _i2++) {
-      if (latexMatch[_i2] !== "") allEmpty = false;
+      if (latexMatch[_i2] !== '') allEmpty = false;
     }
 
     if (allEmpty) return false; // If an element between two dollars is two or more words and only words
     // and at least one word has three characters then we will treat it as text
 
     for (var _i3 = 0; _i3 < latexMatch.length; _i3++) {
-      var words = latexMatch[_i3].split(" ");
+      var words = latexMatch[_i3].split(' ');
 
       if (words.length >= 2) {
         var allWords = true;
@@ -20643,8 +20643,9 @@ function isTextLatexMath(text) {
   }
 }
 function isTextHtml(text) {
+  text = text.replace(/[\r\n]+/g, ' ');
   if (HTML_CODES_REG_EXP.test(text)) return true;
-  var i = text.indexOf("<");
+  var i = text.indexOf('<');
   if (i < 0) return false;
   var containsHtmlTags = HTML_TAGS_REG_EXP.test(text);
   return containsHtmlTags;

package/dist/math-rich-input.css

@@ -78,6 +78,136 @@
   padding: 2px;
   margin: 0px 2px;
 }
+/* Note that the top left position of the toolbar is set programatically in componentDidMount */
+
+.Toolbar {
+  position: absolute;
+  z-index: 1;
+  display: flex;
+  height: 42px;
+  background-color: white;
+  border: 1px solid #d0d0d0;
+  border-radius: 5px;
+  box-shadow: 1px 1px 5px #a0a0a0;
+  animation: 0.5s fadeIn1;
+  animation-fill-mode: forwards;
+}
+
+@keyframes fadeIn1 {
+  0% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 1;
+  }
+}
+
+.Toolbar-button {
+  font-family: sans-serif;
+  font-size: 16px;
+  width: 40px;
+  height: 36px;
+  background-color: white;
+  border-radius: 5px;
+  border: 0px;
+  padding: 1px;
+  margin: 2px;
+}
+
+.Toolbar-button:hover {
+  color: white;
+  background: #663676;
+  cursor: pointer;
+}
+
+.Toolbar-button:active {
+  background: #808080;
+  color: white;
+  cursor: pointer;
+}
+
+.TB-narrow {
+  width: 30px;
+}
+
+.TB-wide {
+  width: 46px;
+}
+
+.TB-selected {
+  background: #d0d0d0;
+  color: black;
+  cursor: pointer;
+  animation: 0.2s TB-fadeIn;
+  animation-fill-mode: forwards;
+}
+
+.TB-selected:hover {
+  color: white;
+  background: #663676;
+  cursor: pointer;
+}
+
+@keyframes TB-fadeIn {
+  00% {
+    background: white;
+  }
+  100% {
+    background: #d0d0d0;
+  }
+}
+
+/* Tooltip text */
+.Toolbar-button .tooltiptext {
+  font-weight: normal;
+  visibility: hidden;
+  width: 100px;
+  background-color: #222;
+  color: #fff;
+  /*font-weight: bold;*/
+  font-size: 12px;
+  text-align: center;
+  padding: 4px 10px;
+  border-radius: 6px;
+
+  /* Position the tooltip text - see examples below! */
+  position: absolute;
+  z-index: 2;
+  top: -90%; /* Must leave a small gap between tooltip and button */
+  left: 50px;
+
+  /* transform: translate (50%,0%); */
+}
+
+/* Show the tooltip text when you mouse over the tooltip container */
+.Toolbar-button:hover .tooltiptext {
+  animation: 0.8s fadeIn2;
+  animation-fill-mode: forwards;
+  visibility: visible;
+  /* width: 100px; */
+  /* top: -90%; */ /* Must leave a small gap between tooltip and button */
+  /* left: 20%; */
+  /* margin-left: -50px; */
+}
+
+@keyframes fadeIn2 {
+  00% {
+    opacity: 0;
+  }
+  70% {
+    opacity: 0;
+  }
+  100% {
+    visibility: visible;
+    opacity: 0.9;
+  }
+}
+
+/* .tooltip {
+  position: relative;
+  display: inline-block;
+  border-bottom: 1px dotted black; /* If you want dots under the hoverable text 
+} */
 /* Note that the top left position of the accent bar is set programatically in componentDidMount */
 
 .AccentBar {
@@ -253,136 +383,6 @@
   animation: 0.4s fadeIn1;
   animation-fill-mode: forwards;
 }
-/* Note that the top left position of the toolbar is set programatically in componentDidMount */
-
-.Toolbar {
-  position: absolute;
-  z-index: 1;
-  display: flex;
-  height: 42px;
-  background-color: white;
-  border: 1px solid #d0d0d0;
-  border-radius: 5px;
-  box-shadow: 1px 1px 5px #a0a0a0;
-  animation: 0.5s fadeIn1;
-  animation-fill-mode: forwards;
-}
-
-@keyframes fadeIn1 {
-  0% {
-    opacity: 0;
-  }
-  100% {
-    opacity: 1;
-  }
-}
-
-.Toolbar-button {
-  font-family: sans-serif;
-  font-size: 16px;
-  width: 40px;
-  height: 36px;
-  background-color: white;
-  border-radius: 5px;
-  border: 0px;
-  padding: 1px;
-  margin: 2px;
-}
-
-.Toolbar-button:hover {
-  color: white;
-  background: #663676;
-  cursor: pointer;
-}
-
-.Toolbar-button:active {
-  background: #808080;
-  color: white;
-  cursor: pointer;
-}
-
-.TB-narrow {
-  width: 30px;
-}
-
-.TB-wide {
-  width: 46px;
-}
-
-.TB-selected {
-  background: #d0d0d0;
-  color: black;
-  cursor: pointer;
-  animation: 0.2s TB-fadeIn;
-  animation-fill-mode: forwards;
-}
-
-.TB-selected:hover {
-  color: white;
-  background: #663676;
-  cursor: pointer;
-}
-
-@keyframes TB-fadeIn {
-  00% {
-    background: white;
-  }
-  100% {
-    background: #d0d0d0;
-  }
-}
-
-/* Tooltip text */
-.Toolbar-button .tooltiptext {
-  font-weight: normal;
-  visibility: hidden;
-  width: 100px;
-  background-color: #222;
-  color: #fff;
-  /*font-weight: bold;*/
-  font-size: 12px;
-  text-align: center;
-  padding: 4px 10px;
-  border-radius: 6px;
-
-  /* Position the tooltip text - see examples below! */
-  position: absolute;
-  z-index: 2;
-  top: -90%; /* Must leave a small gap between tooltip and button */
-  left: 50px;
-
-  /* transform: translate (50%,0%); */
-}
-
-/* Show the tooltip text when you mouse over the tooltip container */
-.Toolbar-button:hover .tooltiptext {
-  animation: 0.8s fadeIn2;
-  animation-fill-mode: forwards;
-  visibility: visible;
-  /* width: 100px; */
-  /* top: -90%; */ /* Must leave a small gap between tooltip and button */
-  /* left: 20%; */
-  /* margin-left: -50px; */
-}
-
-@keyframes fadeIn2 {
-  00% {
-    opacity: 0;
-  }
-  70% {
-    opacity: 0;
-  }
-  100% {
-    visibility: visible;
-    opacity: 0.9;
-  }
-}
-
-/* .tooltip {
-  position: relative;
-  display: inline-block;
-  border-bottom: 1px dotted black; /* If you want dots under the hoverable text 
-} */
 .EquationEditorModal-background {
   position: fixed;
   top: 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zzish/math-rich-input",
-  "version": "0.1.35",
+  "version": "0.1.36",
   "description": "React component for user to enter rich text with embedded math equations.",
   "repository": {
     "type": "git",

package/src/mimeTypeHelper.js

@@ -1,67 +1,69 @@
-const INLINE_LATEX_REG_EXP = /\$\$[\s\S]+?\$\$|\\\[[\s\S]+?\\\]|\\\([\s\S]+?\\\)|\$[^$\\]*(?:\\.[^$\\]*)*\$/g;
+const INLINE_LATEX_REG_EXP =
+  /\$\$[\s\S]+?\$\$|\\\[[\s\S]+?\\\]|\\\([\s\S]+?\\\)|\$[^$\\]*(?:\\.[^$\\]*)*\$/g;
 const BLOCL_LATEX_REG_EXP = /\$\$[\s\S]+?\$\$|\\\[[\s\S]+?\\\]/g;
 
-export const MIME_TYPE_PLAIN_TEXT = "text/plain"
-export const MIME_TYPE_HTML = "text/html"
-export const MIME_TYPE_TEX = "application/x-tex"
-export const MIME_TYPE_ZZISH_HTML_MATH = "application/x-zzish-html-math"
+export const MIME_TYPE_PLAIN_TEXT = 'text/plain';
+export const MIME_TYPE_HTML = 'text/html';
+export const MIME_TYPE_TEX = 'application/x-tex';
+export const MIME_TYPE_ZZISH_HTML_MATH = 'application/x-zzish-html-math';
 
-const LATEX_COMMAND_REG_EXP = /\\[a-zA-Z]/g
+const LATEX_COMMAND_REG_EXP = /\\[a-zA-Z]/g;
 
-const HTML_CODES_REG_EXP = /&(#36|quot|apos|lt|gt|amp);/
-const HTML_TAGS_REG_EXP = /<(br|basefont|hr|input|source|frame|param|area|meta|!--|col|link|option|base|img|wbr|!DOCTYPE).*?>|<(a|abbr|acronym|address|applet|article|aside|audio|b|bdi|bdo|big|blockquote|body|button|canvas|caption|center|cite|code|colgroup|command|datalist|dd|del|details|dfn|dialog|dir|div|dl|dt|em|embed|fieldset|figcaption|figure|font|footer|form|frameset|head|header|hgroup|h1|h2|h3|h4|h5|h6|html|i|iframe|ins|kbd|keygen|label|legend|li|map|mark|menu|meter|nav|noframes|noscript|object|ol|optgroup|output|p|pre|progress|q|rp|rt|ruby|s|samp|script|section|select|small|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|track|tt|u|ul|var|video).*?<\/\2>/i
-const HTML_MATH_TAGS_REC_EXP = /<math>/i
+const HTML_CODES_REG_EXP = /&(#36|quot|apos|lt|gt|amp);/;
+const HTML_TAGS_REG_EXP =
+  /<(br|basefont|hr|input|source|frame|param|area|meta|!--|col|link|option|base|img|wbr|!DOCTYPE).*?>|<(a|abbr|acronym|address|applet|article|aside|audio|b|bdi|bdo|big|blockquote|body|button|canvas|caption|center|cite|code|colgroup|command|datalist|dd|del|details|dfn|dialog|dir|div|dl|dt|em|embed|fieldset|figcaption|figure|font|footer|form|frameset|head|header|hgroup|h1|h2|h3|h4|h5|h6|html|i|iframe|ins|kbd|keygen|label|legend|li|map|mark|menu|meter|nav|noframes|noscript|object|ol|optgroup|output|p|pre|progress|q|rp|rt|ruby|s|samp|script|section|select|small|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|track|tt|u|ul|var|video).*?<\/\2>/i;
+const HTML_MATH_TAGS_REC_EXP = /<math>/i;
 
-const WORDS_REG_EXP = /^[a-zA-Z]*[,."';:?!]*$/i
+const WORDS_REG_EXP = /^[a-zA-Z]*[,."';:?!]*$/i;
 
-function stripDollars (stringToStrip) {
-  return stringToStrip[0] === "$" && stringToStrip[1] !== "$"
+function stripDollars(stringToStrip) {
+  return stringToStrip[0] === '$' && stringToStrip[1] !== '$'
     ? stringToStrip.slice(1, -1)
-    : stringToStrip.slice(2, -2)
+    : stringToStrip.slice(2, -2);
 }
 
 export function isTextLatexMath(text) {
   // We need at least two dollar signs to be latex
-  let i = text.indexOf("$")
-  if (i < 0)
-    return false
-  let j = text.indexOf("\\$")
-  if (j >=0)
-    return true 
-  i = text.indexOf("$",i+1)
-  if (i < 0)
-    return false
+  let i = text.indexOf('$');
+  if (i < 0) return false;
+  let j = text.indexOf('\\$');
+  if (j >= 0) return true;
+  i = text.indexOf('$', i + 1);
+  if (i < 0) return false;
 
   // Lets try and extract the potentially latex nodes
-  let latexMatch = text.match(BLOCL_LATEX_REG_EXP)
+  let latexMatch = text.match(BLOCL_LATEX_REG_EXP);
   if (latexMatch === null || latexMatch === undefined)
     latexMatch = text.match(INLINE_LATEX_REG_EXP);
 
-  if (latexMatch === null || latexMatch === undefined || latexMatch.length === 0)
-    return false
-  
+  if (
+    latexMatch === null ||
+    latexMatch === undefined ||
+    latexMatch.length === 0
+  )
+    return false;
+
   for (let i = 0; i < latexMatch.length; i++)
-    latexMatch[i] = stripDollars(latexMatch[i])
+    latexMatch[i] = stripDollars(latexMatch[i]);
 
-    
   // If all dollar signs are followed by a number, it probably is not latex
-  i = text.indexOf("$")
-  let probablyLatex = false
-  while (i >=0) {
-    if (i === text.length-1) {
-      probablyLatex = true
-      break
+  i = text.indexOf('$');
+  let probablyLatex = false;
+  while (i >= 0) {
+    if (i === text.length - 1) {
+      probablyLatex = true;
+      break;
     }
-    let c = text.charAt(i+1)
-    if (c < "0" ||  c > "9") {
-      probablyLatex = true
-      break
+    let c = text.charAt(i + 1);
+    if (c < '0' || c > '9') {
+      probablyLatex = true;
+      break;
     }
-    i = text.indexOf("$",i+1)
+    i = text.indexOf('$', i + 1);
   }
 
   // Note that there are other uses of a dollar sign, that couold potentially be
-  // entered.  For example, if someone created a question about the use of the 
+  // entered.  For example, if someone created a question about the use of the
   // $ sign in excel cells or the use of the $ sign in regular expressions.
 
   if (probablyLatex) {
@@ -79,80 +81,69 @@ export function isTextLatexMath(text) {
     // }
 
     // If all the latex elements are empty, then we will treat it as plain text
-    let allEmpty = true
+    let allEmpty = true;
     for (let i = 0; i < latexMatch.length; i++) {
-      if (latexMatch[i] !== "")
-        allEmpty = false
+      if (latexMatch[i] !== '') allEmpty = false;
     }
-    if (allEmpty)
-      return false
+    if (allEmpty) return false;
 
     // If an element between two dollars is two or more words and only words
     // and at least one word has three characters then we will treat it as text
     for (let i = 0; i < latexMatch.length; i++) {
-      let words = latexMatch[i].split(" ")
+      let words = latexMatch[i].split(' ');
       if (words.length >= 2) {
-        let allWords = true
-        let longWord = false
+        let allWords = true;
+        let longWord = false;
         for (let j = 0; j < words.length; j++) {
           // console.log(j+":"+words[j])
-          if (words[j].length > 0 &&
-              WORDS_REG_EXP.test(words[j]) === false) {
+          if (words[j].length > 0 && WORDS_REG_EXP.test(words[j]) === false) {
             // console.log("Not: "+words[j])
-            allWords = false
-            break
-          }
-          if (words[j].length >= 3)
-            longWord = true
+            allWords = false;
+            break;
           }
-        if (allWords && longWord)
-          return false
+          if (words[j].length >= 3) longWord = true;
+        }
+        if (allWords && longWord) return false;
       }
     }
 
-    return true
+    return true;
   } else {
     // At this point it probably is not latex, but we can check inside the latex
     // elements for things that make it likely to be latex, such as latex commands
 
     for (let i = 0; i < latexMatch.length; i++) {
-      if (latexMatch[i].match(LATEX_COMMAND_REG_EXP) !== null)
-        return true
+      if (latexMatch[i].match(LATEX_COMMAND_REG_EXP) !== null) return true;
     }
 
-    return false
+    return false;
   }
 }
 
 export function isTextHtml(text) {
-  if (HTML_CODES_REG_EXP.test(text))
-    return true
-  let i = text.indexOf("<")
-  if (i < 0)
-    return false
-  
-  let containsHtmlTags = HTML_TAGS_REG_EXP.test(text)
-  return containsHtmlTags
+  text = text.replace(/[\r\n]+/g, ' ');
+  if (HTML_CODES_REG_EXP.test(text)) return true;
+  let i = text.indexOf('<');
+  if (i < 0) return false;
+
+  let containsHtmlTags = HTML_TAGS_REG_EXP.test(text);
+  return containsHtmlTags;
 }
 
 export function isTextHtmlMath(text) {
-  let containsMathTags = HTML_MATH_TAGS_REC_EXP.test(text)
-  return containsMathTags
+  let containsMathTags = HTML_MATH_TAGS_REC_EXP.test(text);
+  return containsMathTags;
 }
 
 export function determineMimeType(text) {
-  if (isTextHtmlMath(text))
-    return MIME_TYPE_ZZISH_HTML_MATH
-  
-  if (isTextHtml(text))
-    return MIME_TYPE_HTML
+  if (isTextHtmlMath(text)) return MIME_TYPE_ZZISH_HTML_MATH;
 
-  if (isTextLatexMath(text))
-    return MIME_TYPE_TEX
+  if (isTextHtml(text)) return MIME_TYPE_HTML;
 
-  return MIME_TYPE_PLAIN_TEXT
-}
+  if (isTextLatexMath(text)) return MIME_TYPE_TEX;
 
+  return MIME_TYPE_PLAIN_TEXT;
+}
 
 // test = (text, mimeType) => {
 //   let result = determineMimeType(text)
@@ -201,4 +192,4 @@ export function determineMimeType(text) {
         {this.test("$a bcd; e$", "text/plain")}
         {this.test("$a bcd. e$", "text/plain")}
         {this.test("$a bcd> e$", "application/x-tex")}
-*/
+*/