@zzish/math-rich-input 0.1.27 → 0.1.29

package/dist/math-rich-input.css

@@ -78,136 +78,6 @@
   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 
-} */
 .EquationEditorModal-background {
   position: fixed;
   top: 0;
@@ -363,6 +233,136 @@
 .EquationEditorModal .slider.round:before {
   border-radius: 50%;
 }
+/* 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 {

package/package.json

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

package/src/MathRichInput.jsx

@@ -477,6 +477,7 @@ export default class MathRichInput extends React.Component {
         this.props.useExpertMode,
         this.props.selectedTab
       );
+      e.preventDefault()
       return;
     }
 
@@ -589,108 +590,25 @@ export default class MathRichInput extends React.Component {
     let index = rangeParams.startNodeIndex;
     let offset = rangeParams.startOffset;
 
-    let new_globalOffset = rangeParams.startGlobalOffset - 1;
-    let new_rangeParams = {
-      startGlobalOffset: new_globalOffset,
-      endGlobalOffset: new_globalOffset,
-    };
-    e.preventDefault();
-    this._setRangeParams(new_rangeParams);
-    return;
-
-    // console.log("Old: "+index+"->"+offset)
-
-    // The user shouldn't be in a katex node, but lets deal with it anyway
-    let node = this._findNodeWithIndex(index);
-    if (isKatexNode(node)) {
-      console.warn("Cursor is inside katex node");
-      let new_index = index - 1; // Jump out of the latex node
-      let prev_node = this._findNodeWithIndex(index - 1);
-      let new_offset = getNodeTextLength(prev_node);
-
-      let new_rangeParams = {
-        startNodeIndex: new_index,
-        startOffset: new_offset,
-        endNodeIndex: new_index,
-        endOffset: new_offset,
-        startGlobalOffset: new_globalOffset,
-        endGlobalOffset: new_globalOffset,
-      };
-      this._setRangeParams(new_rangeParams);
-      e.preventDefault();
-      return;
-    }
-
-    if (offset > 2) return;
-
-    let new_index = -1;
-    let new_offset = -1;
-
-    // Deal with case of inserted small space at start of <p> element or after katex node
-    if (offset === 2) {
-      new_index = index;
-      if (this.nodeStartsWithSmallSpace(node)) {
-        if (index > 0 && isKatexNode(this._findNodeWithIndex(index - 1)))
-          new_offset = 1;
-        else new_offset = 0;
-      } else new_offset = 1;
-    }
-
-    if (offset === 1) {
-      if (this.nodeStartsWithSmallSpace(node)) {
-        if (index === 0) {
-          e.preventDefault();
-          return;
-        }
-        let prev_node = this._findNodeWithIndex(index - 1);
-        if (index >= 2 && isKatexNode(prev_node)) new_index = index - 2;
-        else new_index = index - 1;
-
-        let new_node = this._findNodeWithIndex(new_index);
-        new_offset = getNodeTextLength(new_node);
-      } else {
-        new_index = index;
-        new_offset = 0;
-      }
-    }
-
-    if (offset === 0) {
-      let prev_node = this._findNodeWithIndex(index - 1);
-      if (index >= 2 && isKatexNode(prev_node)) new_index = index - 2;
-      else new_index = index - 1;
-      let new_node = this._findNodeWithIndex(new_index);
-      new_offset = getNodeTextLength(new_node);
-      if (new_offset === 1) {
-        if (this.nodeStartsWithSmallSpace(new_node)) {
-          if (index > 0 && isKatexNode(this._findNodeWithIndex(index - 1)))
-            new_offset = 1;
-          else new_offset = 0;
+    console.log("handleKeyDownArrowLeft")
+    console.log(rangeParams)
+    let new_globalOffset = rangeParams.endGlobalOffset - 1;
+    let new_rangeParams = null
+    if (e.shiftKey && new_globalOffset > rangeParams.startGlobalOffset) {
+        new_rangeParams = {
+          startGlobalOffset: rangeParams.startGlobalOffset,
+          endGlobalOffset: new_globalOffset,
         }
-      }
-    }
-
-    // Move cursor to start of field if in starting small space
-    if (
-      new_index === 0 &&
-      new_offset === 1 &&
-      this.inputStartsWithSmallSpace()
-    ) {
-      new_offset = 0;
-    }
-
-    if (new_index === -1 || new_offset === -1) return;
-    else {
-      let new_rangeParams = {
-        startNodeIndex: new_index,
-        startOffset: new_offset,
-        endNodeIndex: new_index,
-        endOffset: new_offset,
+    } else {
+      new_rangeParams = {
         startGlobalOffset: new_globalOffset,
         endGlobalOffset: new_globalOffset,
       };
-      this._setRangeParams(new_rangeParams);
-      e.preventDefault();
     }
+    console.log(new_rangeParams)
+    e.preventDefault();
+    this._setRangeParams(new_rangeParams);
+    return;
   };
 
   handleKeyDownArrowRight = (e) => {
@@ -699,103 +617,22 @@ export default class MathRichInput extends React.Component {
     let index = rangeParams.startNodeIndex;
     let offset = rangeParams.startOffset;
 
-    let new_globalOffset = rangeParams.startGlobalOffset + 1;
-    let new_rangeParams = {
-      startGlobalOffset: new_globalOffset,
-      endGlobalOffset: new_globalOffset,
-    };
-    e.preventDefault();
-    this._setRangeParams(new_rangeParams);
-    return;
-
-    if (index < 0)
-      // Empty input field
-      return;
-
-    let node = this._findNodeWithIndex(index);
-    let length = getNodeTextLength(node);
-
-    // The user shouldn't be in a katex node, but lets deal with it anyway
-    if (isKatexNode(node)) {
-      console.warn("Cursor is inside katex node");
-      let new_index = index + 1; // Jump out of the latex node
-      let new_offset = SMALL_SPACE_LENGTH; // As there will be a SMALL_SPACE at the start of the text node
-
-      let new_rangeParams = {
-        startNodeIndex: new_index,
-        startOffset: new_offset,
-        endNodeIndex: new_index,
-        endOffset: new_offset,
+    let new_rangeParams = null
+    let new_globalOffset = rangeParams.endGlobalOffset + 1;
+    if (e.shiftKey && new_globalOffset > rangeParams.startGlobalOffset) {
+      new_rangeParams = {
+        startGlobalOffset: rangeParams.startGlobalOffset,
+        endGlobalOffset: new_globalOffset,
       };
-      this._setRangeParams(new_rangeParams);
-      e.preventDefault();
-      return;
-    }
-
-    // Deal with case of inserted small space at start of <p> element
-    if (offset === 0) {
-      if (this.nodeStartsWithSmallSpace(node)) {
-        // console.log("Offset = 0 and node starts with small space");
-        let new_index = -1;
-        let new_offset = -1;
-
-        if (node.nodeValue.length > 1) {
-          new_index = index;
-          new_offset = SMALL_SPACE_LENGTH + 1;
-        } else {
-          new_index = index + 1;
-          let next_node = this._findNodeWithIndex(new_index);
-          if (next_node !== null) {
-            if (isKatexNode(next_node)) {
-              new_index = index + 2;
-              new_offset = SMALL_SPACE_LENGTH;
-            } else {
-              new_index = index + 1;
-              new_offset = 0;
-            }
-          } else {
-            new_index = index;
-            new_offset = offset;
-          }
-        }
-        let new_rangeParams = {
-          startNodeIndex: new_index,
-          startOffset: new_offset,
-          endNodeIndex: new_index,
-          endOffset: new_offset,
-        };
-        this._setRangeParams(new_rangeParams);
-
-        e.preventDefault();
-        return;
-      }
-    }
-
-    // If at the end of a text node
-    if (
-      offset === length ||
-      (index === 0 && this.inputStartsWithSmallSpace())
-    ) {
-      let next_node = this._findNodeWithIndex(index + 1);
-
-      // If there is no next node, then we can't move, so do the default action
-      // If the next node is a normal node, do the default action
-      if (next_node === null || !isKatexNode(next_node)) return;
-
-      let new_index = index + 2; // Jump over the latex node
-      let new_offset = SMALL_SPACE_LENGTH; // As there will be a SMALL_SPACE at the start of the text node
-
-      let new_rangeParams = {
-        startNodeIndex: new_index,
-        startOffset: new_offset,
-        endNodeIndex: new_index,
-        endOffset: new_offset,
+    } else {
+      new_rangeParams = {
+        startGlobalOffset: new_globalOffset,
+        endGlobalOffset: new_globalOffset,
       };
-      this._setRangeParams(new_rangeParams);
-
-      e.preventDefault();
-      return;
     }
+    e.preventDefault();
+    this._setRangeParams(new_rangeParams);
+    return;
   };
 
   editableDivIsPlainText = () => {
@@ -1306,13 +1143,14 @@ export default class MathRichInput extends React.Component {
 
   handleInput = (event) => {
     try {
-      // console.log("handleInput")
+      console.log("handleInput")
       let raw_text = elementToMarkedRawText(
         this.editableDiv,
         null,
         0,
         this.enableHtml()
       );
+      console.log("handleInput 2")
       const params = this._getRangeParams();
       if (params === null || params === undefined)
         console.error("Could not get range params from input field");
@@ -1351,6 +1189,7 @@ export default class MathRichInput extends React.Component {
 
   updateActiveButtons = () => {
     try {
+      console.log("updateActiveButtons")
       let rangeParams = this._getRangeParams();
       if (rangeParams === null || rangeParams === undefined) {
         console.warn(
@@ -1659,6 +1498,8 @@ export default class MathRichInput extends React.Component {
       let start_pos = this.markedRawText.indexOf(MARK);
       let end_pos = this.markedRawText.indexOf(MARK, start_pos + MARK.length);
       let oldRangeParams = this.getOldRangeParams();
+      console.log("Old range params")
+      console.log(oldRangeParams)
 
       // Handle case of empty string returned
       if (latex === "") {
@@ -2114,14 +1955,15 @@ export default class MathRichInput extends React.Component {
         offset,
         this.enableHtml()
       );
+
+      console.log("Raw text before line insert")
+      console.log(raw_text)
+      console.log("Range params before line insert")
+      console.log(rangeParams)
+
       let new_raw_text = null;
       let new_rangeParams = { ...rangeParams };
 
-      if (new_rangeParams.startGlobalOffset) {
-        new_rangeParams.startGlobalOffset++;
-        new_rangeParams.endGlobalOffset++;
-      }
-
       if (this.enableHtml()) {
         new_raw_text = removeMarks(
           insertCharacterBeforeMarks(raw_text, "</p><p>")
@@ -2133,6 +1975,11 @@ export default class MathRichInput extends React.Component {
         new_rangeParams.startOffset = 0;
         new_rangeParams.endNodeIndex = rangeParams.endNodeIndex + 1;
         new_rangeParams.endOffset = 0;
+        if (new_rangeParams.startGlobalOffset) {
+          new_rangeParams.startGlobalOffset++;
+          new_rangeParams.endGlobalOffset++;
+        }
+  
       } else {
         new_raw_text = removeMarks(insertCharacterBeforeMarks(raw_text, "\n"));
         new_rangeParams.startOffset++;
@@ -2144,6 +1991,12 @@ export default class MathRichInput extends React.Component {
         this.props.mimeType,
         this.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)
+
 
       this.applyChangesToComponent(
         new_raw_text,