@magmamath/students-features 1.7.7 → 1.7.8

package/src/features/keyboard/constants/__tests__/keyboard.characterization.test.ts

@@ -0,0 +1,50 @@
+import {
+  KeyboardConfig,
+  KeyboardCurrencyVariant,
+  KeyboardPreset,
+  KeyboardTimeVariant,
+  MultiplicationSymbol,
+} from '@magmamath/frontend-config'
+import { resolveKeyboard } from '../keyboard.helpers'
+import { KeyboardKey, ResolvedKeyboard } from '../../types/types'
+
+const keyId = (key: KeyboardKey) => ({
+  m: key.mathliveValue,
+  k: key.katexValue,
+  l: key.label ?? null,
+})
+
+const serialize = (kb: ResolvedKeyboard) => ({
+  operators: Object.fromEntries(
+    Object.entries(kb.operators).map(([type, group]) => [type, group.keys.map(keyId)]),
+  ),
+  units: Object.fromEntries(
+    Object.entries(kb.units).map(([type, group]) => [type, group.keys.map((row) => row.map(keyId))]),
+  ),
+})
+
+const config = (overrides: Partial<KeyboardConfig> = {}): KeyboardConfig => ({
+  preset: KeyboardPreset.DOT_MIXED,
+  currencyVariant: KeyboardCurrencyVariant.DOLLAR_CENT,
+  timeVariant: KeyboardTimeVariant.H24,
+  ...overrides,
+})
+
+const PRESETS = Object.values(KeyboardPreset)
+const MULTIPLICATION = [MultiplicationSymbol.TIMES, MultiplicationSymbol.CDOT, undefined] as const
+
+describe('resolveKeyboard characterization', () => {
+  describe.each(PRESETS)('preset %s', (preset) => {
+    it.each(MULTIPLICATION)('multiplication %s', (symbol) => {
+      expect(serialize(resolveKeyboard(config({ preset }), symbol))).toMatchSnapshot()
+    })
+  })
+
+  it.each(Object.values(KeyboardCurrencyVariant))('currency variant %s', (currencyVariant) => {
+    expect(serialize(resolveKeyboard(config({ currencyVariant }), MultiplicationSymbol.TIMES))).toMatchSnapshot()
+  })
+
+  it.each(Object.values(KeyboardTimeVariant))('time variant %s', (timeVariant) => {
+    expect(serialize(resolveKeyboard(config({ timeVariant }), MultiplicationSymbol.TIMES))).toMatchSnapshot()
+  })
+})

package/src/features/keyboard/constants/groups/basic.constants.ts

@@ -1,25 +1,13 @@
 import { MATH_BASIC_OPERATORS } from '../keys'
-import { KeyboardGroups } from '../../types/types'
+import { KeySlot, LayoutGroup } from '../../types/types'
 
-export const KEYBOARD_BASIC: KeyboardGroups = {
-  DOT: {
-    keys: [
-      MATH_BASIC_OPERATORS.ADDITION,
-      MATH_BASIC_OPERATORS.SUBTRACTION,
-      MATH_BASIC_OPERATORS.EQUALS,
-      MATH_BASIC_OPERATORS.MULTIPLICATION,
-      MATH_BASIC_OPERATORS.DIVISION,
-      MATH_BASIC_OPERATORS.COMMA,
-    ],
-  },
-  COMMA: {
-    keys: [
-      MATH_BASIC_OPERATORS.ADDITION,
-      MATH_BASIC_OPERATORS.SUBTRACTION,
-      MATH_BASIC_OPERATORS.EQUALS,
-      MATH_BASIC_OPERATORS.C_DOT,
-      MATH_BASIC_OPERATORS.DIVISION,
-      MATH_BASIC_OPERATORS.DOT,
-    ],
-  },
+export const KEYBOARD_BASIC: LayoutGroup = {
+  keys: [
+    MATH_BASIC_OPERATORS.ADDITION,
+    MATH_BASIC_OPERATORS.SUBTRACTION,
+    MATH_BASIC_OPERATORS.EQUALS,
+    { slot: KeySlot.MULTIPLICATION },
+    MATH_BASIC_OPERATORS.DIVISION,
+    { slot: KeySlot.LIST_SEPARATOR },
+  ],
 }

package/src/features/keyboard/constants/groups/basicPlus.constants.ts

@@ -1,8 +1,8 @@
 import { MATH_BASIC_OPERATORS, MATH_TEXT_SYMBOLS } from '../keys'
-import { KeyboardGroups } from '../../types/types'
+import { KeySlot, LayoutGroups } from '../../types/types'
 
-export const KEYBOARD_BASIC_PLUS: KeyboardGroups = {
-  DOT: {
+export const KEYBOARD_BASIC_PLUS: LayoutGroups = {
+  DESKTOP: {
     keys: [
       MATH_BASIC_OPERATORS.ADDITION,
       MATH_BASIC_OPERATORS.SUBTRACTION,
@@ -10,9 +10,9 @@ export const KEYBOARD_BASIC_PLUS: KeyboardGroups = {
       MATH_BASIC_OPERATORS.ROUND_BRACKET_LEFT,
       MATH_BASIC_OPERATORS.ROUND_BRACKET_RIGHT,
       MATH_BASIC_OPERATORS.FRACTION,
-      MATH_BASIC_OPERATORS.MULTIPLICATION,
+      { slot: KeySlot.MULTIPLICATION },
       MATH_BASIC_OPERATORS.DIVISION,
-      MATH_BASIC_OPERATORS.COMMA,
+      { slot: KeySlot.LIST_SEPARATOR },
       MATH_BASIC_OPERATORS.PERCENT,
       MATH_BASIC_OPERATORS.SQUARE_POWER,
       MATH_BASIC_OPERATORS.SQUARE_ROOT,
@@ -24,7 +24,7 @@ export const KEYBOARD_BASIC_PLUS: KeyboardGroups = {
       MATH_BASIC_OPERATORS.NTH_ROOT,
     ],
   },
-  COMMA: {
+  MOBILE: {
     keys: [
       MATH_BASIC_OPERATORS.ADDITION,
       MATH_BASIC_OPERATORS.SUBTRACTION,
@@ -32,52 +32,9 @@ export const KEYBOARD_BASIC_PLUS: KeyboardGroups = {
       MATH_BASIC_OPERATORS.ROUND_BRACKET_LEFT,
       MATH_BASIC_OPERATORS.ROUND_BRACKET_RIGHT,
       MATH_BASIC_OPERATORS.FRACTION,
-      MATH_BASIC_OPERATORS.C_DOT,
+      { slot: KeySlot.MULTIPLICATION },
       MATH_BASIC_OPERATORS.DIVISION,
-      MATH_BASIC_OPERATORS.DOT,
-      MATH_BASIC_OPERATORS.PERCENT,
-      MATH_BASIC_OPERATORS.SQUARE_POWER,
-      MATH_BASIC_OPERATORS.SQUARE_ROOT,
-      MATH_TEXT_SYMBOLS.X,
-      MATH_TEXT_SYMBOLS.Y,
-      MATH_TEXT_SYMBOLS.Z,
-      MATH_BASIC_OPERATORS.PERMILLE,
-      MATH_BASIC_OPERATORS.NTH_POWER,
-      MATH_BASIC_OPERATORS.NTH_ROOT,
-    ],
-  },
-  MOBILE_DOT: {
-    keys: [
-      MATH_BASIC_OPERATORS.ADDITION,
-      MATH_BASIC_OPERATORS.SUBTRACTION,
-      MATH_BASIC_OPERATORS.EQUALS,
-      MATH_BASIC_OPERATORS.ROUND_BRACKET_LEFT,
-      MATH_BASIC_OPERATORS.ROUND_BRACKET_RIGHT,
-      MATH_BASIC_OPERATORS.FRACTION,
-      MATH_BASIC_OPERATORS.MULTIPLICATION,
-      MATH_BASIC_OPERATORS.DIVISION,
-      MATH_BASIC_OPERATORS.COMMA,
-      MATH_BASIC_OPERATORS.PERCENT,
-      MATH_BASIC_OPERATORS.SQUARE_POWER,
-      MATH_BASIC_OPERATORS.SQUARE_ROOT,
-      MATH_TEXT_SYMBOLS.X,
-      MATH_TEXT_SYMBOLS.Y,
-      MATH_TEXT_SYMBOLS.Z,
-      MATH_BASIC_OPERATORS.PERMILLE,
-      MATH_BASIC_OPERATORS.NTH_POWER,
-    ],
-  },
-  MOBILE_COMMA: {
-    keys: [
-      MATH_BASIC_OPERATORS.ADDITION,
-      MATH_BASIC_OPERATORS.SUBTRACTION,
-      MATH_BASIC_OPERATORS.EQUALS,
-      MATH_BASIC_OPERATORS.ROUND_BRACKET_LEFT,
-      MATH_BASIC_OPERATORS.ROUND_BRACKET_RIGHT,
-      MATH_BASIC_OPERATORS.FRACTION,
-      MATH_BASIC_OPERATORS.C_DOT,
-      MATH_BASIC_OPERATORS.DIVISION,
-      MATH_BASIC_OPERATORS.DOT,
+      { slot: KeySlot.LIST_SEPARATOR },
       MATH_BASIC_OPERATORS.PERCENT,
       MATH_BASIC_OPERATORS.SQUARE_POWER,
       MATH_BASIC_OPERATORS.SQUARE_ROOT,

package/src/features/keyboard/constants/groups/basicPlusPlus.constants.ts

@@ -4,10 +4,10 @@ import {
   MATH_SYMBOLS,
   MATH_TEXT_SYMBOLS,
 } from '../keys'
-import { KeyboardGroups } from '../../types/types'
+import { KeySlot, LayoutGroups } from '../../types/types'
 
-export const KEYBOARD_BASIC_PLUS_PLUS: KeyboardGroups = {
-  DOT: {
+export const KEYBOARD_BASIC_PLUS_PLUS: LayoutGroups = {
+  DESKTOP: {
     keys: [
       MATH_BASIC_OPERATORS.ADDITION,
       MATH_BASIC_OPERATORS.SUBTRACTION,
@@ -18,7 +18,7 @@ export const KEYBOARD_BASIC_PLUS_PLUS: KeyboardGroups = {
       MATH_BASIC_OPERATORS.SQUARE_ROOT,
       MATH_SYMBOLS.PI,
       MATH_GEOMETRY_SYMBOLS.RADIAN,
-      MATH_BASIC_OPERATORS.MULTIPLICATION,
+      { slot: KeySlot.MULTIPLICATION },
       MATH_BASIC_OPERATORS.FRACTION,
       MATH_BASIC_OPERATORS.SLASH,
       MATH_BASIC_OPERATORS.PLUS_MINUS,
@@ -27,7 +27,7 @@ export const KEYBOARD_BASIC_PLUS_PLUS: KeyboardGroups = {
       MATH_BASIC_OPERATORS.NTH_ROOT,
       MATH_SYMBOLS.THETA,
       MATH_GEOMETRY_SYMBOLS.DEGREE,
-      MATH_BASIC_OPERATORS.COMMA,
+      { slot: KeySlot.LIST_SEPARATOR },
       MATH_TEXT_SYMBOLS.X,
       MATH_TEXT_SYMBOLS.Y,
       MATH_TEXT_SYMBOLS.Z,
@@ -38,62 +38,7 @@ export const KEYBOARD_BASIC_PLUS_PLUS: KeyboardGroups = {
       MATH_BASIC_OPERATORS.GREATER_THAN,
     ],
   },
-  COMMA: {
-    keys: [
-      MATH_BASIC_OPERATORS.ADDITION,
-      MATH_BASIC_OPERATORS.SUBTRACTION,
-      MATH_BASIC_OPERATORS.EQUALS,
-      MATH_BASIC_OPERATORS.ROUND_BRACKET_LEFT,
-      MATH_BASIC_OPERATORS.ROUND_BRACKET_RIGHT,
-      MATH_BASIC_OPERATORS.SQUARE_POWER,
-      MATH_BASIC_OPERATORS.SQUARE_ROOT,
-      MATH_SYMBOLS.PI,
-      MATH_GEOMETRY_SYMBOLS.RADIAN,
-      MATH_BASIC_OPERATORS.C_DOT,
-      MATH_BASIC_OPERATORS.FRACTION,
-      MATH_BASIC_OPERATORS.SLASH,
-      MATH_BASIC_OPERATORS.PLUS_MINUS,
-      MATH_BASIC_OPERATORS.PERCENT,
-      MATH_BASIC_OPERATORS.NTH_POWER,
-      MATH_BASIC_OPERATORS.NTH_ROOT,
-      MATH_SYMBOLS.THETA,
-      MATH_GEOMETRY_SYMBOLS.DEGREE,
-      MATH_BASIC_OPERATORS.DOT,
-      MATH_TEXT_SYMBOLS.X,
-      MATH_TEXT_SYMBOLS.Y,
-      MATH_TEXT_SYMBOLS.Z,
-      MATH_BASIC_OPERATORS.PERMILLE,
-      MATH_BASIC_OPERATORS.LESS_THAN,
-      MATH_BASIC_OPERATORS.LESS_THAN_OR_EQUAL,
-      MATH_BASIC_OPERATORS.GREATER_THAN_OR_EQUAL,
-      MATH_BASIC_OPERATORS.GREATER_THAN,
-    ],
-  },
-  MOBILE_DOT: {
-    keys: [
-      MATH_BASIC_OPERATORS.ADDITION,
-      MATH_BASIC_OPERATORS.SUBTRACTION,
-      MATH_BASIC_OPERATORS.EQUALS,
-      MATH_BASIC_OPERATORS.ROUND_BRACKET_LEFT,
-      MATH_BASIC_OPERATORS.ROUND_BRACKET_RIGHT,
-      MATH_SYMBOLS.PI,
-      MATH_GEOMETRY_SYMBOLS.RADIAN,
-      MATH_BASIC_OPERATORS.MULTIPLICATION,
-      MATH_BASIC_OPERATORS.FRACTION,
-      MATH_BASIC_OPERATORS.COMMA,
-      MATH_BASIC_OPERATORS.SQUARE_POWER,
-      MATH_BASIC_OPERATORS.SQUARE_ROOT,
-      MATH_SYMBOLS.THETA,
-      MATH_GEOMETRY_SYMBOLS.DEGREE,
-      MATH_TEXT_SYMBOLS.X,
-      MATH_TEXT_SYMBOLS.Y,
-      MATH_TEXT_SYMBOLS.Z,
-      MATH_BASIC_OPERATORS.NTH_POWER,
-      MATH_BASIC_OPERATORS.LESS_THAN,
-      MATH_BASIC_OPERATORS.GREATER_THAN,
-    ],
-  },
-  MOBILE_COMMA: {
+  MOBILE: {
     keys: [
       MATH_BASIC_OPERATORS.ADDITION,
       MATH_BASIC_OPERATORS.SUBTRACTION,
@@ -102,9 +47,9 @@ export const KEYBOARD_BASIC_PLUS_PLUS: KeyboardGroups = {
       MATH_BASIC_OPERATORS.ROUND_BRACKET_RIGHT,
       MATH_SYMBOLS.PI,
       MATH_GEOMETRY_SYMBOLS.RADIAN,
-      MATH_BASIC_OPERATORS.C_DOT,
+      { slot: KeySlot.MULTIPLICATION },
       MATH_BASIC_OPERATORS.FRACTION,
-      MATH_BASIC_OPERATORS.DOT,
+      { slot: KeySlot.LIST_SEPARATOR },
       MATH_BASIC_OPERATORS.SQUARE_POWER,
       MATH_BASIC_OPERATORS.SQUARE_ROOT,
       MATH_SYMBOLS.THETA,

package/src/features/keyboard/constants/groups/numpad.constants.ts

@@ -1,37 +1,19 @@
-import { MATH_BASIC_OPERATORS, MATH_SPECIAL_OPERATORS } from '../keys'
-import { KeyboardGroups } from '../../types/types'
+import { MATH_SPECIAL_OPERATORS } from '../keys'
+import { KeySlot, LayoutGroup } from '../../types/types'
 
-export const KEYBOARD_NUMPAD: KeyboardGroups = {
-  DOT: {
-    keys: [
-      { label: '1', mathliveValue: '1', katexValue: '1' },
-      { label: '2', mathliveValue: '2', katexValue: '2' },
-      { label: '3', mathliveValue: '3', katexValue: '3' },
-      MATH_SPECIAL_OPERATORS.BACKSPACE,
-      { label: '4', mathliveValue: '4', katexValue: '4' },
-      { label: '5', mathliveValue: '5', katexValue: '5' },
-      { label: '6', mathliveValue: '6', katexValue: '6' },
-      MATH_BASIC_OPERATORS.DOT,
-      { label: '7', mathliveValue: '7', katexValue: '7' },
-      { label: '8', mathliveValue: '8', katexValue: '8' },
-      { label: '9', mathliveValue: '9', katexValue: '9' },
-      { label: '0', mathliveValue: '0', katexValue: '0' },
-    ],
-  },
-  COMMA: {
-    keys: [
-      { label: '1', mathliveValue: '1', katexValue: '1' },
-      { label: '2', mathliveValue: '2', katexValue: '2' },
-      { label: '3', mathliveValue: '3', katexValue: '3' },
-      MATH_SPECIAL_OPERATORS.BACKSPACE,
-      { label: '4', mathliveValue: '4', katexValue: '4' },
-      { label: '5', mathliveValue: '5', katexValue: '5' },
-      { label: '6', mathliveValue: '6', katexValue: '6' },
-      MATH_BASIC_OPERATORS.COMMA,
-      { label: '7', mathliveValue: '7', katexValue: '7' },
-      { label: '8', mathliveValue: '8', katexValue: '8' },
-      { label: '9', mathliveValue: '9', katexValue: '9' },
-      { label: '0', mathliveValue: '0', katexValue: '0' },
-    ],
-  },
+export const KEYBOARD_NUMPAD: LayoutGroup = {
+  keys: [
+    { label: '1', mathliveValue: '1', katexValue: '1' },
+    { label: '2', mathliveValue: '2', katexValue: '2' },
+    { label: '3', mathliveValue: '3', katexValue: '3' },
+    MATH_SPECIAL_OPERATORS.BACKSPACE,
+    { label: '4', mathliveValue: '4', katexValue: '4' },
+    { label: '5', mathliveValue: '5', katexValue: '5' },
+    { label: '6', mathliveValue: '6', katexValue: '6' },
+    { slot: KeySlot.DECIMAL_SEPARATOR },
+    { label: '7', mathliveValue: '7', katexValue: '7' },
+    { label: '8', mathliveValue: '8', katexValue: '8' },
+    { label: '9', mathliveValue: '9', katexValue: '9' },
+    { label: '0', mathliveValue: '0', katexValue: '0' },
+  ],
 }

package/src/features/keyboard/constants/keyboard.helpers.ts

@@ -3,14 +3,22 @@ import {
   KeyboardCurrencyVariant,
   KeyboardPreset,
   KeyboardTimeVariant,
+  MultiplicationSymbol,
+  NumberDecimalSeparator,
 } from '@magmamath/frontend-config'
 import {
   KeyboardGroup,
+  KeyboardKey,
   KeyboardRowsGroup,
   KeyboardType,
   KeyboardUnitsGroupType,
+  KeySlot,
+  KeySlotRef,
+  LayoutGroup,
+  LayoutKey,
   ResolvedKeyboard,
 } from '../types/types'
+import { MATH_BASIC_OPERATORS } from './keys'
 import {
   KEYBOARD_ALGEBRA,
   KEYBOARD_AREA,
@@ -28,27 +36,57 @@ import {
   KEYBOARD_WEIGHT,
 } from './groups'
 
-type KeyboardPresetConfig = {
-  operators: Record<
-    Exclude<KeyboardType, KeyboardType.BasicTime | KeyboardType.BasicCurrency>,
-    KeyboardGroup
-  >
+type SlotBinding = Record<KeySlot, KeyboardKey>
+
+const PRESET_SEPARATOR: Record<KeyboardPreset, NumberDecimalSeparator> = {
+  [KeyboardPreset.DOT_MIXED]: NumberDecimalSeparator.DOT,
+  [KeyboardPreset.DOT_MIXED_ALT]: NumberDecimalSeparator.DOT,
+  [KeyboardPreset.COMMA_METRIC]: NumberDecimalSeparator.COMMA,
+}
+
+const MULTIPLICATION_KEYS: Record<MultiplicationSymbol, KeyboardKey> = {
+  [MultiplicationSymbol.TIMES]: MATH_BASIC_OPERATORS.MULTIPLICATION,
+  [MultiplicationSymbol.CDOT]: MATH_BASIC_OPERATORS.C_DOT,
+}
+
+const DEFAULT_MULTIPLICATION_SYMBOL: Record<NumberDecimalSeparator, MultiplicationSymbol> = {
+  [NumberDecimalSeparator.DOT]: MultiplicationSymbol.TIMES,
+  [NumberDecimalSeparator.COMMA]: MultiplicationSymbol.CDOT,
+}
+
+const DECIMAL_SEPARATOR_KEYS: Record<NumberDecimalSeparator, KeyboardKey> = {
+  [NumberDecimalSeparator.DOT]: MATH_BASIC_OPERATORS.DOT,
+  [NumberDecimalSeparator.COMMA]: MATH_BASIC_OPERATORS.COMMA,
+}
+
+const LIST_SEPARATOR_KEYS: Record<NumberDecimalSeparator, KeyboardKey> = {
+  [NumberDecimalSeparator.DOT]: MATH_BASIC_OPERATORS.COMMA,
+  [NumberDecimalSeparator.COMMA]: MATH_BASIC_OPERATORS.DOT,
+}
+
+const buildBinding = (
+  separator: NumberDecimalSeparator,
+  multiplicationSymbol?: MultiplicationSymbol,
+): SlotBinding => ({
+  [KeySlot.MULTIPLICATION]: MULTIPLICATION_KEYS[multiplicationSymbol ?? DEFAULT_MULTIPLICATION_SYMBOL[separator]],
+  [KeySlot.DECIMAL_SEPARATOR]: DECIMAL_SEPARATOR_KEYS[separator],
+  [KeySlot.LIST_SEPARATOR]: LIST_SEPARATOR_KEYS[separator],
+})
+
+const isSlot = (key: LayoutKey): key is KeySlotRef => 'slot' in key
+
+const resolveGroup = (group: LayoutGroup, binding: SlotBinding): KeyboardGroup => ({
+  ...group,
+  keys: group.keys.map((key) => (isSlot(key) ? binding[key.slot] : key)),
+})
+
+type PresetUnits = {
+  basicUnits: KeyboardGroup
   units: Record<KeyboardUnitsGroupType, KeyboardRowsGroup>
 }
 
-const PRESET_DOT_MIXED: KeyboardPresetConfig = {
-  operators: {
-    [KeyboardType.Basic]: KEYBOARD_BASIC.DOT,
-    [KeyboardType.BasicPlus]: KEYBOARD_BASIC_PLUS.DOT,
-    [KeyboardType.BasicPlusMobile]: KEYBOARD_BASIC_PLUS.MOBILE_DOT,
-    [KeyboardType.BasicPlusPlus]: KEYBOARD_BASIC_PLUS_PLUS.DOT,
-    [KeyboardType.BasicPlusPlusMobile]: KEYBOARD_BASIC_PLUS_PLUS.MOBILE_DOT,
-    [KeyboardType.BasicUnits]: { keys: KEYBOARD_LENGTH.MIXED.keys[0] },
-    [KeyboardType.AlgebraAdvanced]: KEYBOARD_ALGEBRA,
-    [KeyboardType.Geometry]: KEYBOARD_GEOMETRY,
-    [KeyboardType.Numpad]: KEYBOARD_NUMPAD.DOT,
-    [KeyboardType.Underlined]: KEYBOARD_UNDERLINED,
-  },
+const DOT_MIXED_UNITS: PresetUnits = {
+  basicUnits: { keys: KEYBOARD_LENGTH.MIXED.keys[0] },
   units: {
     [KeyboardUnitsGroupType.LENGTH]: KEYBOARD_LENGTH.MIXED,
     [KeyboardUnitsGroupType.AREA]: KEYBOARD_AREA.MIXED,
@@ -58,19 +96,8 @@ const PRESET_DOT_MIXED: KeyboardPresetConfig = {
   },
 }
 
-const PRESET_COMMA_METRIC: KeyboardPresetConfig = {
-  operators: {
-    [KeyboardType.Basic]: KEYBOARD_BASIC.COMMA,
-    [KeyboardType.BasicPlus]: KEYBOARD_BASIC_PLUS.COMMA,
-    [KeyboardType.BasicPlusMobile]: KEYBOARD_BASIC_PLUS.MOBILE_COMMA,
-    [KeyboardType.BasicPlusPlus]: KEYBOARD_BASIC_PLUS_PLUS.COMMA,
-    [KeyboardType.BasicPlusPlusMobile]: KEYBOARD_BASIC_PLUS_PLUS.MOBILE_COMMA,
-    [KeyboardType.BasicUnits]: { keys: KEYBOARD_LENGTH.METRIC.keys[0] },
-    [KeyboardType.AlgebraAdvanced]: KEYBOARD_ALGEBRA,
-    [KeyboardType.Geometry]: KEYBOARD_GEOMETRY,
-    [KeyboardType.Numpad]: KEYBOARD_NUMPAD.COMMA,
-    [KeyboardType.Underlined]: KEYBOARD_UNDERLINED,
-  },
+const COMMA_METRIC_UNITS: PresetUnits = {
+  basicUnits: { keys: KEYBOARD_LENGTH.METRIC.keys[0] },
   units: {
     [KeyboardUnitsGroupType.LENGTH]: KEYBOARD_LENGTH.METRIC,
     [KeyboardUnitsGroupType.AREA]: KEYBOARD_AREA.METRIC,
@@ -80,18 +107,18 @@ const PRESET_COMMA_METRIC: KeyboardPresetConfig = {
   },
 }
 
-const PRESET_DOT_MIXED_ALT: KeyboardPresetConfig = {
-  operators: PRESET_DOT_MIXED.operators,
+const DOT_MIXED_ALT_UNITS: PresetUnits = {
+  basicUnits: DOT_MIXED_UNITS.basicUnits,
   units: {
-    ...PRESET_DOT_MIXED.units,
+    ...DOT_MIXED_UNITS.units,
     [KeyboardUnitsGroupType.VOLUME]: KEYBOARD_VOLUME.MIXED_ALT,
   },
 }
 
-const PRESET_MAP: Record<KeyboardPreset, KeyboardPresetConfig> = {
-  [KeyboardPreset.DOT_MIXED]: PRESET_DOT_MIXED,
-  [KeyboardPreset.DOT_MIXED_ALT]: PRESET_DOT_MIXED_ALT,
-  [KeyboardPreset.COMMA_METRIC]: PRESET_COMMA_METRIC,
+const PRESET_UNITS_MAP: Record<KeyboardPreset, PresetUnits> = {
+  [KeyboardPreset.DOT_MIXED]: DOT_MIXED_UNITS,
+  [KeyboardPreset.DOT_MIXED_ALT]: DOT_MIXED_ALT_UNITS,
+  [KeyboardPreset.COMMA_METRIC]: COMMA_METRIC_UNITS,
 }
 
 const CURRENCY_MAP: Record<KeyboardCurrencyVariant, KeyboardGroup> = {
@@ -109,15 +136,29 @@ const TIME_MAP: Record<KeyboardTimeVariant, KeyboardGroup> = {
   [KeyboardTimeVariant.H24]: KEYBOARD_TIME.H24,
 }
 
-export const resolveKeyboard = (config: KeyboardConfig): ResolvedKeyboard => {
-  const preset = PRESET_MAP[config.preset]
+export const resolveKeyboard = (
+  config: KeyboardConfig,
+  multiplicationSymbol?: MultiplicationSymbol,
+): ResolvedKeyboard => {
+  const separator = PRESET_SEPARATOR[config.preset]
+  const binding = buildBinding(separator, multiplicationSymbol)
+  const presetUnits = PRESET_UNITS_MAP[config.preset]
 
   return {
     operators: {
-      ...preset.operators,
+      [KeyboardType.Basic]: resolveGroup(KEYBOARD_BASIC, binding),
+      [KeyboardType.BasicPlus]: resolveGroup(KEYBOARD_BASIC_PLUS.DESKTOP, binding),
+      [KeyboardType.BasicPlusMobile]: resolveGroup(KEYBOARD_BASIC_PLUS.MOBILE, binding),
+      [KeyboardType.BasicPlusPlus]: resolveGroup(KEYBOARD_BASIC_PLUS_PLUS.DESKTOP, binding),
+      [KeyboardType.BasicPlusPlusMobile]: resolveGroup(KEYBOARD_BASIC_PLUS_PLUS.MOBILE, binding),
+      [KeyboardType.BasicUnits]: presetUnits.basicUnits,
+      [KeyboardType.AlgebraAdvanced]: resolveGroup(KEYBOARD_ALGEBRA, binding),
+      [KeyboardType.Geometry]: resolveGroup(KEYBOARD_GEOMETRY, binding),
+      [KeyboardType.Numpad]: resolveGroup(KEYBOARD_NUMPAD, binding),
+      [KeyboardType.Underlined]: resolveGroup(KEYBOARD_UNDERLINED, binding),
       [KeyboardType.BasicCurrency]: CURRENCY_MAP[config.currencyVariant],
       [KeyboardType.BasicTime]: TIME_MAP[config.timeVariant],
     },
-    units: preset.units,
+    units: presetUnits.units,
   }
 }

package/src/features/keyboard/types/types.ts

@@ -38,6 +38,23 @@ export enum KeyboardUnitsGroupType {
 
 export type MathOperatorsGroup = Record<string, KeyboardKey>
 
+export enum KeySlot {
+  MULTIPLICATION = 'MULTIPLICATION',
+  DECIMAL_SEPARATOR = 'DECIMAL_SEPARATOR',
+  LIST_SEPARATOR = 'LIST_SEPARATOR',
+}
+
+export type KeySlotRef = { slot: KeySlot }
+
+export type LayoutKey = KeyboardKey | KeySlotRef
+
+export type LayoutGroup = {
+  keys: LayoutKey[]
+  numOfRows?: number
+}
+
+export type LayoutGroups = Record<string, LayoutGroup>
+
 export type KeyboardGroup = {
   keys: KeyboardKey[]
   numOfRows?: number