@magmamath/students-features 0.9.0-rc19 → 0.9.0-rc2

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

@@ -1,24 +1,18 @@
-import { KeyboardGroup, KeyboardKey, KeyboardType } from '../types/types'
+import { KeyboardGroup, KeyboardKey, KeyboardType } from '../types'
 import {
   MATH_CURRENCY_SW_KEYBOARD_GROUP,
-  MATH_CURRENCY_UK_KEYBOARD_GROUP,
   MATH_CURRENCY_US_KEYBOARD_GROUP,
   MATH_ENTRY_BASIC_KEYBOARD_GROUP,
-  MATH_ENTRY_BASIC_SW_KEYBOARD_GROUP,
   MATH_TIME_SW_KEYBOARD_GROUP,
   MATH_TIME_US_KEYBOARD_GROUP,
 } from '../components/BasicLayout/keyboardGroup'
 import { MATH_ENTRY_ALGEBRA_KEYBOARD_GROUP } from '../components/AlgebraLayout/keyboardGroups'
 import {
-  MATH_ENTRY_BASIC_EXTENDED_MOBILE,
-  MATH_ENTRY_BASIC_EXTENDED_MOBILE_SW,
   MATH_ENTRY_BASIC_SW_EXTENDED,
   MATH_ENTRY_BASIC_US_EXTENDED,
 } from '../components/BasicExtendedLayout/keyboardGroups'
 import {
   MATH_ENTRY_BASIC_EXTENDED_PLUS,
-  MATH_ENTRY_BASIC_EXTENDED_PLUS_MOBILE,
-  MATH_ENTRY_BASIC_EXTENDED_PLUS_MOBILE_SW,
   MATH_ENTRY_BASIC_EXTENDED_PLUS_SW,
 } from '../components/BasicExtendedPlusLayout/keyboardGroups'
 import {
@@ -30,18 +24,12 @@ import { MATH_BASIC_OPERATORS } from '../types/MathKeysGroups/basicOperators'
 import { MATH_AREA_UNITS, MATH_VOLUME_UNITS } from '../types/MathKeysGroups/units'
 import { MATH_INTEGRALS_AND_DERIVATIVES } from '../types/MathKeysGroups/calculusOperators'
 import { Locale } from '../../../shared/translation'
-import {
-  MATH_BASIC_TRIGONOMETRIC_FUNCTIONS,
-  MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS,
-} from '@magmamath/students-features'
 
 export const KEYBOARD_GROUPS_BY_LOCALE: Record<Locale, Record<KeyboardType, KeyboardGroup>> = {
   [Locale.CA]: {
     [KeyboardType.Basic]: MATH_ENTRY_BASIC_KEYBOARD_GROUP,
     [KeyboardType.BasicExtended]: MATH_ENTRY_BASIC_US_EXTENDED,
-    [KeyboardType.BasicExtendedMobile]: MATH_ENTRY_BASIC_EXTENDED_MOBILE,
     [KeyboardType.BasicExtendedPlus]: MATH_ENTRY_BASIC_EXTENDED_PLUS,
-    [KeyboardType.BasicExtendedPlusMobile]: MATH_ENTRY_BASIC_EXTENDED_PLUS_MOBILE,
     [KeyboardType.BasicUnits]: {
       ...MATH_ENTRY_LENGTH_UNITS_US_KEYBOARD_GROUPS,
       keys: MATH_ENTRY_LENGTH_UNITS_US_KEYBOARD_GROUPS.keys[0],
@@ -54,9 +42,7 @@ export const KEYBOARD_GROUPS_BY_LOCALE: Record<Locale, Record<KeyboardType, Keyb
   [Locale.SCT]: {
     [KeyboardType.Basic]: MATH_ENTRY_BASIC_KEYBOARD_GROUP,
     [KeyboardType.BasicExtended]: MATH_ENTRY_BASIC_US_EXTENDED,
-    [KeyboardType.BasicExtendedMobile]: MATH_ENTRY_BASIC_EXTENDED_MOBILE,
     [KeyboardType.BasicExtendedPlus]: MATH_ENTRY_BASIC_EXTENDED_PLUS,
-    [KeyboardType.BasicExtendedPlusMobile]: MATH_ENTRY_BASIC_EXTENDED_PLUS_MOBILE,
     [KeyboardType.BasicUnits]: {
       ...MATH_ENTRY_LENGTH_UNITS_US_KEYBOARD_GROUPS,
       keys: MATH_ENTRY_LENGTH_UNITS_US_KEYBOARD_GROUPS.keys[0],
@@ -69,14 +55,12 @@ export const KEYBOARD_GROUPS_BY_LOCALE: Record<Locale, Record<KeyboardType, Keyb
   [Locale.GB]: {
     [KeyboardType.Basic]: MATH_ENTRY_BASIC_KEYBOARD_GROUP,
     [KeyboardType.BasicExtended]: MATH_ENTRY_BASIC_US_EXTENDED,
-    [KeyboardType.BasicExtendedMobile]: MATH_ENTRY_BASIC_EXTENDED_MOBILE,
     [KeyboardType.BasicExtendedPlus]: MATH_ENTRY_BASIC_EXTENDED_PLUS,
-    [KeyboardType.BasicExtendedPlusMobile]: MATH_ENTRY_BASIC_EXTENDED_PLUS_MOBILE,
     [KeyboardType.BasicUnits]: {
       ...MATH_ENTRY_LENGTH_UNITS_US_KEYBOARD_GROUPS,
       keys: MATH_ENTRY_LENGTH_UNITS_US_KEYBOARD_GROUPS.keys[0],
     },
-    [KeyboardType.BasicCurrency]: MATH_CURRENCY_UK_KEYBOARD_GROUP,
+    [KeyboardType.BasicCurrency]: MATH_CURRENCY_SW_KEYBOARD_GROUP,
     [KeyboardType.BasicTime]: MATH_TIME_SW_KEYBOARD_GROUP,
     [KeyboardType.AlgebraAdvanced]: MATH_ENTRY_ALGEBRA_KEYBOARD_GROUP,
     [KeyboardType.Numpad]: MATH_ENTRY_NUMBERS_US_KEYBOARD_GROUP,
@@ -84,9 +68,7 @@ export const KEYBOARD_GROUPS_BY_LOCALE: Record<Locale, Record<KeyboardType, Keyb
   [Locale.EN]: {
     [KeyboardType.Basic]: MATH_ENTRY_BASIC_KEYBOARD_GROUP,
     [KeyboardType.BasicExtended]: MATH_ENTRY_BASIC_US_EXTENDED,
-    [KeyboardType.BasicExtendedMobile]: MATH_ENTRY_BASIC_EXTENDED_MOBILE,
     [KeyboardType.BasicExtendedPlus]: MATH_ENTRY_BASIC_EXTENDED_PLUS,
-    [KeyboardType.BasicExtendedPlusMobile]: MATH_ENTRY_BASIC_EXTENDED_PLUS_MOBILE,
     [KeyboardType.BasicUnits]: {
       ...MATH_ENTRY_LENGTH_UNITS_US_KEYBOARD_GROUPS,
       keys: MATH_ENTRY_LENGTH_UNITS_US_KEYBOARD_GROUPS.keys[0],
@@ -97,11 +79,9 @@ export const KEYBOARD_GROUPS_BY_LOCALE: Record<Locale, Record<KeyboardType, Keyb
     [KeyboardType.Numpad]: MATH_ENTRY_NUMBERS_US_KEYBOARD_GROUP,
   },
   [Locale.SW]: {
-    [KeyboardType.Basic]: MATH_ENTRY_BASIC_SW_KEYBOARD_GROUP,
+    [KeyboardType.Basic]: MATH_ENTRY_BASIC_KEYBOARD_GROUP,
     [KeyboardType.BasicExtended]: MATH_ENTRY_BASIC_SW_EXTENDED,
-    [KeyboardType.BasicExtendedMobile]: MATH_ENTRY_BASIC_EXTENDED_MOBILE_SW,
     [KeyboardType.BasicExtendedPlus]: MATH_ENTRY_BASIC_EXTENDED_PLUS_SW,
-    [KeyboardType.BasicExtendedPlusMobile]: MATH_ENTRY_BASIC_EXTENDED_PLUS_MOBILE_SW,
     [KeyboardType.BasicUnits]: {
       ...MATH_ENTRY_LENGTH_UNITS_US_KEYBOARD_GROUPS,
       keys: MATH_ENTRY_LENGTH_UNITS_US_KEYBOARD_GROUPS.keys[0],
@@ -120,6 +100,7 @@ export const DISABLED_KEYS: KeyboardKey[] = [
   MATH_BASIC_OPERATORS.ORDERED_PAIR,
   MATH_BASIC_OPERATORS.NTH_ROOT,
   MATH_BASIC_OPERATORS.FRACTION,
+  MATH_INTEGRALS_AND_DERIVATIVES.DEFINITEINTEGRAL,
   MATH_AREA_UNITS.SQUARE_YARD,
   MATH_AREA_UNITS.SQUARE_MILE,
   MATH_AREA_UNITS.SQUARE_FOOT,
@@ -137,16 +118,5 @@ export const DISABLED_KEYS: KeyboardKey[] = [
   MATH_VOLUME_UNITS.CUBIC_METER,
   MATH_VOLUME_UNITS.CUBIC_CENTIMETER,
   MATH_VOLUME_UNITS.CUBIC_MILLIMETER,
-  MATH_VOLUME_UNITS.CUBIC_DECIMETER,
   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_BASIC_TRIGONOMETRIC_FUNCTIONS.TAN,
-  MATH_BASIC_TRIGONOMETRIC_FUNCTIONS.SIN,
-  MATH_BASIC_TRIGONOMETRIC_FUNCTIONS.COS,
-  MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS.ARCTAN,
-  MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS.ARCSIN,
-  MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS.ARCCOS,
 ]

package/src/features/keyboard/constants.ts

@@ -4,5 +4,3 @@ export const DEFAULT_KEY_ICON_PROPS = {
   size: 16,
   color: COLORS.NEUTRAL_9,
 } as const
-
-export const MAX_WIDTH_FOR_MOBILE_LAYOUT = 1280

package/src/features/keyboard/helpers.ts

@@ -1,5 +1,5 @@
 import { KEYBOARD_GROUPS_BY_LOCALE } from './constants/keysValues'
-import { KeyboardGroup, KeyboardType } from './types/types'
+import { KeyboardGroup, KeyboardType } from './types'
 import { Locale } from '../../shared/translation/types'
 import { MATH_ENTRY_ALGEBRA_KEYBOARD_GROUP } from './components/AlgebraLayout/keyboardGroups'
 

package/src/features/keyboard/index.ts

@@ -1,3 +1,2 @@
-export * from './types/types'
+export * from './types'
 export { Keyboard } from './components/Keyboard'
-export * from './types/MathKeysGroups'

package/src/features/keyboard/types/MathKeysGroups/basicOperators.tsx

@@ -36,7 +36,7 @@ import { PlusMinusIcon } from '../../../../shared/icons/MATH/PlusMinusIcon/PlusM
 import { SigmaSumIcon } from '../../../../shared/icons/MATH/SigmaSumIcon/SigmaSumIcon'
 import { ParenthesesIcon } from '../../../../shared/icons/MATH/ParenthesesIcon/ParenthesesIcon'
 import { OrderedPairIcon } from '../../../../shared/icons/MATH/OrderedPairIcon/OrderedPairIcon'
-import { MathKeysGroup } from '../types'
+import { MathKeysGroup } from '../../types'
 import { DEFAULT_KEY_ICON_PROPS } from '../../constants'
 import { DivisionIcon } from '../../../../shared/icons/MATH/DivisionIcon/DivisionIcon'
 import { EqualsIcon } from '../../../../shared/icons/MATH/EqualsIcon/EqualsIcon'
@@ -102,7 +102,7 @@ export const MATH_BASIC_OPERATORS: MathKeysGroup<typeof MathBasicOperator> = {
   [MathBasicOperator.MULTIPLICATION]: {
     icon: <MultiplicationIcon {...DEFAULT_KEY_ICON_PROPS} />,
     mathliveValue: '\\times',
-    katexValue: '×',
+    katexValue: 'x',
   },
   [MathBasicOperator.DIVISION]: {
     icon: <DivisionIcon {...DEFAULT_KEY_ICON_PROPS} />,
@@ -113,13 +113,11 @@ export const MATH_BASIC_OPERATORS: MathKeysGroup<typeof MathBasicOperator> = {
     icon: <LessThanIcon {...DEFAULT_KEY_ICON_PROPS} />,
     mathliveValue: '<',
     katexValue: 'LESS_THAN',
-    spreadsheetValue: '<',
   },
   [MathBasicOperator.GREATER_THAN]: {
     icon: <GreaterThanIcon {...DEFAULT_KEY_ICON_PROPS} />,
     mathliveValue: '>',
     katexValue: 'GREATER_THAN',
-    spreadsheetValue: '>',
   },
   [MathBasicOperator.LESS_THAN_OR_EQUAL]: {
     icon: <LessThanOrEqualIcon {...DEFAULT_KEY_ICON_PROPS} />,

package/src/features/keyboard/types/MathKeysGroups/calculusOperators.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { MathKeysGroup } from '../types'
+import { MathKeysGroup } from '../../types'
 import { COLORS } from '@magmamath/react-native-ui'
 import { IntegralIcon } from '../../../../shared/icons/MATH/IntegralIcon/IntegralIcon'
 import { DoubleIntegralIcon } from '../../../../shared/icons/MATH/DoubleIntegralIcon/DoubleIntegralIcon'
@@ -31,8 +31,8 @@ export const MATH_INTEGRALS_AND_DERIVATIVES: MathKeysGroup<
     icon: (
       <DefiniteIntegralIcon {...DEFAULT_KEY_ICON_PROPS} size={20} extraColor={COLORS.NEUTRAL_6} />
     ),
-    mathliveValue: '\\int_{\\placeholder{lower}}^{\\placeholder{upper}}',
-    katexValue: '\\int_{a}^{b}',
+    mathliveValue: '$\\int_{#@}^{\\placeholder{}}$',
+    katexValue: '∫',
   },
   [MathIntegralsAndDerivativesOperator.DERIVATIVE]: {
     icon: <DerivativeIcon {...DEFAULT_KEY_ICON_PROPS} size={20} />,

package/src/features/keyboard/types/MathKeysGroups/geometry.tsx

@@ -3,7 +3,7 @@ import { DegreeIcon } from '../../../../shared/icons/MATH/DegreeIcon/DegreeIcon'
 import { AngleIcon } from '../../../../shared/icons/MATH/AngleIcon/AngleIcon'
 import { ParallelIcon } from '../../../../shared/icons/MATH/ParallelIcon/ParallelIcon'
 import { PerpendicularIcon } from '../../../../shared/icons/MATH/PerpendicularIcon/PerpendicularIcon'
-import { MathKeysGroup } from '../types'
+import { MathKeysGroup } from '../../types'
 import { DEFAULT_KEY_ICON_PROPS } from '../../constants'
 
 export enum MathGeometrySymbols {
@@ -39,11 +39,5 @@ export const MATH_GEOMETRY_SYMBOLS: MathKeysGroup<typeof MathGeometrySymbols> =
     label: 'rad',
     mathliveValue: 'rad',
     katexValue: 'rad',
-    style: {
-      text: {
-        fontSize: 14,
-        fontWeight: 700,
-      },
-    },
   },
 }

package/src/features/keyboard/types/MathKeysGroups/specialOperators.tsx

@@ -1,5 +1,5 @@
 import React from 'react'
-import { MathKeysGroup } from '../types'
+import { MathKeysGroup } from '../../types'
 import { DEFAULT_KEY_ICON_PROPS } from '../../constants'
 import { BackspaceIcon } from '../../../../shared/icons/MATH/BackspaceIcon/BackspaceIcon'
 
@@ -16,44 +16,24 @@ export const MATH_SPECIAL_OPERATORS: MathKeysGroup<typeof MathSpecialOperator> =
     label: 'lim',
     mathliveValue: '$\\lim_{\\placeholder{}}^{\\placeholder{}}$',
     katexValue: 'lim',
-    style: {
-      text: {
-        fontSize: 11,
-      },
-    },
   },
   [MathSpecialOperator.LN]: {
     label: 'ln',
     mathliveValue: '$\\ln(\\placeholder{})$',
     katexValue: 'ln',
-    style: {
-      text: {
-        fontSize: 11,
-      },
-    },
   },
   [MathSpecialOperator.LOG]: {
     label: 'log',
     mathliveValue: '$\\log_{\\placeholder{}}$',
     katexValue: 'log',
-    style: {
-      text: {
-        fontSize: 11,
-      },
-    },
   },
   [MathSpecialOperator.LOG10]: {
     label: 'log10',
     mathliveValue: '$\\log_{10}(\\placeholder{})$',
     katexValue: 'log₁₀',
-    style: {
-      text: {
-        fontSize: 11,
-      },
-    },
   },
   [MathSpecialOperator.BACKSPACE]: {
-    icon: <BackspaceIcon {...DEFAULT_KEY_ICON_PROPS} size={20} />,
+    icon: <BackspaceIcon {...DEFAULT_KEY_ICON_PROPS} />,
     mathliveValue: 'backspace',
     katexValue: 'backspace',
   },

package/src/features/keyboard/types/MathKeysGroups/symbols.tsx

@@ -1,5 +1,5 @@
 import { PiIcon } from '../../../../shared/icons/MATH/PiIcon/PiIcon'
-import { MathKeysGroup } from '../types'
+import { MathKeysGroup } from '../../types'
 import { AlphaIcon } from '../../../../shared/icons/MATH/AlphaIcon/AlphaIcon'
 import { BetaIcon } from '../../../../shared/icons/MATH/BetaIcon/BetaIcon'
 import { GammaIcon } from '../../../../shared/icons/MATH/GammaIcon/GammaIcon'

package/src/features/keyboard/types/MathKeysGroups/textSymbols.tsx

@@ -1,4 +1,4 @@
-import { MathKeysGroup } from '../types'
+import { MathKeysGroup } from '../../types'
 import { XIcon } from '../../../../shared/icons/MATH/XIcon/XIcon'
 import { DEFAULT_KEY_ICON_PROPS } from '../../constants'
 import React from 'react'
@@ -20,47 +20,47 @@ export enum MathTextSymbol {
 export const MATH_TEXT_SYMBOLS: MathKeysGroup<typeof MathTextSymbol> = {
   [MathTextSymbol.A]: {
     label: 'a',
-    mathliveValue: 'a',
+    mathliveValue: '$a$',
     katexValue: 'a',
   },
   [MathTextSymbol.B]: {
     label: 'b',
-    mathliveValue: 'b',
+    mathliveValue: '$b$',
     katexValue: 'b',
   },
   [MathTextSymbol.C]: {
     label: 'c',
-    mathliveValue: 'c',
+    mathliveValue: '$c$',
     katexValue: 'c',
   },
   [MathTextSymbol.F]: {
     label: 'f',
-    mathliveValue: 'f',
+    mathliveValue: '$f$',
     katexValue: 'f',
   },
   [MathTextSymbol.G]: {
     label: 'g',
-    mathliveValue: 'g',
+    mathliveValue: '$g$',
     katexValue: 'g',
   },
   [MathTextSymbol.H]: {
     label: 'h',
-    mathliveValue: 'h',
+    mathliveValue: '$h$',
     katexValue: 'h',
   },
   [MathTextSymbol.X]: {
     icon: <XIcon {...DEFAULT_KEY_ICON_PROPS} />,
-    mathliveValue: 'x',
+    mathliveValue: '$x$',
     katexValue: 'x',
   },
   [MathTextSymbol.Y]: {
     icon: <YIcon {...DEFAULT_KEY_ICON_PROPS} />,
-    mathliveValue: 'y',
+    mathliveValue: '$y$',
     katexValue: 'y',
   },
   [MathTextSymbol.Z]: {
     icon: <ZIcon {...DEFAULT_KEY_ICON_PROPS} />,
-    mathliveValue: 'z',
+    mathliveValue: '$z$',
     katexValue: 'z',
   },
 }

package/src/features/keyboard/types/MathKeysGroups/trigonometric.tsx

@@ -1,4 +1,4 @@
-import { MathKeysGroup } from '../types'
+import { MathKeysGroup } from '../../types'
 
 export enum MathBasicTrigonometricFunction {
   SIN = 'SIN',
@@ -24,62 +24,32 @@ export const MATH_BASIC_TRIGONOMETRIC_FUNCTIONS: MathKeysGroup<
   [MathBasicTrigonometricFunction.SIN]: {
     label: 'sin',
     mathliveValue: '$\\sin(\\placeholder{})$',
-    katexValue: 'sin()',
-    style: {
-      text: {
-        fontSize: 11,
-      },
-    },
+    katexValue: 'sin',
   },
   [MathBasicTrigonometricFunction.COS]: {
     label: 'cos',
     mathliveValue: '$\\cos(\\placeholder{})$',
     katexValue: 'cos',
-    style: {
-      text: {
-        fontSize: 11,
-      },
-    },
   },
   [MathBasicTrigonometricFunction.TAN]: {
     label: 'tan',
     mathliveValue: '$\\tan(\\placeholder{})$',
     katexValue: 'tan',
-    style: {
-      text: {
-        fontSize: 11,
-      },
-    },
   },
   [MathBasicTrigonometricFunction.COT]: {
     label: 'cot',
     mathliveValue: '$\\cot(\\placeholder{})$',
     katexValue: 'cot',
-    style: {
-      text: {
-        fontSize: 11,
-      },
-    },
   },
   [MathBasicTrigonometricFunction.SEC]: {
     label: 'sec',
     mathliveValue: '$\\sec(\\placeholder{})$',
     katexValue: 'sec',
-    style: {
-      text: {
-        fontSize: 11,
-      },
-    },
   },
   [MathBasicTrigonometricFunction.CSC]: {
     label: 'csc',
     mathliveValue: '$\\csc(\\placeholder{})$',
     katexValue: 'csc',
-    style: {
-      text: {
-        fontSize: 11,
-      },
-    },
   },
 }
 
@@ -90,78 +60,30 @@ export const MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS: MathKeysGroup<
     label: 'arcsin',
     mathliveValue: '$\\arcsin(\\placeholder{})$',
     katexValue: 'arcsin',
-    style: {
-      button: {
-        width: 58,
-      },
-      text: {
-        fontSize: 11,
-      },
-    },
   },
   [MathInverseTrigonometricFunction.ARCCOS]: {
     label: 'arccos',
     mathliveValue: '$\\arccos(\\placeholder{})$',
     katexValue: 'arccos',
-    style: {
-      button: {
-        width: 58,
-      },
-      text: {
-        fontSize: 11,
-      },
-    },
   },
   [MathInverseTrigonometricFunction.ARCTAN]: {
     label: 'arctan',
     mathliveValue: '$\\arctan(\\placeholder{})$',
     katexValue: 'arctan',
-    style: {
-      button: {
-        width: 58,
-      },
-      text: {
-        fontSize: 11,
-      },
-    },
   },
   [MathInverseTrigonometricFunction.ARCCOT]: {
     label: 'arccot',
     mathliveValue: '$\\operatorname{arccot}(\\placeholder{})$',
     katexValue: 'arccot',
-    style: {
-      button: {
-        width: 58,
-      },
-      text: {
-        fontSize: 11,
-      },
-    },
   },
   [MathInverseTrigonometricFunction.ARCSEC]: {
     label: 'arcsec',
     mathliveValue: '$\\operatorname{arcsec}(\\placeholder{})$',
     katexValue: 'arcsec',
-    style: {
-      button: {
-        width: 58,
-      },
-      text: {
-        fontSize: 11,
-      },
-    },
   },
   [MathInverseTrigonometricFunction.ARCCSC]: {
     label: 'arccsc',
     mathliveValue: '$\\operatorname{arccsc}(\\placeholder{})$',
     katexValue: 'arccsc',
-    style: {
-      button: {
-        width: 58,
-      },
-      text: {
-        fontSize: 11,
-      },
-    },
   },
 }