@magmamath/students-features 0.9.0-rc10 → 0.9.0-rc11
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/dist/commonjs/features/keyboard/components/Keyboard.js +9 -5
- package/dist/commonjs/features/keyboard/components/Keyboard.js.map +1 -1
- package/dist/commonjs/features/keyboard/components/UnitsLayout/UnitsLayout.js +1 -1
- package/dist/commonjs/features/keyboard/constants/keysValues.js +2 -1
- package/dist/commonjs/features/keyboard/constants/keysValues.js.map +1 -1
- package/dist/module/features/keyboard/components/Keyboard.js +10 -6
- package/dist/module/features/keyboard/components/Keyboard.js.map +1 -1
- package/dist/module/features/keyboard/components/UnitsLayout/UnitsLayout.js +1 -1
- package/dist/module/features/keyboard/constants/keysValues.js +2 -1
- package/dist/module/features/keyboard/constants/keysValues.js.map +1 -1
- package/dist/typescript/commonjs/features/keyboard/components/Keyboard.d.ts.map +1 -1
- package/dist/typescript/commonjs/features/keyboard/constants/keysValues.d.ts.map +1 -1
- package/dist/typescript/module/features/keyboard/components/Keyboard.d.ts.map +1 -1
- package/dist/typescript/module/features/keyboard/constants/keysValues.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/features/keyboard/components/Keyboard.tsx +15 -8
- package/src/features/keyboard/components/UnitsLayout/UnitsLayout.tsx +1 -1
- package/src/features/keyboard/constants/keysValues.ts +8 -1
|
@@ -7,8 +7,9 @@ exports.Keyboard = void 0;
|
|
|
7
7
|
var _react = _interopRequireWildcard(require("react"));
|
|
8
8
|
var _reactNative = require("react-native");
|
|
9
9
|
var _reactNativeUi = require("@magmamath/react-native-ui");
|
|
10
|
-
var _Numpad = require("./Numpad/Numpad.js");
|
|
11
10
|
var _keyboardLayouts = require("../constants/keyboardLayouts.js");
|
|
11
|
+
var _types = require("../types/types.js");
|
|
12
|
+
var _Numpad = require("./Numpad/Numpad.js");
|
|
12
13
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
13
14
|
function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
|
|
14
15
|
function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
|
|
@@ -19,14 +20,17 @@ const Keyboard = ({
|
|
|
19
20
|
...props
|
|
20
21
|
}) => {
|
|
21
22
|
const slideAnim = (0, _react.useRef)(new _reactNative.Animated.Value(600)).current;
|
|
23
|
+
const maxWidth = characterType && _keyboardLayouts.KEYBOARD_LAYOUTS[_types.KeyboardType.AlgebraAdvanced].characterTypes.includes(characterType) ? 1300 : 1180;
|
|
22
24
|
const {
|
|
23
25
|
width
|
|
24
26
|
} = (0, _reactNative.useWindowDimensions)();
|
|
25
27
|
(0, _react.useEffect)(() => {
|
|
26
|
-
_reactNative.Animated.
|
|
28
|
+
_reactNative.Animated.spring(slideAnim, {
|
|
27
29
|
toValue: visible ? 0 : 600,
|
|
28
|
-
|
|
29
|
-
|
|
30
|
+
stiffness: visible ? 320 : 720,
|
|
31
|
+
damping: visible ? 40 : 60,
|
|
32
|
+
mass: 1,
|
|
33
|
+
velocity: 0,
|
|
30
34
|
useNativeDriver: true
|
|
31
35
|
}).start();
|
|
32
36
|
}, [visible]);
|
|
@@ -42,7 +46,7 @@ const Keyboard = ({
|
|
|
42
46
|
}],
|
|
43
47
|
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(Layout, {
|
|
44
48
|
...props
|
|
45
|
-
}), width >=
|
|
49
|
+
}), width >= maxWidth && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Numpad.Numpad, {
|
|
46
50
|
...props
|
|
47
51
|
})]
|
|
48
52
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_reactNativeUi","
|
|
1
|
+
{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_reactNativeUi","_keyboardLayouts","_types","_Numpad","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","Keyboard","style","characterType","visible","props","slideAnim","useRef","Animated","Value","current","maxWidth","KEYBOARD_LAYOUTS","KeyboardType","AlgebraAdvanced","characterTypes","includes","width","useWindowDimensions","useEffect","spring","toValue","stiffness","damping","mass","velocity","useNativeDriver","start","Layout","getLayoutByCharType","jsxs","View","styles","container","transform","translateY","children","jsx","Numpad","exports","StyleSheet","create","flexDirection","alignItems","justifyContent","backgroundColor","COLORS","NEUTRAL_2","borderRadius","paddingTop","paddingHorizontal","paddingBottom","borderColor","NEUTRAL_5","borderWidth","overflow","minHeight","SHADOWS"],"sourceRoot":"../../../../../src","sources":["features/keyboard/components/Keyboard.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -15,6 +15,7 @@ var _basicOperators = require("../types/MathKeysGroups/basicOperators.js");
|
|
|
15
15
|
var _units = require("../types/MathKeysGroups/units.js");
|
|
16
16
|
var _calculusOperators = require("../types/MathKeysGroups/calculusOperators.js");
|
|
17
17
|
var _index = require("../../../shared/translation/index.js");
|
|
18
|
+
var _studentsFeatures = require("@magmamath/students-features");
|
|
18
19
|
const KEYBOARD_GROUPS_BY_LOCALE = exports.KEYBOARD_GROUPS_BY_LOCALE = {
|
|
19
20
|
[_index.Locale.CA]: {
|
|
20
21
|
[_types.KeyboardType.Basic]: _keyboardGroup.MATH_ENTRY_BASIC_KEYBOARD_GROUP,
|
|
@@ -82,5 +83,5 @@ const KEYBOARD_GROUPS_BY_LOCALE = exports.KEYBOARD_GROUPS_BY_LOCALE = {
|
|
|
82
83
|
[_types.KeyboardType.Numpad]: _keyboardGroups4.MATH_ENTRY_NUMBERS_SW_KEYBOARD_GROUP
|
|
83
84
|
}
|
|
84
85
|
};
|
|
85
|
-
const DISABLED_KEYS = exports.DISABLED_KEYS = [_basicOperators.MATH_BASIC_OPERATORS.PARENTHESES, _basicOperators.MATH_BASIC_OPERATORS.INTERVAL, _basicOperators.MATH_BASIC_OPERATORS.ABSOLUTE_VALUE, _basicOperators.MATH_BASIC_OPERATORS.ORDERED_PAIR, _basicOperators.MATH_BASIC_OPERATORS.NTH_ROOT, _basicOperators.MATH_BASIC_OPERATORS.FRACTION,
|
|
86
|
+
const DISABLED_KEYS = exports.DISABLED_KEYS = [_basicOperators.MATH_BASIC_OPERATORS.PARENTHESES, _basicOperators.MATH_BASIC_OPERATORS.INTERVAL, _basicOperators.MATH_BASIC_OPERATORS.ABSOLUTE_VALUE, _basicOperators.MATH_BASIC_OPERATORS.ORDERED_PAIR, _basicOperators.MATH_BASIC_OPERATORS.NTH_ROOT, _basicOperators.MATH_BASIC_OPERATORS.FRACTION, _units.MATH_AREA_UNITS.SQUARE_YARD, _units.MATH_AREA_UNITS.SQUARE_MILE, _units.MATH_AREA_UNITS.SQUARE_FOOT, _units.MATH_AREA_UNITS.SQUARE_INCH, _units.MATH_AREA_UNITS.SQUARE_KILOMETER, _units.MATH_AREA_UNITS.SQUARE_METER, _units.MATH_AREA_UNITS.SQUARE_CENTIMETER, _units.MATH_AREA_UNITS.SQUARE_MILLIMETER, _units.MATH_AREA_UNITS.SQUARE_DECIMETER, _units.MATH_VOLUME_UNITS.CUBIC_YARD, _units.MATH_VOLUME_UNITS.CUBIC_MILE, _units.MATH_VOLUME_UNITS.CUBIC_FOOT, _units.MATH_VOLUME_UNITS.CUBIC_INCH, _units.MATH_VOLUME_UNITS.CUBIC_KILOMETER, _units.MATH_VOLUME_UNITS.CUBIC_METER, _units.MATH_VOLUME_UNITS.CUBIC_CENTIMETER, _units.MATH_VOLUME_UNITS.CUBIC_MILLIMETER, _units.MATH_VOLUME_UNITS.FLOZ, _calculusOperators.MATH_INTEGRALS_AND_DERIVATIVES.DEFINITEINTEGRAL, _calculusOperators.MATH_INTEGRALS_AND_DERIVATIVES.INTEGRAL, _calculusOperators.MATH_INTEGRALS_AND_DERIVATIVES.DERIVATIVE, _calculusOperators.MATH_INTEGRALS_AND_DERIVATIVES.DOUBLEINTEGRAL, _studentsFeatures.MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS.ARCTAN, _studentsFeatures.MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS.ARCSIN, _studentsFeatures.MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS.ARCCOS];
|
|
86
87
|
//# sourceMappingURL=keysValues.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_types","require","_keyboardGroup","_keyboardGroups","_keyboardGroups2","_keyboardGroups3","_keyboardGroups4","_keyboardGroups5","_basicOperators","_units","_calculusOperators","_index","KEYBOARD_GROUPS_BY_LOCALE","exports","Locale","CA","KeyboardType","Basic","MATH_ENTRY_BASIC_KEYBOARD_GROUP","BasicExtended","MATH_ENTRY_BASIC_US_EXTENDED","BasicExtendedPlus","MATH_ENTRY_BASIC_EXTENDED_PLUS","BasicUnits","MATH_ENTRY_LENGTH_UNITS_US_KEYBOARD_GROUPS","keys","BasicCurrency","MATH_CURRENCY_US_KEYBOARD_GROUP","BasicTime","MATH_TIME_US_KEYBOARD_GROUP","AlgebraAdvanced","MATH_ENTRY_ALGEBRA_KEYBOARD_GROUP","Numpad","MATH_ENTRY_NUMBERS_US_KEYBOARD_GROUP","SCT","MATH_CURRENCY_SW_KEYBOARD_GROUP","MATH_TIME_SW_KEYBOARD_GROUP","GB","MATH_CURRENCY_UK_KEYBOARD_GROUP","EN","SW","MATH_ENTRY_BASIC_SW_EXTENDED","MATH_ENTRY_BASIC_EXTENDED_PLUS_SW","MATH_ENTRY_NUMBERS_SW_KEYBOARD_GROUP","DISABLED_KEYS","MATH_BASIC_OPERATORS","PARENTHESES","INTERVAL","ABSOLUTE_VALUE","ORDERED_PAIR","NTH_ROOT","FRACTION","
|
|
1
|
+
{"version":3,"names":["_types","require","_keyboardGroup","_keyboardGroups","_keyboardGroups2","_keyboardGroups3","_keyboardGroups4","_keyboardGroups5","_basicOperators","_units","_calculusOperators","_index","_studentsFeatures","KEYBOARD_GROUPS_BY_LOCALE","exports","Locale","CA","KeyboardType","Basic","MATH_ENTRY_BASIC_KEYBOARD_GROUP","BasicExtended","MATH_ENTRY_BASIC_US_EXTENDED","BasicExtendedPlus","MATH_ENTRY_BASIC_EXTENDED_PLUS","BasicUnits","MATH_ENTRY_LENGTH_UNITS_US_KEYBOARD_GROUPS","keys","BasicCurrency","MATH_CURRENCY_US_KEYBOARD_GROUP","BasicTime","MATH_TIME_US_KEYBOARD_GROUP","AlgebraAdvanced","MATH_ENTRY_ALGEBRA_KEYBOARD_GROUP","Numpad","MATH_ENTRY_NUMBERS_US_KEYBOARD_GROUP","SCT","MATH_CURRENCY_SW_KEYBOARD_GROUP","MATH_TIME_SW_KEYBOARD_GROUP","GB","MATH_CURRENCY_UK_KEYBOARD_GROUP","EN","SW","MATH_ENTRY_BASIC_SW_EXTENDED","MATH_ENTRY_BASIC_EXTENDED_PLUS_SW","MATH_ENTRY_NUMBERS_SW_KEYBOARD_GROUP","DISABLED_KEYS","MATH_BASIC_OPERATORS","PARENTHESES","INTERVAL","ABSOLUTE_VALUE","ORDERED_PAIR","NTH_ROOT","FRACTION","MATH_AREA_UNITS","SQUARE_YARD","SQUARE_MILE","SQUARE_FOOT","SQUARE_INCH","SQUARE_KILOMETER","SQUARE_METER","SQUARE_CENTIMETER","SQUARE_MILLIMETER","SQUARE_DECIMETER","MATH_VOLUME_UNITS","CUBIC_YARD","CUBIC_MILE","CUBIC_FOOT","CUBIC_INCH","CUBIC_KILOMETER","CUBIC_METER","CUBIC_CENTIMETER","CUBIC_MILLIMETER","FLOZ","MATH_INTEGRALS_AND_DERIVATIVES","DEFINITEINTEGRAL","INTEGRAL","DERIVATIVE","DOUBLEINTEGRAL","MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS","ARCTAN","ARCSIN","ARCCOS"],"sourceRoot":"../../../../../src","sources":["features/keyboard/constants/keysValues.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,cAAA,GAAAD,OAAA;AAQA,IAAAE,eAAA,GAAAF,OAAA;AACA,IAAAG,gBAAA,GAAAH,OAAA;AAIA,IAAAI,gBAAA,GAAAJ,OAAA;AAIA,IAAAK,gBAAA,GAAAL,OAAA;AAIA,IAAAM,gBAAA,GAAAN,OAAA;AACA,IAAAO,eAAA,GAAAP,OAAA;AACA,IAAAQ,MAAA,GAAAR,OAAA;AACA,IAAAS,kBAAA,GAAAT,OAAA;AACA,IAAAU,MAAA,GAAAV,OAAA;AACA,IAAAW,iBAAA,GAAAX,OAAA;AAEO,MAAMY,yBAA8E,GAAAC,OAAA,CAAAD,yBAAA,GAAG;EAC5F,CAACE,aAAM,CAACC,EAAE,GAAG;IACX,CAACC,mBAAY,CAACC,KAAK,GAAGC,8CAA+B;IACrD,CAACF,mBAAY,CAACG,aAAa,GAAGC,6CAA4B;IAC1D,CAACJ,mBAAY,CAACK,iBAAiB,GAAGC,+CAA8B;IAChE,CAACN,mBAAY,CAACO,UAAU,GAAG;MACzB,GAAGC,2DAA0C;MAC7CC,IAAI,EAAED,2DAA0C,CAACC,IAAI,CAAC,CAAC;IACzD,CAAC;IACD,CAACT,mBAAY,CAACU,aAAa,GAAGC,8CAA+B;IAC7D,CAACX,mBAAY,CAACY,SAAS,GAAGC,0CAA2B;IACrD,CAACb,mBAAY,CAACc,eAAe,GAAGC,iDAAiC;IACjE,CAACf,mBAAY,CAACgB,MAAM,GAAGC;EACzB,CAAC;EACD,CAACnB,aAAM,CAACoB,GAAG,GAAG;IACZ,CAAClB,mBAAY,CAACC,KAAK,GAAGC,8CAA+B;IACrD,CAACF,mBAAY,CAACG,aAAa,GAAGC,6CAA4B;IAC1D,CAACJ,mBAAY,CAACK,iBAAiB,GAAGC,+CAA8B;IAChE,CAACN,mBAAY,CAACO,UAAU,GAAG;MACzB,GAAGC,2DAA0C;MAC7CC,IAAI,EAAED,2DAA0C,CAACC,IAAI,CAAC,CAAC;IACzD,CAAC;IACD,CAACT,mBAAY,CAACU,aAAa,GAAGS,8CAA+B;IAC7D,CAACnB,mBAAY,CAACY,SAAS,GAAGQ,0CAA2B;IACrD,CAACpB,mBAAY,CAACc,eAAe,GAAGC,iDAAiC;IACjE,CAACf,mBAAY,CAACgB,MAAM,GAAGC;EACzB,CAAC;EACD,CAACnB,aAAM,CAACuB,EAAE,GAAG;IACX,CAACrB,mBAAY,CAACC,KAAK,GAAGC,8CAA+B;IACrD,CAACF,mBAAY,CAACG,aAAa,GAAGC,6CAA4B;IAC1D,CAACJ,mBAAY,CAACK,iBAAiB,GAAGC,+CAA8B;IAChE,CAACN,mBAAY,CAACO,UAAU,GAAG;MACzB,GAAGC,2DAA0C;MAC7CC,IAAI,EAAED,2DAA0C,CAACC,IAAI,CAAC,CAAC;IACzD,CAAC;IACD,CAACT,mBAAY,CAACU,aAAa,GAAGY,8CAA+B;IAC7D,CAACtB,mBAAY,CAACY,SAAS,GAAGQ,0CAA2B;IACrD,CAACpB,mBAAY,CAACc,eAAe,GAAGC,iDAAiC;IACjE,CAACf,mBAAY,CAACgB,MAAM,GAAGC;EACzB,CAAC;EACD,CAACnB,aAAM,CAACyB,EAAE,GAAG;IACX,CAACvB,mBAAY,CAACC,KAAK,GAAGC,8CAA+B;IACrD,CAACF,mBAAY,CAACG,aAAa,GAAGC,6CAA4B;IAC1D,CAACJ,mBAAY,CAACK,iBAAiB,GAAGC,+CAA8B;IAChE,CAACN,mBAAY,CAACO,UAAU,GAAG;MACzB,GAAGC,2DAA0C;MAC7CC,IAAI,EAAED,2DAA0C,CAACC,IAAI,CAAC,CAAC;IACzD,CAAC;IACD,CAACT,mBAAY,CAACU,aAAa,GAAGC,8CAA+B;IAC7D,CAACX,mBAAY,CAACY,SAAS,GAAGC,0CAA2B;IACrD,CAACb,mBAAY,CAACc,eAAe,GAAGC,iDAAiC;IACjE,CAACf,mBAAY,CAACgB,MAAM,GAAGC;EACzB,CAAC;EACD,CAACnB,aAAM,CAAC0B,EAAE,GAAG;IACX,CAACxB,mBAAY,CAACC,KAAK,GAAGC,8CAA+B;IACrD,CAACF,mBAAY,CAACG,aAAa,GAAGsB,6CAA4B;IAC1D,CAACzB,mBAAY,CAACK,iBAAiB,GAAGqB,kDAAiC;IACnE,CAAC1B,mBAAY,CAACO,UAAU,GAAG;MACzB,GAAGC,2DAA0C;MAC7CC,IAAI,EAAED,2DAA0C,CAACC,IAAI,CAAC,CAAC;IACzD,CAAC;IACD,CAACT,mBAAY,CAACU,aAAa,GAAGS,8CAA+B;IAC7D,CAACnB,mBAAY,CAACY,SAAS,GAAGQ,0CAA2B;IACrD,CAACpB,mBAAY,CAACc,eAAe,GAAGC,iDAAiC;IACjE,CAACf,mBAAY,CAACgB,MAAM,GAAGW;EACzB;AACF,CAAC;AAEM,MAAMC,aAA4B,GAAA/B,OAAA,CAAA+B,aAAA,GAAG,CAC1CC,oCAAoB,CAACC,WAAW,EAChCD,oCAAoB,CAACE,QAAQ,EAC7BF,oCAAoB,CAACG,cAAc,EACnCH,oCAAoB,CAACI,YAAY,EACjCJ,oCAAoB,CAACK,QAAQ,EAC7BL,oCAAoB,CAACM,QAAQ,EAC7BC,sBAAe,CAACC,WAAW,EAC3BD,sBAAe,CAACE,WAAW,EAC3BF,sBAAe,CAACG,WAAW,EAC3BH,sBAAe,CAACI,WAAW,EAC3BJ,sBAAe,CAACK,gBAAgB,EAChCL,sBAAe,CAACM,YAAY,EAC5BN,sBAAe,CAACO,iBAAiB,EACjCP,sBAAe,CAACQ,iBAAiB,EACjCR,sBAAe,CAACS,gBAAgB,EAChCC,wBAAiB,CAACC,UAAU,EAC5BD,wBAAiB,CAACE,UAAU,EAC5BF,wBAAiB,CAACG,UAAU,EAC5BH,wBAAiB,CAACI,UAAU,EAC5BJ,wBAAiB,CAACK,eAAe,EACjCL,wBAAiB,CAACM,WAAW,EAC7BN,wBAAiB,CAACO,gBAAgB,EAClCP,wBAAiB,CAACQ,gBAAgB,EAClCR,wBAAiB,CAACS,IAAI,EACtBC,iDAA8B,CAACC,gBAAgB,EAC/CD,iDAA8B,CAACE,QAAQ,EACvCF,iDAA8B,CAACG,UAAU,EACzCH,iDAA8B,CAACI,cAAc,EAC7CC,sDAAoC,CAACC,MAAM,EAC3CD,sDAAoC,CAACE,MAAM,EAC3CF,sDAAoC,CAACG,MAAM,CAC5C","ignoreList":[]}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
|
|
3
3
|
import React, { useEffect, useRef } from 'react';
|
|
4
|
-
import { Animated, StyleSheet,
|
|
4
|
+
import { Animated, StyleSheet, useWindowDimensions } from 'react-native';
|
|
5
5
|
import { COLORS, SHADOWS } from '@magmamath/react-native-ui';
|
|
6
|
+
import { getLayoutByCharType, KEYBOARD_LAYOUTS } from "../constants/keyboardLayouts.js";
|
|
7
|
+
import { KeyboardType } from "../types/types.js";
|
|
6
8
|
import { Numpad } from "./Numpad/Numpad.js";
|
|
7
|
-
import { getLayoutByCharType } from "../constants/keyboardLayouts.js";
|
|
8
9
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
9
10
|
export const Keyboard = ({
|
|
10
11
|
style,
|
|
@@ -13,14 +14,17 @@ export const Keyboard = ({
|
|
|
13
14
|
...props
|
|
14
15
|
}) => {
|
|
15
16
|
const slideAnim = useRef(new Animated.Value(600)).current;
|
|
17
|
+
const maxWidth = characterType && KEYBOARD_LAYOUTS[KeyboardType.AlgebraAdvanced].characterTypes.includes(characterType) ? 1300 : 1180;
|
|
16
18
|
const {
|
|
17
19
|
width
|
|
18
20
|
} = useWindowDimensions();
|
|
19
21
|
useEffect(() => {
|
|
20
|
-
Animated.
|
|
22
|
+
Animated.spring(slideAnim, {
|
|
21
23
|
toValue: visible ? 0 : 600,
|
|
22
|
-
|
|
23
|
-
|
|
24
|
+
stiffness: visible ? 320 : 720,
|
|
25
|
+
damping: visible ? 40 : 60,
|
|
26
|
+
mass: 1,
|
|
27
|
+
velocity: 0,
|
|
24
28
|
useNativeDriver: true
|
|
25
29
|
}).start();
|
|
26
30
|
}, [visible]);
|
|
@@ -36,7 +40,7 @@ export const Keyboard = ({
|
|
|
36
40
|
}],
|
|
37
41
|
children: [/*#__PURE__*/_jsx(Layout, {
|
|
38
42
|
...props
|
|
39
|
-
}), width >=
|
|
43
|
+
}), width >= maxWidth && /*#__PURE__*/_jsx(Numpad, {
|
|
40
44
|
...props
|
|
41
45
|
})]
|
|
42
46
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","useEffect","useRef","Animated","StyleSheet","
|
|
1
|
+
{"version":3,"names":["React","useEffect","useRef","Animated","StyleSheet","useWindowDimensions","COLORS","SHADOWS","getLayoutByCharType","KEYBOARD_LAYOUTS","KeyboardType","Numpad","jsx","_jsx","jsxs","_jsxs","Keyboard","style","characterType","visible","props","slideAnim","Value","current","maxWidth","AlgebraAdvanced","characterTypes","includes","width","spring","toValue","stiffness","damping","mass","velocity","useNativeDriver","start","Layout","View","styles","container","transform","translateY","children","create","flexDirection","alignItems","justifyContent","backgroundColor","NEUTRAL_2","borderRadius","paddingTop","paddingHorizontal","paddingBottom","borderColor","NEUTRAL_5","borderWidth","overflow","minHeight"],"sourceRoot":"../../../../../src","sources":["features/keyboard/components/Keyboard.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,SAAS,EAAEC,MAAM,QAAQ,OAAO;AAChD,SACEC,QAAQ,EAGRC,UAAU,EACVC,mBAAmB,QAEd,cAAc;AACrB,SAASC,MAAM,EAAqBC,OAAO,QAAQ,4BAA4B;AAC/E,SAASC,mBAAmB,EAAEC,gBAAgB,QAAQ,iCAA8B;AACpF,SAAwCC,YAAY,QAAQ,mBAAgB;AAC5E,SAASC,MAAM,QAAQ,oBAAiB;AAAA,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAaxC,OAAO,MAAMC,QAAQ,GAAGA,CAAC;EAAEC,KAAK;EAAEC,aAAa;EAAEC,OAAO,GAAG,IAAI;EAAE,GAAGC;AAAqB,CAAC,KAAK;EAC7F,MAAMC,SAAS,GAAGnB,MAAM,CAAC,IAAIC,QAAQ,CAACmB,KAAK,CAAC,GAAG,CAAC,CAAC,CAACC,OAAO;EACzD,MAAMC,QAAQ,GACZN,aAAa,IACbT,gBAAgB,CAACC,YAAY,CAACe,eAAe,CAAC,CAACC,cAAc,CAACC,QAAQ,CAACT,aAAa,CAAC,GACjF,IAAI,GACJ,IAAI;EACV,MAAM;IAAEU;EAAM,CAAC,GAAGvB,mBAAmB,CAAC,CAAC;EAEvCJ,SAAS,CAAC,MAAM;IACdE,QAAQ,CAAC0B,MAAM,CAACR,SAAS,EAAE;MACzBS,OAAO,EAAEX,OAAO,GAAG,CAAC,GAAG,GAAG;MAC1BY,SAAS,EAAEZ,OAAO,GAAG,GAAG,GAAG,GAAG;MAC9Ba,OAAO,EAAEb,OAAO,GAAG,EAAE,GAAG,EAAE;MAC1Bc,IAAI,EAAE,CAAC;MACPC,QAAQ,EAAE,CAAC;MACXC,eAAe,EAAE;IACnB,CAAC,CAAC,CAACC,KAAK,CAAC,CAAC;EACZ,CAAC,EAAE,CAACjB,OAAO,CAAC,CAAC;EAEb,IAAIS,KAAK,GAAG,GAAG,EAAE;IACf,OAAO,IAAI;EACb;EAEA,MAAMS,MAAM,GAAG7B,mBAAmB,CAACU,aAAa,CAAC;EAEjD,oBACEH,KAAA,CAACZ,QAAQ,CAACmC,IAAI;IACZrB,KAAK,EAAE,CACLsB,MAAM,CAACC,SAAS,EAChBvB,KAAK,EACL;MACEwB,SAAS,EAAE,CAAC;QAAEC,UAAU,EAAErB;MAAU,CAAC;IACvC,CAAC,CACD;IAAAsB,QAAA,gBAEF9B,IAAA,CAACwB,MAAM;MAAA,GAAKjB;IAAK,CAAG,CAAC,EACpBQ,KAAK,IAAIJ,QAAQ,iBAAIX,IAAA,CAACF,MAAM;MAAA,GAAKS;IAAK,CAAG,CAAC;EAAA,CAC9B,CAAC;AAEpB,CAAC;AAED,MAAMmB,MAAM,GAAGnC,UAAU,CAACwC,MAAM,CAAC;EAC/BJ,SAAS,EAAE;IACTK,aAAa,EAAE,KAAK;IACpBC,UAAU,EAAE,YAAY;IACxBC,cAAc,EAAE,eAAe;IAC/BC,eAAe,EAAE1C,MAAM,CAAC2C,SAAS;IACjCC,YAAY,EAAE,EAAE;IAChBC,UAAU,EAAE,CAAC;IACbC,iBAAiB,EAAE,EAAE;IACrBC,aAAa,EAAE,EAAE;IACjBC,WAAW,EAAEhD,MAAM,CAACiD,SAAS;IAC7BC,WAAW,EAAE,CAAC;IACd5B,KAAK,EAAE,MAAM;IACb6B,QAAQ,EAAE,QAAQ;IAClBC,SAAS,EAAE,GAAG;IACd,GAAGnD,OAAO,CAAC,CAAC;EACd;AACF,CAAC,CAAC","ignoreList":[]}
|
|
@@ -11,6 +11,7 @@ import { MATH_BASIC_OPERATORS } from "../types/MathKeysGroups/basicOperators.js"
|
|
|
11
11
|
import { MATH_AREA_UNITS, MATH_VOLUME_UNITS } from "../types/MathKeysGroups/units.js";
|
|
12
12
|
import { MATH_INTEGRALS_AND_DERIVATIVES } from "../types/MathKeysGroups/calculusOperators.js";
|
|
13
13
|
import { Locale } from "../../../shared/translation/index.js";
|
|
14
|
+
import { MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS } from '@magmamath/students-features';
|
|
14
15
|
export const KEYBOARD_GROUPS_BY_LOCALE = {
|
|
15
16
|
[Locale.CA]: {
|
|
16
17
|
[KeyboardType.Basic]: MATH_ENTRY_BASIC_KEYBOARD_GROUP,
|
|
@@ -78,5 +79,5 @@ export const KEYBOARD_GROUPS_BY_LOCALE = {
|
|
|
78
79
|
[KeyboardType.Numpad]: MATH_ENTRY_NUMBERS_SW_KEYBOARD_GROUP
|
|
79
80
|
}
|
|
80
81
|
};
|
|
81
|
-
export const DISABLED_KEYS = [MATH_BASIC_OPERATORS.PARENTHESES, MATH_BASIC_OPERATORS.INTERVAL, MATH_BASIC_OPERATORS.ABSOLUTE_VALUE, MATH_BASIC_OPERATORS.ORDERED_PAIR, MATH_BASIC_OPERATORS.NTH_ROOT, MATH_BASIC_OPERATORS.FRACTION,
|
|
82
|
+
export const DISABLED_KEYS = [MATH_BASIC_OPERATORS.PARENTHESES, MATH_BASIC_OPERATORS.INTERVAL, MATH_BASIC_OPERATORS.ABSOLUTE_VALUE, MATH_BASIC_OPERATORS.ORDERED_PAIR, MATH_BASIC_OPERATORS.NTH_ROOT, MATH_BASIC_OPERATORS.FRACTION, MATH_AREA_UNITS.SQUARE_YARD, MATH_AREA_UNITS.SQUARE_MILE, MATH_AREA_UNITS.SQUARE_FOOT, MATH_AREA_UNITS.SQUARE_INCH, MATH_AREA_UNITS.SQUARE_KILOMETER, MATH_AREA_UNITS.SQUARE_METER, MATH_AREA_UNITS.SQUARE_CENTIMETER, MATH_AREA_UNITS.SQUARE_MILLIMETER, MATH_AREA_UNITS.SQUARE_DECIMETER, MATH_VOLUME_UNITS.CUBIC_YARD, MATH_VOLUME_UNITS.CUBIC_MILE, MATH_VOLUME_UNITS.CUBIC_FOOT, MATH_VOLUME_UNITS.CUBIC_INCH, MATH_VOLUME_UNITS.CUBIC_KILOMETER, MATH_VOLUME_UNITS.CUBIC_METER, MATH_VOLUME_UNITS.CUBIC_CENTIMETER, MATH_VOLUME_UNITS.CUBIC_MILLIMETER, MATH_VOLUME_UNITS.FLOZ, MATH_INTEGRALS_AND_DERIVATIVES.DEFINITEINTEGRAL, MATH_INTEGRALS_AND_DERIVATIVES.INTEGRAL, MATH_INTEGRALS_AND_DERIVATIVES.DERIVATIVE, MATH_INTEGRALS_AND_DERIVATIVES.DOUBLEINTEGRAL, MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS.ARCTAN, MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS.ARCSIN, MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS.ARCCOS];
|
|
82
83
|
//# sourceMappingURL=keysValues.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["KeyboardType","MATH_CURRENCY_SW_KEYBOARD_GROUP","MATH_CURRENCY_UK_KEYBOARD_GROUP","MATH_CURRENCY_US_KEYBOARD_GROUP","MATH_ENTRY_BASIC_KEYBOARD_GROUP","MATH_TIME_SW_KEYBOARD_GROUP","MATH_TIME_US_KEYBOARD_GROUP","MATH_ENTRY_ALGEBRA_KEYBOARD_GROUP","MATH_ENTRY_BASIC_SW_EXTENDED","MATH_ENTRY_BASIC_US_EXTENDED","MATH_ENTRY_BASIC_EXTENDED_PLUS","MATH_ENTRY_BASIC_EXTENDED_PLUS_SW","MATH_ENTRY_NUMBERS_SW_KEYBOARD_GROUP","MATH_ENTRY_NUMBERS_US_KEYBOARD_GROUP","MATH_ENTRY_LENGTH_UNITS_US_KEYBOARD_GROUPS","MATH_BASIC_OPERATORS","MATH_AREA_UNITS","MATH_VOLUME_UNITS","MATH_INTEGRALS_AND_DERIVATIVES","Locale","KEYBOARD_GROUPS_BY_LOCALE","CA","Basic","BasicExtended","BasicExtendedPlus","BasicUnits","keys","BasicCurrency","BasicTime","AlgebraAdvanced","Numpad","SCT","GB","EN","SW","DISABLED_KEYS","PARENTHESES","INTERVAL","ABSOLUTE_VALUE","ORDERED_PAIR","NTH_ROOT","FRACTION","
|
|
1
|
+
{"version":3,"names":["KeyboardType","MATH_CURRENCY_SW_KEYBOARD_GROUP","MATH_CURRENCY_UK_KEYBOARD_GROUP","MATH_CURRENCY_US_KEYBOARD_GROUP","MATH_ENTRY_BASIC_KEYBOARD_GROUP","MATH_TIME_SW_KEYBOARD_GROUP","MATH_TIME_US_KEYBOARD_GROUP","MATH_ENTRY_ALGEBRA_KEYBOARD_GROUP","MATH_ENTRY_BASIC_SW_EXTENDED","MATH_ENTRY_BASIC_US_EXTENDED","MATH_ENTRY_BASIC_EXTENDED_PLUS","MATH_ENTRY_BASIC_EXTENDED_PLUS_SW","MATH_ENTRY_NUMBERS_SW_KEYBOARD_GROUP","MATH_ENTRY_NUMBERS_US_KEYBOARD_GROUP","MATH_ENTRY_LENGTH_UNITS_US_KEYBOARD_GROUPS","MATH_BASIC_OPERATORS","MATH_AREA_UNITS","MATH_VOLUME_UNITS","MATH_INTEGRALS_AND_DERIVATIVES","Locale","MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS","KEYBOARD_GROUPS_BY_LOCALE","CA","Basic","BasicExtended","BasicExtendedPlus","BasicUnits","keys","BasicCurrency","BasicTime","AlgebraAdvanced","Numpad","SCT","GB","EN","SW","DISABLED_KEYS","PARENTHESES","INTERVAL","ABSOLUTE_VALUE","ORDERED_PAIR","NTH_ROOT","FRACTION","SQUARE_YARD","SQUARE_MILE","SQUARE_FOOT","SQUARE_INCH","SQUARE_KILOMETER","SQUARE_METER","SQUARE_CENTIMETER","SQUARE_MILLIMETER","SQUARE_DECIMETER","CUBIC_YARD","CUBIC_MILE","CUBIC_FOOT","CUBIC_INCH","CUBIC_KILOMETER","CUBIC_METER","CUBIC_CENTIMETER","CUBIC_MILLIMETER","FLOZ","DEFINITEINTEGRAL","INTEGRAL","DERIVATIVE","DOUBLEINTEGRAL","ARCTAN","ARCSIN","ARCCOS"],"sourceRoot":"../../../../../src","sources":["features/keyboard/constants/keysValues.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Keyboard.d.ts","sourceRoot":"","sources":["../../../../../../src/features/keyboard/components/Keyboard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAA;AAChD,OAAO,
|
|
1
|
+
{"version":3,"file":"Keyboard.d.ts","sourceRoot":"","sources":["../../../../../../src/features/keyboard/components/Keyboard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAA;AAChD,OAAO,EAGL,SAAS,EAGT,SAAS,EACV,MAAM,cAAc,CAAA;AACrB,OAAO,EAAU,iBAAiB,EAAW,MAAM,4BAA4B,CAAA;AAE/E,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAgB,MAAM,gBAAgB,CAAA;AAG5E,KAAK,aAAa,GAAG;IACnB,UAAU,EAAE,CAAC,EAAE,UAAU,EAAE,aAAa,EAAE,eAAe,EAAE,EAAE,gBAAgB,KAAK,IAAI,CAAA;IACtF,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAA;IAC5B,KAAK,CAAC,EAAE,iBAAiB,CAAA;IACzB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,wBAAwB,CAAC,EAAE,OAAO,CAAA;IAClC,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,YAAY,CAAC,EAAE,WAAW,EAAE,CAAA;CAC7B,CAAA;AAED,eAAO,MAAM,QAAQ,gDAAwD,aAAa,6BAwCzF,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keysValues.d.ts","sourceRoot":"","sources":["../../../../../../src/features/keyboard/constants/keysValues.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AA0BzE,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAA;
|
|
1
|
+
{"version":3,"file":"keysValues.d.ts","sourceRoot":"","sources":["../../../../../../src/features/keyboard/constants/keysValues.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AA0BzE,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAA;AAGpD,eAAO,MAAM,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,EAAE,aAAa,CAAC,CAkEzF,CAAA;AAED,eAAO,MAAM,aAAa,EAAE,WAAW,EAgCtC,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Keyboard.d.ts","sourceRoot":"","sources":["../../../../../../src/features/keyboard/components/Keyboard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAA;AAChD,OAAO,
|
|
1
|
+
{"version":3,"file":"Keyboard.d.ts","sourceRoot":"","sources":["../../../../../../src/features/keyboard/components/Keyboard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAA;AAChD,OAAO,EAGL,SAAS,EAGT,SAAS,EACV,MAAM,cAAc,CAAA;AACrB,OAAO,EAAU,iBAAiB,EAAW,MAAM,4BAA4B,CAAA;AAE/E,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAgB,MAAM,gBAAgB,CAAA;AAG5E,KAAK,aAAa,GAAG;IACnB,UAAU,EAAE,CAAC,EAAE,UAAU,EAAE,aAAa,EAAE,eAAe,EAAE,EAAE,gBAAgB,KAAK,IAAI,CAAA;IACtF,aAAa,CAAC,EAAE,MAAM,CAAA;IACtB,KAAK,CAAC,EAAE,SAAS,CAAC,SAAS,CAAC,CAAA;IAC5B,KAAK,CAAC,EAAE,iBAAiB,CAAA;IACzB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,wBAAwB,CAAC,EAAE,OAAO,CAAA;IAClC,UAAU,CAAC,EAAE,OAAO,CAAA;IACpB,YAAY,CAAC,EAAE,WAAW,EAAE,CAAA;CAC7B,CAAA;AAED,eAAO,MAAM,QAAQ,gDAAwD,aAAa,6BAwCzF,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keysValues.d.ts","sourceRoot":"","sources":["../../../../../../src/features/keyboard/constants/keysValues.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AA0BzE,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAA;
|
|
1
|
+
{"version":3,"file":"keysValues.d.ts","sourceRoot":"","sources":["../../../../../../src/features/keyboard/constants/keysValues.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,gBAAgB,CAAA;AA0BzE,OAAO,EAAE,MAAM,EAAE,MAAM,6BAA6B,CAAA;AAGpD,eAAO,MAAM,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,YAAY,EAAE,aAAa,CAAC,CAkEzF,CAAA;AAED,eAAO,MAAM,aAAa,EAAE,WAAW,EAgCtC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,16 +1,16 @@
|
|
|
1
1
|
import React, { useEffect, useRef } from 'react'
|
|
2
2
|
import {
|
|
3
3
|
Animated,
|
|
4
|
+
Easing,
|
|
4
5
|
StyleProp,
|
|
5
6
|
StyleSheet,
|
|
6
|
-
ViewStyle,
|
|
7
|
-
Easing,
|
|
8
7
|
useWindowDimensions,
|
|
8
|
+
ViewStyle,
|
|
9
9
|
} from 'react-native'
|
|
10
10
|
import { COLORS, SelectOptionColor, SHADOWS } from '@magmamath/react-native-ui'
|
|
11
|
+
import { getLayoutByCharType, KEYBOARD_LAYOUTS } from '../constants/keyboardLayouts'
|
|
12
|
+
import { KeyboardKey, KeyboardKeyValue, KeyboardType } from '../types/types'
|
|
11
13
|
import { Numpad } from './Numpad/Numpad'
|
|
12
|
-
import { getLayoutByCharType } from '../constants/keyboardLayouts'
|
|
13
|
-
import { KeyboardKey, KeyboardKeyValue } from '../types/types'
|
|
14
14
|
|
|
15
15
|
type KeyboardProps = {
|
|
16
16
|
onKeyPress: ({ katexValue, mathliveValue, isSpecialSymbol }: KeyboardKeyValue) => void
|
|
@@ -25,13 +25,20 @@ type KeyboardProps = {
|
|
|
25
25
|
|
|
26
26
|
export const Keyboard = ({ style, characterType, visible = true, ...props }: KeyboardProps) => {
|
|
27
27
|
const slideAnim = useRef(new Animated.Value(600)).current
|
|
28
|
+
const maxWidth =
|
|
29
|
+
characterType &&
|
|
30
|
+
KEYBOARD_LAYOUTS[KeyboardType.AlgebraAdvanced].characterTypes.includes(characterType)
|
|
31
|
+
? 1300
|
|
32
|
+
: 1180
|
|
28
33
|
const { width } = useWindowDimensions()
|
|
29
34
|
|
|
30
35
|
useEffect(() => {
|
|
31
|
-
Animated.
|
|
36
|
+
Animated.spring(slideAnim, {
|
|
32
37
|
toValue: visible ? 0 : 600,
|
|
33
|
-
|
|
34
|
-
|
|
38
|
+
stiffness: visible ? 320 : 720,
|
|
39
|
+
damping: visible ? 40 : 60,
|
|
40
|
+
mass: 1,
|
|
41
|
+
velocity: 0,
|
|
35
42
|
useNativeDriver: true,
|
|
36
43
|
}).start()
|
|
37
44
|
}, [visible])
|
|
@@ -53,7 +60,7 @@ export const Keyboard = ({ style, characterType, visible = true, ...props }: Key
|
|
|
53
60
|
]}
|
|
54
61
|
>
|
|
55
62
|
<Layout {...props} />
|
|
56
|
-
{width >=
|
|
63
|
+
{width >= maxWidth && <Numpad {...props} />}
|
|
57
64
|
</Animated.View>
|
|
58
65
|
)
|
|
59
66
|
}
|
|
@@ -25,6 +25,7 @@ import { MATH_BASIC_OPERATORS } from '../types/MathKeysGroups/basicOperators'
|
|
|
25
25
|
import { MATH_AREA_UNITS, MATH_VOLUME_UNITS } from '../types/MathKeysGroups/units'
|
|
26
26
|
import { MATH_INTEGRALS_AND_DERIVATIVES } from '../types/MathKeysGroups/calculusOperators'
|
|
27
27
|
import { Locale } from '../../../shared/translation'
|
|
28
|
+
import { MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS } from '@magmamath/students-features'
|
|
28
29
|
|
|
29
30
|
export const KEYBOARD_GROUPS_BY_LOCALE: Record<Locale, Record<KeyboardType, KeyboardGroup>> = {
|
|
30
31
|
[Locale.CA]: {
|
|
@@ -101,7 +102,6 @@ export const DISABLED_KEYS: KeyboardKey[] = [
|
|
|
101
102
|
MATH_BASIC_OPERATORS.ORDERED_PAIR,
|
|
102
103
|
MATH_BASIC_OPERATORS.NTH_ROOT,
|
|
103
104
|
MATH_BASIC_OPERATORS.FRACTION,
|
|
104
|
-
MATH_INTEGRALS_AND_DERIVATIVES.DEFINITEINTEGRAL,
|
|
105
105
|
MATH_AREA_UNITS.SQUARE_YARD,
|
|
106
106
|
MATH_AREA_UNITS.SQUARE_MILE,
|
|
107
107
|
MATH_AREA_UNITS.SQUARE_FOOT,
|
|
@@ -120,4 +120,11 @@ export const DISABLED_KEYS: KeyboardKey[] = [
|
|
|
120
120
|
MATH_VOLUME_UNITS.CUBIC_CENTIMETER,
|
|
121
121
|
MATH_VOLUME_UNITS.CUBIC_MILLIMETER,
|
|
122
122
|
MATH_VOLUME_UNITS.FLOZ,
|
|
123
|
+
MATH_INTEGRALS_AND_DERIVATIVES.DEFINITEINTEGRAL,
|
|
124
|
+
MATH_INTEGRALS_AND_DERIVATIVES.INTEGRAL,
|
|
125
|
+
MATH_INTEGRALS_AND_DERIVATIVES.DERIVATIVE,
|
|
126
|
+
MATH_INTEGRALS_AND_DERIVATIVES.DOUBLEINTEGRAL,
|
|
127
|
+
MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS.ARCTAN,
|
|
128
|
+
MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS.ARCSIN,
|
|
129
|
+
MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS.ARCCOS,
|
|
123
130
|
]
|