@magmamath/students-features 1.6.3-rc.1 → 1.6.3-rc.2
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/constants/keyboard.helpers.js +2 -0
- package/dist/commonjs/features/keyboard/constants/keyboard.helpers.js.map +1 -1
- package/dist/module/features/keyboard/constants/keyboard.helpers.js +2 -0
- package/dist/module/features/keyboard/constants/keyboard.helpers.js.map +1 -1
- package/dist/typescript/commonjs/features/keyboard/constants/keyboard.helpers.d.ts.map +1 -1
- package/dist/typescript/module/features/keyboard/constants/keyboard.helpers.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/features/keyboard/__tests__/keyboard.helpers.test.ts +18 -12
- package/src/features/keyboard/constants/keyboard.helpers.ts +6 -0
|
@@ -83,12 +83,14 @@ const MULTIPLICATION_KEYS = {
|
|
|
83
83
|
[_frontendConfig.MultiplicationSymbol.CDOT]: _index.MATH_BASIC_OPERATORS.C_DOT
|
|
84
84
|
};
|
|
85
85
|
const isMultiplicationKey = key => key === _index.MATH_BASIC_OPERATORS.MULTIPLICATION || key === _index.MATH_BASIC_OPERATORS.C_DOT;
|
|
86
|
+
const MULTIPLICATION_LOCKED_LAYOUTS = new Set([_types.KeyboardType.AlgebraAdvanced]);
|
|
86
87
|
const applyMultiplicationSymbol = (operators, symbol) => {
|
|
87
88
|
const multiplicationKey = MULTIPLICATION_KEYS[symbol];
|
|
88
89
|
const result = {
|
|
89
90
|
...operators
|
|
90
91
|
};
|
|
91
92
|
Object.values(_types.KeyboardType).forEach(type => {
|
|
93
|
+
if (MULTIPLICATION_LOCKED_LAYOUTS.has(type)) return;
|
|
92
94
|
const group = result[type];
|
|
93
95
|
result[type] = {
|
|
94
96
|
...group,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_frontendConfig","require","_types","_index","_index2","PRESET_DOT_MIXED","operators","KeyboardType","Basic","KEYBOARD_BASIC","DOT","BasicPlus","KEYBOARD_BASIC_PLUS","BasicPlusMobile","MOBILE_DOT","BasicPlusPlus","KEYBOARD_BASIC_PLUS_PLUS","BasicPlusPlusMobile","BasicUnits","keys","KEYBOARD_LENGTH","MIXED","AlgebraAdvanced","KEYBOARD_ALGEBRA","Geometry","KEYBOARD_GEOMETRY","Numpad","KEYBOARD_NUMPAD","Underlined","KEYBOARD_UNDERLINED","units","KeyboardUnitsGroupType","LENGTH","AREA","KEYBOARD_AREA","VOLUME","KEYBOARD_VOLUME","WEIGHT","KEYBOARD_WEIGHT","TIME","KEYBOARD_TIME_UNITS","DEFAULT","PRESET_COMMA_METRIC","COMMA","MOBILE_COMMA","METRIC","PRESET_DOT_MIXED_ALT","MIXED_ALT","PRESET_MAP","KeyboardPreset","DOT_MIXED","DOT_MIXED_ALT","COMMA_METRIC","CURRENCY_MAP","KeyboardCurrencyVariant","DOLLAR_CENT","KEYBOARD_CURRENCY","POUND_PENCE","KRONE_EURO_POUND","EURO_DOLLAR_POUND","ZLOTY_GROSZ","FRANC_RAPPEN","TIME_MAP","KeyboardTimeVariant","H12","KEYBOARD_TIME","H24","MULTIPLICATION_KEYS","MultiplicationSymbol","TIMES","MATH_BASIC_OPERATORS","MULTIPLICATION","CDOT","C_DOT","isMultiplicationKey","key","applyMultiplicationSymbol","symbol","multiplicationKey","result","Object","values","forEach","type","group","map","resolveKeyboard","config","multiplicationSymbol","preset","BasicCurrency","currencyVariant","BasicTime","timeVariant","exports"],"sourceRoot":"../../../../../src","sources":["features/keyboard/constants/keyboard.helpers.ts"],"mappings":"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
|
|
1
|
+
{"version":3,"names":["_frontendConfig","require","_types","_index","_index2","PRESET_DOT_MIXED","operators","KeyboardType","Basic","KEYBOARD_BASIC","DOT","BasicPlus","KEYBOARD_BASIC_PLUS","BasicPlusMobile","MOBILE_DOT","BasicPlusPlus","KEYBOARD_BASIC_PLUS_PLUS","BasicPlusPlusMobile","BasicUnits","keys","KEYBOARD_LENGTH","MIXED","AlgebraAdvanced","KEYBOARD_ALGEBRA","Geometry","KEYBOARD_GEOMETRY","Numpad","KEYBOARD_NUMPAD","Underlined","KEYBOARD_UNDERLINED","units","KeyboardUnitsGroupType","LENGTH","AREA","KEYBOARD_AREA","VOLUME","KEYBOARD_VOLUME","WEIGHT","KEYBOARD_WEIGHT","TIME","KEYBOARD_TIME_UNITS","DEFAULT","PRESET_COMMA_METRIC","COMMA","MOBILE_COMMA","METRIC","PRESET_DOT_MIXED_ALT","MIXED_ALT","PRESET_MAP","KeyboardPreset","DOT_MIXED","DOT_MIXED_ALT","COMMA_METRIC","CURRENCY_MAP","KeyboardCurrencyVariant","DOLLAR_CENT","KEYBOARD_CURRENCY","POUND_PENCE","KRONE_EURO_POUND","EURO_DOLLAR_POUND","ZLOTY_GROSZ","FRANC_RAPPEN","TIME_MAP","KeyboardTimeVariant","H12","KEYBOARD_TIME","H24","MULTIPLICATION_KEYS","MultiplicationSymbol","TIMES","MATH_BASIC_OPERATORS","MULTIPLICATION","CDOT","C_DOT","isMultiplicationKey","key","MULTIPLICATION_LOCKED_LAYOUTS","Set","applyMultiplicationSymbol","symbol","multiplicationKey","result","Object","values","forEach","type","has","group","map","resolveKeyboard","config","multiplicationSymbol","preset","BasicCurrency","currencyVariant","BasicTime","timeVariant","exports"],"sourceRoot":"../../../../../src","sources":["features/keyboard/constants/keyboard.helpers.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -79,12 +79,14 @@ const MULTIPLICATION_KEYS = {
|
|
|
79
79
|
[MultiplicationSymbol.CDOT]: MATH_BASIC_OPERATORS.C_DOT
|
|
80
80
|
};
|
|
81
81
|
const isMultiplicationKey = key => key === MATH_BASIC_OPERATORS.MULTIPLICATION || key === MATH_BASIC_OPERATORS.C_DOT;
|
|
82
|
+
const MULTIPLICATION_LOCKED_LAYOUTS = new Set([KeyboardType.AlgebraAdvanced]);
|
|
82
83
|
const applyMultiplicationSymbol = (operators, symbol) => {
|
|
83
84
|
const multiplicationKey = MULTIPLICATION_KEYS[symbol];
|
|
84
85
|
const result = {
|
|
85
86
|
...operators
|
|
86
87
|
};
|
|
87
88
|
Object.values(KeyboardType).forEach(type => {
|
|
89
|
+
if (MULTIPLICATION_LOCKED_LAYOUTS.has(type)) return;
|
|
88
90
|
const group = result[type];
|
|
89
91
|
result[type] = {
|
|
90
92
|
...group,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["KeyboardCurrencyVariant","KeyboardPreset","KeyboardTimeVariant","MultiplicationSymbol","KeyboardType","KeyboardUnitsGroupType","MATH_BASIC_OPERATORS","KEYBOARD_ALGEBRA","KEYBOARD_AREA","KEYBOARD_BASIC","KEYBOARD_BASIC_PLUS","KEYBOARD_BASIC_PLUS_PLUS","KEYBOARD_CURRENCY","KEYBOARD_GEOMETRY","KEYBOARD_LENGTH","KEYBOARD_NUMPAD","KEYBOARD_TIME","KEYBOARD_TIME_UNITS","KEYBOARD_UNDERLINED","KEYBOARD_VOLUME","KEYBOARD_WEIGHT","PRESET_DOT_MIXED","operators","Basic","DOT","BasicPlus","BasicPlusMobile","MOBILE_DOT","BasicPlusPlus","BasicPlusPlusMobile","BasicUnits","keys","MIXED","AlgebraAdvanced","Geometry","Numpad","Underlined","units","LENGTH","AREA","VOLUME","WEIGHT","TIME","DEFAULT","PRESET_COMMA_METRIC","COMMA","MOBILE_COMMA","METRIC","PRESET_DOT_MIXED_ALT","MIXED_ALT","PRESET_MAP","DOT_MIXED","DOT_MIXED_ALT","COMMA_METRIC","CURRENCY_MAP","DOLLAR_CENT","POUND_PENCE","KRONE_EURO_POUND","EURO_DOLLAR_POUND","ZLOTY_GROSZ","FRANC_RAPPEN","TIME_MAP","H12","H24","MULTIPLICATION_KEYS","TIMES","MULTIPLICATION","CDOT","C_DOT","isMultiplicationKey","key","applyMultiplicationSymbol","symbol","multiplicationKey","result","Object","values","forEach","type","group","map","resolveKeyboard","config","multiplicationSymbol","preset","BasicCurrency","currencyVariant","BasicTime","timeVariant"],"sourceRoot":"../../../../../src","sources":["features/keyboard/constants/keyboard.helpers.ts"],"mappings":"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
|
|
1
|
+
{"version":3,"names":["KeyboardCurrencyVariant","KeyboardPreset","KeyboardTimeVariant","MultiplicationSymbol","KeyboardType","KeyboardUnitsGroupType","MATH_BASIC_OPERATORS","KEYBOARD_ALGEBRA","KEYBOARD_AREA","KEYBOARD_BASIC","KEYBOARD_BASIC_PLUS","KEYBOARD_BASIC_PLUS_PLUS","KEYBOARD_CURRENCY","KEYBOARD_GEOMETRY","KEYBOARD_LENGTH","KEYBOARD_NUMPAD","KEYBOARD_TIME","KEYBOARD_TIME_UNITS","KEYBOARD_UNDERLINED","KEYBOARD_VOLUME","KEYBOARD_WEIGHT","PRESET_DOT_MIXED","operators","Basic","DOT","BasicPlus","BasicPlusMobile","MOBILE_DOT","BasicPlusPlus","BasicPlusPlusMobile","BasicUnits","keys","MIXED","AlgebraAdvanced","Geometry","Numpad","Underlined","units","LENGTH","AREA","VOLUME","WEIGHT","TIME","DEFAULT","PRESET_COMMA_METRIC","COMMA","MOBILE_COMMA","METRIC","PRESET_DOT_MIXED_ALT","MIXED_ALT","PRESET_MAP","DOT_MIXED","DOT_MIXED_ALT","COMMA_METRIC","CURRENCY_MAP","DOLLAR_CENT","POUND_PENCE","KRONE_EURO_POUND","EURO_DOLLAR_POUND","ZLOTY_GROSZ","FRANC_RAPPEN","TIME_MAP","H12","H24","MULTIPLICATION_KEYS","TIMES","MULTIPLICATION","CDOT","C_DOT","isMultiplicationKey","key","MULTIPLICATION_LOCKED_LAYOUTS","Set","applyMultiplicationSymbol","symbol","multiplicationKey","result","Object","values","forEach","type","has","group","map","resolveKeyboard","config","multiplicationSymbol","preset","BasicCurrency","currencyVariant","BasicTime","timeVariant"],"sourceRoot":"../../../../../src","sources":["features/keyboard/constants/keyboard.helpers.ts"],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyboard.helpers.d.ts","sourceRoot":"","sources":["../../../../../../src/features/keyboard/constants/keyboard.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EAId,oBAAoB,EACrB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAML,gBAAgB,EACjB,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"keyboard.helpers.d.ts","sourceRoot":"","sources":["../../../../../../src/features/keyboard/constants/keyboard.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EAId,oBAAoB,EACrB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAML,gBAAgB,EACjB,MAAM,gBAAgB,CAAA;AAmIvB,eAAO,MAAM,eAAe,WAClB,cAAc,yBACC,oBAAoB,KAC1C,gBAcF,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"keyboard.helpers.d.ts","sourceRoot":"","sources":["../../../../../../src/features/keyboard/constants/keyboard.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EAId,oBAAoB,EACrB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAML,gBAAgB,EACjB,MAAM,gBAAgB,CAAA;
|
|
1
|
+
{"version":3,"file":"keyboard.helpers.d.ts","sourceRoot":"","sources":["../../../../../../src/features/keyboard/constants/keyboard.helpers.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EAId,oBAAoB,EACrB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAML,gBAAgB,EACjB,MAAM,gBAAgB,CAAA;AAmIvB,eAAO,MAAM,eAAe,WAClB,cAAc,yBACC,oBAAoB,KAC1C,gBAcF,CAAA"}
|
package/package.json
CHANGED
|
@@ -48,7 +48,9 @@ const COMMA_CONFIG: KeyboardConfig = {
|
|
|
48
48
|
}
|
|
49
49
|
|
|
50
50
|
const collectKeys = (keyboard: ResolvedKeyboard): KeyboardKey[] =>
|
|
51
|
-
Object.
|
|
51
|
+
Object.entries(keyboard.operators)
|
|
52
|
+
.filter(([type]) => type !== KeyboardType.AlgebraAdvanced)
|
|
53
|
+
.flatMap(([, group]) => group.keys)
|
|
52
54
|
|
|
53
55
|
describe('resolveKeyboard multiplication symbol', () => {
|
|
54
56
|
it('keeps groups untouched when no symbol is passed', () => {
|
|
@@ -78,27 +80,31 @@ describe('resolveKeyboard multiplication symbol', () => {
|
|
|
78
80
|
expect(keys).not.toContain(MATH_BASIC_OPERATORS.C_DOT)
|
|
79
81
|
})
|
|
80
82
|
|
|
81
|
-
it('unifies
|
|
83
|
+
it('unifies basic layouts to the explicit symbol even when it matches the preset', () => {
|
|
82
84
|
const withSymbol = resolveKeyboard(DOT_CONFIG, MultiplicationSymbol.TIMES)
|
|
83
85
|
const withoutSymbol = resolveKeyboard(DOT_CONFIG)
|
|
84
86
|
|
|
85
87
|
expect(withSymbol.operators[KeyboardType.Basic].keys).toEqual(
|
|
86
88
|
withoutSymbol.operators[KeyboardType.Basic].keys,
|
|
87
89
|
)
|
|
88
|
-
|
|
90
|
+
})
|
|
91
|
+
|
|
92
|
+
it('keeps the algebra advanced layout untouched so both symbols coexist', () => {
|
|
93
|
+
const times = resolveKeyboard(DOT_CONFIG, MultiplicationSymbol.TIMES)
|
|
94
|
+
const cdot = resolveKeyboard(COMMA_CONFIG, MultiplicationSymbol.CDOT)
|
|
95
|
+
const plain = resolveKeyboard(DOT_CONFIG)
|
|
96
|
+
|
|
97
|
+
expect(times.operators[KeyboardType.AlgebraAdvanced].keys).toContain(
|
|
98
|
+
MATH_BASIC_OPERATORS.C_DOT,
|
|
99
|
+
)
|
|
100
|
+
expect(times.operators[KeyboardType.AlgebraAdvanced].keys).not.toContain(
|
|
89
101
|
MATH_BASIC_OPERATORS.MULTIPLICATION,
|
|
90
102
|
)
|
|
91
|
-
expect(
|
|
92
|
-
|
|
103
|
+
expect(cdot.operators[KeyboardType.AlgebraAdvanced].keys).toEqual(
|
|
104
|
+
plain.operators[KeyboardType.AlgebraAdvanced].keys,
|
|
93
105
|
)
|
|
94
|
-
})
|
|
95
|
-
|
|
96
|
-
it('replaces C_DOT in the algebra layout', () => {
|
|
97
|
-
const keyboard = resolveKeyboard(COMMA_CONFIG, MultiplicationSymbol.TIMES)
|
|
98
|
-
const algebraKeys = keyboard.operators[KeyboardType.AlgebraAdvanced].keys
|
|
99
106
|
|
|
100
|
-
expect(
|
|
101
|
-
expect(algebraKeys).not.toContain(MATH_BASIC_OPERATORS.C_DOT)
|
|
107
|
+
expect(times.operators[KeyboardType.Basic].keys).toContain(MATH_BASIC_OPERATORS.MULTIPLICATION)
|
|
102
108
|
})
|
|
103
109
|
|
|
104
110
|
it('does not duplicate multiplication keys after substitution', () => {
|
|
@@ -119,6 +119,10 @@ const MULTIPLICATION_KEYS: Record<MultiplicationSymbol, KeyboardKey> = {
|
|
|
119
119
|
const isMultiplicationKey = (key: KeyboardKey) =>
|
|
120
120
|
key === MATH_BASIC_OPERATORS.MULTIPLICATION || key === MATH_BASIC_OPERATORS.C_DOT
|
|
121
121
|
|
|
122
|
+
const MULTIPLICATION_LOCKED_LAYOUTS: ReadonlySet<KeyboardType> = new Set([
|
|
123
|
+
KeyboardType.AlgebraAdvanced,
|
|
124
|
+
])
|
|
125
|
+
|
|
122
126
|
const applyMultiplicationSymbol = (
|
|
123
127
|
operators: ResolvedKeyboard['operators'],
|
|
124
128
|
symbol: MultiplicationSymbol,
|
|
@@ -127,6 +131,8 @@ const applyMultiplicationSymbol = (
|
|
|
127
131
|
const result = { ...operators }
|
|
128
132
|
|
|
129
133
|
Object.values(KeyboardType).forEach((type) => {
|
|
134
|
+
if (MULTIPLICATION_LOCKED_LAYOUTS.has(type)) return
|
|
135
|
+
|
|
130
136
|
const group = result[type]
|
|
131
137
|
result[type] = {
|
|
132
138
|
...group,
|