@zzish/math-rich-input 0.1.30 → 0.1.31

package/dist/index.js

@@ -21032,8 +21032,8 @@ function elementToMarkedRawText(element) {
   var nodeToMark = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
   var offset = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 0;
   var useHtmlMath = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : true;
-  console.log("elementToMarkedRawText");
-  console.log(element.innerHTML);
+  // console.log("elementToMarkedRawText")
+  // console.log(element.innerHTML)
   if (element.innerHTML === "<p><br></p>") throw new Error("We are here"); // console.log("Node to mark:")
   // console.log(nodeToMark)
 
@@ -21351,17 +21351,17 @@ function findNodeAndOffsetForGlobalOffset(node, globalOffset) {
 
   if (isTextNode(node)) {
     result.node = node;
-    result.lastTextNode = node;
-    console.log("Found text node \'" + node.nodeValue + "\' of length " + node.nodeValue.length);
-    console.log("result.offset was: " + result.offset);
+    result.lastTextNode = node; // console.log("Found text node \'"+node.nodeValue+"\' of length "+node.nodeValue.length)
+    // console.log("result.offset was: "+result.offset)
+
     result.offset += node.nodeValue.length;
 
     if (nodeStartsWithSmallSpace(node)) {
-      console.log("Text node starts with small space");
+      // console.log("Text node starts with small space")
       result.offset -= 1;
-    }
+    } // console.log("result.offset now: "+result.offset)
+
 
-    console.log("result.offset now: " + result.offset);
     return false;
   }
 
@@ -21381,10 +21381,9 @@ function findNodeAndOffsetForGlobalOffset(node, globalOffset) {
   }
 
   if (node.nodeType === 1 && node.tagName === "P") {
-    console.log("Leaving p node");
+    // console.log("Leaving p node")
     result.node = null;
-    result.offset++;
-    console.log("result.offset now: " + result.offset);
+    result.offset++; // console.log("result.offset now: "+result.offset)
   }
 
   return false;
@@ -21405,10 +21404,9 @@ function findFirstTextNode(node) {
 function findNodeAndOffsetForGlobalOffsetInEditableDiv(editableDiv, globalOffset) {
   var result = {
     offset: 0
-  };
-  console.log("Finding node and offset within: " + editableDiv.outerHTML);
-  findNodeAndOffsetForGlobalOffset(editableDiv, globalOffset, result);
-  console.log(result);
+  }; // console.log("Finding node and offset within: "+editableDiv.outerHTML)
+
+  findNodeAndOffsetForGlobalOffset(editableDiv, globalOffset, result); // console.log(result)
 
   if (result.node === null) {
     if (globalOffset > 0 && result.lastTextNode !== null) {
@@ -21441,8 +21439,8 @@ function findNodeAndOffsetForGlobalOffsetInEditableDiv(editableDiv, globalOffset
 
 
 function getRangeParams(editableDiv) {
-  console.log("getRangeParams"); // console.log("Inner html: "+editableDiv.innerHTML)
-
+  // console.log ("getRangeParams")
+  // console.log("Inner html: "+editableDiv.innerHTML)
   var isSupported = typeof window.getSelection !== "undefined";
 
   if (!isSupported) {
@@ -21523,12 +21521,11 @@ function setRangeParamsFromGlobalOffsets(editableDiv, params) {
     var startResult = findNodeAndOffsetForGlobalOffsetInEditableDiv(editableDiv, params.startGlobalOffset);
     var endResult = findNodeAndOffsetForGlobalOffsetInEditableDiv(editableDiv, params.endGlobalOffset);
 
-    if (startResult.node !== null) {
-      console.log("Setting range to start in node:");
-      console.log("  node type: " + startResult.node.nodeType);
-      console.log("  tag name: " + startResult.node.tagName);
-      console.log("  node value: " + startResult.node.nodeValue);
-      console.log("  offset:" + startResult.offset);
+    if (startResult.node !== null) {// console.log("Setting range to start in node:")
+      // console.log("  node type: "+startResult.node.nodeType)
+      // console.log("  tag name: "+startResult.node.tagName)
+      // console.log("  node value: "+startResult.node.nodeValue)
+      // console.log("  offset:"+startResult.offset)
     } else {
       console.warn("Can't set range, null start node returned");
       return;
@@ -21561,14 +21558,13 @@ function setRangeParams(editableDiv, params) {
 
 
     if (params.startGlobalOffset !== null && params.startGlobalOffset !== undefined) {
-      console.log("Setting range from global offsets");
+      // console.log("Setting range from global offsets")
       setRangeParamsFromGlobalOffsets(editableDiv, params);
       return;
     } // Otherwise use the old way of doing things
+    // console.log("Setting range from node index and local offset")
 
 
-    console.log("Setting range from node index and local offset");
-
     if (params.startNodeIndex === null || params.startNodeIndex === undefined) {
       console.error("Can't set range params: params.startNodeIndex === " + params.startNodeIndex);
       return;
@@ -21594,17 +21590,17 @@ function setRangeParams(editableDiv, params) {
     if (params.endNodeIndex === 0 && params.endOffset === 1 && isSmallSpace(nodes[0])) endOffset = 0; // Find the nodes
 
     var startNode = findNodeWithIndex(editableDiv, params.startNodeIndex);
-    var endNode = findNodeWithIndex(editableDiv, params.endNodeIndex);
-    console.log("Setting range to start in node:");
-    console.log("  node type: " + startNode.nodeType);
-    console.log("  tag name: " + startNode.tagName);
-    console.log("  node value: " + startNode.nodeValue);
-    console.log("  offset:" + startOffset);
-    console.log("Setting range to end in node:");
-    console.log("  node type: " + endNode.nodeType);
-    console.log("  tag name: " + endNode.tagName);
-    console.log("  node value: " + endNode.nodeValue);
-    console.log("  offset:" + endOffset); // Set range in document
+    var endNode = findNodeWithIndex(editableDiv, params.endNodeIndex); // console.log("Setting range to start in node:")
+    // console.log("  node type: "+startNode.nodeType)
+    // console.log("  tag name: "+startNode.tagName)
+    // console.log("  node value: "+startNode.nodeValue)
+    // console.log("  offset:"+startOffset)
+    // console.log("Setting range to end in node:")
+    // console.log("  node type: "+endNode.nodeType)
+    // console.log("  tag name: "+endNode.tagName)
+    // console.log("  node value: "+endNode.nodeValue)
+    // console.log("  offset:"+endOffset)
+    // Set range in document
 
     if (startNode === null) {
       console.warn("Could not set range to start node with index " + params.startNodeIndex);
@@ -22104,7 +22100,7 @@ var MathRichInput = /*#__PURE__*/function (_React$Component) {
       }
 
       if (deleteToEmpty) {
-        console.log("deleteToEmpty");
+        // console.log("deleteToEmpty")
         var _new_rangeParams = {
           startNodeIndex: 0,
           startOffset: 1,
@@ -22201,9 +22197,9 @@ var MathRichInput = /*#__PURE__*/function (_React$Component) {
       var rangeParams = _this2._getRangeParams();
 
       rangeParams.startNodeIndex;
-      rangeParams.startOffset;
-      console.log("handleKeyDownArrowLeft");
-      console.log(rangeParams);
+      rangeParams.startOffset; // console.log("handleKeyDownArrowLeft")
+      // console.log(rangeParams)
+
       var new_globalOffset = rangeParams.endGlobalOffset - 1;
       var new_rangeParams = null;
 
@@ -22217,9 +22213,9 @@ var MathRichInput = /*#__PURE__*/function (_React$Component) {
           startGlobalOffset: new_globalOffset,
           endGlobalOffset: new_globalOffset
         };
-      }
+      } // console.log(new_rangeParams)
+
 
-      console.log(new_rangeParams);
       e.preventDefault();
 
       _this2._setRangeParams(new_rangeParams);
@@ -22371,8 +22367,8 @@ var MathRichInput = /*#__PURE__*/function (_React$Component) {
 
       if (new_accent === "") _this2.accent = "";else {
         e.preventDefault();
-        _this2.accent = new_accent;
-        console.log("Accent set: " + _this2.accent);
+        _this2.accent = new_accent; // console.log("Accent set: " + this.accent);
+
         return true;
       }
 
@@ -22437,41 +22433,43 @@ var MathRichInput = /*#__PURE__*/function (_React$Component) {
           if (e.key === "i") _this2.styleText(e, "Italic");
           if (e.key === "u") _this2.styleText(e, "Underline"); // Don't apply superscript is ctrl ^, this is reserved for creating accents
 
-          if (/(Win)/i.test(window.navigator.platform) && e.ctrlKey && (e.key === "6" || e.key === "^")) return; // otherwise
-
-          if (e.key === "6" || e.key === "^" || e.key === "+" || e.key === "=") _this2.styleText(e, "Superscript"); // Don't apply subscript if it is the browser command key for "smaller"
-          // if (/(Win)/i.test(window.navigator.platform) && e.ctrlKey && e.key === "-")
-          //   return
-          // if (/(Mac)/i.test(window.navigator.platform) && e.metaKey && e.key === "-")
-          //   return
-          // otherwise
-
-          if (e.key === "-" || e.key === "_") _this2.styleText(e, "Subscript");
-          e.preventDefault();
-          return;
+          if (/(Win)/i.test(window.navigator.platform) && e.ctrlKey && (e.key === "6" || e.key === "^")) {// do nothing
+          } else {
+            // otherwise
+            if (e.key === "6" || e.key === "^" || e.key === "+" || e.key === "=") _this2.styleText(e, "Superscript"); // Don't apply subscript if it is the browser command key for "smaller"
+            // if (/(Win)/i.test(window.navigator.platform) && e.ctrlKey && e.key === "-")
+            //   return
+            // if (/(Mac)/i.test(window.navigator.platform) && e.metaKey && e.key === "-")
+            //   return
+            // otherwise
+
+            if (e.key === "-" || e.key === "_") _this2.styleText(e, "Subscript");
+            e.preventDefault();
+            return;
+          }
         }
 
         if ((e.metaKey || e.ctrlKey) && e.key === "v") {
-          console.log("Executing paste");
+          // console.log("Executing paste");
           document.execCommand("paste");
           return;
         }
 
         if ((e.metaKey || e.ctrlKey) && e.key === "c") {
-          console.log("Executing copy");
+          // console.log("Executing copy");
           document.execCommand("copy");
           return;
         }
 
         if ((e.metaKey || e.ctrlKey) && e.key === "x") {
-          console.log("Executing cut");
+          // console.log("Executing cut");
           document.execCommand("cut");
           return;
         } // Ignore automatic key repeat presses on Windows so that we can show an accent bar on
         // long key press
 
 
-        if (!/(Win)/i.test(window.navigator.platform)) {
+        if (/(Win)/i.test(window.navigator.platform)) {
           if (e.key === _this2.keyPressed && _this2.keyPressStartTime > 0) {
             if (e.key.length === 1 && ("a" <= e.key && e.key <= "z" || "A" <= e.key && e.key <= "Z" || e.key === "!" || e.key === "?")) {
               e.preventDefault();
@@ -22484,15 +22482,20 @@ var MathRichInput = /*#__PURE__*/function (_React$Component) {
           var key = _this2.fetchAccentLetter();
 
           if (key === "a" || key === "e" || key === "i" || key === "o" || key === "u" || key === "c" || key === "l" || key === "n" || key === "s" || key === "?" || key === "!") {
+            console.log("showing/hiding accent bar");
+
             _this2.setState({
               showAccentBar: !_this2.state.showAccentBar
             });
           } else {
+            console.log("hiding accent bar");
+
             _this2.setState({
               showAccentBar: false
             });
           }
 
+          e.preventDefault();
           return;
         }
 
@@ -22507,9 +22510,14 @@ var MathRichInput = /*#__PURE__*/function (_React$Component) {
 
         if (_this2.keyPressStartTime < 0) {
           _this2.keyPressStartTime = Date.now();
-          if (_this2.state.showAccentBar) _this2.setState({
-            showAccentBar: false
-          });
+
+          if (_this2.state.showAccentBar) {
+            console.log("Hiding accent bar 2");
+
+            _this2.setState({
+              showAccentBar: false
+            });
+          }
         }
 
         if (e.key === "Backspace") {
@@ -22603,8 +22611,7 @@ var MathRichInput = /*#__PURE__*/function (_React$Component) {
 
         if (e.key.length === 1 && // ie, it's not something like "arrowLeft"
         params.startOffset === 0 && _this2.nodeStartsWithSmallSpace(startNode)) {
-          console.log("Handling character input at start of text node with small space");
-
+          // console.log("Handling character input at start of text node with small space")
           _this2.insertAfterSmallSpace(e.key, params);
 
           e.preventDefault();
@@ -22703,9 +22710,8 @@ var MathRichInput = /*#__PURE__*/function (_React$Component) {
 
     _defineProperty(_assertThisInitialized(_this2), "handleInput", function (event) {
       try {
-        console.log("handleInput");
+        // console.log("handleInput")
         var raw_text = elementToMarkedRawText(_this2.editableDiv, null, 0, _this2.enableHtml());
-        console.log("handleInput 2");
 
         var params = _this2._getRangeParams();
 
@@ -22727,8 +22733,7 @@ var MathRichInput = /*#__PURE__*/function (_React$Component) {
 
     _defineProperty(_assertThisInitialized(_this2), "updateActiveButtons", function () {
       try {
-        console.log("updateActiveButtons");
-
+        // console.log("updateActiveButtons")
         var rangeParams = _this2._getRangeParams();
 
         if (rangeParams === null || rangeParams === undefined) {
@@ -22797,20 +22802,21 @@ var MathRichInput = /*#__PURE__*/function (_React$Component) {
       if (clipboardData === null || clipboardData === undefined) {
         console.warn("handlePaste called, but no clipboard data");
         return;
-      }
+      } // for (let i = 0; i < clipboardData.types.length; i++)
+      //   console.log(
+      //     clipboardData.types[i] +
+      //       ": " +
+      //       clipboardData.getData(clipboardData.types[i])
+      //   );
 
-      for (var i = 0; i < clipboardData.types.length; i++) {
-        console.log(clipboardData.types[i] + ": " + clipboardData.getData(clipboardData.types[i]));
-      }
 
       var pasteHtml = clipboardData.getData("text/html");
 
       if (pasteHtml !== null && pasteHtml.length > 0) {
-        console.log("** Paste html");
-        console.log(pasteHtml);
-        pasteHtml = sanitiseHtml(pasteHtml);
-        console.log("** Santised paste html");
-        console.log(pasteHtml);
+        // console.log("** Paste html");
+        // console.log(pasteHtml);
+        pasteHtml = sanitiseHtml(pasteHtml); // console.log("** Santised paste html");
+        // console.log(pasteHtml);
 
         _this2.insertHtml(pasteHtml);
 
@@ -22866,9 +22872,9 @@ var MathRichInput = /*#__PURE__*/function (_React$Component) {
         // console.log(node)
 
         if (node === null || node === undefined) {
-          console.error("Could not find node with index: " + rangeParams.startNodeIndex);
-          console.log("Child nodes:");
-          console.log(_this2.editableDiv.childNodes);
+          console.error("Could not find node with index: " + rangeParams.startNodeIndex); // console.log("Child nodes:");
+          // console.log(this.editableDiv.childNodes);
+
           node = _this2._findFirstTextNode();
           offset = 0;
         }
@@ -23011,10 +23017,10 @@ var MathRichInput = /*#__PURE__*/function (_React$Component) {
 
         var end_pos = _this2.markedRawText.indexOf(MARK, start_pos + MARK.length);
 
-        var oldRangeParams = _this2.getOldRangeParams();
+        var oldRangeParams = _this2.getOldRangeParams(); // console.log("Old range params")
+        // console.log(oldRangeParams)
+        // Handle case of empty string returned
 
-        console.log("Old range params");
-        console.log(oldRangeParams); // Handle case of empty string returned
 
         if (latex === "") {
           // console.log("Empty latex returned from equation editor")
@@ -23198,21 +23204,25 @@ var MathRichInput = /*#__PURE__*/function (_React$Component) {
 
         var new_rangeParams = _objectSpread2({}, rangeParams);
 
-        new_raw_text = removeMarks(insertCharacterBeforeMarks(raw_text, new_text)); // console.log("New raw text:")
-        // console.log(new_raw_text)
-        // if (rangeParams.startNodeIndex === rangeParams.endNodeIndex &&
-        //     rangeParams.startOffset === rangeParams.endOffset)
-        //   new_rangeParams.startOffset = new_rangeParams.startOffset + new_text.length
-
-        new_rangeParams.endOffset = new_rangeParams.endOffset + new_text.length;
+        new_raw_text = removeMarks(insertCharacterBeforeMarks(raw_text, new_text)); // console.log("Range params before insert")
+        // console.log(rangeParams)
 
-        if (!selectInsertedText) {
-          new_rangeParams.startNodeIndex = new_rangeParams.endNodeIndex;
-          new_rangeParams.startOffset = new_rangeParams.endOffset;
-        } // console.log("Setting new range params: ")
+        if (selectInsertedText) {
+          new_rangeParams.startNodeIndex = rangeParams.endNodeIndex;
+          new_rangeParams.startOffset = rangeParams.endOffset;
+          new_rangeParams.endNodeIndex = rangeParams.endNodeIndex;
+          new_rangeParams.endOffset = rangeParams.endOffset + new_text.length;
+          new_rangeParams.startGlobalOffset = rangeParams.endGlobalOffset;
+          new_rangeParams.endGlobalOffset = rangeParams.endGlobalOffset + new_text.length;
+        } else {
+          new_rangeParams.startNodeIndex = rangeParams.endNodeIndex;
+          new_rangeParams.startOffset = rangeParams.endOffset + new_text.length;
+          new_rangeParams.endNodeIndex = rangeParams.endNodeIndex;
+          new_rangeParams.endOffset = rangeParams.endOffset + new_text.length;
+          new_rangeParams.startGlobalOffset = rangeParams.endGlobalOffset + new_text.length;
+          new_rangeParams.endGlobalOffset = rangeParams.endGlobalOffset + new_text.length;
+        } // console.log("Range params after insert")
         // console.log(new_rangeParams)
-        // console.log("Setting new mime-type: ")
-        // console.log(this.props.mimeType)
 
 
         new_raw_text = removeEncodingIfPlainText(new_raw_text, _this2.props.mimeType, _this2.enableHtml());
@@ -23400,11 +23410,11 @@ var MathRichInput = /*#__PURE__*/function (_React$Component) {
         var node = _this2._findNodeWithIndex(rangeParams.endNodeIndex);
 
         var offset = rangeParams.endOffset;
-        var raw_text = elementToMarkedRawText(_this2.editableDiv, node, offset, _this2.enableHtml());
-        console.log("Raw text before line insert");
-        console.log(raw_text);
-        console.log("Range params before line insert");
-        console.log(rangeParams);
+        var raw_text = elementToMarkedRawText(_this2.editableDiv, node, offset, _this2.enableHtml()); // console.log("Raw text before line insert")
+        // console.log(raw_text)
+        // console.log("Range params before line insert")
+        // console.log(rangeParams)
+
         var new_raw_text = null;
 
         var new_rangeParams = _objectSpread2({}, rangeParams);
@@ -23427,11 +23437,10 @@ var MathRichInput = /*#__PURE__*/function (_React$Component) {
           new_rangeParams.endOffset++;
         }
 
-        new_raw_text = removeEncodingIfPlainText(new_raw_text, _this2.props.mimeType, _this2.enableHtml());
-        console.log("New raw text after line insert");
-        console.log(new_raw_text);
-        console.log("New range params after line insert");
-        console.log(new_rangeParams);
+        new_raw_text = removeEncodingIfPlainText(new_raw_text, _this2.props.mimeType, _this2.enableHtml()); // console.log("New raw text after line insert")
+        // console.log(new_raw_text)
+        // console.log("New range params after line insert")
+        // console.log(new_rangeParams)
 
         _this2.applyChangesToComponent(new_raw_text, _this2.props.mimeType, new_rangeParams, _this2.props.useExpertMode, _this2.props.selectedTab);
       } catch (error) {
@@ -23479,6 +23488,8 @@ var MathRichInput = /*#__PURE__*/function (_React$Component) {
       try {
         _this2.insertAccentLetter(event, oldCharacter, newCharacter);
 
+        console.log("Hiding accent bar 3");
+
         _this2.setState({
           showAccentBar: false
         });
@@ -23517,6 +23528,8 @@ var MathRichInput = /*#__PURE__*/function (_React$Component) {
       }
 
       try {
+        console.log("Hiding accent bar 4");
+
         _this2.setState({
           hasFocus: false,
           showAccentBar: false
@@ -23695,8 +23708,7 @@ var MathRichInput = /*#__PURE__*/function (_React$Component) {
     key: "componentDidUpdate",
     value: function componentDidUpdate() {
       try {
-        console.log("componentDidUpdate");
-
+        // console.log("componentDidUpdate")
         if (this.afterComponentUpdateData !== null && this.afterComponentUpdateData !== undefined && this.afterComponentUpdateData.value === this.props.value) {
           this._setRangeParams(this.afterComponentUpdateData.rangeParams);