@pie-lib/math-input 6.6.8 → 6.7.0

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,"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"}

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "6.6.8",
+  "version": "6.7.0",
   "main": "lib/index.js",
   "module": "src/index.jsx",
   "dependencies": {
@@ -22,5 +22,5 @@
     "react-dom": "^16.9.0"
   },
   "scripts": {},
-  "gitHead": "8c254f4c516c9f4e67109accdb2ad415e1f6cea4"
+  "gitHead": "f766e0fdb9e51a9449324db51ccaa93904211710"
 }

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,6 +46,7 @@ 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}

package/src/keypad/index.jsx

@@ -40,14 +40,17 @@ const LatexButton = withStyles(theme => ({
       width: '30px',
       marginTop: '0 !important',
       borderTop: '2px solid black',
+      fontFamily: 'Roboto, Helvetica, Arial, sans-serif !important',
+
       '&.mq-arrow-both': {
+        top: '5px !important',
         '& *': {
           lineHeight: '1 !important'
         },
         '&:before': {
           fontSize: '80%',
           left: 'calc(-13%)',
-          top: '-0.25em'
+          top: '-0.31em'
         },
         '&:after': {
           fontSize: '80% !important',
@@ -57,12 +60,12 @@ const LatexButton = withStyles(theme => ({
         '&.mq-empty:before': {
           fontSize: '80%',
           left: 'calc(-13%)',
-          top: '-0.25em'
+          top: '-0.26em'
         },
         '&.mq-empty:after': {
           fontSize: '80%',
           right: 'calc(-13%)',
-          top: '-0.25em'
+          top: '-0.26em'
         },
         '&.mq-empty': {
           minHeight: '1.4em'
@@ -123,7 +126,7 @@ const LatexButton = withStyles(theme => ({
         paddingTop: '0 !important'
       },
       '&:after': {
-        top: '-1.64em !important'
+        top: '-2.8em !important'
       }
     }
   }
@@ -145,6 +148,20 @@ const LatexButton = withStyles(theme => ({
   } else {
     buttonClass = classNames(props.classes.latexButton, props.mqClassName);
   }
+
+  try {
+    const MQ = MathQuill.getInterface(2);
+    const span = document.createElement('span');
+    span.innerHTML = '';
+    const mathField = MQ.StaticMath(span);
+
+    mathField.parseLatex(props.latex);
+    mathField.latex(props.latex);
+  } catch (e) {
+    // received latex has errors - do not create button
+    return <></>;
+  }
+
   return (
     <Button className={classNames(props.classes.root, props.className)} onClick={props.onClick}>
       <mq.Static className={buttonClass} latex={props.latex} />
@@ -152,12 +169,25 @@ const LatexButton = withStyles(theme => ({
   );
 });
 
+const createCustomLayout = layoutObj => {
+  if (layoutObj) {
+    return {
+      gridTemplateColumns: `repeat(${layoutObj.columns}, minmax(min-content, 150px))`,
+      gridTemplateRows: `repeat(${layoutObj.rows}, minmax(40px, 60px))`,
+      gridAutoFlow: 'initial'
+    };
+  }
+
+  return {};
+};
+
 export class KeyPad extends React.Component {
   static propTypes = {
     classes: PropTypes.object.isRequired,
     className: PropTypes.string,
     baseSet: PropTypes.array,
     additionalKeys: PropTypes.array,
+    layoutForKeyPad: PropTypes.object,
     onPress: PropTypes.func.isRequired,
     onFocus: PropTypes.func,
     noDecimal: PropTypes.bool,
@@ -193,14 +223,23 @@ export class KeyPad extends React.Component {
   };
 
   render() {
-    const { classes, className, baseSet, additionalKeys, onFocus, mode } = this.props;
+    const {
+      classes,
+      className,
+      baseSet,
+      additionalKeys,
+      layoutForKeyPad,
+      onFocus,
+      mode
+    } = this.props;
 
     const noBaseSet = [
       'non-negative-integers',
       'integers',
       'decimals',
       'fractions',
-      'item-authoring'
+      'item-authoring',
+      'language'
     ];
 
     const keysWithoutBaseSet = noBaseSet.includes(mode);
@@ -211,10 +250,15 @@ export class KeyPad extends React.Component {
     const shift = allKeys.length % 5 ? 1 : 0;
     const style = {
       gridTemplateColumns: `repeat(${Math.floor(allKeys.length / 5) +
-        shift}, minmax(min-content, 150px))`
+        shift}, minmax(min-content, 150px))`,
+      ...createCustomLayout(layoutForKeyPad)
     };
     return (
-      <div className={classNames(classes.keys, className)} style={style} onFocus={onFocus}>
+      <div
+        className={classNames(classes.keys, className, classes[mode])}
+        style={style}
+        onFocus={onFocus}
+      >
         {allKeys.map((k, index) => {
           const onClick = this.buttonClick.bind(this, k);
 
@@ -227,11 +271,14 @@ export class KeyPad extends React.Component {
             className: classNames(
               classes.labelButton,
               !keysWithoutBaseSet && classes[k.category],
+              classes[k.extraClass],
               k.label === ',' && classes.comma,
               k.label === '.' && classes.dot
             ),
             disabled: this.keyIsNotAllowed(k),
-            key: `${k.label || k.latex || k.command}-${index}`
+            key: `${k.label || k.latex || k.command}-${index}`,
+            ...(k.actions || {}),
+            ...(k.extraProps || {})
           };
 
           if (k.latex) {
@@ -267,6 +314,9 @@ const styles = theme => ({
     gridColumnGap: '0px',
     gridAutoFlow: 'column'
   },
+  character: {
+    textTransform: 'initial !important'
+  },
   holder: {
     position: 'relative',
     width: '100%',

package/src/keys/grades.js

@@ -374,6 +374,6 @@ export const normalizeAdditionalKeys = additionalKeys => {
         latex === key.otherNotation
     );
 
-    return predefinedKey || additionalkey;
+    return !latex ? additionalkey : predefinedKey || additionalkey;
   });
 };