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

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

@@ -0,0 +1,47 @@
+import {
+  KeyboardKey,
+  MATH_AREA_UNITS,
+  MATH_BASIC_OPERATORS,
+  MATH_BASIC_TRIGONOMETRIC_FUNCTIONS,
+  MATH_INTEGRALS_AND_DERIVATIVES,
+  MATH_INVERSE_TRIGONOMETRIC_FUNCTIONS,
+  MATH_VOLUME_UNITS,
+} from '@magmamath/students-features'
+
+export const DISABLED_KEYS: KeyboardKey[] = [
+  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.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/helpers.ts

@@ -1,8 +1,14 @@
 import { KEYBOARD_GROUPS_BY_LOCALE } from './constants/keysValues'
-import { KeyboardGroup, KeyboardType } from './types'
+import { KeyboardGroup, KeyboardType } from './types/types'
 import { Locale } from '../../shared/translation/types'
 import { MATH_ENTRY_ALGEBRA_KEYBOARD_GROUP } from './components/AlgebraLayout/keyboardGroups'
 
 export function getKeyboardGroup(locale: Locale, type: KeyboardType): KeyboardGroup {
   return KEYBOARD_GROUPS_BY_LOCALE[locale]?.[type] ?? MATH_ENTRY_ALGEBRA_KEYBOARD_GROUP
 }
+
+export const getIsIpadOrIphoneDevice = () => {
+  const isIOS = /iPad|iPhone|iPod/.test(navigator.platform)
+  const isIpadOS = navigator?.maxTouchPoints > 2 && /MacIntel/.test(navigator.platform)
+  return isIOS || isIpadOS
+}

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

@@ -36,8 +36,8 @@ 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 { DEFAULT_KEY_ICON_PROPS } from '../../constants'
+import { MathKeysGroup } from '../types'
+import { DEFAULT_KEY_ICON_PROPS } from '../../constants/constants'
 import { DivisionIcon } from '../../../../shared/icons/MATH/DivisionIcon/DivisionIcon'
 import { EqualsIcon } from '../../../../shared/icons/MATH/EqualsIcon/EqualsIcon'
 import { AbsoluteValueIcon } from '../../../../shared/icons/MATH/AbsoluteValueIcon/AbsoluteValueIcon'
@@ -102,7 +102,7 @@ export const MATH_BASIC_OPERATORS: MathKeysGroup<typeof MathBasicOperator> = {
   [MathBasicOperator.MULTIPLICATION]: {
     icon: <MultiplicationIcon {...DEFAULT_KEY_ICON_PROPS} />,
     mathliveValue: '\\times',
-    katexValue: 'x',
+    katexValue: '×',
   },
   [MathBasicOperator.DIVISION]: {
     icon: <DivisionIcon {...DEFAULT_KEY_ICON_PROPS} />,
@@ -113,11 +113,13 @@ 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,11 +1,11 @@
 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'
 import { DefiniteIntegralIcon } from '../../../../shared/icons/MATH/DefiniteIntegralIcon/DefiniteIntegralIcon'
 import { DerivativeIcon } from '../../../../shared/icons/MATH/DerivativeIcon/DerivativeIcon'
-import { DEFAULT_KEY_ICON_PROPS } from '../../constants'
+import { DEFAULT_KEY_ICON_PROPS } from '../../constants/constants'
 
 export enum MathIntegralsAndDerivativesOperator {
   INTEGRAL = 'INTEGRAL',
@@ -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{}}$',
-    katexValue: '∫',
+    mathliveValue: '\\int_{\\placeholder{lower}}^{\\placeholder{upper}}',
+    katexValue: '\\int_{a}^{b}',
   },
   [MathIntegralsAndDerivativesOperator.DERIVATIVE]: {
     icon: <DerivativeIcon {...DEFAULT_KEY_ICON_PROPS} size={20} />,

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

@@ -3,8 +3,8 @@ 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 { DEFAULT_KEY_ICON_PROPS } from '../../constants'
+import { MathKeysGroup } from '../types'
+import { DEFAULT_KEY_ICON_PROPS } from '../../constants/constants'
 
 export enum MathGeometrySymbols {
   DEGREE = 'DEGREE',
@@ -39,5 +39,11 @@ 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/index.ts

@@ -0,0 +1,7 @@
+export * from './basicOperators'
+export * from './textSymbols'
+export * from './units'
+export * from './specialOperators'
+export * from './trigonometric'
+export * from './calculusOperators'
+export * from './geometry'

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

@@ -1,6 +1,6 @@
 import React from 'react'
-import { MathKeysGroup } from '../../types'
-import { DEFAULT_KEY_ICON_PROPS } from '../../constants'
+import { MathKeysGroup } from '../types'
+import { DEFAULT_KEY_ICON_PROPS } from '../../constants/constants'
 import { BackspaceIcon } from '../../../../shared/icons/MATH/BackspaceIcon/BackspaceIcon'
 
 export enum MathSpecialOperator {
@@ -16,24 +16,44 @@ 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} />,
+    icon: <BackspaceIcon {...DEFAULT_KEY_ICON_PROPS} size={20} />,
     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'
@@ -15,7 +15,7 @@ import { SigmaIcon } from '../../../../shared/icons/MATH/SigmaIcon/SigmaIcon'
 import { SigmaSumIcon } from '../../../../shared/icons/MATH/SigmaSumIcon/SigmaSumIcon'
 import { RhoIcon } from '../../../../shared/icons/MATH/RhoIcon/RhoIcon'
 import { PhiIcon } from '../../../../shared/icons/MATH/PhiIcon/PhiIcon'
-import { DEFAULT_KEY_ICON_PROPS } from '../../constants'
+import { DEFAULT_KEY_ICON_PROPS } from '../../constants/constants'
 import React from 'react'
 
 export enum MathSymbol {

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

@@ -1,6 +1,6 @@
-import { MathKeysGroup } from '../../types'
+import { MathKeysGroup } from '../types'
 import { XIcon } from '../../../../shared/icons/MATH/XIcon/XIcon'
-import { DEFAULT_KEY_ICON_PROPS } from '../../constants'
+import { DEFAULT_KEY_ICON_PROPS } from '../../constants/constants'
 import React from 'react'
 import { YIcon } from '../../../../shared/icons/MATH/YIcon/YIcon'
 import { ZIcon } from '../../../../shared/icons/MATH/ZIcon/ZIcon'
@@ -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,32 +24,62 @@ export const MATH_BASIC_TRIGONOMETRIC_FUNCTIONS: MathKeysGroup<
   [MathBasicTrigonometricFunction.SIN]: {
     label: 'sin',
     mathliveValue: '$\\sin(\\placeholder{})$',
-    katexValue: 'sin',
+    katexValue: 'sin()',
+    style: {
+      text: {
+        fontSize: 11,
+      },
+    },
   },
   [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,
+      },
+    },
   },
 }
 
@@ -60,30 +90,78 @@ 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,
+      },
+    },
   },
 }