@zzish/math-rich-input 0.1.36 → 0.1.38

package/dist/index.js

@@ -20539,7 +20539,7 @@ 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_CODES_REG_EXP = /&(#36|quot|apos|lt|gt|amp|#44|#58|#124);/;
 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;
 var HTML_MATH_TAGS_REC_EXP = /<math>/i;
 var WORDS_REG_EXP = /^[a-zA-Z]*[,."';:?!]*$/i;
@@ -20892,11 +20892,14 @@ function encodeToHtml(text) {
   text = text.replace(/'/g, "&apos;");
   text = text.replace(/"/g, "&quot;");
   text = text.replace(/\$/g, "&#36;");
+  text = text.replace(/,/g, "&#44;");
+  text = text.replace(/:/g, "&#58;");
+  text = text.replace(/\|/g, "&#124;");
   return text;
 }
 
 var decodeFromHtml = function () {
-  var translate_re = /&(#36|quot|apos|lt|gt|amp);/g,
+  var translate_re = /&(#36|quot|apos|lt|gt|amp|#44|#58|#124);/g,
       translate = {
     // 'nbsp': String.fromCharCode(160), 
     '#36': '$',
@@ -20904,7 +20907,10 @@ var decodeFromHtml = function () {
     'apos': '\'',
     'lt': '<',
     'gt': '>',
-    'amp': '&'
+    'amp': '&',
+    '#44': ',',
+    '#58': ':',
+    '#124': '|'
   },
       translator = function translator($0, $1) {
     return translate[$1];

package/dist/math-rich-input.css

@@ -208,6 +208,161 @@
   display: inline-block;
   border-bottom: 1px dotted black; /* If you want dots under the hoverable text 
 } */
+.EquationEditorModal-background {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background: black;
+  z-index: 99;
+  animation: 0.3s shade;
+  animation-fill-mode: forwards;
+}
+
+@keyframes shade {
+  00% {
+    opacity: 0;
+  }
+  100% {
+    opacity: 0.6;
+  }
+}
+
+.EquationEditorModal {
+  background: white;
+  border: 1px solid #808080;
+  border-radius: 10px;
+  box-shadow: 0px 2px 5px 1px #a0a0a0;
+  position: fixed;
+  max-width: 500px;
+  width: 98%;
+  top: 50%;
+  left: 50%;
+  /* transform: translate(-50%,-50%); */
+  z-index: 100;
+  animation: 0.3s rise;
+  animation-fill-mode: forwards;
+}
+
+@keyframes rise {
+  00% {
+    transform: translate(-50%, 100%);
+    opacity: 0;
+  }
+  100% {
+    transform: translate(-50%, -50%);
+    opacity: 1;
+  }
+}
+
+.EquationEditorModal-mobile {
+  background: white;
+  border: 1px solid #808080;
+  border-radius: 10px;
+  box-shadow: 0px 2px 5px 1px #a0a0a0;
+  position: fixed;
+  max-width: 500px;
+  width: 99%;
+  top: 0%;
+  left: 50%;
+  transform: translate(-50%, 1px);
+  z-index: 100;
+}
+
+.EquationEditorModal .title {
+  display: flex;
+  justify-content: space-between;
+  font-size: 14px;
+  color: #404040;
+  text-align: left;
+  background: #e0e0e0;
+  border: 0px;
+  border-radius: 5px 5px 0px 0px;
+  padding: 15px;
+  margin: 0px;
+}
+
+.EquationEditorModal-mobile .title {
+  display: flex;
+  justify-content: space-between;
+  font-size: 14px;
+  color: #404040;
+  text-align: left;
+  background: #e0e0e0;
+  border: 0px;
+  border-radius: 5px 5px 0px 0px;
+  height: 30px;
+  padding: 15px;
+  margin: 0px;
+}
+
+.EquationEditorModal .expertModeSwitch .switch {
+  margin-left: 10px;
+}
+
+/* The switch - the box around the slider */
+.EquationEditorModal .switch {
+  position: relative;
+  display: inline-block;
+  width: 35px;
+  height: 22px;
+}
+
+/* Hide default HTML checkbox */
+.EquationEditorModal .switch input {
+  opacity: 0;
+  width: 0;
+  height: 0;
+}
+
+/* The slider */
+.EquationEditorModal .slider {
+  position: absolute;
+  cursor: pointer;
+  top: 0;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  background-color: #ccc;
+  -webkit-transition: 0.4s;
+  transition: 0.4s;
+}
+
+.EquationEditorModal .slider:before {
+  position: absolute;
+  content: "";
+  height: 14px;
+  width: 14px;
+  left: 4px;
+  bottom: 4px;
+  background-color: white;
+  -webkit-transition: 0.4s;
+  transition: 0.4s;
+}
+
+.EquationEditorModal input:checked + .slider {
+  background-color: #663676;
+}
+
+.EquationEditorModal input:focus + .slider {
+  box-shadow: 0 0 1px #2196f3;
+}
+
+.EquationEditorModal input:checked + .slider:before {
+  -webkit-transform: translateX(13px);
+  -ms-transform: translateX(13px);
+  transform: translateX(13px);
+}
+
+/* Rounded sliders */
+.EquationEditorModal .slider.round {
+  border-radius: 18px;
+}
+
+.EquationEditorModal .slider.round:before {
+  border-radius: 50%;
+}
 /* Note that the top left position of the accent bar is set programatically in componentDidMount */
 
 .AccentBar {
@@ -383,161 +538,6 @@
   animation: 0.4s fadeIn1;
   animation-fill-mode: forwards;
 }
-.EquationEditorModal-background {
-  position: fixed;
-  top: 0;
-  left: 0;
-  width: 100%;
-  height: 100%;
-  background: black;
-  z-index: 99;
-  animation: 0.3s shade;
-  animation-fill-mode: forwards;
-}
-
-@keyframes shade {
-  00% {
-    opacity: 0;
-  }
-  100% {
-    opacity: 0.6;
-  }
-}
-
-.EquationEditorModal {
-  background: white;
-  border: 1px solid #808080;
-  border-radius: 10px;
-  box-shadow: 0px 2px 5px 1px #a0a0a0;
-  position: fixed;
-  max-width: 500px;
-  width: 98%;
-  top: 50%;
-  left: 50%;
-  /* transform: translate(-50%,-50%); */
-  z-index: 100;
-  animation: 0.3s rise;
-  animation-fill-mode: forwards;
-}
-
-@keyframes rise {
-  00% {
-    transform: translate(-50%, 100%);
-    opacity: 0;
-  }
-  100% {
-    transform: translate(-50%, -50%);
-    opacity: 1;
-  }
-}
-
-.EquationEditorModal-mobile {
-  background: white;
-  border: 1px solid #808080;
-  border-radius: 10px;
-  box-shadow: 0px 2px 5px 1px #a0a0a0;
-  position: fixed;
-  max-width: 500px;
-  width: 99%;
-  top: 0%;
-  left: 50%;
-  transform: translate(-50%, 1px);
-  z-index: 100;
-}
-
-.EquationEditorModal .title {
-  display: flex;
-  justify-content: space-between;
-  font-size: 14px;
-  color: #404040;
-  text-align: left;
-  background: #e0e0e0;
-  border: 0px;
-  border-radius: 5px 5px 0px 0px;
-  padding: 15px;
-  margin: 0px;
-}
-
-.EquationEditorModal-mobile .title {
-  display: flex;
-  justify-content: space-between;
-  font-size: 14px;
-  color: #404040;
-  text-align: left;
-  background: #e0e0e0;
-  border: 0px;
-  border-radius: 5px 5px 0px 0px;
-  height: 30px;
-  padding: 15px;
-  margin: 0px;
-}
-
-.EquationEditorModal .expertModeSwitch .switch {
-  margin-left: 10px;
-}
-
-/* The switch - the box around the slider */
-.EquationEditorModal .switch {
-  position: relative;
-  display: inline-block;
-  width: 35px;
-  height: 22px;
-}
-
-/* Hide default HTML checkbox */
-.EquationEditorModal .switch input {
-  opacity: 0;
-  width: 0;
-  height: 0;
-}
-
-/* The slider */
-.EquationEditorModal .slider {
-  position: absolute;
-  cursor: pointer;
-  top: 0;
-  left: 0;
-  right: 0;
-  bottom: 0;
-  background-color: #ccc;
-  -webkit-transition: 0.4s;
-  transition: 0.4s;
-}
-
-.EquationEditorModal .slider:before {
-  position: absolute;
-  content: "";
-  height: 14px;
-  width: 14px;
-  left: 4px;
-  bottom: 4px;
-  background-color: white;
-  -webkit-transition: 0.4s;
-  transition: 0.4s;
-}
-
-.EquationEditorModal input:checked + .slider {
-  background-color: #663676;
-}
-
-.EquationEditorModal input:focus + .slider {
-  box-shadow: 0 0 1px #2196f3;
-}
-
-.EquationEditorModal input:checked + .slider:before {
-  -webkit-transform: translateX(13px);
-  -ms-transform: translateX(13px);
-  transform: translateX(13px);
-}
-
-/* Rounded sliders */
-.EquationEditorModal .slider.round {
-  border-radius: 18px;
-}
-
-.EquationEditorModal .slider.round:before {
-  border-radius: 50%;
-}
 .EquationEditor {
   height: auto;
   text-align: center;

package/package.json

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

package/src/mathRichInputHelper.js

@@ -245,11 +245,14 @@ function encodeToHtml(text) {
   text = text.replace(/'/g,"'") 
   text = text.replace(/"/g,""") 
   text = text.replace(/\$/g,"$")
+  text = text.replace(/,/g,",")
+  text = text.replace(/:/g,":")
+  text = text.replace(/\|/g,"|")
   return text
 }
 
 var decodeFromHtml = (function() {
-  var translate_re = /&(#36|quot|apos|lt|gt|amp);/g,
+  var translate_re = /&(#36|quot|apos|lt|gt|amp|#44|#58|#124);/g,
       translate = {
           // 'nbsp': String.fromCharCode(160), 
           '#36': '$',
@@ -257,7 +260,10 @@ var decodeFromHtml = (function() {
           'apos': '\'',
           'lt'  : '<', 
           'gt'  : '>',
-          'amp' : '&'
+          'amp' : '&',
+          '#44' : ',',
+          '#58' : ':',
+          '#124' : '|'
       },
       translator = function($0, $1) { 
           return translate[$1]; 

package/src/mimeTypeHelper.js

@@ -9,7 +9,7 @@ export const MIME_TYPE_ZZISH_HTML_MATH = 'application/x-zzish-html-math';
 
 const LATEX_COMMAND_REG_EXP = /\\[a-zA-Z]/g;
 
-const HTML_CODES_REG_EXP = /&(#36|quot|apos|lt|gt|amp);/;
+const HTML_CODES_REG_EXP = /&(#36|quot|apos|lt|gt|amp|#44|#58|#124);/;
 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;