@pie-lib/math-input 6.11.4 → 6.13.0-beta.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +16 -0
- package/NEXT.CHANGELOG.json +1 -0
- package/lib/__tests__/math-input-test.js +109 -0
- package/lib/horizontal-keypad.js +10 -4
- package/lib/index.js +11 -15
- package/lib/keypad/__tests__/index.test.js +41 -0
- package/lib/keypad/__tests__/keys-layout.test.js +15 -0
- package/lib/keypad/index.js +96 -25
- package/lib/keypad/keys-layout.js +1 -1
- package/lib/keys/__tests__/utils.test.js +60 -0
- package/lib/keys/basic-operators.js +1 -1
- package/lib/keys/chars.js +1 -1
- package/lib/keys/comparison.js +1 -1
- package/lib/keys/constants.js +1 -1
- package/lib/keys/digits.js +1 -1
- package/lib/keys/edit.js +1 -1
- package/lib/keys/exponent.js +1 -1
- package/lib/keys/fractions.js +1 -1
- package/lib/keys/geometry.js +5 -3
- package/lib/keys/grades.js +13 -1
- package/lib/keys/index.js +1 -1
- package/lib/keys/log.js +2 -2
- package/lib/keys/logic.js +1 -1
- package/lib/keys/matrices.js +1 -1
- package/lib/keys/misc.js +1 -1
- package/lib/keys/navigation.js +1 -1
- package/lib/keys/operators.js +1 -1
- package/lib/keys/statistics.js +1 -1
- package/lib/keys/sub-sup.js +1 -1
- package/lib/keys/trigonometry.js +1 -1
- package/lib/keys/utils.js +1 -1
- package/lib/keys/vars.js +1 -1
- package/lib/math-input.js +1 -1
- package/lib/mq/__tests__/input.test.js +119 -0
- package/lib/mq/__tests__/static.test.js +74 -0
- package/lib/mq/common-mq-styles.js +110 -0
- package/lib/mq/custom-elements.js +1 -1
- package/lib/mq/index.js +9 -1
- package/lib/mq/input.js +13 -11
- package/lib/mq/static.js +199 -76
- package/lib/updateSpans.js +23 -0
- package/package.json +2 -2
- package/src/__tests__/__snapshots__/math-input-test.jsx.snap +152 -0
- package/src/__tests__/math-input-test.jsx +85 -0
- package/src/horizontal-keypad.jsx +14 -1
- package/src/index.jsx +1 -10
- package/src/keypad/__tests__/__snapshots__/index.test.jsx.snap +193 -0
- package/src/keypad/__tests__/index.test.jsx +24 -0
- package/src/keypad/__tests__/keys-layout.test.js +15 -0
- package/src/keypad/index.jsx +99 -15
- package/src/keys/__tests__/utils.test.js +57 -0
- package/src/keys/geometry.js +6 -2
- package/src/keys/grades.js +11 -0
- package/src/keys/log.js +1 -1
- package/src/mq/__tests__/__snapshots__/input.test.jsx.snap +9 -0
- package/src/mq/__tests__/input.test.jsx +92 -0
- package/src/mq/__tests__/static.test.jsx +57 -0
- package/src/mq/common-mq-styles.js +105 -0
- package/src/mq/index.js +2 -1
- package/src/mq/input.jsx +22 -9
- package/src/mq/static.jsx +142 -13
- package/src/updateSpans.js +15 -0
- package/README.md +0 -27
- package/lib/horizontal-keypad.js.map +0 -1
- package/lib/index.js.map +0 -1
- package/lib/keypad/index.js.map +0 -1
- package/lib/keypad/keys-layout.js.map +0 -1
- package/lib/keys/basic-operators.js.map +0 -1
- package/lib/keys/chars.js.map +0 -1
- package/lib/keys/comparison.js.map +0 -1
- package/lib/keys/constants.js.map +0 -1
- package/lib/keys/digits.js.map +0 -1
- package/lib/keys/edit.js.map +0 -1
- package/lib/keys/exponent.js.map +0 -1
- package/lib/keys/fractions.js.map +0 -1
- package/lib/keys/geometry.js.map +0 -1
- package/lib/keys/grades.js.map +0 -1
- package/lib/keys/index.js.map +0 -1
- package/lib/keys/log.js.map +0 -1
- package/lib/keys/logic.js.map +0 -1
- package/lib/keys/matrices.js.map +0 -1
- package/lib/keys/misc.js.map +0 -1
- package/lib/keys/navigation.js.map +0 -1
- package/lib/keys/operators.js.map +0 -1
- package/lib/keys/statistics.js.map +0 -1
- package/lib/keys/sub-sup.js.map +0 -1
- package/lib/keys/trigonometry.js.map +0 -1
- package/lib/keys/utils.js.map +0 -1
- package/lib/keys/vars.js.map +0 -1
- package/lib/math-input.js.map +0 -1
- package/lib/mq/custom-elements.js.map +0 -1
- package/lib/mq/index.js.map +0 -1
- package/lib/mq/input.js.map +0 -1
- package/lib/mq/static.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,22 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
# [6.13.0-beta.0](https://github.com/pie-framework/pie-lib/compare/@pie-lib/math-input@6.11.4...@pie-lib/math-input@6.13.0-beta.0) (2025-07-15)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @pie-lib/math-input
|
|
9
|
+
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
|
|
14
|
+
# [6.12.0-beta.0](https://github.com/pie-framework/pie-lib/compare/@pie-lib/math-input@6.11.4...@pie-lib/math-input@6.12.0-beta.0) (2025-07-15)
|
|
15
|
+
|
|
16
|
+
**Note:** Version bump only for package @pie-lib/math-input
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
|
|
20
|
+
|
|
21
|
+
|
|
6
22
|
## [6.11.4](https://github.com/pie-framework/pie-lib/compare/@pie-lib/math-input@6.11.3...@pie-lib/math-input@6.11.4) (2023-07-04)
|
|
7
23
|
|
|
8
24
|
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
[]
|
|
@@ -0,0 +1,109 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
5
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
6
|
+
|
|
7
|
+
var _enzyme = require("enzyme");
|
|
8
|
+
|
|
9
|
+
var _react = _interopRequireDefault(require("react"));
|
|
10
|
+
|
|
11
|
+
var _mathInput = require("@pie-lib/math-input");
|
|
12
|
+
|
|
13
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
14
|
+
|
|
15
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
16
|
+
|
|
17
|
+
describe('MathInput', function () {
|
|
18
|
+
var w;
|
|
19
|
+
var onChange;
|
|
20
|
+
beforeEach(function () {
|
|
21
|
+
onChange = jest.fn();
|
|
22
|
+
});
|
|
23
|
+
|
|
24
|
+
var wrapper = function wrapper(extras) {
|
|
25
|
+
var defaults = {
|
|
26
|
+
classes: {},
|
|
27
|
+
className: 'className',
|
|
28
|
+
onChange: onChange
|
|
29
|
+
};
|
|
30
|
+
|
|
31
|
+
var props = _objectSpread(_objectSpread({}, defaults), extras);
|
|
32
|
+
|
|
33
|
+
return (0, _enzyme.shallow)( /*#__PURE__*/_react["default"].createElement(_mathInput.MathInput, props));
|
|
34
|
+
};
|
|
35
|
+
|
|
36
|
+
describe('snapshot', function () {
|
|
37
|
+
it('renders', function () {
|
|
38
|
+
w = wrapper();
|
|
39
|
+
expect(w).toMatchSnapshot();
|
|
40
|
+
});
|
|
41
|
+
});
|
|
42
|
+
describe('logic', function () {
|
|
43
|
+
beforeEach(function () {
|
|
44
|
+
w = wrapper();
|
|
45
|
+
w.instance().input = {
|
|
46
|
+
write: jest.fn(),
|
|
47
|
+
command: jest.fn(),
|
|
48
|
+
keystroke: jest.fn()
|
|
49
|
+
};
|
|
50
|
+
});
|
|
51
|
+
describe('keypadPress', function () {
|
|
52
|
+
it('calls input.write for latex', function () {
|
|
53
|
+
w.instance().keypadPress({
|
|
54
|
+
latex: 'latex'
|
|
55
|
+
});
|
|
56
|
+
expect(w.instance().input.write).toHaveBeenLastCalledWith('latex');
|
|
57
|
+
});
|
|
58
|
+
it('calls input.write for write', function () {
|
|
59
|
+
w.instance().keypadPress({
|
|
60
|
+
write: 'write'
|
|
61
|
+
});
|
|
62
|
+
expect(w.instance().input.write).toHaveBeenLastCalledWith('write');
|
|
63
|
+
});
|
|
64
|
+
it('calls input.command for command', function () {
|
|
65
|
+
w.instance().keypadPress({
|
|
66
|
+
command: 'cmd'
|
|
67
|
+
});
|
|
68
|
+
expect(w.instance().input.command).toHaveBeenLastCalledWith('cmd');
|
|
69
|
+
});
|
|
70
|
+
it('calls input.keystroke for keystroke', function () {
|
|
71
|
+
w.instance().keypadPress({
|
|
72
|
+
keystroke: 'k'
|
|
73
|
+
});
|
|
74
|
+
expect(w.instance().input.keystroke).toHaveBeenLastCalledWith('k');
|
|
75
|
+
});
|
|
76
|
+
});
|
|
77
|
+
});
|
|
78
|
+
describe('changeLatex', function () {
|
|
79
|
+
it('calls onChange', function () {
|
|
80
|
+
w = wrapper();
|
|
81
|
+
w.instance().changeLatex('new-latex');
|
|
82
|
+
expect(onChange).toHaveBeenCalledWith('new-latex');
|
|
83
|
+
});
|
|
84
|
+
it('does not call onChange if it is the same as the existing latex', function () {
|
|
85
|
+
w = wrapper();
|
|
86
|
+
w.setProps({
|
|
87
|
+
latex: 'new-latex'
|
|
88
|
+
});
|
|
89
|
+
w.instance().changeLatex('new-latex');
|
|
90
|
+
expect(onChange).not.toHaveBeenCalledWith('new-latex');
|
|
91
|
+
});
|
|
92
|
+
});
|
|
93
|
+
describe('inputFocus', function () {
|
|
94
|
+
it('sets state', function () {
|
|
95
|
+
w = wrapper();
|
|
96
|
+
w.instance().inputFocus();
|
|
97
|
+
expect(w.state().focused).toBe(true);
|
|
98
|
+
});
|
|
99
|
+
});
|
|
100
|
+
describe('inputBlur', function () {
|
|
101
|
+
it('sets state', function () {
|
|
102
|
+
w = wrapper();
|
|
103
|
+
w.instance().inputFocus();
|
|
104
|
+
w.instance().inputBlur();
|
|
105
|
+
expect(w.state().focused).toBe(false);
|
|
106
|
+
});
|
|
107
|
+
});
|
|
108
|
+
});
|
|
109
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9fX3Rlc3RzX18vbWF0aC1pbnB1dC10ZXN0LmpzeCJdLCJuYW1lcyI6WyJkZXNjcmliZSIsInciLCJvbkNoYW5nZSIsImJlZm9yZUVhY2giLCJqZXN0IiwiZm4iLCJ3cmFwcGVyIiwiZXh0cmFzIiwiZGVmYXVsdHMiLCJjbGFzc2VzIiwiY2xhc3NOYW1lIiwicHJvcHMiLCJpdCIsImV4cGVjdCIsInRvTWF0Y2hTbmFwc2hvdCIsImluc3RhbmNlIiwiaW5wdXQiLCJ3cml0ZSIsImNvbW1hbmQiLCJrZXlzdHJva2UiLCJrZXlwYWRQcmVzcyIsImxhdGV4IiwidG9IYXZlQmVlbkxhc3RDYWxsZWRXaXRoIiwiY2hhbmdlTGF0ZXgiLCJ0b0hhdmVCZWVuQ2FsbGVkV2l0aCIsInNldFByb3BzIiwibm90IiwiaW5wdXRGb2N1cyIsInN0YXRlIiwiZm9jdXNlZCIsInRvQmUiLCJpbnB1dEJsdXIiXSwibWFwcGluZ3MiOiI7Ozs7OztBQUFBOztBQUNBOztBQUNBOzs7Ozs7QUFFQUEsUUFBUSxDQUFDLFdBQUQsRUFBYyxZQUFNO0FBQzFCLE1BQUlDLENBQUo7QUFDQSxNQUFJQyxRQUFKO0FBRUFDLEVBQUFBLFVBQVUsQ0FBQyxZQUFNO0FBQ2ZELElBQUFBLFFBQVEsR0FBR0UsSUFBSSxDQUFDQyxFQUFMLEVBQVg7QUFDRCxHQUZTLENBQVY7O0FBR0EsTUFBTUMsT0FBTyxHQUFHLFNBQVZBLE9BQVUsQ0FBQ0MsTUFBRCxFQUFZO0FBQzFCLFFBQU1DLFFBQVEsR0FBRztBQUNmQyxNQUFBQSxPQUFPLEVBQUUsRUFETTtBQUVmQyxNQUFBQSxTQUFTLEVBQUUsV0FGSTtBQUdmUixNQUFBQSxRQUFRLEVBQVJBO0FBSGUsS0FBakI7O0FBS0EsUUFBTVMsS0FBSyxtQ0FBUUgsUUFBUixHQUFxQkQsTUFBckIsQ0FBWDs7QUFDQSxXQUFPLG1DQUFRLGdDQUFDLG9CQUFELEVBQWVJLEtBQWYsQ0FBUixDQUFQO0FBQ0QsR0FSRDs7QUFTQVgsRUFBQUEsUUFBUSxDQUFD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S0FBSyxFQUFFO0FBQVQsT0FBWDtBQUNBcEIsTUFBQUEsQ0FBQyxDQUFDYyxRQUFGLEdBQWFRLFdBQWIsQ0FBeUIsV0FBekI7QUFDQVYsTUFBQUEsTUFBTSxDQUFDWCxRQUFELENBQU4sQ0FBaUJ3QixHQUFqQixDQUFxQkYsb0JBQXJCLENBQTBDLFdBQTFDO0FBQ0QsS0FMQyxDQUFGO0FBTUQsR0FaTyxDQUFSO0FBY0F4QixFQUFBQSxRQUFRLENBQUMsWUFBRCxFQUFlLFlBQU07QUFDM0JZLElBQUFBLEVBQUUsQ0FBQyxZQUFELEVBQWUsWUFBTTtBQUNyQlgsTUFBQUEsQ0FBQyxHQUFHSyxPQUFPLEVBQVg7QUFDQUwsTUFBQUEsQ0FBQyxDQUFDYyxRQUFGLEdBQWFZLFVBQWI7QUFDQWQsTUFBQUEsTUFBTSxDQUFDWixDQUFDLENBQUMyQixLQUFGLEdBQVVDLE9BQVgsQ0FBTixDQUEwQkMsSUFBMUIsQ0FBK0IsSUFBL0I7QUFDRCxLQUpDLENBQUY7QUFLRCxHQU5PLENBQVI7QUFPQTlCLEVBQUFBLFFBQVEsQ0FBQyxXQUFELEVBQWMsWUFBTTtBQUMxQlksSUFBQUEsRUFBRSxDQUFDLFlBQUQsRUFBZSxZQUFNO0FBQ3JCWCxNQUFBQSxDQUFDLEdBQUdLLE9BQU8sRUFBWDtBQUNBTCxNQUFBQSxDQUFDLENBQUNjLFFBQUYsR0FBYVksVUFBYjtBQUNBMUIsTUFBQUEsQ0FBQyxDQUFDYyxRQUFGLEdBQWFnQixTQUFiO0FBQ0FsQixNQUFBQSxNQUFNLENBQUNaLENBQUMsQ0FBQzJCLEtBQUYsR0FBVUMsT0FBWCxDQUFOLENBQTBCQyxJQUExQixDQUErQixLQUEvQjtBQUNELEtBTEMsQ0FBRjtBQU1ELEdBUE8sQ0FBUjtBQVFELENBaEZPLENBQVIiLCJzb3VyY2VzQ29udGVudCI6WyJpbXBvcnQgeyBzaGFsbG93IH0gZnJvbSAnZW56eW1lJztcbmltcG9ydCBSZWFjdCBmcm9tICdyZWFjdCc7XG5pbXBvcnQgeyBNYXRoSW5wdXQgfSBmcm9tICdAcGllLWxpYi9tYXRoLWlucHV0JztcblxuZGVzY3JpYmUoJ01hdGhJbnB1dCcsICgpID0+IHtcbiAgbGV0IHc7XG4gIGxldCBvbkNoYW5nZTtcblxuICBiZWZvcmVFYWNoKCgpID0+IHtcbiAgICBvbkNoYW5nZSA9IGplc3QuZm4oKTtcbiAgfSk7XG4gIGNvbnN0IHdyYXBwZXIgPSAoZXh0cmFzKSA9PiB7XG4gICAgY29uc3QgZGVmYXVsdHMgPSB7XG4gICAgICBjbGFzc2VzOiB7fSxcbiAgICAgIGNsYXNzTmFtZTogJ2NsYXNzTmFtZScsXG4gICAgICBvbkNoYW5nZSxcbiAgICB9O1xuICAgIGNvbnN0IHByb3BzID0geyAuLi5kZWZhdWx0cywgLi4uZXh0cmFzIH07XG4gICAgcmV0dXJuIHNoYWxsb3coPE1hdGhJbnB1dCB7Li4ucHJvcHN9IC8+KTtcbiAgfTtcbiAgZGVzY3JpYmUoJ3NuYXBzaG90JywgKCkgPT4ge1xuICAgIGl0KCdyZW5kZXJzJywgKCkgPT4ge1xuICAgICAgdyA9IHdyYXBwZXIoKTtcbiAgICAgIGV4cGVjdCh3KS50b01hdGNoU25hcHNob3QoKTtcbiAgICB9KTtcbiAgfSk7XG4gIGRlc2NyaWJlKCdsb2dpYycsICgpID0+IHtcbiAgICBiZWZvcmVFYWNoKCgpID0+IHtcbiAgICAgIHcgPSB3cmFwcGVyKCk7XG4gICAgICB3Lmluc3RhbmNlKCkuaW5wdXQgPSB7XG4gICAgICAgIHdyaXRlOiBqZXN0LmZuKCksXG4gICAgICAgIGNvbW1hbmQ6IGplc3QuZm4oKSxcbiAgICAgICAga2V5c3Ryb2tlOiBqZXN0LmZuKCksXG4gICAgICB9O1xuICAgIH0pO1xuICAgIGRlc2NyaWJlKCdrZXlwYWRQcmVzcycsICgpID0+IHtcbiAgICAgIGl0KCdjYWxscyBpbnB1dC53cml0ZSBmb3IgbGF0ZXgnLCAoKSA9PiB7XG4gICAgICAgIHcuaW5zdGFuY2UoKS5rZXlwYWRQcmVzcyh7IGxhdGV4OiAnbGF0ZXgnIH0pO1xuICAgICAgICBleHBlY3Qody5pbnN0YW5jZSgpLmlucHV0LndyaXRlKS50b0hhdmVCZWVuTGFzdENhbGxlZFdpdGgoJ2xhdGV4Jyk7XG4gICAgICB9KTtcbiAgICAgIGl0KCdjYWxscyBpbnB1dC53cml0ZSBmb3Igd3JpdGUnLCAoKSA9PiB7XG4gICAgICAgIHcuaW5zdGFuY2UoKS5rZXlwYWRQcmVzcyh7IHdyaXRlOiAnd3JpdGUnIH0pO1xuICAgICAgICBleHBlY3Qody5pbnN0YW5jZSgpLmlucHV0LndyaXRlKS50b0hhdmVCZWVuTGFzdENhbGxlZFdpdGgoJ3dyaXRlJyk7XG4gICAgICB9KTtcbiAgICAgIGl0KCdjYWxscyBpbnB1dC5jb21tYW5kIGZvciBjb21tYW5kJywgKCkgPT4ge1xuICAgICAgICB3Lmluc3RhbmNlKCkua2V5cGFkUHJlc3MoeyBjb21tYW5kOiAnY21kJyB9KTtcbiAgICAgICAgZXhwZWN0KHcuaW5zdGFuY2UoKS5pbnB1dC5jb21tYW5kKS50b0hhdmVCZWVuTGFzdENhbGxlZFdpdGgoJ2NtZCcpO1xuICAgICAgfSk7XG4gICAgICBpdCgnY2FsbHMgaW5wdXQua2V5c3Ryb2tlIGZvciBrZXlzdHJva2UnLCAoKSA9PiB7XG4gICAgICAgIHcuaW5zdGFuY2UoKS5rZXlwYWRQcmVzcyh7IGtleXN0cm9rZTogJ2snIH0pO1xuICAgICAgICBleHBlY3Qody5pbnN0YW5jZSgpLmlucHV0LmtleXN0cm9rZSkudG9IYXZlQmVlbkxhc3RDYWxsZWRXaXRoKCdrJyk7XG4gICAgICB9KTtcbiAgICB9KTtcbiAgfSk7XG5cbiAgZGVzY3JpYmUoJ2NoYW5nZUxhdGV4JywgKCkgPT4ge1xuICAgIGl0KCdjYWxscyBvbkNoYW5nZScsICgpID0+IHtcbiAgICAgIHcgPSB3cmFwcGVyKCk7XG4gICAgICB3Lmluc3RhbmNlKCkuY2hhbmdlTGF0ZXgoJ25ldy1sYXRleCcpO1xuICAgICAgZXhwZWN0KG9uQ2hhbmdlKS50b0hhdmVCZWVuQ2FsbGVkV2l0aCgnbmV3LWxhdGV4Jyk7XG4gICAgfSk7XG4gICAgaXQoJ2RvZXMgbm90IGNhbGwgb25DaGFuZ2UgaWYgaXQgaXMgdGhlIHNhbWUgYXMgdGhlIGV4aXN0aW5nIGxhdGV4JywgKCkgPT4ge1xuICAgICAgdyA9IHdyYXBwZXIoKTtcbiAgICAgIHcuc2V0UHJvcHMoeyBsYXRleDogJ25ldy1sYXRleCcgfSk7XG4gICAgICB3Lmluc3RhbmNlKCkuY2hhbmdlTGF0ZXgoJ25ldy1sYXRleCcpO1xuICAgICAgZXhwZWN0KG9uQ2hhbmdlKS5ub3QudG9IYXZlQmVlbkNhbGxlZFdpdGgoJ25ldy1sYXRleCcpO1xuICAgIH0pO1xuICB9KTtcblxuICBkZXNjcmliZSgnaW5wdXRGb2N1cycsICgpID0+IHtcbiAgICBpdCgnc2V0cyBzdGF0ZScsICgpID0+IHtcbiAgICAgIHcgPSB3cmFwcGVyKCk7XG4gICAgICB3Lmluc3RhbmNlKCkuaW5wdXRGb2N1cygpO1xuICAgICAgZXhwZWN0KHcuc3RhdGUoKS5mb2N1c2VkKS50b0JlKHRydWUpO1xuICAgIH0pO1xuICB9KTtcbiAgZGVzY3JpYmUoJ2lucHV0Qmx1cicsICgpID0+IHtcbiAgICBpdCgnc2V0cyBzdGF0ZScsICgpID0+IHtcbiAgICAgIHcgPSB3cmFwcGVyKCk7XG4gICAgICB3Lmluc3RhbmNlKCkuaW5wdXRGb2N1cygpO1xuICAgICAgdy5pbnN0YW5jZSgpLmlucHV0Qmx1cigpO1xuICAgICAgZXhwZWN0KHcuc3RhdGUoKS5mb2N1c2VkKS50b0JlKGZhbHNlKTtcbiAgICB9KTtcbiAgfSk7XG59KTtcbiJdfQ==
|
package/lib/horizontal-keypad.js
CHANGED
|
@@ -81,19 +81,23 @@ var HorizontalKeypad = /*#__PURE__*/function (_React$Component) {
|
|
|
81
81
|
var _this$props = this.props,
|
|
82
82
|
mode = _this$props.mode,
|
|
83
83
|
onFocus = _this$props.onFocus,
|
|
84
|
+
controlledKeypadMode = _this$props.controlledKeypadMode,
|
|
84
85
|
noDecimal = _this$props.noDecimal,
|
|
85
86
|
className = _this$props.className,
|
|
86
87
|
additionalKeys = _this$props.additionalKeys,
|
|
87
|
-
layoutForKeyPad = _this$props.layoutForKeyPad
|
|
88
|
+
layoutForKeyPad = _this$props.layoutForKeyPad,
|
|
89
|
+
setKeypadInteraction = _this$props.setKeypadInteraction;
|
|
88
90
|
var normalizedKeys = (0, _grades.normalizeAdditionalKeys)(additionalKeys);
|
|
89
91
|
return /*#__PURE__*/_react["default"].createElement(_keypad["default"], {
|
|
90
92
|
className: className,
|
|
93
|
+
controlledKeypadMode: controlledKeypadMode,
|
|
91
94
|
onFocus: onFocus,
|
|
92
95
|
noDecimal: noDecimal,
|
|
93
96
|
layoutForKeyPad: layoutForKeyPad,
|
|
94
97
|
additionalKeys: (0, _utils.extendKeySet)((0, _grades.keysForGrade)(mode), normalizedKeys),
|
|
95
98
|
onPress: this.keypadPress,
|
|
96
|
-
mode: mode
|
|
99
|
+
mode: mode,
|
|
100
|
+
setKeypadInteraction: setKeypadInteraction
|
|
97
101
|
});
|
|
98
102
|
}
|
|
99
103
|
}]);
|
|
@@ -103,16 +107,18 @@ var HorizontalKeypad = /*#__PURE__*/function (_React$Component) {
|
|
|
103
107
|
exports["default"] = HorizontalKeypad;
|
|
104
108
|
(0, _defineProperty2["default"])(HorizontalKeypad, "propTypes", {
|
|
105
109
|
className: _propTypes["default"].string,
|
|
110
|
+
controlledKeypadMode: _propTypes["default"].bool,
|
|
106
111
|
mode: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].number]),
|
|
107
112
|
layoutForKeyPad: _propTypes["default"].object,
|
|
108
113
|
onClick: _propTypes["default"].func.isRequired,
|
|
109
114
|
onFocus: _propTypes["default"].func,
|
|
110
115
|
noDecimal: _propTypes["default"].bool,
|
|
111
|
-
additionalKeys: _propTypes["default"].array
|
|
116
|
+
additionalKeys: _propTypes["default"].array,
|
|
117
|
+
setKeypadInteraction: _propTypes["default"].func
|
|
112
118
|
});
|
|
113
119
|
(0, _defineProperty2["default"])(HorizontalKeypad, "defaultProps", {
|
|
114
120
|
mode: 'scientific',
|
|
115
121
|
noDecimal: false,
|
|
116
122
|
additionalKeys: []
|
|
117
123
|
});
|
|
118
|
-
//# sourceMappingURL=
|
|
124
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9ob3Jpem9udGFsLWtleXBhZC5qc3giXSwibmFtZXMiOlsidG9PbGRNb2RlbCIsImQiLCJjb21tYW5kIiwidmFsdWUiLCJ0eXBlIiwid3JpdGUiLCJrZXlzdHJva2UiLCJIb3Jpem9udGFsS2V5cGFkIiwiZGF0YSIsIm9uQ2xpY2siLCJwcm9wcyIsIm1vZGUiLCJvbkZvY3VzIiwiY29udHJvbGxlZEtleXBhZE1vZGUiLCJub0RlY2ltYWwiLCJjbGFzc05hbWUiLCJhZGRpdGlvbmFsS2V5cyIsImxheW91dEZvcktleVBhZCIsInNldEtleXBhZEludGVyYWN0aW9uIiwibm9ybWFsaXplZEtleXMiLCJrZXlwYWRQcmVzcyIsIlJlYWN0IiwiQ29tcG9uZW50IiwiUHJvcFR5cGVzIiwic3RyaW5nIiwiYm9vbCIsIm9uZU9mVHlwZSIsIm51bWJlciIsIm9iamVjdCIsImZ1bmMiLCJpc1JlcXVpcmVkIiwiYXJyYXkiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBQUE7O0FBQ0E7O0FBQ0E7O0FBQ0E7O0FBQ0E7Ozs7OztBQUVBLElBQU1BLFVBQVUsR0FBRyxTQUFiQSxVQUFhLENBQUNDLENBQUQsRUFBTztBQUN4QixNQUFJQSxDQUFDLENBQUNDLE9BQU4sRUFBZTtBQUNiLFdBQU87QUFBRUMsTUFBQUEsS0FBSyxFQUFFRixDQUFDLENBQUNDLE9BQVg7QUFBb0JFLE1BQUFBLElBQUksRUFBRTtBQUExQixLQUFQO0FBQ0QsR0FGRCxNQUVPLElBQUlILENBQUMsQ0FBQ0ksS0FBTixFQUFhO0FBQ2xCLFdBQU87QUFBRUYsTUFBQUEsS0FBSyxFQUFFRixDQUFDLENBQUNJO0FBQVgsS0FBUDtBQUNELEdBRk0sTUFFQSxJQUFJSixDQUFDLENBQUNLLFNBQU4sRUFBaUI7QUFDdEIsV0FBTztBQUFFRixNQUFBQSxJQUFJLEVBQUUsUUFBUjtBQUFrQkQsTUFBQUEsS0FBSyxFQUFFRixDQUFDLENBQUNLO0FBQTNCLEtBQVA7QUFDRDtBQUNGLENBUkQ7O0lBVXFCQyxnQjs7Ozs7Ozs7Ozs7Ozs7O29HQW1CTCxVQUFDQyxJQUFELEVBQVU7QUFDdEIsVUFBUUMsT0FBUixHQUFvQixNQUFLQyxLQUF6QixDQUFRRCxPQUFSO0FBRUFBLE1BQUFBLE9BQU8sQ0FBQ1QsVUFBVSxDQUFDUSxJQUFELENBQVgsQ0FBUDtBQUNELEs7Ozs7OztXQUVELGtCQUFTO0FBQ1Asd0JBU0ksS0FBS0UsS0FUVDtBQUFBLFVBQ0VDLElBREYsZUFDRUEsSUFERjtBQUFBLFVBRUVDLE9BRkYsZUFFRUEsT0FGRjtBQUFBLFVBR0VDLG9CQUhGLGVBR0VBLG9CQUhGO0FBQUEsVUFJRUMsU0FKRixlQUlFQSxTQUpGO0FBQUEsVUFLRUMsU0FMRixlQUtFQSxTQUxGO0FBQUEsVUFNRUMsY0FORixlQU1FQSxjQU5GO0FBQUEsVUFPRUMsZUFQRixlQU9FQSxlQVBGO0FBQUEsVUFRRUMsb0JBUkYsZUFRRUEsb0JBUkY7QUFVQSxVQUFNQyxjQUFjLEdBQUcscUNBQXdCSCxjQUF4QixDQUF2QjtBQUVBLDBCQUNFLGdDQUFDLGtCQUFEO0FBQ0UsUUFBQSxTQUFTLEVBQUVELFNBRGI7QUFFRSxRQUFBLG9CQUFvQixFQUFFRixvQkFGeEI7QUFHRSxRQUFBLE9BQU8sRUFBRUQsT0FIWDtBQUlFLFFBQUEsU0FBUyxFQUFFRSxTQUpiO0FBS0UsUUFBQSxlQUFlLEVBQUVHLGVBTG5CO0FBTUUsUUFBQSxjQUFjLEVBQUUseUJBQWEsMEJBQWFOLElBQWIsQ0FBYixFQUFpQ1EsY0FBakMsQ0FObEI7QUFPRSxRQUFBLE9BQU8sRUFBRSxLQUFLQyxXQVBoQjtBQVFFLFFBQUEsSUFBSSxFQUFFVCxJQVJSO0FBU0UsUUFBQSxvQkFBb0IsRUFBRU87QUFUeEIsUUFERjtBQWFEOzs7RUFuRDJDRyxrQkFBTUMsUzs7O2lDQUEvQmYsZ0IsZUFDQTtBQUNqQlEsRUFBQUEsU0FBUyxFQUFFUSxzQkFBVUMsTUFESjtBQUVqQlgsRUFBQUEsb0JBQW9CLEVBQUVVLHNCQUFVRSxJQUZmO0FBR2pCZCxFQUFBQSxJQUFJLEVBQUVZLHNCQUFVRyxTQUFWLENBQW9CLENBQUNILHNCQUFVQyxNQUFYLEVBQW1CRCxzQkFBVUksTUFBN0IsQ0FBcEIsQ0FIVztBQUlqQlYsRUFBQUEsZUFBZSxFQUFFTSxzQkFBVUssTUFKVjtBQUtqQm5CLEVBQUFBLE9BQU8sRUFBRWMsc0JBQVVNLElBQVYsQ0FBZUMsVUFMUDtBQU1qQmxCLEVBQUFBLE9BQU8sRUFBRVcsc0JBQVVNLElBTkY7QUFPakJmLEVBQUFBLFNBQVMsRUFBRVMsc0JBQVVFLElBUEo7QUFRakJULEVBQUFBLGNBQWMsRUFBRU8sc0JBQVVRLEtBUlQ7QUFTakJiLEVBQUFBLG9CQUFvQixFQUFFSyxzQkFBVU07QUFUZixDO2lDQURBdEIsZ0Isa0JBYUc7QUFDcEJJLEVBQUFBLElBQUksRUFBRSxZQURjO0FBRXBCRyxFQUFBQSxTQUFTLEVBQUUsS0FGUztBQUdwQkUsRUFBQUEsY0FBYyxFQUFFO0FBSEksQyIsInNvdXJjZXNDb250ZW50IjpbImltcG9ydCBSZWFjdCBmcm9tICdyZWFjdCc7XG5pbXBvcnQgUHJvcFR5cGVzIGZyb20gJ3Byb3AtdHlwZXMnO1xuaW1wb3J0IHsga2V5c0ZvckdyYWRlLCBub3JtYWxpemVBZGRpdGlvbmFsS2V5cyB9IGZyb20gJy4va2V5cy9ncmFkZXMnO1xuaW1wb3J0IHsgZXh0ZW5kS2V5U2V0IH0gZnJvbSAnLi9rZXlzL3V0aWxzJztcbmltcG9ydCBLZXlwYWQgZnJvbSAnLi9rZXlwYWQnO1xuXG5jb25zdCB0b09sZE1vZGVsID0gKGQpID0+IHtcbiAgaWYgKGQuY29tbWFuZCkge1xuICAgIHJldHVybiB7IHZhbHVlOiBkLmNvbW1hbmQsIHR5cGU6ICdjb21tYW5kJyB9O1xuICB9IGVsc2UgaWYgKGQud3JpdGUpIHtcbiAgICByZXR1cm4geyB2YWx1ZTogZC53cml0ZSB9O1xuICB9IGVsc2UgaWYgKGQua2V5c3Ryb2tlKSB7XG4gICAgcmV0dXJuIHsgdHlwZTogJ2N1cnNvcicsIHZhbHVlOiBkLmtleXN0cm9rZSB9O1xuICB9XG59O1xuXG5leHBvcnQgZGVmYXVsdCBjbGFzcyBIb3Jpem9udGFsS2V5cGFkIGV4dGVuZHMgUmVhY3QuQ29tcG9uZW50IHtcbiAgc3RhdGljIHByb3BUeXBlcyA9IHtcbiAgICBjbGFzc05hbWU6IFByb3BUeXBlcy5zdHJpbmcsXG4gICAgY29udHJvbGxlZEtleXBhZE1vZGU6IFByb3BUeXBlcy5ib29sLFxuICAgIG1vZGU6IFByb3BUeXBlcy5vbmVPZlR5cGUoW1Byb3BUeXBlcy5zdHJpbmcsIFByb3BUeXBlcy5udW1iZXJdKSxcbiAgICBsYXlvdXRGb3JLZXlQYWQ6IFByb3BUeXBlcy5vYmplY3QsXG4gICAgb25DbGljazogUHJvcFR5cGVzLmZ1bmMuaXNSZXF1aXJlZCxcbiAgICBvbkZvY3VzOiBQcm9wVHlwZXMuZnVuYyxcbiAgICBub0RlY2ltYWw6IFByb3BUeXBlcy5ib29sLFxuICAgIGFkZGl0aW9uYWxLZXlzOiBQcm9wVHlwZXMuYXJyYXksXG4gICAgc2V0S2V5cGFkSW50ZXJhY3Rpb246IFByb3BUeXBlcy5mdW5jLFxuICB9O1xuXG4gIHN0YXRpYyBkZWZhdWx0UHJvcHMgPSB7XG4gICAgbW9kZTogJ3NjaWVudGlmaWMnLFxuICAgIG5vRGVjaW1hbDogZmFsc2UsXG4gICAgYWRkaXRpb25hbEtleXM6IFtdLFxuICB9O1xuXG4gIGtleXBhZFByZXNzID0gKGRhdGEpID0+IHtcbiAgICBjb25zdCB7IG9uQ2xpY2sgfSA9IHRoaXMucHJvcHM7XG5cbiAgICBvbkNsaWNrKHRvT2xkTW9kZWwoZGF0YSkpO1xuICB9O1xuXG4gIHJlbmRlcigpIHtcbiAgICBjb25zdCB7XG4gICAgICBtb2RlLFxuICAgICAgb25Gb2N1cyxcbiAgICAgIGNvbnRyb2xsZWRLZXlwYWRNb2RlLFxuICAgICAgbm9EZWNpbWFsLFxuICAgICAgY2xhc3NOYW1lLFxuICAgICAgYWRkaXRpb25hbEtleXMsXG4gICAgICBsYXlvdXRGb3JLZXlQYWQsXG4gICAgICBzZXRLZXlwYWRJbnRlcmFjdGlvbixcbiAgICB9ID0gdGhpcy5wcm9wcztcbiAgICBjb25zdCBub3JtYWxpemVkS2V5cyA9IG5vcm1hbGl6ZUFkZGl0aW9uYWxLZXlzKGFkZGl0aW9uYWxLZXlzKTtcblxuICAgIHJldHVybiAoXG4gICAgICA8S2V5cGFkXG4gICAgICAgIGNsYXNzTmFtZT17Y2xhc3NOYW1lfVxuICAgICAgICBjb250cm9sbGVkS2V5cGFkTW9kZT17Y29udHJvbGxlZEtleXBhZE1vZGV9XG4gICAgICAgIG9uRm9jdXM9e29uRm9jdXN9XG4gICAgICAgIG5vRGVjaW1hbD17bm9EZWNpbWFsfVxuICAgICAgICBsYXlvdXRGb3JLZXlQYWQ9e2xheW91dEZvcktleVBhZH1cbiAgICAgICAgYWRkaXRpb25hbEtleXM9e2V4dGVuZEtleVNldChrZXlzRm9yR3JhZGUobW9kZSksIG5vcm1hbGl6ZWRLZXlzKX1cbiAgICAgICAgb25QcmVzcz17dGhpcy5rZXlwYWRQcmVzc31cbiAgICAgICAgbW9kZT17bW9kZX1cbiAgICAgICAgc2V0S2V5cGFkSW50ZXJhY3Rpb249e3NldEtleXBhZEludGVyYWN0aW9ufVxuICAgICAgLz5cbiAgICApO1xuICB9XG59XG4iXX0=
|
package/lib/index.js
CHANGED
|
@@ -20,10 +20,18 @@ Object.defineProperty(exports, "keysForGrade", {
|
|
|
20
20
|
return _grades.keysForGrade;
|
|
21
21
|
}
|
|
22
22
|
});
|
|
23
|
-
exports.
|
|
23
|
+
exports.removeBrackets = exports.mq = void 0;
|
|
24
|
+
Object.defineProperty(exports, "updateSpans", {
|
|
25
|
+
enumerable: true,
|
|
26
|
+
get: function get() {
|
|
27
|
+
return _updateSpans.updateSpans;
|
|
28
|
+
}
|
|
29
|
+
});
|
|
24
30
|
|
|
25
31
|
var _grades = require("./keys/grades");
|
|
26
32
|
|
|
33
|
+
var _updateSpans = require("./updateSpans");
|
|
34
|
+
|
|
27
35
|
var keys = _interopRequireWildcard(require("./keys"));
|
|
28
36
|
|
|
29
37
|
exports.keys = keys;
|
|
@@ -62,19 +70,7 @@ exports.addBrackets = addBrackets;
|
|
|
62
70
|
|
|
63
71
|
var removeBrackets = function removeBrackets(s) {
|
|
64
72
|
return rmRightBracket(rmLeftBracket(s));
|
|
65
|
-
}; // increase the font of parallel notation
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
exports.removeBrackets = removeBrackets;
|
|
69
|
-
|
|
70
|
-
var updateSpans = function updateSpans() {
|
|
71
|
-
var spans = Array.from(document.querySelectorAll('span[mathquill-command-id]'));
|
|
72
|
-
(spans || []).forEach(function (span) {
|
|
73
|
-
if (span && span.innerText === '∥' && span.className !== 'mq-editable-field') {
|
|
74
|
-
span.style.fontSize = '32px';
|
|
75
|
-
}
|
|
76
|
-
});
|
|
77
73
|
};
|
|
78
74
|
|
|
79
|
-
exports.
|
|
80
|
-
//# sourceMappingURL=
|
|
75
|
+
exports.removeBrackets = removeBrackets;
|
|
76
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uL3NyYy9pbmRleC5qc3giXSwibmFtZXMiOlsiYWRkTGVmdEJyYWNrZXQiLCJzIiwiaW5kZXhPZiIsImFkZFJpZ2h0QnJhY2tldCIsImxlbmd0aCIsInJtTGVmdEJyYWNrZXQiLCJzdWJzdHJpbmciLCJybVJpZ2h0QnJhY2tldCIsImFkZEJyYWNrZXRzIiwicmVtb3ZlQnJhY2tldHMiXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBOztBQUNBOztBQVVBOzs7O0FBRUE7O0FBRUE7Ozs7Ozs7O0FBWkEsSUFBTUEsY0FBYyxHQUFHLFNBQWpCQSxjQUFpQixDQUFDQyxDQUFEO0FBQUEsU0FBUUEsQ0FBQyxDQUFDQyxPQUFGLENBQVUsS0FBVixNQUFxQixDQUFyQixHQUF5QkQsQ0FBekIsZ0JBQW1DQSxDQUFuQyxDQUFSO0FBQUEsQ0FBdkI7O0FBQ0EsSUFBTUUsZUFBZSxHQUFHLFNBQWxCQSxlQUFrQixDQUFDRixDQUFEO0FBQUEsU0FBUUEsQ0FBQyxDQUFDQyxPQUFGLENBQVUsS0FBVixNQUFxQkQsQ0FBQyxDQUFDRyxNQUFGLEdBQVcsQ0FBaEMsR0FBb0NILENBQXBDLGFBQTJDQSxDQUEzQyxRQUFSO0FBQUEsQ0FBeEI7O0FBQ0EsSUFBTUksYUFBYSxHQUFHLFNBQWhCQSxhQUFnQixDQUFDSixDQUFEO0FBQUEsU0FBUUEsQ0FBQyxDQUFDQyxPQUFGLENBQVUsS0FBVixNQUFxQixDQUFyQixHQUF5QkQsQ0FBQyxDQUFDSyxTQUFGLENBQVksQ0FBWixDQUF6QixHQUEwQ0wsQ0FBbEQ7QUFBQSxDQUF0Qjs7QUFDQSxJQUFNTSxjQUFjLEdBQUcsU0FBakJBLGNBQWlCLENBQUNOLENBQUQ7QUFBQSxTQUFRQSxDQUFDLENBQUNDLE9BQUYsQ0FBVSxLQUFWLE1BQXFCRCxDQUFDLENBQUNHLE1BQUYsR0FBVyxDQUFoQyxHQUFvQ0gsQ0FBQyxDQUFDSyxTQUFGLENBQVksQ0FBWixFQUFlTCxDQUFDLENBQUNHLE1BQUYsR0FBVyxDQUExQixDQUFwQyxHQUFtRUgsQ0FBM0U7QUFBQSxDQUF2Qjs7QUFFQSxJQUFNTyxXQUFXLEdBQUcsU0FBZEEsV0FBYyxDQUFDUCxDQUFEO0FBQUEsU0FBT0UsZUFBZSxDQUFDSCxjQUFjLENBQUNDLENBQUQsQ0FBZixDQUF0QjtBQUFBLENBQXBCOzs7O0FBQ0EsSUFBTVEsY0FBYyxHQUFHLFNBQWpCQSxjQUFpQixDQUFDUixDQUFEO0FBQUEsU0FBT00sY0FBYyxDQUFDRixhQUFhLENBQUNKLENBQUQsQ0FBZCxDQUFyQjtBQUFBLENBQXZCIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsga2V5c0ZvckdyYWRlIH0gZnJvbSAnLi9rZXlzL2dyYWRlcyc7XG5pbXBvcnQgeyB1cGRhdGVTcGFuc30gZnJvbSBcIi4vdXBkYXRlU3BhbnNcIjtcblxuY29uc3QgYWRkTGVmdEJyYWNrZXQgPSAocykgPT4gKHMuaW5kZXhPZignXFxcXCgnKSA9PT0gMCA/IHMgOiBgXFxcXCgke3N9YCk7XG5jb25zdCBhZGRSaWdodEJyYWNrZXQgPSAocykgPT4gKHMuaW5kZXhPZignXFxcXCknKSA9PT0gcy5sZW5ndGggLSAyID8gcyA6IGAke3N9XFxcXClgKTtcbmNvbnN0IHJtTGVmdEJyYWNrZXQgPSAocykgPT4gKHMuaW5kZXhPZignXFxcXCgnKSA9PT0gMCA/IHMuc3Vic3RyaW5nKDIpIDogcyk7XG5jb25zdCBybVJpZ2h0QnJhY2tldCA9IChzKSA9PiAocy5pbmRleE9mKCdcXFxcKScpID09PSBzLmxlbmd0aCAtIDIgPyBzLnN1YnN0cmluZygwLCBzLmxlbmd0aCAtIDIpIDogcyk7XG5cbmNvbnN0IGFkZEJyYWNrZXRzID0gKHMpID0+IGFkZFJpZ2h0QnJhY2tldChhZGRMZWZ0QnJhY2tldChzKSk7XG5jb25zdCByZW1vdmVCcmFja2V0cyA9IChzKSA9PiBybVJpZ2h0QnJhY2tldChybUxlZnRCcmFja2V0KHMpKTtcblxuaW1wb3J0ICogYXMga2V5cyBmcm9tICcuL2tleXMnO1xuXG5pbXBvcnQgSG9yaXpvbnRhbEtleXBhZCBmcm9tICcuL2hvcml6b250YWwta2V5cGFkJztcblxuaW1wb3J0ICogYXMgbXEgZnJvbSAnLi9tcSc7XG5cbmV4cG9ydCB7IGtleXNGb3JHcmFkZSwgYWRkQnJhY2tldHMsIHJlbW92ZUJyYWNrZXRzLCBrZXlzLCBIb3Jpem9udGFsS2V5cGFkLCBtcSwgdXBkYXRlU3BhbnMgfTtcbiJdfQ==
|
|
@@ -0,0 +1,41 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
|
|
4
|
+
|
|
5
|
+
var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
|
|
6
|
+
|
|
7
|
+
var _enzyme = require("enzyme");
|
|
8
|
+
|
|
9
|
+
var _react = _interopRequireDefault(require("react"));
|
|
10
|
+
|
|
11
|
+
var _index = require("../index");
|
|
12
|
+
|
|
13
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
14
|
+
|
|
15
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { (0, _defineProperty2["default"])(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
16
|
+
|
|
17
|
+
describe('Keypad', function () {
|
|
18
|
+
var w;
|
|
19
|
+
var onChange = jest.fn();
|
|
20
|
+
|
|
21
|
+
var wrapper = function wrapper(extras) {
|
|
22
|
+
var defaults = {
|
|
23
|
+
classes: {},
|
|
24
|
+
className: 'className',
|
|
25
|
+
onChange: onChange,
|
|
26
|
+
onPress: jest.fn()
|
|
27
|
+
};
|
|
28
|
+
|
|
29
|
+
var props = _objectSpread(_objectSpread({}, defaults), extras);
|
|
30
|
+
|
|
31
|
+
return (0, _enzyme.shallow)( /*#__PURE__*/_react["default"].createElement(_index.KeyPad, props));
|
|
32
|
+
};
|
|
33
|
+
|
|
34
|
+
describe('snapshot', function () {
|
|
35
|
+
it('renders', function () {
|
|
36
|
+
w = wrapper();
|
|
37
|
+
expect(w).toMatchSnapshot();
|
|
38
|
+
});
|
|
39
|
+
});
|
|
40
|
+
});
|
|
41
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9rZXlwYWQvX190ZXN0c19fL2luZGV4LnRlc3QuanN4Il0sIm5hbWVzIjpbImRlc2NyaWJlIiwidyIsIm9uQ2hhbmdlIiwiamVzdCIsImZuIiwid3JhcHBlciIsImV4dHJhcyIsImRlZmF1bHRzIiwiY2xhc3NlcyIsImNsYXNzTmFtZSIsIm9uUHJlc3MiLCJwcm9wcyIsIml0IiwiZXhwZWN0IiwidG9NYXRjaFNuYXBzaG90Il0sIm1hcHBpbmdzIjoiOzs7Ozs7QUFBQTs7QUFDQTs7QUFDQTs7Ozs7O0FBRUFBLFFBQVEsQ0FBQyxRQUFELEVBQVcsWUFBTTtBQUN2QixNQUFJQyxDQUFKO0FBQ0EsTUFBSUMsUUFBUSxHQUFHQyxJQUFJLENBQUNDLEVBQUwsRUFBZjs7QUFDQSxNQUFNQyxPQUFPLEdBQUcsU0FBVkEsT0FBVSxDQUFDQyxNQUFELEVBQVk7QUFDMUIsUUFBTUMsUUFBUSxHQUFHO0FBQ2ZDLE1BQUFBLE9BQU8sRUFBRSxFQURNO0FBRWZDLE1BQUFBLFNBQVMsRUFBRSxXQUZJO0FBR2ZQLE1BQUFBLFFBQVEsRUFBUkEsUUFIZTtBQUlmUSxNQUFBQSxPQUFPLEVBQUVQLElBQUksQ0FBQ0MsRUFBTDtBQUpNLEtBQWpCOztBQU1BLFFBQU1PLEtBQUssbUNBQVFKLFFBQVIsR0FBcUJELE1BQXJCLENBQVg7O0FBQ0EsV0FBTyxtQ0FBUSxnQ0FBQyxhQUFELEVBQVlLLEtBQVosQ0FBUixDQUFQO0FBQ0QsR0FURDs7QUFVQVgsRUFBQUEsUUFBUSxDQUFDLFVBQUQsRUFBYSxZQUFNO0FBQ3pCWSxJQUFBQSxFQUFFLENBQUMsU0FBRCxFQUFZLFlBQU07QUFDbEJYLE1BQUFBLENBQUMsR0FBR0ksT0FBTyxFQUFYO0FBQ0FRLE1BQUFBLE1BQU0sQ0FBQ1osQ0FBRCxDQUFOLENBQVVhLGVBQVY7QUFDRCxLQUhDLENBQUY7QUFJRCxHQUxPLENBQVI7QUFNRCxDQW5CTyxDQUFSIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgc2hhbGxvdyB9IGZyb20gJ2VuenltZSc7XG5pbXBvcnQgUmVhY3QgZnJvbSAncmVhY3QnO1xuaW1wb3J0IHsgS2V5UGFkIH0gZnJvbSAnLi4vaW5kZXgnO1xuXG5kZXNjcmliZSgnS2V5cGFkJywgKCkgPT4ge1xuICBsZXQgdztcbiAgbGV0IG9uQ2hhbmdlID0gamVzdC5mbigpO1xuICBjb25zdCB3cmFwcGVyID0gKGV4dHJhcykgPT4ge1xuICAgIGNvbnN0IGRlZmF1bHRzID0ge1xuICAgICAgY2xhc3Nlczoge30sXG4gICAgICBjbGFzc05hbWU6ICdjbGFzc05hbWUnLFxuICAgICAgb25DaGFuZ2UsXG4gICAgICBvblByZXNzOiBqZXN0LmZuKCksXG4gICAgfTtcbiAgICBjb25zdCBwcm9wcyA9IHsgLi4uZGVmYXVsdHMsIC4uLmV4dHJhcyB9O1xuICAgIHJldHVybiBzaGFsbG93KDxLZXlQYWQgey4uLnByb3BzfSAvPik7XG4gIH07XG4gIGRlc2NyaWJlKCdzbmFwc2hvdCcsICgpID0+IHtcbiAgICBpdCgncmVuZGVycycsICgpID0+IHtcbiAgICAgIHcgPSB3cmFwcGVyKCk7XG4gICAgICBleHBlY3QodykudG9NYXRjaFNuYXBzaG90KCk7XG4gICAgfSk7XG4gIH0pO1xufSk7XG4iXX0=
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
|
|
3
|
+
var _keysLayout = require("../keys-layout");
|
|
4
|
+
|
|
5
|
+
var _keys = require("../../keys");
|
|
6
|
+
|
|
7
|
+
describe('keys-layout', function () {
|
|
8
|
+
describe('sortKeys', function () {
|
|
9
|
+
it('pads the rows', function () {
|
|
10
|
+
var result = (0, _keysLayout.sortKeys)([[1, 2, 3]]);
|
|
11
|
+
expect(result).toEqual([[1, undefined, undefined, undefined, undefined], [2, undefined, undefined, undefined, undefined], [3, undefined, undefined, undefined, undefined]]);
|
|
12
|
+
});
|
|
13
|
+
});
|
|
14
|
+
});
|
|
15
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,eyJ2ZXJzaW9uIjozLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9rZXlwYWQvX190ZXN0c19fL2tleXMtbGF5b3V0LnRlc3QuanMiXSwibmFtZXMiOlsiZGVzY3JpYmUiLCJpdCIsInJlc3VsdCIsImV4cGVjdCIsInRvRXF1YWwiLCJ1bmRlZmluZWQiXSwibWFwcGluZ3MiOiI7O0FBQUE7O0FBQ0E7O0FBRUFBLFFBQVEsQ0FBQyxhQUFELEVBQWdCLFlBQU07QUFDNUJBLEVBQUFBLFFBQVEsQ0FBQyxVQUFELEVBQWEsWUFBTTtBQUN6QkMsSUFBQUEsRUFBRSxDQUFDLGVBQUQsRUFBa0IsWUFBTTtBQUN4QixVQUFNQyxNQUFNLEdBQUcsMEJBQVMsQ0FBQyxDQUFDLENBQUQsRUFBSSxDQUFKLEVBQU8sQ0FBUCxDQUFELENBQVQsQ0FBZjtBQUNBQyxNQUFBQSxNQUFNLENBQUNELE1BQUQsQ0FBTixDQUFlRSxPQUFmLENBQXVCLENBQ3JCLENBQUMsQ0FBRCxFQUFJQyxTQUFKLEVBQWVBLFNBQWYsRUFBMEJBLFNBQTFCLEVBQXFDQSxTQUFyQyxDQURxQixFQUVyQixDQUFDLENBQUQsRUFBSUEsU0FBSixFQUFlQSxTQUFmLEVBQTBCQSxTQUExQixFQUFxQ0EsU0FBckMsQ0FGcUIsRUFHckIsQ0FBQyxDQUFELEVBQUlBLFNBQUosRUFBZUEsU0FBZixFQUEwQkEsU0FBMUIsRUFBcUNBLFNBQXJDLENBSHFCLENBQXZCO0FBS0QsS0FQQyxDQUFGO0FBUUQsR0FUTyxDQUFSO0FBVUQsQ0FYTyxDQUFSIiwic291cmNlc0NvbnRlbnQiOlsiaW1wb3J0IHsgc29ydEtleXMgfSBmcm9tICcuLi9rZXlzLWxheW91dCc7XG5pbXBvcnQgeyBiYXNlU2V0LCBjb21wYXJpc29uIH0gZnJvbSAnLi4vLi4va2V5cyc7XG5cbmRlc2NyaWJlKCdrZXlzLWxheW91dCcsICgpID0+IHtcbiAgZGVzY3JpYmUoJ3NvcnRLZXlzJywgKCkgPT4ge1xuICAgIGl0KCdwYWRzIHRoZSByb3dzJywgKCkgPT4ge1xuICAgICAgY29uc3QgcmVzdWx0ID0gc29ydEtleXMoW1sxLCAyLCAzXV0pO1xuICAgICAgZXhwZWN0KHJlc3VsdCkudG9FcXVhbChbXG4gICAgICAgIFsxLCB1bmRlZmluZWQsIHVuZGVmaW5lZCwgdW5kZWZpbmVkLCB1bmRlZmluZWRdLFxuICAgICAgICBbMiwgdW5kZWZpbmVkLCB1bmRlZmluZWQsIHVuZGVmaW5lZCwgdW5kZWZpbmVkXSxcbiAgICAgICAgWzMsIHVuZGVmaW5lZCwgdW5kZWZpbmVkLCB1bmRlZmluZWQsIHVuZGVmaW5lZF0sXG4gICAgICBdKTtcbiAgICB9KTtcbiAgfSk7XG59KTtcbiJdfQ==
|
package/lib/keypad/index.js
CHANGED
|
@@ -43,17 +43,21 @@ var _colorManipulator = require("@material-ui/core/styles/colorManipulator");
|
|
|
43
43
|
|
|
44
44
|
var _green = _interopRequireDefault(require("@material-ui/core/colors/green"));
|
|
45
45
|
|
|
46
|
-
var
|
|
46
|
+
var _debug = _interopRequireDefault(require("debug"));
|
|
47
|
+
|
|
48
|
+
var _lodash = _interopRequireDefault(require("lodash"));
|
|
49
|
+
|
|
50
|
+
var _mathquill = _interopRequireDefault(require("@pie-framework/mathquill"));
|
|
47
51
|
|
|
48
52
|
var mq = _interopRequireWildcard(require("../mq"));
|
|
49
53
|
|
|
50
54
|
var _keys = require("../keys");
|
|
51
55
|
|
|
52
|
-
var
|
|
56
|
+
var _editableHtml = require("@pie-lib/editable-html");
|
|
53
57
|
|
|
54
|
-
var
|
|
58
|
+
var _commonMqStyles = require("../mq/common-mq-styles");
|
|
55
59
|
|
|
56
|
-
var
|
|
60
|
+
var _keysLayout = require("./keys-layout");
|
|
57
61
|
|
|
58
62
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
59
63
|
|
|
@@ -91,6 +95,10 @@ var LatexButton = (0, _styles.withStyles)(function (theme) {
|
|
|
91
95
|
'& .mq-overline .mq-overline-inner': {
|
|
92
96
|
borderTop: '2px solid black'
|
|
93
97
|
},
|
|
98
|
+
'& .mq-non-leaf.mq-overline': {
|
|
99
|
+
borderTop: 'none !important' // fixing PD-4873 - in OT, it has border-top 1px and adds extra line
|
|
100
|
+
|
|
101
|
+
},
|
|
94
102
|
'& .mq-overarrow': {
|
|
95
103
|
width: '30px',
|
|
96
104
|
marginTop: '0 !important',
|
|
@@ -99,12 +107,14 @@ var LatexButton = (0, _styles.withStyles)(function (theme) {
|
|
|
99
107
|
'&.mq-arrow-both': {
|
|
100
108
|
top: '0px !important',
|
|
101
109
|
'& *': {
|
|
102
|
-
lineHeight: '1 !important'
|
|
110
|
+
lineHeight: '1 !important',
|
|
111
|
+
borderTop: 'none !important' // fixing PD-4873 - in OT, it has border-top 1px and adds extra line,
|
|
112
|
+
|
|
103
113
|
},
|
|
104
114
|
'&:before': {
|
|
105
115
|
fontSize: '80%',
|
|
106
|
-
left: 'calc(-13%)',
|
|
107
|
-
top: '-0.31em'
|
|
116
|
+
left: 'calc(-13%) !important',
|
|
117
|
+
top: '-0.31em !important'
|
|
108
118
|
},
|
|
109
119
|
'&:after': {
|
|
110
120
|
fontSize: '80% !important',
|
|
@@ -127,8 +137,8 @@ var LatexButton = (0, _styles.withStyles)(function (theme) {
|
|
|
127
137
|
},
|
|
128
138
|
'&.mq-arrow-right:before': {
|
|
129
139
|
fontSize: '80%',
|
|
130
|
-
right: 'calc(-13%)',
|
|
131
|
-
top: '-0.26em'
|
|
140
|
+
right: 'calc(-13%) !important',
|
|
141
|
+
top: '-0.26em !important'
|
|
132
142
|
},
|
|
133
143
|
'& .mq-overarrow-inner': {
|
|
134
144
|
border: 'none !important'
|
|
@@ -164,6 +174,10 @@ var LatexButton = (0, _styles.withStyles)(function (theme) {
|
|
|
164
174
|
},
|
|
165
175
|
'& .mq-overarc': {
|
|
166
176
|
borderTop: '2px solid black !important',
|
|
177
|
+
'& .mq-overline': {
|
|
178
|
+
borderTop: 'none !important' // fixing PD-4873 - in OT, it has border-top 1px and adds extra line
|
|
179
|
+
|
|
180
|
+
},
|
|
167
181
|
'& .mq-overline-inner': {
|
|
168
182
|
borderTop: 'none !important',
|
|
169
183
|
paddingTop: '0 !important'
|
|
@@ -171,7 +185,7 @@ var LatexButton = (0, _styles.withStyles)(function (theme) {
|
|
|
171
185
|
}
|
|
172
186
|
},
|
|
173
187
|
parallelButton: {
|
|
174
|
-
fontStyle: 'italic'
|
|
188
|
+
fontStyle: 'italic !important'
|
|
175
189
|
},
|
|
176
190
|
leftRightArrowButton: {
|
|
177
191
|
'& .mq-overarrow.mq-arrow-both': {
|
|
@@ -237,16 +251,18 @@ var KeyPad = /*#__PURE__*/function (_React$Component) {
|
|
|
237
251
|
|
|
238
252
|
var _super = _createSuper(KeyPad);
|
|
239
253
|
|
|
240
|
-
function KeyPad() {
|
|
254
|
+
function KeyPad(props) {
|
|
241
255
|
var _this;
|
|
242
256
|
|
|
243
257
|
(0, _classCallCheck2["default"])(this, KeyPad);
|
|
244
|
-
|
|
245
|
-
|
|
246
|
-
|
|
247
|
-
|
|
248
|
-
|
|
249
|
-
|
|
258
|
+
_this = _super.call(this, props);
|
|
259
|
+
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "handleKeypadInteraction", function () {
|
|
260
|
+
// Check if the setKeypadInteraction prop is available, which is used for both
|
|
261
|
+
// the language keypad and the special characters keypad
|
|
262
|
+
if (_this.props.setKeypadInteraction) {
|
|
263
|
+
_this.props.setKeypadInteraction(true);
|
|
264
|
+
}
|
|
265
|
+
});
|
|
250
266
|
(0, _defineProperty2["default"])((0, _assertThisInitialized2["default"])(_this), "buttonClick", function (key) {
|
|
251
267
|
log('[buttonClick]', key);
|
|
252
268
|
var onPress = _this.props.onPress;
|
|
@@ -265,10 +281,59 @@ var KeyPad = /*#__PURE__*/function (_React$Component) {
|
|
|
265
281
|
|
|
266
282
|
return false;
|
|
267
283
|
});
|
|
284
|
+
_this.keypadRef = /*#__PURE__*/_react["default"].createRef();
|
|
268
285
|
return _this;
|
|
269
286
|
}
|
|
270
287
|
|
|
271
288
|
(0, _createClass2["default"])(KeyPad, [{
|
|
289
|
+
key: "componentDidMount",
|
|
290
|
+
value: function componentDidMount() {
|
|
291
|
+
var _this$keypadRef;
|
|
292
|
+
|
|
293
|
+
var keyPadElement = (_this$keypadRef = this.keypadRef) === null || _this$keypadRef === void 0 ? void 0 : _this$keypadRef.current;
|
|
294
|
+
var mainContainer = keyPadElement === null || keyPadElement === void 0 ? void 0 : keyPadElement.closest(".".concat(_editableHtml.constants.MAIN_CONTAINER_CLASS));
|
|
295
|
+
var currentToolbar = keyPadElement === null || keyPadElement === void 0 ? void 0 : keyPadElement.closest('.pie-toolbar'); // need only for math keyboard so we need also controlledKeypadMode
|
|
296
|
+
|
|
297
|
+
if (this.props.controlledKeypadMode && mainContainer && currentToolbar) {
|
|
298
|
+
var mainContainerPosition = mainContainer.getBoundingClientRect();
|
|
299
|
+
var currentToolbarPosition = currentToolbar.getBoundingClientRect();
|
|
300
|
+
var difference = mainContainerPosition.top + mainContainerPosition.height - (currentToolbarPosition.top + currentToolbarPosition.height);
|
|
301
|
+
|
|
302
|
+
if (difference < 0) {
|
|
303
|
+
var totalHeight = mainContainerPosition.height + mainContainerPosition.top - difference; // increase the height of the main container if keyboard needs it
|
|
304
|
+
|
|
305
|
+
if (mainContainer) {
|
|
306
|
+
mainContainer.style.height = "".concat(totalHeight, "px");
|
|
307
|
+
}
|
|
308
|
+
}
|
|
309
|
+
}
|
|
310
|
+
|
|
311
|
+
if (keyPadElement) {
|
|
312
|
+
keyPadElement.addEventListener('touchstart', this.handleKeypadInteraction, true);
|
|
313
|
+
keyPadElement.addEventListener('mousedown', this.handleKeypadInteraction, true);
|
|
314
|
+
}
|
|
315
|
+
}
|
|
316
|
+
}, {
|
|
317
|
+
key: "componentWillUnmount",
|
|
318
|
+
value: function componentWillUnmount() {
|
|
319
|
+
var _this$keypadRef2;
|
|
320
|
+
|
|
321
|
+
var keyPadElement = (_this$keypadRef2 = this.keypadRef) === null || _this$keypadRef2 === void 0 ? void 0 : _this$keypadRef2.current; // need only for math keyboard
|
|
322
|
+
|
|
323
|
+
if (this.props.controlledKeypadMode && keyPadElement) {
|
|
324
|
+
var mainContainer = keyPadElement.closest(".".concat(_editableHtml.constants.MAIN_CONTAINER_CLASS));
|
|
325
|
+
|
|
326
|
+
if (mainContainer) {
|
|
327
|
+
mainContainer.style.height = 'unset';
|
|
328
|
+
}
|
|
329
|
+
}
|
|
330
|
+
|
|
331
|
+
if (keyPadElement) {
|
|
332
|
+
keyPadElement.removeEventListener('touchstart', this.handleKeypadInteraction, true);
|
|
333
|
+
keyPadElement.removeEventListener('mousedown', this.handleKeypadInteraction, true);
|
|
334
|
+
}
|
|
335
|
+
}
|
|
336
|
+
}, {
|
|
272
337
|
key: "render",
|
|
273
338
|
value: function render() {
|
|
274
339
|
var _this2 = this;
|
|
@@ -292,6 +357,7 @@ var KeyPad = /*#__PURE__*/function (_React$Component) {
|
|
|
292
357
|
}, createCustomLayout(layoutForKeyPad));
|
|
293
358
|
|
|
294
359
|
return /*#__PURE__*/_react["default"].createElement("div", {
|
|
360
|
+
ref: this.keypadRef,
|
|
295
361
|
className: (0, _classnames["default"])(classes.keys, className, classes[mode]),
|
|
296
362
|
style: style,
|
|
297
363
|
onFocus: onFocus
|
|
@@ -325,6 +391,7 @@ var KeyPad = /*#__PURE__*/function (_React$Component) {
|
|
|
325
391
|
return /*#__PURE__*/_react["default"].createElement(_Button["default"], (0, _extends2["default"])({
|
|
326
392
|
key: index
|
|
327
393
|
}, common, {
|
|
394
|
+
className: (0, _classnames["default"])(common.className, (0, _defineProperty2["default"])({}, classes.deleteButton, k.label === '⌫')),
|
|
328
395
|
"aria-label": k.ariaLabel ? k.ariaLabel : k.name || k.label
|
|
329
396
|
}), k.label);
|
|
330
397
|
} else {
|
|
@@ -347,13 +414,15 @@ exports.KeyPad = KeyPad;
|
|
|
347
414
|
(0, _defineProperty2["default"])(KeyPad, "propTypes", {
|
|
348
415
|
classes: _propTypes["default"].object.isRequired,
|
|
349
416
|
className: _propTypes["default"].string,
|
|
417
|
+
controlledKeypadMode: _propTypes["default"].bool,
|
|
350
418
|
baseSet: _propTypes["default"].array,
|
|
351
419
|
additionalKeys: _propTypes["default"].array,
|
|
352
420
|
layoutForKeyPad: _propTypes["default"].object,
|
|
353
421
|
onPress: _propTypes["default"].func.isRequired,
|
|
354
422
|
onFocus: _propTypes["default"].func,
|
|
355
423
|
noDecimal: _propTypes["default"].bool,
|
|
356
|
-
|
|
424
|
+
setKeypadInteraction: _propTypes["default"].func,
|
|
425
|
+
mode: _propTypes["default"].oneOfType([_propTypes["default"].string, _propTypes["default"].number])
|
|
357
426
|
});
|
|
358
427
|
(0, _defineProperty2["default"])(KeyPad, "defaultProps", {
|
|
359
428
|
baseSet: _keys.baseSet,
|
|
@@ -362,23 +431,20 @@ exports.KeyPad = KeyPad;
|
|
|
362
431
|
|
|
363
432
|
var styles = function styles(theme) {
|
|
364
433
|
return {
|
|
365
|
-
keys: {
|
|
366
|
-
'& *': {
|
|
367
|
-
fontFamily: 'Roboto, Helvetica, Arial, sans-serif !important'
|
|
368
|
-
},
|
|
434
|
+
keys: _objectSpread(_objectSpread({}, _commonMqStyles.commonMqKeyboardStyles), {}, {
|
|
369
435
|
width: '100%',
|
|
370
436
|
display: 'grid',
|
|
371
437
|
gridTemplateRows: 'repeat(5, minmax(40px, 60px))',
|
|
372
438
|
gridRowGap: '0px',
|
|
373
439
|
gridColumnGap: '0px',
|
|
374
440
|
gridAutoFlow: 'column'
|
|
375
|
-
},
|
|
441
|
+
}),
|
|
376
442
|
character: {
|
|
377
443
|
textTransform: 'initial !important',
|
|
378
444
|
gridTemplateRows: 'repeat(5, minmax(40px, 50px)) !important'
|
|
379
445
|
},
|
|
380
446
|
language: {
|
|
381
|
-
gridTemplateRows: 'repeat(
|
|
447
|
+
gridTemplateRows: 'repeat(4, minmax(40px, 50px)) !important',
|
|
382
448
|
'& *': {
|
|
383
449
|
fontFamily: 'Roboto, Helvetica, Arial, sans-serif !important'
|
|
384
450
|
}
|
|
@@ -408,6 +474,11 @@ var styles = function styles(theme) {
|
|
|
408
474
|
backgroundColor: (0, _colorManipulator.lighten)(theme.palette.primary.light, 0.7)
|
|
409
475
|
}
|
|
410
476
|
},
|
|
477
|
+
deleteButton: {
|
|
478
|
+
'& > span': {
|
|
479
|
+
fontFamily: 'Roboto, Helvetica, Arial, sans-serif !important'
|
|
480
|
+
}
|
|
481
|
+
},
|
|
411
482
|
base: {},
|
|
412
483
|
operators: {
|
|
413
484
|
backgroundColor: (0, _colorManipulator.lighten)(theme.palette.secondary.light, 0.5),
|
|
@@ -438,4 +509,4 @@ var styles = function styles(theme) {
|
|
|
438
509
|
var _default = (0, _styles.withStyles)(styles)(KeyPad);
|
|
439
510
|
|
|
440
511
|
exports["default"] = _default;
|
|
441
|
-
//# sourceMappingURL=index.js.map
|
|
512
|
+
//# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../../src/keypad/index.jsx"],"names":["log","LatexButton","theme","root","textTransform","padding","margin","fontSize","latexButton","pointerEvents","transform","marginBottom","backgroundColor","palette","secondary","main","borderTop","width","marginTop","fontFamily","top","lineHeight","left","right","minHeight","border","display","paddingTop","parallelButton","fontStyle","leftRightArrowButton","position","props","buttonClass","latex","classes","mqClassName","MQ","MathQuill","getInterface","span","document","createElement","innerHTML","mathField","StaticMath","parseLatex","e","className","onClick","ariaLabel","createCustomLayout","layoutObj","gridTemplateColumns","columns","gridTemplateRows","rows","gridAutoFlow","KeyPad","setKeypadInteraction","key","onPress","base","extras","transposed","_","flatten","noDecimal","write","label","keypadRef","React","createRef","keyPadElement","current","mainContainer","closest","constants","MAIN_CONTAINER_CLASS","currentToolbar","controlledKeypadMode","mainContainerPosition","getBoundingClientRect","currentToolbarPosition","difference","height","totalHeight","style","addEventListener","handleKeypadInteraction","removeEventListener","baseSet","additionalKeys","layoutForKeyPad","onFocus","mode","noBaseSet","keysWithoutBaseSet","includes","allKeys","flowKeys","shift","length","Math","floor","keys","map","k","index","buttonClick","bind","common","labelButton","category","extraClass","comma","dot","disabled","keyIsNotAllowed","command","actions","extraProps","name","deleteButton","Icon","icon","Component","PropTypes","object","isRequired","string","bool","array","func","oneOfType","number","styles","commonMqKeyboardStyles","gridRowGap","gridColumnGap","character","language","holder","borderRadius","spacing","unit","minWidth","primary","light","operators","comparison","green"],"mappings":"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","sourcesContent":["import React from 'react';\nimport PropTypes from 'prop-types';\nimport Button from '@material-ui/core/Button';\nimport IconButton from '@material-ui/core/IconButton';\nimport { withStyles } from '@material-ui/core/styles';\nimport classNames from 'classnames';\nimport { lighten, fade } from '@material-ui/core/styles/colorManipulator';\nimport green from '@material-ui/core/colors/green';\nimport debug from 'debug';\nimport _ from 'lodash';\nimport MathQuill from '@pie-framework/mathquill';\n\nimport * as mq from '../mq';\nimport { baseSet } from '../keys';\nimport { constants } from '@pie-lib/editable-html';\nimport { commonMqKeyboardStyles } from '../mq/common-mq-styles';\nimport { sortKeys } from './keys-layout';\n\nconst log = debug('pie-lib:math-inline:keypad');\n\nconst LatexButton = withStyles((theme) => ({\n  root: {\n    textTransform: 'none',\n    padding: 0,\n    margin: 0,\n    fontSize: '110% !important',\n  },\n  latexButton: {\n    pointerEvents: 'none',\n    textTransform: 'none !important',\n    '& .mq-scaled.mq-sqrt-prefix': {\n      transform: 'scale(1, 0.9) !important',\n    },\n    '& .mq-sup-only .mq-sup': {\n      marginBottom: '0.9px !important',\n    },\n    '& .mq-empty': {\n      backgroundColor: `${fade(theme.palette.secondary.main, 0.4)} !important`,\n    },\n    '& .mq-overline .mq-overline-inner': {\n      borderTop: '2px solid black',\n    },\n    '& .mq-non-leaf.mq-overline': {\n      borderTop: 'none !important', // fixing PD-4873 - in OT, it has border-top 1px and adds extra line\n    },\n    '& .mq-overarrow': {\n      width: '30px',\n      marginTop: '0 !important',\n      borderTop: '2px solid black',\n      fontFamily: 'Roboto, Helvetica, Arial, sans-serif !important',\n\n      '&.mq-arrow-both': {\n        top: '0px !important',\n        '& *': {\n          lineHeight: '1 !important',\n          borderTop: 'none !important', // fixing PD-4873 - in OT, it has border-top 1px and adds extra line,\n        },\n        '&:before': {\n          fontSize: '80%',\n          left: 'calc(-13%) !important',\n          top: '-0.31em !important',\n        },\n        '&:after': {\n          fontSize: '80% !important',\n          right: 'calc(-13%) !important',\n          top: '-1.5em',\n        },\n        '&.mq-empty:before': {\n          fontSize: '80%',\n          left: 'calc(-13%)',\n          top: '-0.26em',\n        },\n        '&.mq-empty:after': {\n          fontSize: '80%',\n          right: 'calc(-13%)',\n          top: '-0.26em',\n        },\n        '&.mq-empty': {\n          minHeight: '1.4em',\n        },\n      },\n      '&.mq-arrow-right:before': {\n        fontSize: '80%',\n        right: 'calc(-13%) !important',\n        top: '-0.26em !important',\n      },\n      '& .mq-overarrow-inner': {\n        border: 'none !important',\n      },\n      '& .mq-overarrow-inner .mq-overarrow-inner-right': {\n        display: 'none !important',\n      },\n    },\n    '& .mq-root-block': {\n      padding: '5px !important',\n    },\n    '& .mq-overarrow.mq-arrow-both.mq-empty:after': {\n      right: '-6px',\n      fontSize: '80% !important',\n      top: '-3px',\n    },\n    '& .mq-overarrow.mq-arrow-right.mq-empty:before': {\n      right: '-5px',\n      fontSize: '80% !important',\n      top: '-3px',\n    },\n    '& .mq-overarrow.mq-arrow-both.mq-empty:before': {\n      left: '-6px',\n      fontSize: '80% !important',\n      top: '-3px',\n    },\n    '& .mq-longdiv-inner': {\n      borderTop: '1px solid !important',\n      paddingTop: '1.5px !important',\n    },\n    '& .mq-parallelogram': {\n      lineHeight: 0.85,\n    },\n    '& .mq-overarc': {\n      borderTop: '2px solid black !important',\n      '& .mq-overline': {\n        borderTop: 'none !important', // fixing PD-4873 - in OT, it has border-top 1px and adds extra line\n      },\n      '& .mq-overline-inner': {\n        borderTop: 'none !important',\n        paddingTop: '0 !important',\n      },\n    },\n  },\n  parallelButton: {\n    fontStyle: 'italic !important',\n  },\n  leftRightArrowButton: {\n    '& .mq-overarrow.mq-arrow-both': {\n      '& .mq-overline-inner': {\n        borderTop: 'none !important',\n        paddingTop: '0 !important',\n      },\n      '&:after': {\n        position: 'absolute !important',\n        top: '0px !important',\n      },\n    },\n  },\n}))((props) => {\n  let buttonClass;\n\n  if (props.latex === '\\\\parallel') {\n    buttonClass = classNames(props.classes.latexButton, props.mqClassName, props.classes.parallelButton);\n  } else if (props.latex === '\\\\overleftrightarrow{\\\\overline{}}') {\n    buttonClass = classNames(props.classes.latexButton, props.mqClassName, props.classes.leftRightArrowButton);\n  } else {\n    buttonClass = classNames(props.classes.latexButton, props.mqClassName);\n  }\n\n  try {\n    const MQ = MathQuill.getInterface(2);\n    const span = document.createElement('span');\n    span.innerHTML = '';\n    const mathField = MQ.StaticMath(span);\n\n    mathField.parseLatex(props.latex);\n    mathField.latex(props.latex);\n  } catch (e) {\n    // received latex has errors - do not create button\n    return <></>;\n  }\n\n  return (\n    <Button\n      className={classNames(props.classes.root, props.className)}\n      onClick={props.onClick}\n      aria-label={props.ariaLabel}\n    >\n      <mq.Static className={buttonClass} latex={props.latex} />\n    </Button>\n  );\n});\n\nconst createCustomLayout = (layoutObj) => {\n  if (layoutObj) {\n    return {\n      gridTemplateColumns: `repeat(${layoutObj.columns}, minmax(min-content, 150px))`,\n      gridTemplateRows: `repeat(${layoutObj.rows}, minmax(40px, 60px))`,\n      gridAutoFlow: 'initial',\n    };\n  }\n\n  return {};\n};\n\nexport class KeyPad extends React.Component {\n  static propTypes = {\n    classes: PropTypes.object.isRequired,\n    className: PropTypes.string,\n    controlledKeypadMode: PropTypes.bool,\n    baseSet: PropTypes.array,\n    additionalKeys: PropTypes.array,\n    layoutForKeyPad: PropTypes.object,\n    onPress: PropTypes.func.isRequired,\n    onFocus: PropTypes.func,\n    noDecimal: PropTypes.bool,\n    setKeypadInteraction: PropTypes.func,\n    mode: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),\n  };\n  static defaultProps = {\n    baseSet: baseSet,\n    noDecimal: false,\n  };\n\n  constructor(props) {\n    super(props);\n    this.keypadRef = React.createRef();\n  }\n\n  componentDidMount() {\n    const keyPadElement = this.keypadRef?.current;\n    const mainContainer = keyPadElement?.closest(`.${constants.MAIN_CONTAINER_CLASS}`);\n    const currentToolbar = keyPadElement?.closest('.pie-toolbar');\n\n    // need only for math keyboard so we need also controlledKeypadMode\n    if (this.props.controlledKeypadMode && mainContainer && currentToolbar) {\n      const mainContainerPosition = mainContainer.getBoundingClientRect();\n      const currentToolbarPosition = currentToolbar.getBoundingClientRect();\n      const difference =\n        mainContainerPosition.top +\n        mainContainerPosition.height -\n        (currentToolbarPosition.top + currentToolbarPosition.height);\n      if (difference < 0) {\n        const totalHeight = mainContainerPosition.height + mainContainerPosition.top - difference;\n        // increase the height of the main container if keyboard needs it\n        if (mainContainer) {\n          mainContainer.style.height = `${totalHeight}px`;\n        }\n      }\n    }\n\n    if (keyPadElement) {\n      keyPadElement.addEventListener('touchstart', this.handleKeypadInteraction, true);\n      keyPadElement.addEventListener('mousedown', this.handleKeypadInteraction, true);\n    }\n  }\n\n  componentWillUnmount() {\n    const keyPadElement = this.keypadRef?.current;\n    // need only for math keyboard\n    if (this.props.controlledKeypadMode && keyPadElement) {\n      const mainContainer = keyPadElement.closest(`.${constants.MAIN_CONTAINER_CLASS}`);\n\n      if (mainContainer) {\n        mainContainer.style.height = 'unset';\n      }\n    }\n\n    if (keyPadElement) {\n      keyPadElement.removeEventListener('touchstart', this.handleKeypadInteraction, true);\n      keyPadElement.removeEventListener('mousedown', this.handleKeypadInteraction, true);\n    }\n  }\n\n  handleKeypadInteraction = () => {\n    // Check if the setKeypadInteraction prop is available, which is used for both\n    // the language keypad and the special characters keypad\n    if (this.props.setKeypadInteraction) {\n      this.props.setKeypadInteraction(true);\n    }\n  };\n\n  buttonClick = (key) => {\n    log('[buttonClick]', key);\n    const { onPress } = this.props;\n\n    onPress(key);\n  };\n\n  flowKeys = (base, extras) => {\n    const transposed = [...sortKeys(base), ...sortKeys(extras)];\n    return _.flatten(transposed);\n  };\n\n  keyIsNotAllowed = (key) => {\n    const { noDecimal } = this.props;\n\n    if (((key.write === '.' && key.label === '.') || (key.write === ',' && key.label === ',')) && noDecimal) {\n      return true;\n    }\n\n    return false;\n  };\n\n  render() {\n    const { classes, className, baseSet, additionalKeys, layoutForKeyPad, onFocus, mode } = this.props;\n\n    const noBaseSet = ['non-negative-integers', 'integers', 'decimals', 'fractions', 'item-authoring', 'language'];\n\n    const keysWithoutBaseSet = noBaseSet.includes(mode);\n    const allKeys = keysWithoutBaseSet\n      ? this.flowKeys([], additionalKeys || [])\n      : this.flowKeys(baseSet, additionalKeys || []); //, ...sortKeys(additionalKeys)];\n\n    const shift = allKeys.length % 5 ? 1 : 0;\n    const style = {\n      gridTemplateColumns: `repeat(${Math.floor(allKeys.length / 5) + shift}, minmax(min-content, 150px))`,\n      ...createCustomLayout(layoutForKeyPad),\n    };\n\n    return (\n      <div\n        ref={this.keypadRef}\n        className={classNames(classes.keys, className, classes[mode])}\n        style={style}\n        onFocus={onFocus}\n      >\n        {allKeys.map((k, index) => {\n          const onClick = this.buttonClick.bind(this, k);\n\n          if (!k) {\n            return <span key={`empty-${index}`} />;\n          }\n\n          const common = {\n            onClick,\n            className: classNames(\n              classes.labelButton,\n              !keysWithoutBaseSet && classes[k.category],\n              classes[k.extraClass],\n              k.label === ',' && classes.comma,\n              k.label === '.' && classes.dot,\n            ),\n            disabled: this.keyIsNotAllowed(k),\n            key: `${k.label || k.latex || k.command}-${index}`,\n            ...(k.actions || {}),\n            ...(k.extraProps || {}),\n          };\n\n          if (k.latex) {\n            return (\n              <LatexButton\n                latex={k.latex}\n                key={index}\n                {...common}\n                className={classes.latexButton}\n                ariaLabel={k.ariaLabel ? k.ariaLabel : k.name || k.label}\n              />\n            );\n          }\n\n          if (k.label) {\n            return (\n              <Button\n                key={index}\n                {...common}\n                className={classNames(common.className, { [classes.deleteButton]: k.label === '⌫' })}\n                aria-label={k.ariaLabel ? k.ariaLabel : k.name || k.label}\n              >\n                {k.label}\n              </Button>\n            );\n          } else {\n            const Icon = k.icon ? k.icon : 'div';\n\n            return (\n              <IconButton tabIndex={'-1'} {...common} key={index}>\n                <Icon className={classes.icon} />\n              </IconButton>\n            );\n          }\n        })}\n      </div>\n    );\n  }\n}\n\nconst styles = (theme) => ({\n  keys: {\n    ...commonMqKeyboardStyles,\n    width: '100%',\n    display: 'grid',\n    gridTemplateRows: 'repeat(5, minmax(40px, 60px))',\n    gridRowGap: '0px',\n    gridColumnGap: '0px',\n    gridAutoFlow: 'column',\n  },\n  character: {\n    textTransform: 'initial !important',\n    gridTemplateRows: 'repeat(5, minmax(40px, 50px)) !important',\n  },\n  language: {\n    gridTemplateRows: 'repeat(4, minmax(40px, 50px)) !important',\n    '& *': {\n      fontFamily: 'Roboto, Helvetica, Arial, sans-serif !important',\n    },\n  },\n  holder: {\n    position: 'relative',\n    width: '100%',\n    height: '100%',\n    backgroundColor: '#cef',\n    borderRadius: 0,\n    padding: `${theme.spacing.unit}px 0 ${theme.spacing.unit}px 0`,\n  },\n  labelButton: {\n    minWidth: 'auto',\n    fontSize: '140% !important',\n    backgroundColor: lighten(theme.palette.primary.light, 0.5),\n    '&:hover': {\n      backgroundColor: lighten(theme.palette.primary.light, 0.7),\n    },\n    borderRadius: 0,\n  },\n  latexButton: {\n    minWidth: 'auto',\n    borderRadius: 0,\n    backgroundColor: lighten(theme.palette.primary.light, 0.5),\n    '&:hover': {\n      backgroundColor: lighten(theme.palette.primary.light, 0.7),\n    },\n  },\n  deleteButton: {\n    '& > span': {\n      fontFamily: 'Roboto, Helvetica, Arial, sans-serif !important',\n    },\n  },\n  base: {},\n  operators: {\n    backgroundColor: lighten(theme.palette.secondary.light, 0.5),\n    '&:hover': {\n      backgroundColor: lighten(theme.palette.secondary.light, 0.7),\n    },\n  },\n  comparison: {\n    backgroundColor: lighten(green[500], 0.5),\n    '&:hover': {\n      backgroundColor: lighten(green[500], 0.7),\n    },\n  },\n  comma: {\n    fontSize: '200% !important',\n    lineHeight: '100%',\n  },\n  dot: {\n    fontSize: '200% !important',\n    lineHeight: '100%',\n  },\n  icon: {\n    height: '30px',\n  },\n});\n\nexport default withStyles(styles)(KeyPad);\n"]}
|