@pie-lib/math-input 6.6.1-next.45 → 6.6.1-next.506

package/lib/mq/input.js

@@ -1,45 +1,43 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = exports.Input = void 0;
 
-var _react = _interopRequireDefault(require("react"));
-
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
-var _styles = require("@material-ui/core/styles");
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
-var _debug = _interopRequireDefault(require("debug"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 
-var _classnames = _interopRequireDefault(require("classnames"));
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
 
-var _customElements = require("./custom-elements");
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 
-var _mathquill = _interopRequireDefault(require("@pie-framework/mathquill"));
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 
-function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+var _react = _interopRequireDefault(require("react"));
 
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+var _propTypes = _interopRequireDefault(require("prop-types"));
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+var _styles = require("@material-ui/core/styles");
 
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+var _debug = _interopRequireDefault(require("debug"));
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+var _classnames = _interopRequireDefault(require("classnames"));
 
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+var _customElements = require("./custom-elements");
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+var _mathquill = _interopRequireDefault(require("@pie-framework/mathquill"));
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 var MQ;
 
@@ -56,25 +54,22 @@ var log = (0, _debug["default"])('math-input:mq:input');
  * Wrapper for MathQuill MQ.MathField.
  */
 
-var Input =
-/*#__PURE__*/
-function (_React$Component) {
-  _inherits(Input, _React$Component);
+var Input = /*#__PURE__*/function (_React$Component) {
+  (0, _inherits2["default"])(Input, _React$Component);
 
-  function Input() {
-    var _getPrototypeOf2;
+  var _super = _createSuper(Input);
 
+  function Input() {
     var _this;
 
-    _classCallCheck(this, Input);
+    (0, _classCallCheck2["default"])(this, Input);
 
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
 
-    _this = _possibleConstructorReturn(this, (_getPrototypeOf2 = _getPrototypeOf(Input)).call.apply(_getPrototypeOf2, [this].concat(args)));
-
-    _defineProperty(_assertThisInitialized(_this), "onInputEdit", function () {
+    _this = _super.call.apply(_super, [this].concat(args));
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onInputEdit", function () {
       log('[onInputEdit] ...');
       var onChange = _this.props.onChange;
 
@@ -86,14 +81,12 @@ function (_React$Component) {
         onChange(_this.mathField.latex());
       }
     });
-
-    _defineProperty(_assertThisInitialized(_this), "refresh", function () {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "refresh", function () {
       _this.blur();
 
       _this.focus();
     });
-
-    _defineProperty(_assertThisInitialized(_this), "onKeyPress", function (event) {
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onKeyPress", function (event) {
       var keys = Object.keys(_this.mathField.__controller.options);
 
       if (keys.indexOf('ignoreNextMousedown') < 0) {
@@ -111,12 +104,48 @@ function (_React$Component) {
 
         _this.onInputEdit();
       }
-    });
 
+      if (event.charCode === 47) {
+        // Whenever the math editor cursor is positioned after an integer
+        // (i.e. a sequence of 1 or more digits) followed immediately by a space followed immediately by another integer,
+        // then a side effect of pressing the forward slash key or clicking the B fraction button should be to remove
+        // the space between the first integer and the second integer (which is now the numerator of a new fraction).
+        // E.g. if the user were trying to enter the mixed number one and two-thirds, and typed [1], [space], [2], [forward slash],
+        // producing the latex 1\ \frac{2}{|} (where | is not actually part of the representation, but rather
+        // represents the position of the cursor), this should be automatically transformed to 1\frac{2}{|}
+        // (with | again representing the position of the cursor).
+        // Similarly, if the user had typed [1], [2], [space], [3], [4], [forward slash], then the resulting representation should
+        // be transformed from 12\ \frac{34}{|} to 12\frac{34}{|}.
+        var latex = _this.mathField.latex();
+
+        if (latex.match(/([1-9])\\ /)) {
+          event.preventDefault();
+          event.stopPropagation();
+
+          _this.clear();
+
+          var indexOfSpace = latex.lastIndexOf('\\ '); // split the latex by the last space added
+
+          var firstPart = latex.slice(0, indexOfSpace);
+          var secondPart = latex.slice(indexOfSpace + 2); // reconstruct the latex without the extra space
+
+          var newLatex = firstPart + '\\frac{' + secondPart + '}{}';
+
+          _this.mathField.latex(newLatex); // trigger pressing keydown to move focus on the denominator
+
+
+          _this.mathField.el().dispatchEvent(new KeyboardEvent('keydown', {
+            keyCode: 37
+          }));
+
+          _this.onInputEdit();
+        }
+      }
+    });
     return _this;
   }
 
-  _createClass(Input, [{
+  (0, _createClass2["default"])(Input, [{
     key: "componentDidMount",
     value: function componentDidMount() {
       if (!MQ) {
@@ -217,7 +246,7 @@ function (_React$Component) {
           onBlur = _this$props.onBlur,
           classes = _this$props.classes,
           className = _this$props.className;
-      return _react["default"].createElement("span", {
+      return /*#__PURE__*/_react["default"].createElement("span", {
         className: (0, _classnames["default"])(classes.input, className),
         onKeyPress: this.onKeyPress,
         onClick: onClick,
@@ -229,13 +258,11 @@ function (_React$Component) {
       });
     }
   }]);
-
   return Input;
 }(_react["default"].Component);
 
 exports.Input = Input;
-
-_defineProperty(Input, "propTypes", {
+(0, _defineProperty2["default"])(Input, "propTypes", {
   className: _propTypes["default"].string,
   classes: _propTypes["default"].object.isRequired,
   onClick: _propTypes["default"].func,

package/lib/mq/input.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/mq/input.jsx"],"names":["MQ","window","MathQuill","getInterface","registerEmbed","log","Input","onChange","props","mathField","latex","blur","focus","event","keys","Object","__controller","options","indexOf","refresh","charCode","write","onInputEdit","Error","MathField","input","handlers","edit","bind","updateLatex","v","Array","isArray","forEach","vv","cmd","keystroke","nextProps","onClick","onFocus","onBlur","classes","className","onKeyPress","r","React","Component","PropTypes","string","object","isRequired","func","styles"],"mappings":"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","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { withStyles } from '@material-ui/core/styles';\nimport debug from 'debug';\nimport classNames from 'classnames';\nimport { registerLineBreak } from './custom-elements';\nimport MathQuill from '@pie-framework/mathquill';\n\nlet MQ;\nif (typeof window !== 'undefined') {\n  MQ = MathQuill.getInterface(2);\n\n  if (MQ && MQ.registerEmbed) {\n    registerLineBreak(MQ);\n  }\n}\n\nconst log = debug('math-input:mq:input');\n\n/**\n * Wrapper for MathQuill MQ.MathField.\n */\nexport class Input extends React.Component {\n  static propTypes = {\n    className: PropTypes.string,\n    classes: PropTypes.object.isRequired,\n    onClick: PropTypes.func,\n    onChange: PropTypes.func,\n    latex: PropTypes.string,\n    onFocus: PropTypes.func,\n    onBlur: PropTypes.func\n  };\n\n  componentDidMount() {\n    if (!MQ) {\n      throw new Error('MQ is not defined - but component has mounted?');\n    }\n\n    this.mathField = MQ.MathField(this.input, {\n      handlers: {\n        edit: this.onInputEdit.bind(this)\n      }\n    });\n\n    this.updateLatex();\n  }\n\n  componentDidUpdate() {\n    this.updateLatex();\n  }\n\n  updateLatex() {\n    if (!this.mathField) {\n      return;\n    }\n    const { latex } = this.props;\n    if (latex) {\n      this.mathField.latex(latex);\n    }\n  }\n\n  clear() {\n    this.mathField.latex('');\n    return '';\n  }\n\n  blur() {\n    log('blur mathfield');\n    this.mathField.blur();\n  }\n\n  focus() {\n    log('focus mathfield...');\n    this.mathField.focus();\n  }\n\n  command(v) {\n    log('command: ', v);\n    if (Array.isArray(v)) {\n      v.forEach(vv => {\n        this.mathField.cmd(vv);\n      });\n    } else {\n      this.mathField.cmd(v);\n    }\n    this.mathField.focus();\n    return this.mathField.latex();\n  }\n\n  keystroke(v) {\n    this.mathField.keystroke(v);\n    this.mathField.focus();\n    return this.mathField.latex();\n  }\n\n  write(v) {\n    log('write: ', v);\n    this.mathField.write(v);\n    this.mathField.focus();\n    return this.mathField.latex();\n  }\n\n  onInputEdit = () => {\n    log('[onInputEdit] ...');\n    const { onChange } = this.props;\n    if (!this.mathField) {\n      return;\n    }\n\n    if (onChange) {\n      onChange(this.mathField.latex());\n    }\n  };\n\n  refresh = () => {\n    this.blur();\n    this.focus();\n  };\n\n  onKeyPress = event => {\n    const keys = Object.keys(this.mathField.__controller.options);\n\n    if (keys.indexOf('ignoreNextMousedown') < 0) {\n      // It seems like the controller has the above handler as an option\n      // when all the right events are set and everything works fine\n      // this seems to work in all cases\n      this.refresh();\n    }\n\n    if (event.charCode === 13) {\n      // if enter's pressed, we're going for a custom embedded element that'll\n      // have a block display (empty div) - for a hacked line break using ccs\n      // all because mathquill doesn't support a line break\n      this.write('\\\\embed{newLine}[]');\n      this.onInputEdit();\n    }\n  };\n\n  shouldComponentUpdate(nextProps) {\n    log('next: ', nextProps.latex);\n    log('current: ', this.mathField.latex());\n    return nextProps.latex !== this.mathField.latex();\n  }\n\n  render() {\n    const { onClick, onFocus, onBlur, classes, className } = this.props;\n\n    return (\n      <span\n        className={classNames(classes.input, className)}\n        onKeyPress={this.onKeyPress}\n        onClick={onClick}\n        onFocus={onFocus}\n        onBlur={onBlur}\n        ref={r => (this.input = r)}\n      />\n    );\n  }\n}\n\nconst styles = () => ({});\n\nexport default withStyles(styles)(Input);\n"],"file":"input.js"}
+{"version":3,"file":"input.js","names":["MQ","window","MathQuill","getInterface","registerEmbed","registerLineBreak","log","debug","Input","onChange","props","mathField","latex","blur","focus","event","keys","Object","__controller","options","indexOf","refresh","charCode","write","onInputEdit","match","preventDefault","stopPropagation","clear","indexOfSpace","lastIndexOf","firstPart","slice","secondPart","newLatex","el","dispatchEvent","KeyboardEvent","keyCode","Error","MathField","input","handlers","edit","bind","updateLatex","v","Array","isArray","forEach","vv","cmd","keystroke","nextProps","onClick","onFocus","onBlur","classes","className","classNames","onKeyPress","r","React","Component","PropTypes","string","object","isRequired","func","styles","withStyles"],"sources":["../../src/mq/input.jsx"],"sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport { withStyles } from '@material-ui/core/styles';\nimport debug from 'debug';\nimport classNames from 'classnames';\nimport { registerLineBreak } from './custom-elements';\nimport MathQuill from '@pie-framework/mathquill';\n\nlet MQ;\nif (typeof window !== 'undefined') {\n  MQ = MathQuill.getInterface(2);\n\n  if (MQ && MQ.registerEmbed) {\n    registerLineBreak(MQ);\n  }\n}\n\nconst log = debug('math-input:mq:input');\n\n/**\n * Wrapper for MathQuill MQ.MathField.\n */\nexport class Input extends React.Component {\n  static propTypes = {\n    className: PropTypes.string,\n    classes: PropTypes.object.isRequired,\n    onClick: PropTypes.func,\n    onChange: PropTypes.func,\n    latex: PropTypes.string,\n    onFocus: PropTypes.func,\n    onBlur: PropTypes.func\n  };\n\n  componentDidMount() {\n    if (!MQ) {\n      throw new Error('MQ is not defined - but component has mounted?');\n    }\n\n    this.mathField = MQ.MathField(this.input, {\n      handlers: {\n        edit: this.onInputEdit.bind(this)\n      }\n    });\n\n    this.updateLatex();\n  }\n\n  componentDidUpdate() {\n    this.updateLatex();\n  }\n\n  updateLatex() {\n    if (!this.mathField) {\n      return;\n    }\n    const { latex } = this.props;\n    if (latex) {\n      this.mathField.latex(latex);\n    }\n  }\n\n  clear() {\n    this.mathField.latex('');\n    return '';\n  }\n\n  blur() {\n    log('blur mathfield');\n    this.mathField.blur();\n  }\n\n  focus() {\n    log('focus mathfield...');\n    this.mathField.focus();\n  }\n\n  command(v) {\n    log('command: ', v);\n    if (Array.isArray(v)) {\n      v.forEach(vv => {\n        this.mathField.cmd(vv);\n      });\n    } else {\n      this.mathField.cmd(v);\n    }\n    this.mathField.focus();\n    return this.mathField.latex();\n  }\n\n  keystroke(v) {\n    this.mathField.keystroke(v);\n    this.mathField.focus();\n    return this.mathField.latex();\n  }\n\n  write(v) {\n    log('write: ', v);\n    this.mathField.write(v);\n    this.mathField.focus();\n    return this.mathField.latex();\n  }\n\n  onInputEdit = () => {\n    log('[onInputEdit] ...');\n    const { onChange } = this.props;\n    if (!this.mathField) {\n      return;\n    }\n\n    if (onChange) {\n      onChange(this.mathField.latex());\n    }\n  };\n\n  refresh = () => {\n    this.blur();\n    this.focus();\n  };\n\n  onKeyPress = event => {\n    const keys = Object.keys(this.mathField.__controller.options);\n\n    if (keys.indexOf('ignoreNextMousedown') < 0) {\n      // It seems like the controller has the above handler as an option\n      // when all the right events are set and everything works fine\n      // this seems to work in all cases\n      this.refresh();\n    }\n\n    if (event.charCode === 13) {\n      // if enter's pressed, we're going for a custom embedded element that'll\n      // have a block display (empty div) - for a hacked line break using ccs\n      // all because mathquill doesn't support a line break\n      this.write('\\\\embed{newLine}[]');\n      this.onInputEdit();\n    }\n\n    if (event.charCode === 47) {\n      // Whenever the math editor cursor is positioned after an integer\n      // (i.e. a sequence of 1 or more digits) followed immediately by a space followed immediately by another integer,\n      // then a side effect of pressing the forward slash key or clicking the B fraction button should be to remove\n      // the space between the first integer and the second integer (which is now the numerator of a new fraction).\n      // E.g. if the user were trying to enter the mixed number one and two-thirds, and typed [1], [space], [2], [forward slash],\n      // producing the latex 1\\ \\frac{2}{|} (where | is not actually part of the representation, but rather\n      // represents the position of the cursor), this should be automatically transformed to 1\\frac{2}{|}\n      // (with | again representing the position of the cursor).\n      // Similarly, if the user had typed [1], [2], [space], [3], [4], [forward slash], then the resulting representation should\n      // be transformed from 12\\ \\frac{34}{|} to 12\\frac{34}{|}.\n      const latex = this.mathField.latex();\n\n      if (latex.match(/([1-9])\\\\ /)) {\n        event.preventDefault();\n        event.stopPropagation();\n\n        this.clear();\n\n        const indexOfSpace = latex.lastIndexOf('\\\\ ');\n        // split the latex by the last space added\n        const firstPart = latex.slice(0, indexOfSpace);\n        const secondPart = latex.slice(indexOfSpace + 2);\n\n        // reconstruct the latex without the extra space\n        const newLatex = firstPart + '\\\\frac{' + secondPart + '}{}';\n\n        this.mathField.latex(newLatex);\n        // trigger pressing keydown to move focus on the denominator\n        this.mathField.el().dispatchEvent(new KeyboardEvent('keydown', { keyCode: 37 }));\n\n        this.onInputEdit();\n      }\n    }\n  };\n\n  shouldComponentUpdate(nextProps) {\n    log('next: ', nextProps.latex);\n    log('current: ', this.mathField.latex());\n    return nextProps.latex !== this.mathField.latex();\n  }\n\n  render() {\n    const { onClick, onFocus, onBlur, classes, className } = this.props;\n\n    return (\n      <span\n        className={classNames(classes.input, className)}\n        onKeyPress={this.onKeyPress}\n        onClick={onClick}\n        onFocus={onFocus}\n        onBlur={onBlur}\n        ref={r => (this.input = r)}\n      />\n    );\n  }\n}\n\nconst styles = () => ({});\n\nexport default withStyles(styles)(Input);\n"],"mappings":"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"}

package/lib/mq/static.js

@@ -1,41 +1,39 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports["default"] = void 0;
 
-var _propTypes = _interopRequireDefault(require("prop-types"));
-
-var _react = _interopRequireDefault(require("react"));
-
-var _debug = _interopRequireDefault(require("debug"));
+var _classCallCheck2 = _interopRequireDefault(require("@babel/runtime/helpers/classCallCheck"));
 
-var _mathquill = _interopRequireDefault(require("@pie-framework/mathquill"));
+var _createClass2 = _interopRequireDefault(require("@babel/runtime/helpers/createClass"));
 
-var _index = require("../index");
+var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
 
-function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+var _possibleConstructorReturn2 = _interopRequireDefault(require("@babel/runtime/helpers/possibleConstructorReturn"));
 
-function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+var _getPrototypeOf2 = _interopRequireDefault(require("@babel/runtime/helpers/getPrototypeOf"));
 
-function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+var _propTypes = _interopRequireDefault(require("prop-types"));
 
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+var _react = _interopRequireDefault(require("react"));
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+var _debug = _interopRequireDefault(require("debug"));
 
-function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
+var _mathquill = _interopRequireDefault(require("@pie-framework/mathquill"));
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+var _index = require("../index");
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = (0, _getPrototypeOf2["default"])(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = (0, _getPrototypeOf2["default"])(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return (0, _possibleConstructorReturn2["default"])(this, result); }; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
 
 var MQ;
 
@@ -56,25 +54,22 @@ function stripSpaces() {
  */
 
 
-var Static =
-/*#__PURE__*/
-function (_React$Component) {
-  _inherits(Static, _React$Component);
+var Static = /*#__PURE__*/function (_React$Component) {
+  (0, _inherits2["default"])(Static, _React$Component);
 
-  function Static() {
-    var _getPrototypeOf2;
+  var _super = _createSuper(Static);
 
+  function Static() {
     var _this;
 
-    _classCallCheck(this, Static);
+    (0, _classCallCheck2["default"])(this, Static);
 
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
     }
 
-    _this = _possibleConstructorReturn(this, (_getPrototypeOf2 = _getPrototypeOf(Static)).call.apply(_getPrototypeOf2, [this].concat(args)));
-
-    _defineProperty(_assertThisInitialized(_this), "onFocus", function (e) {
+    _this = _super.call.apply(_super, [this].concat(args));
+    (0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "onFocus", function (e) {
       try {
         var rootBlock = e.target.parentElement.nextSibling;
         var id = parseInt(rootBlock.getAttribute('mathquill-block-id'), 10);
@@ -102,11 +97,10 @@ function (_React$Component) {
         console.error('error finding root block', err.message);
       }
     });
-
     return _this;
   }
 
-  _createClass(Static, [{
+  (0, _createClass2["default"])(Static, [{
     key: "componentDidMount",
     value: function componentDidMount() {
       this.update();
@@ -193,7 +187,7 @@ function (_React$Component) {
       var _this$props = this.props,
           onBlur = _this$props.onBlur,
           className = _this$props.className;
-      return _react["default"].createElement("span", {
+      return /*#__PURE__*/_react["default"].createElement("span", {
         className: className,
         onFocus: this.onFocus,
         onBlur: onBlur,
@@ -203,13 +197,11 @@ function (_React$Component) {
       });
     }
   }]);
-
   return Static;
 }(_react["default"].Component);
 
 exports["default"] = Static;
-
-_defineProperty(Static, "propTypes", {
+(0, _defineProperty2["default"])(Static, "propTypes", {
   latex: _propTypes["default"].string.isRequired,
   onFocus: _propTypes["default"].func,
   onBlur: _propTypes["default"].func,

package/lib/mq/static.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/mq/static.jsx"],"names":["MQ","window","MathQuill","getInterface","log","REGEX","WHITESPACE_REGEX","stripSpaces","string","replace","Static","e","rootBlock","target","parentElement","nextSibling","id","parseInt","getAttribute","innerField","mathField","innerFields","find","f","name","props","getFieldName","setInput","onSubFieldFocus","err","console","error","message","update","field","onSubFieldChange","latex","Error","StaticMath","input","handlers","edit","onInputEdit","bind","parseLatex","blur","focus","nextProps","parsedLatex","stripped","newFieldCount","match","length","out","trim","Object","keys","warn","onBlur","className","onFocus","r","React","Component","PropTypes","isRequired","func"],"mappings":"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","sourcesContent":["import PropTypes from 'prop-types';\nimport React from 'react';\nimport debug from 'debug';\nimport MathQuill from '@pie-framework/mathquill';\nimport { updateSpans } from '../index';\n\nlet MQ;\nif (typeof window !== 'undefined') {\n  MQ = MathQuill.getInterface(2);\n}\n\nconst log = debug('pie-lib:math-input:mq:static');\nconst REGEX = /\\\\MathQuillMathField\\[r\\d*\\]\\{(.*?)\\}/g;\nconst WHITESPACE_REGEX = / /g;\n\nfunction stripSpaces(string = '') {\n  return string.replace(WHITESPACE_REGEX, '');\n}\n\n/**\n * Wrapper for MathQuill MQ.MathField.\n */\nexport default class Static extends React.Component {\n  static propTypes = {\n    latex: PropTypes.string.isRequired,\n    onFocus: PropTypes.func,\n    onBlur: PropTypes.func,\n    className: PropTypes.string,\n    getFieldName: PropTypes.func,\n    onSubFieldChange: PropTypes.func,\n    onSubFieldFocus: PropTypes.func,\n    setInput: PropTypes.func\n  };\n\n  componentDidMount() {\n    this.update();\n    updateSpans();\n  }\n\n  componentDidUpdate() {\n    this.update();\n    updateSpans();\n  }\n\n  onInputEdit(field) {\n    if (!this.mathField) {\n      return;\n    }\n    const name = this.props.getFieldName(field, this.mathField.innerFields);\n    if (this.props.onSubFieldChange) {\n      this.props.onSubFieldChange(name, field.latex());\n    }\n  }\n\n  update() {\n    if (!MQ) {\n      throw new Error('MQ is not defined - but component has mounted?');\n    }\n    // this.input.innerHTML = this.props.latex;\n    if (!this.mathField) {\n      this.mathField = MQ.StaticMath(this.input, {\n        handlers: {\n          edit: this.onInputEdit.bind(this)\n        }\n      });\n    }\n\n    try {\n      this.mathField.parseLatex(this.props.latex);\n      this.mathField.latex(this.props.latex);\n    } catch (e) {\n      // default latex if received has errors\n      this.mathField.latex('\\\\MathQuillMathField[r1]{}');\n    }\n  }\n\n  blur() {\n    log('blur mathfield');\n    this.mathField.blur();\n  }\n\n  focus() {\n    log('focus mathfield...');\n    this.mathField.focus();\n  }\n\n  shouldComponentUpdate(nextProps) {\n    try {\n      const parsedLatex = this.mathField.parseLatex(nextProps.latex);\n      const stripped = stripSpaces(parsedLatex);\n      const newFieldCount = (nextProps.latex.match(REGEX) || []).length;\n\n      const out =\n        stripped !== stripSpaces(this.mathField.latex().trim()) ||\n        newFieldCount !== Object.keys(this.mathField.innerFields).length / 2;\n\n      log('[shouldComponentUpdate] ', out);\n      return out;\n    } catch (e) {\n      // eslint-disable-next-line no-console\n      console.warn('Error parsing latex:', e.message, 'skip update');\n      // eslint-disable-next-line no-console\n      console.warn(e);\n      return false;\n    }\n  }\n\n  onFocus = e => {\n    try {\n      let rootBlock = e.target.parentElement.nextSibling;\n      let id = parseInt(rootBlock.getAttribute('mathquill-block-id'), 10);\n\n      if (!id) {\n        rootBlock = rootBlock.parentElement;\n        id = parseInt(rootBlock.getAttribute('mathquill-block-id'), 10);\n      }\n\n      const innerField = this.mathField.innerFields.find(f => f.id === id);\n\n      if (innerField) {\n        const name = this.props.getFieldName(innerField, this.mathField.innerFields);\n        if (this.props.setInput) {\n          this.props.setInput(innerField);\n        }\n        this.props.onSubFieldFocus(name, innerField);\n      }\n    } catch (err) {\n      // eslint-disable-next-line no-console\n      console.error('error finding root block', err.message);\n    }\n  };\n\n  render() {\n    const { onBlur, className } = this.props;\n\n    return (\n      <span\n        className={className}\n        onFocus={this.onFocus}\n        onBlur={onBlur}\n        ref={r => (this.input = r)}\n      />\n    );\n  }\n}\n"],"file":"static.js"}
+{"version":3,"file":"static.js","names":["MQ","window","MathQuill","getInterface","log","debug","REGEX","WHITESPACE_REGEX","stripSpaces","string","replace","Static","e","rootBlock","target","parentElement","nextSibling","id","parseInt","getAttribute","innerField","mathField","innerFields","find","f","name","props","getFieldName","setInput","onSubFieldFocus","err","console","error","message","update","updateSpans","field","onSubFieldChange","latex","Error","StaticMath","input","handlers","edit","onInputEdit","bind","parseLatex","blur","focus","nextProps","parsedLatex","stripped","newFieldCount","match","length","out","trim","Object","keys","warn","onBlur","className","onFocus","r","React","Component","PropTypes","isRequired","func"],"sources":["../../src/mq/static.jsx"],"sourcesContent":["import PropTypes from 'prop-types';\nimport React from 'react';\nimport debug from 'debug';\nimport MathQuill from '@pie-framework/mathquill';\nimport { updateSpans } from '../index';\n\nlet MQ;\nif (typeof window !== 'undefined') {\n  MQ = MathQuill.getInterface(2);\n}\n\nconst log = debug('pie-lib:math-input:mq:static');\nconst REGEX = /\\\\MathQuillMathField\\[r\\d*\\]\\{(.*?)\\}/g;\nconst WHITESPACE_REGEX = / /g;\n\nfunction stripSpaces(string = '') {\n  return string.replace(WHITESPACE_REGEX, '');\n}\n\n/**\n * Wrapper for MathQuill MQ.MathField.\n */\nexport default class Static extends React.Component {\n  static propTypes = {\n    latex: PropTypes.string.isRequired,\n    onFocus: PropTypes.func,\n    onBlur: PropTypes.func,\n    className: PropTypes.string,\n    getFieldName: PropTypes.func,\n    onSubFieldChange: PropTypes.func,\n    onSubFieldFocus: PropTypes.func,\n    setInput: PropTypes.func\n  };\n\n  componentDidMount() {\n    this.update();\n    updateSpans();\n  }\n\n  componentDidUpdate() {\n    this.update();\n    updateSpans();\n  }\n\n  onInputEdit(field) {\n    if (!this.mathField) {\n      return;\n    }\n    const name = this.props.getFieldName(field, this.mathField.innerFields);\n    if (this.props.onSubFieldChange) {\n      this.props.onSubFieldChange(name, field.latex());\n    }\n  }\n\n  update() {\n    if (!MQ) {\n      throw new Error('MQ is not defined - but component has mounted?');\n    }\n    // this.input.innerHTML = this.props.latex;\n    if (!this.mathField) {\n      this.mathField = MQ.StaticMath(this.input, {\n        handlers: {\n          edit: this.onInputEdit.bind(this)\n        }\n      });\n    }\n\n    try {\n      this.mathField.parseLatex(this.props.latex);\n      this.mathField.latex(this.props.latex);\n    } catch (e) {\n      // default latex if received has errors\n      this.mathField.latex('\\\\MathQuillMathField[r1]{}');\n    }\n  }\n\n  blur() {\n    log('blur mathfield');\n    this.mathField.blur();\n  }\n\n  focus() {\n    log('focus mathfield...');\n    this.mathField.focus();\n  }\n\n  shouldComponentUpdate(nextProps) {\n    try {\n      const parsedLatex = this.mathField.parseLatex(nextProps.latex);\n      const stripped = stripSpaces(parsedLatex);\n      const newFieldCount = (nextProps.latex.match(REGEX) || []).length;\n\n      const out =\n        stripped !== stripSpaces(this.mathField.latex().trim()) ||\n        newFieldCount !== Object.keys(this.mathField.innerFields).length / 2;\n\n      log('[shouldComponentUpdate] ', out);\n      return out;\n    } catch (e) {\n      // eslint-disable-next-line no-console\n      console.warn('Error parsing latex:', e.message, 'skip update');\n      // eslint-disable-next-line no-console\n      console.warn(e);\n      return false;\n    }\n  }\n\n  onFocus = e => {\n    try {\n      let rootBlock = e.target.parentElement.nextSibling;\n      let id = parseInt(rootBlock.getAttribute('mathquill-block-id'), 10);\n\n      if (!id) {\n        rootBlock = rootBlock.parentElement;\n        id = parseInt(rootBlock.getAttribute('mathquill-block-id'), 10);\n      }\n\n      const innerField = this.mathField.innerFields.find(f => f.id === id);\n\n      if (innerField) {\n        const name = this.props.getFieldName(innerField, this.mathField.innerFields);\n        if (this.props.setInput) {\n          this.props.setInput(innerField);\n        }\n        this.props.onSubFieldFocus(name, innerField);\n      }\n    } catch (err) {\n      // eslint-disable-next-line no-console\n      console.error('error finding root block', err.message);\n    }\n  };\n\n  render() {\n    const { onBlur, className } = this.props;\n\n    return (\n      <span\n        className={className}\n        onFocus={this.onFocus}\n        onBlur={onBlur}\n        ref={r => (this.input = r)}\n      />\n    );\n  }\n}\n"],"mappings":"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"}

package/package.json

@@ -3,13 +3,13 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "6.6.1-next.45+b91f0971",
+  "version": "6.6.1-next.506+e8b87499",
   "main": "lib/index.js",
   "module": "src/index.jsx",
   "dependencies": {
     "@material-ui/core": "^3.8.3",
     "@material-ui/icons": "^3.0.2",
-    "@pie-framework/mathquill": "^1.1.2",
+    "@pie-framework/mathquill": "^1.1.3",
     "debug": "^4.1.1",
     "lodash": "^4.17.11",
     "react-portal": "^4.2.0"
@@ -22,5 +22,5 @@
     "react-dom": "^16.9.0"
   },
   "scripts": {},
-  "gitHead": "b91f09710e5de270f9c60981da49f7fbf70c9417"
+  "gitHead": "e8b8749942eb41c8b866c8ad2066bc95934aab05"
 }

package/src/horizontal-keypad.jsx

@@ -18,6 +18,7 @@ export default class HorizontalKeypad extends React.Component {
   static propTypes = {
     className: PropTypes.string,
     mode: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+    layoutForKeyPad: PropTypes.object,
     onClick: PropTypes.func.isRequired,
     onFocus: PropTypes.func,
     noDecimal: PropTypes.bool,
@@ -37,7 +38,7 @@ export default class HorizontalKeypad extends React.Component {
   };
 
   render() {
-    const { mode, onFocus, noDecimal, className, additionalKeys } = this.props;
+    const { mode, onFocus, noDecimal, className, additionalKeys, layoutForKeyPad } = this.props;
     const normalizedKeys = normalizeAdditionalKeys(additionalKeys);
 
     return (
@@ -45,8 +46,10 @@ export default class HorizontalKeypad extends React.Component {
         className={className}
         onFocus={onFocus}
         noDecimal={noDecimal}
+        layoutForKeyPad={layoutForKeyPad}
         additionalKeys={extendKeySet(keysForGrade(mode), normalizedKeys)}
         onPress={this.keypadPress}
+        mode={mode}
       />
     );
   }