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

package/dist/module/features/keyboard/components/Keyboard.js

@@ -1,12 +1,10 @@
 "use strict";
 
 import React, { useEffect, useRef } from 'react';
-import { Animated, StyleSheet, useWindowDimensions } from 'react-native';
-import { COLORS, SHADOWS, SPACING } from '@magmamath/react-native-ui';
-import { getLayoutByCharType, KEYBOARD_LAYOUTS } from "../constants/keyboardLayouts.js";
-import { KeyboardType } from "../types/types.js";
+import { Animated, StyleSheet, Easing, useWindowDimensions } from 'react-native';
+import { COLORS } from '@magmamath/react-native-ui';
 import { Numpad } from "./Numpad/Numpad.js";
-import { MAX_WIDTH_FOR_MOBILE_LAYOUT } from "../constants.js";
+import { getLayoutByCharType } from "../constants/keyboardLayouts.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export const Keyboard = ({
   style,
@@ -18,19 +16,18 @@ export const Keyboard = ({
   const {
     width
   } = useWindowDimensions();
-  const Layout = getLayoutByCharType(characterType);
-  const isBasicMobileLayout = characterType && width <= MAX_WIDTH_FOR_MOBILE_LAYOUT && KEYBOARD_LAYOUTS[KeyboardType.Basic].characterTypes.includes(characterType);
-  const isAlgebraMobileLayout = characterType && width <= MAX_WIDTH_FOR_MOBILE_LAYOUT && (KEYBOARD_LAYOUTS[KeyboardType.AlgebraAdvanced].characterTypes.includes(characterType) || KEYBOARD_LAYOUTS[KeyboardType.BasicExtended].characterTypes.includes(characterType));
   useEffect(() => {
-    Animated.spring(slideAnim, {
+    Animated.timing(slideAnim, {
       toValue: visible ? 0 : 600,
-      stiffness: visible ? 320 : 720,
-      damping: visible ? 40 : 60,
-      mass: 1,
-      velocity: 0,
+      duration: 600,
+      easing: Easing.out(Easing.ease),
       useNativeDriver: true
     }).start();
   }, [visible]);
+  if (width < 820) {
+    return null;
+  }
+  const Layout = getLayoutByCharType(characterType);
   return /*#__PURE__*/_jsxs(Animated.View, {
     style: [styles.container, style, {
       transform: [{
@@ -39,12 +36,8 @@ export const Keyboard = ({
     }],
     children: [/*#__PURE__*/_jsx(Layout, {
       ...props
-    }), /*#__PURE__*/_jsx(Numpad, {
-      ...props,
-      style: {
-        borderColor: isBasicMobileLayout ? 'transparent' : COLORS.NEUTRAL_3,
-        paddingLeft: SPACING[isAlgebraMobileLayout ? 200 : 800]
-      }
+    }), width >= 1075 && /*#__PURE__*/_jsx(Numpad, {
+      ...props
     })]
   });
 };
@@ -61,9 +54,7 @@ const styles = StyleSheet.create({
     borderColor: COLORS.NEUTRAL_5,
     borderWidth: 1,
     width: 'auto',
-    overflow: 'hidden',
-    height: 155,
-    ...SHADOWS[2]
+    overflow: 'hidden'
   }
 });
 //# sourceMappingURL=Keyboard.js.map

package/dist/module/features/keyboard/components/Keyboard.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useEffect","useRef","Animated","StyleSheet","useWindowDimensions","COLORS","SHADOWS","SPACING","getLayoutByCharType","KEYBOARD_LAYOUTS","KeyboardType","Numpad","MAX_WIDTH_FOR_MOBILE_LAYOUT","jsx","_jsx","jsxs","_jsxs","Keyboard","style","characterType","visible","props","slideAnim","Value","current","width","Layout","isBasicMobileLayout","Basic","characterTypes","includes","isAlgebraMobileLayout","AlgebraAdvanced","BasicExtended","spring","toValue","stiffness","damping","mass","velocity","useNativeDriver","start","View","styles","container","transform","translateY","children","borderColor","NEUTRAL_3","paddingLeft","create","flexDirection","alignItems","justifyContent","backgroundColor","NEUTRAL_2","borderRadius","paddingTop","paddingHorizontal","paddingBottom","NEUTRAL_5","borderWidth","overflow","height"],"sourceRoot":"../../../../../src","sources":["features/keyboard/components/Keyboard.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useEffect","useRef","Animated","StyleSheet","Easing","useWindowDimensions","COLORS","Numpad","getLayoutByCharType","jsx","_jsx","jsxs","_jsxs","Keyboard","style","characterType","visible","props","slideAnim","Value","current","width","timing","toValue","duration","easing","out","ease","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"],"sourceRoot":"../../../../../src","sources":["features/keyboard/components/Keyboard.tsx"],"mappings":";;AAAA,OAAOA,KAAK,IAAIC,SAAS,EAAEC,MAAM,QAAQ,OAAO;AAChD,SACEC,QAAQ,EAERC,UAAU,EAEVC,MAAM,EACNC,mBAAmB,QACd,cAAc;AACrB,SAASC,MAAM,QAA2B,4BAA4B;AACtE,SAASC,MAAM,QAAQ,oBAAiB;AACxC,SAASC,mBAAmB,QAAQ,iCAA8B;AAAA,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAelE,OAAO,MAAMC,QAAQ,GAAGA,CAAC;EAAEC,KAAK;EAAEC,aAAa;EAAEC,OAAO,GAAG,IAAI;EAAE,GAAGC;AAAqB,CAAC,KAAK;EAC7F,MAAMC,SAAS,GAAGjB,MAAM,CAAC,IAAIC,QAAQ,CAACiB,KAAK,CAAC,GAAG,CAAC,CAAC,CAACC,OAAO;EACzD,MAAM;IAAEC;EAAM,CAAC,GAAGhB,mBAAmB,CAAC,CAAC;EAEvCL,SAAS,CAAC,MAAM;IACdE,QAAQ,CAACoB,MAAM,CAACJ,SAAS,EAAE;MACzBK,OAAO,EAAEP,OAAO,GAAG,CAAC,GAAG,GAAG;MAC1BQ,QAAQ,EAAE,GAAG;MACbC,MAAM,EAAErB,MAAM,CAACsB,GAAG,CAACtB,MAAM,CAACuB,IAAI,CAAC;MAC/BC,eAAe,EAAE;IACnB,CAAC,CAAC,CAACC,KAAK,CAAC,CAAC;EACZ,CAAC,EAAE,CAACb,OAAO,CAAC,CAAC;EAEb,IAAIK,KAAK,GAAG,GAAG,EAAE;IACf,OAAO,IAAI;EACb;EAEA,MAAMS,MAAM,GAAGtB,mBAAmB,CAACO,aAAa,CAAC;EAEjD,oBACEH,KAAA,CAACV,QAAQ,CAAC6B,IAAI;IACZjB,KAAK,EAAE,CACLkB,MAAM,CAACC,SAAS,EAChBnB,KAAK,EACL;MACEoB,SAAS,EAAE,CAAC;QAAEC,UAAU,EAAEjB;MAAU,CAAC;IACvC,CAAC,CACD;IAAAkB,QAAA,gBAEF1B,IAAA,CAACoB,MAAM;MAAA,GAAKb;IAAK,CAAG,CAAC,EACpBI,KAAK,IAAI,IAAI,iBAAIX,IAAA,CAACH,MAAM;MAAA,GAAKU;IAAK,CAAG,CAAC;EAAA,CAC1B,CAAC;AAEpB,CAAC;AAED,MAAMe,MAAM,GAAG7B,UAAU,CAACkC,MAAM,CAAC;EAC/BJ,SAAS,EAAE;IACTK,aAAa,EAAE,KAAK;IACpBC,UAAU,EAAE,YAAY;IACxBC,cAAc,EAAE,eAAe;IAC/BC,eAAe,EAAEnC,MAAM,CAACoC,SAAS;IACjCC,YAAY,EAAE,EAAE;IAChBC,UAAU,EAAE,CAAC;IACbC,iBAAiB,EAAE,EAAE;IACrBC,aAAa,EAAE,EAAE;IACjBC,WAAW,EAAEzC,MAAM,CAAC0C,SAAS;IAC7BC,WAAW,EAAE,CAAC;IACd5B,KAAK,EAAE,MAAM;IACb6B,QAAQ,EAAE;EACZ;AACF,CAAC,CAAC","ignoreList":[]}

package/dist/module/features/keyboard/components/KeysList/KeysList.js

@@ -3,80 +3,68 @@
 import React from 'react';
 import { StyleSheet } from 'react-native';
 import { SelectGroup, SelectOptionColor, SelectOptionSize } from '@magmamath/react-native-ui';
+import { MathSpecialOperator } from "../../types/MathKeysGroups/specialOperators.js";
 import { DISABLED_KEYS } from "../../constants/keysValues.js";
 import { jsx as _jsx } from "react/jsx-runtime";
-export const getIsIpadOrIphoneDevice = () => {
-  const isIOS = /iPad|iPhone|iPod/.test(navigator.platform);
-  const isIpadOS = navigator?.maxTouchPoints > 2 && /MacIntel/.test(navigator.platform);
-  return isIOS || isIpadOS;
-};
-const isIOSWeb = getIsIpadOrIphoneDevice();
 export const KeysList = ({
   keys,
   numOfRows,
   style,
   onKeyPress,
+  onSpecialKeyPress,
+  onBackspacePress,
   isSpecialButtonsDisabled,
-  isDisabled,
-  disabledKeys
+  isDisabled
 }) => {
   return /*#__PURE__*/_jsx(SelectGroup, {
     style: {
       container: [styles.container, style?.container],
-      row: styles.row
+      row: {
+        gap: 4
+      },
+      option: {
+        container: {
+          flexGrow: 0,
+          flexShrink: 0,
+          flexBasis: 'auto'
+        },
+        ...style?.option
+      }
     },
     numOfRows: numOfRows,
     color: SelectOptionColor.GREY,
     disabled: isDisabled,
-    options: keys.map(key => {
-      const pressHandler = e => {
-        onKeyPress?.({
-          event: e,
+    options: keys.map(key => ({
+      key: key.katexValue,
+      title: key.icon ? key.icon : key.label,
+      disabled: isSpecialButtonsDisabled && DISABLED_KEYS.includes(key)
+    })),
+    size: SelectOptionSize.SMALL,
+    onOptionChange: option => {
+      const key = keys.find(k => k.katexValue === option.key);
+      if (!key) return;
+      if (key.katexValue === MathSpecialOperator.BACKSPACE.toLowerCase()) {
+        onBackspacePress?.();
+        return;
+      }
+      if (key.isSpecialSymbol) {
+        onSpecialKeyPress?.({
           katexValue: key.katexValue,
-          mathliveValue: key.mathliveValue,
-          spreadsheetValue: key.spreadsheetValue,
-          isSpecialSymbol: key.isSpecialSymbol
+          mathliveValue: key.mathliveValue
         });
-      };
-      return {
-        key: key.katexValue,
-        title: key.icon ? key.icon : key.label,
-        // delayPressIn: 0,
-        style: {
-          container: [styles.optionContainer, key.style?.container, style?.option?.container],
-          button: [styles.optionButton, key.style?.button, style?.option?.button],
-          text: [styles.optionText, key.style?.text, style?.option?.text]
-        },
-        ...(isIOSWeb ? {
-          onPress: pressHandler
-        } : {
-          onPressIn: pressHandler
-        }),
-        disabled: isSpecialButtonsDisabled && DISABLED_KEYS.includes(key) || disabledKeys?.includes(key)
-      };
-    }),
-    size: SelectOptionSize.SMALL
+        return;
+      }
+      onKeyPress?.({
+        katexValue: key.katexValue,
+        mathliveValue: key.mathliveValue
+      });
+    }
   });
 };
 const styles = StyleSheet.create({
   container: {
     width: 'auto',
     gap: 9
-  },
-  row: {
-    gap: 3
-  },
-  optionContainer: {
-    flexGrow: 0,
-    flexShrink: 0,
-    flexBasis: 'auto'
-  },
-  optionButton: {
-    width: 40
-  },
-  optionText: {
-    fontSize: 16,
-    fontWeight: 700
   }
 });
 //# sourceMappingURL=KeysList.js.map

package/dist/module/features/keyboard/components/KeysList/KeysList.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","StyleSheet","SelectGroup","SelectOptionColor","SelectOptionSize","DISABLED_KEYS","jsx","_jsx","getIsIpadOrIphoneDevice","isIOS","test","navigator","platform","isIpadOS","maxTouchPoints","isIOSWeb","KeysList","keys","numOfRows","style","onKeyPress","isSpecialButtonsDisabled","isDisabled","disabledKeys","container","styles","row","color","GREY","disabled","options","map","key","pressHandler","e","event","katexValue","mathliveValue","spreadsheetValue","isSpecialSymbol","title","icon","label","optionContainer","option","button","optionButton","text","optionText","onPress","onPressIn","includes","size","SMALL","create","width","gap","flexGrow","flexShrink","flexBasis","fontSize","fontWeight"],"sourceRoot":"../../../../../../src","sources":["features/keyboard/components/KeysList/KeysList.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAA2CC,UAAU,QAAmB,cAAc;AACtF,SAEEC,WAAW,EACXC,iBAAiB,EACjBC,gBAAgB,QACX,4BAA4B;AAEnC,SAASC,aAAa,QAAQ,+BAA4B;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAa1D,OAAO,MAAMC,uBAAuB,GAAGA,CAAA,KAAM;EAC3C,MAAMC,KAAK,GAAG,kBAAkB,CAACC,IAAI,CAACC,SAAS,CAACC,QAAQ,CAAC;EACzD,MAAMC,QAAQ,GAAGF,SAAS,EAAEG,cAAc,GAAG,CAAC,IAAI,UAAU,CAACJ,IAAI,CAACC,SAAS,CAACC,QAAQ,CAAC;EACrF,OAAOH,KAAK,IAAII,QAAQ;AAC1B,CAAC;AACD,MAAME,QAAQ,GAAGP,uBAAuB,CAAC,CAAC;AAE1C,OAAO,MAAMQ,QAAQ,GAAGA,CAAC;EACvBC,IAAI;EACJC,SAAS;EACTC,KAAK;EACLC,UAAU;EACVC,wBAAwB;EACxBC,UAAU;EACVC;AACa,CAAC,KAAK;EACnB,oBACEhB,IAAA,CAACL,WAAW;IACViB,KAAK,EAAE;MACLK,SAAS,EAAE,CAACC,MAAM,CAACD,SAAS,EAAEL,KAAK,EAAEK,SAAS,CAAC;MAC/CE,GAAG,EAAED,MAAM,CAACC;IACd,CAAE;IACFR,SAAS,EAAEA,SAAU;IACrBS,KAAK,EAAExB,iBAAiB,CAACyB,IAAK;IAC9BC,QAAQ,EAAEP,UAAW;IACrBQ,OAAO,EAAEb,IAAI,CAACc,GAAG,CAAEC,GAAG,IAAK;MACzB,MAAMC,YAAY,GAAIC,CAAwB,IAAK;QACjDd,UAAU,GAAG;UACXe,KAAK,EAAED,CAAC;UACRE,UAAU,EAAEJ,GAAG,CAACI,UAAU;UAC1BC,aAAa,EAAEL,GAAG,CAACK,aAAa;UAChCC,gBAAgB,EAAEN,GAAG,CAACM,gBAAgB;UACtCC,eAAe,EAAEP,GAAG,CAACO;QACvB,CAAC,CAAC;MACJ,CAAC;MAED,OAAO;QACLP,GAAG,EAAEA,GAAG,CAACI,UAAU;QACnBI,KAAK,EAAER,GAAG,CAACS,IAAI,GAAGT,GAAG,CAACS,IAAI,GAAGT,GAAG,CAACU,KAAK;QACtC;QACAvB,KAAK,EAAE;UACLK,SAAS,EAAE,CAACC,MAAM,CAACkB,eAAe,EAAEX,GAAG,CAACb,KAAK,EAAEK,SAAS,EAAEL,KAAK,EAAEyB,MAAM,EAAEpB,SAAS,CAAC;UACnFqB,MAAM,EAAE,CAACpB,MAAM,CAACqB,YAAY,EAAEd,GAAG,CAACb,KAAK,EAAE0B,MAAM,EAAE1B,KAAK,EAAEyB,MAAM,EAAEC,MAAM,CAAC;UACvEE,IAAI,EAAE,CAACtB,MAAM,CAACuB,UAAU,EAAEhB,GAAG,CAACb,KAAK,EAAE4B,IAAI,EAAE5B,KAAK,EAAEyB,MAAM,EAAEG,IAAI;QAChE,CAAC;QACD,IAAIhC,QAAQ,GAAG;UAAEkC,OAAO,EAAEhB;QAAa,CAAC,GAAG;UAAEiB,SAAS,EAAEjB;QAAa,CAAC,CAAC;QACvEJ,QAAQ,EACLR,wBAAwB,IAAIhB,aAAa,CAAC8C,QAAQ,CAACnB,GAAG,CAAC,IACxDT,YAAY,EAAE4B,QAAQ,CAACnB,GAAG;MAC9B,CAAC;IACH,CAAC,CAAE;IACHoB,IAAI,EAAEhD,gBAAgB,CAACiD;EAAM,CAC9B,CAAC;AAEN,CAAC;AAED,MAAM5B,MAAM,GAAGxB,UAAU,CAACqD,MAAM,CAAC;EAC/B9B,SAAS,EAAE;IACT+B,KAAK,EAAE,MAAM;IACbC,GAAG,EAAE;EACP,CAAC;EACD9B,GAAG,EAAE;IACH8B,GAAG,EAAE;EACP,CAAC;EACDb,eAAe,EAAE;IACfc,QAAQ,EAAE,CAAC;IACXC,UAAU,EAAE,CAAC;IACbC,SAAS,EAAE;EACb,CAAC;EACDb,YAAY,EAAE;IACZS,KAAK,EAAE;EACT,CAAC;EACDP,UAAU,EAAE;IACVY,QAAQ,EAAE,EAAE;IACZC,UAAU,EAAE;EACd;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["React","StyleSheet","SelectGroup","SelectOptionColor","SelectOptionSize","MathSpecialOperator","DISABLED_KEYS","jsx","_jsx","KeysList","keys","numOfRows","style","onKeyPress","onSpecialKeyPress","onBackspacePress","isSpecialButtonsDisabled","isDisabled","container","styles","row","gap","option","flexGrow","flexShrink","flexBasis","color","GREY","disabled","options","map","key","katexValue","title","icon","label","includes","size","SMALL","onOptionChange","find","k","BACKSPACE","toLowerCase","isSpecialSymbol","mathliveValue","create","width"],"sourceRoot":"../../../../../../src","sources":["features/keyboard/components/KeysList/KeysList.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAAoBC,UAAU,QAAmB,cAAc;AAC/D,SAEEC,WAAW,EACXC,iBAAiB,EACjBC,gBAAgB,QACX,4BAA4B;AAEnC,SAASC,mBAAmB,QAAQ,gDAA6C;AACjF,SAASC,aAAa,QAAQ,+BAA4B;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAY1D,OAAO,MAAMC,QAAQ,GAAGA,CAAC;EACvBC,IAAI;EACJC,SAAS;EACTC,KAAK;EACLC,UAAU;EACVC,iBAAiB;EACjBC,gBAAgB;EAChBC,wBAAwB;EACxBC;AACa,CAAC,KAAK;EACnB,oBACET,IAAA,CAACN,WAAW;IACVU,KAAK,EAAE;MACLM,SAAS,EAAE,CAACC,MAAM,CAACD,SAAS,EAAEN,KAAK,EAAEM,SAAS,CAAC;MAC/CE,GAAG,EAAE;QAAEC,GAAG,EAAE;MAAE,CAAC;MACfC,MAAM,EAAE;QACNJ,SAAS,EAAE;UACTK,QAAQ,EAAE,CAAC;UACXC,UAAU,EAAE,CAAC;UACbC,SAAS,EAAE;QACb,CAAC;QACD,GAAGb,KAAK,EAAEU;MACZ;IACF,CAAE;IACFX,SAAS,EAAEA,SAAU;IACrBe,KAAK,EAAEvB,iBAAiB,CAACwB,IAAK;IAC9BC,QAAQ,EAAEX,UAAW;IACrBY,OAAO,EAAEnB,IAAI,CAACoB,GAAG,CAAEC,GAAG,KAAM;MAC1BA,GAAG,EAAEA,GAAG,CAACC,UAAU;MACnBC,KAAK,EAAEF,GAAG,CAACG,IAAI,GAAGH,GAAG,CAACG,IAAI,GAAGH,GAAG,CAACI,KAAK;MACtCP,QAAQ,EAAEZ,wBAAwB,IAAIV,aAAa,CAAC8B,QAAQ,CAACL,GAAG;IAClE,CAAC,CAAC,CAAE;IACJM,IAAI,EAAEjC,gBAAgB,CAACkC,KAAM;IAC7BC,cAAc,EAAGjB,MAAM,IAAK;MAC1B,MAAMS,GAAG,GAAGrB,IAAI,CAAC8B,IAAI,CAAEC,CAAC,IAAKA,CAAC,CAACT,UAAU,KAAKV,MAAM,CAACS,GAAG,CAAC;MACzD,IAAI,CAACA,GAAG,EAAE;MACV,IAAIA,GAAG,CAACC,UAAU,KAAK3B,mBAAmB,CAACqC,SAAS,CAACC,WAAW,CAAC,CAAC,EAAE;QAClE5B,gBAAgB,GAAG,CAAC;QACpB;MACF;MACA,IAAIgB,GAAG,CAACa,eAAe,EAAE;QACvB9B,iBAAiB,GAAG;UAClBkB,UAAU,EAAED,GAAG,CAACC,UAAU;UAC1Ba,aAAa,EAAEd,GAAG,CAACc;QACrB,CAAC,CAAC;QACF;MACF;MACAhC,UAAU,GAAG;QAAEmB,UAAU,EAAED,GAAG,CAACC,UAAU;QAAEa,aAAa,EAAEd,GAAG,CAACc;MAAc,CAAC,CAAC;IAChF;EAAE,CACH,CAAC;AAEN,CAAC;AAED,MAAM1B,MAAM,GAAGlB,UAAU,CAAC6C,MAAM,CAAC;EAC/B5B,SAAS,EAAE;IACT6B,KAAK,EAAE,MAAM;IACb1B,GAAG,EAAE;EACP;AACF,CAAC,CAAC","ignoreList":[]}

package/dist/module/features/keyboard/components/Numpad/Numpad.js

@@ -3,24 +3,25 @@
 import React from 'react';
 import { KeysList } from "../KeysList/KeysList.js";
 import { StyleSheet, View } from 'react-native';
-import { SPACING } from '@magmamath/react-native-ui';
-import { KeyboardType } from "../../types/types.js";
+import { COLORS, SPACING } from '@magmamath/react-native-ui';
+import { KeyboardType } from "../../types.js";
 import { useText } from "../../../../shared/translation/index.js";
 import { getKeyboardGroup } from "../../helpers.js";
 import { jsx as _jsx } from "react/jsx-runtime";
-export const Numpad = ({
-  style,
-  ...props
-}) => {
+export const Numpad = props => {
   const t = useText();
   const keyboardGroup = getKeyboardGroup(t('locale'), KeyboardType.Numpad);
   return /*#__PURE__*/_jsx(View, {
-    style: [styles.container, style],
+    style: styles.container,
     children: /*#__PURE__*/_jsx(KeysList, {
       keys: keyboardGroup.keys,
       numOfRows: 3,
       style: {
-        container: styles.keysContainer
+        container: styles.keysContainer,
+        option: {
+          text: styles.keyText,
+          button: styles.keyButton
+        }
       },
       ...props
     })
@@ -29,9 +30,8 @@ export const Numpad = ({
 const styles = StyleSheet.create({
   container: {
     borderLeftWidth: 1,
-    borderColor: 'transparent',
-    paddingLeft: SPACING[800],
-    marginLeft: 'auto'
+    borderColor: COLORS.NEUTRAL_3,
+    paddingLeft: SPACING[800]
   },
   keysContainer: {
     display: 'flex',
@@ -46,11 +46,7 @@ const styles = StyleSheet.create({
     fontWeight: 700
   },
   keyButton: {
-    width: 40
-  },
-  optionContainer: {
-    flexGrow: 0,
-    flexBasis: 'auto'
+    width: 42
   }
 });
 //# sourceMappingURL=Numpad.js.map

package/dist/module/features/keyboard/components/Numpad/Numpad.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","KeysList","StyleSheet","View","SPACING","KeyboardType","useText","getKeyboardGroup","jsx","_jsx","Numpad","style","props","t","keyboardGroup","styles","container","children","keys","numOfRows","keysContainer","create","borderLeftWidth","borderColor","paddingLeft","marginLeft","display","width","flexGrow","flexShrink","flexBasis","gap","keyText","fontSize","fontWeight","keyButton","optionContainer"],"sourceRoot":"../../../../../../src","sources":["features/keyboard/components/Numpad/Numpad.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,QAAQ,QAAQ,yBAAsB;AAC/C,SAAoBC,UAAU,EAAEC,IAAI,QAAmB,cAAc;AACrE,SAASC,OAAO,QAAQ,4BAA4B;AACpD,SAA8BC,YAAY,QAAQ,sBAAmB;AACrE,SAAiBC,OAAO,QAAQ,yCAAgC;AAChE,SAASC,gBAAgB,QAAQ,kBAAe;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAMhD,OAAO,MAAMC,MAAM,GAAGA,CAAC;EAAEC,KAAK;EAAE,GAAGC;AAAmB,CAAC,KAAK;EAC1D,MAAMC,CAAC,GAAGP,OAAO,CAAC,CAAC;EACnB,MAAMQ,aAAa,GAAGP,gBAAgB,CAACM,CAAC,CAAC,QAAQ,CAAC,EAAYR,YAAY,CAACK,MAAM,CAAC;EAElF,oBACED,IAAA,CAACN,IAAI;IAACQ,KAAK,EAAE,CAACI,MAAM,CAACC,SAAS,EAAEL,KAAK,CAAE;IAAAM,QAAA,eACrCR,IAAA,CAACR,QAAQ;MACPiB,IAAI,EAAEJ,aAAa,CAACI,IAAK;MACzBC,SAAS,EAAE,CAAE;MACbR,KAAK,EAAE;QACLK,SAAS,EAAED,MAAM,CAACK;MACpB,CAAE;MAAA,GACER;IAAK,CACV;EAAC,CACE,CAAC;AAEX,CAAC;AAED,MAAMG,MAAM,GAAGb,UAAU,CAACmB,MAAM,CAAC;EAC/BL,SAAS,EAAE;IACTM,eAAe,EAAE,CAAC;IAClBC,WAAW,EAAE,aAAa;IAC1BC,WAAW,EAAEpB,OAAO,CAAC,GAAG,CAAC;IACzBqB,UAAU,EAAE;EACd,CAAC;EACDL,aAAa,EAAE;IACbM,OAAO,EAAE,MAAM;IACfC,KAAK,EAAE,MAAM;IACbC,QAAQ,EAAE,CAAC;IACXC,UAAU,EAAE,CAAC;IACbC,SAAS,EAAE,MAAM;IACjBC,GAAG,EAAE;EACP,CAAC;EACDC,OAAO,EAAE;IACPC,QAAQ,EAAE,EAAE;IACZC,UAAU,EAAE;EACd,CAAC;EACDC,SAAS,EAAE;IACTR,KAAK,EAAE;EACT,CAAC;EACDS,eAAe,EAAE;IACfR,QAAQ,EAAE,CAAC;IACXE,SAAS,EAAE;EACb;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["React","KeysList","StyleSheet","View","COLORS","SPACING","KeyboardType","useText","getKeyboardGroup","jsx","_jsx","Numpad","props","t","keyboardGroup","style","styles","container","children","keys","numOfRows","keysContainer","option","text","keyText","button","keyButton","create","borderLeftWidth","borderColor","NEUTRAL_3","paddingLeft","display","width","flexGrow","flexShrink","flexBasis","gap","fontSize","fontWeight"],"sourceRoot":"../../../../../../src","sources":["features/keyboard/components/Numpad/Numpad.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,QAAQ,QAAQ,yBAAsB;AAC/C,SAASC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAC/C,SAASC,MAAM,EAAEC,OAAO,QAAQ,4BAA4B;AAC5D,SAA8BC,YAAY,QAAQ,gBAAa;AAC/D,SAAiBC,OAAO,QAAQ,yCAAgC;AAChE,SAASC,gBAAgB,QAAQ,kBAAe;AAAA,SAAAC,GAAA,IAAAC,IAAA;AAEhD,OAAO,MAAMC,MAAM,GAAIC,KAA0B,IAAK;EACpD,MAAMC,CAAC,GAAGN,OAAO,CAAC,CAAC;EACnB,MAAMO,aAAa,GAAGN,gBAAgB,CAACK,CAAC,CAAC,QAAQ,CAAC,EAAYP,YAAY,CAACK,MAAM,CAAC;EAElF,oBACED,IAAA,CAACP,IAAI;IAACY,KAAK,EAAEC,MAAM,CAACC,SAAU;IAAAC,QAAA,eAC5BR,IAAA,CAACT,QAAQ;MACPkB,IAAI,EAAEL,aAAa,CAACK,IAAK;MACzBC,SAAS,EAAE,CAAE;MACbL,KAAK,EAAE;QACLE,SAAS,EAAED,MAAM,CAACK,aAAa;QAC/BC,MAAM,EAAE;UAAEC,IAAI,EAAEP,MAAM,CAACQ,OAAO;UAAEC,MAAM,EAAET,MAAM,CAACU;QAAU;MAC3D,CAAE;MAAA,GACEd;IAAK,CACV;EAAC,CACE,CAAC;AAEX,CAAC;AAED,MAAMI,MAAM,GAAGd,UAAU,CAACyB,MAAM,CAAC;EAC/BV,SAAS,EAAE;IACTW,eAAe,EAAE,CAAC;IAClBC,WAAW,EAAEzB,MAAM,CAAC0B,SAAS;IAC7BC,WAAW,EAAE1B,OAAO,CAAC,GAAG;EAC1B,CAAC;EACDgB,aAAa,EAAE;IACbW,OAAO,EAAE,MAAM;IACfC,KAAK,EAAE,MAAM;IACbC,QAAQ,EAAE,CAAC;IACXC,UAAU,EAAE,CAAC;IACbC,SAAS,EAAE,MAAM;IACjBC,GAAG,EAAE;EACP,CAAC;EACDb,OAAO,EAAE;IACPc,QAAQ,EAAE,EAAE;IACZC,UAAU,EAAE;EACd,CAAC;EACDb,SAAS,EAAE;IACTO,KAAK,EAAE;EACT;AACF,CAAC,CAAC","ignoreList":[]}

package/dist/module/features/keyboard/components/UnitsLayout/UnitTabs.js

@@ -32,18 +32,30 @@ export const UnitTabs = ({
         children: keyboardGroup.map(keyGroup => /*#__PURE__*/_jsx(KeysList, {
           keys: keyGroup,
           numOfRows: 1,
-          ...props,
           style: {
+            container: styles.keysContainer,
             option: {
-              text: styles.keysText
+              button: styles.option,
+              text: styles.text
             }
-          }
+          },
+          ...props
         }))
       })]
     })
   });
 };
 const styles = StyleSheet.create({
+  keysContainer: {
+    gap: 10
+  },
+  option: {
+    minWidth: 42
+  },
+  text: {
+    fontWeight: 700,
+    fontSize: 14
+  },
   optionContainer: {
     flexGrow: 0,
     flexShrink: 0,
@@ -64,10 +76,6 @@ const styles = StyleSheet.create({
   },
   keyGroupContainer: {
     gap: 8
-  },
-  keysText: {
-    fontSize: 14,
-    fontWeight: 700
   }
 });
 //# sourceMappingURL=UnitTabs.js.map

package/dist/module/features/keyboard/components/UnitsLayout/UnitTabs.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","KeysList","StyleSheet","View","COLORS","TabGroup","TabVariant","KEYBOARD_UNITS_GROUPS_BY_LOCALE","MATH_ENTRY_LENGTH_UNITS_SW_KEYBOARD_GROUPS","useText","jsx","_jsx","jsxs","_jsxs","UnitTabs","activeTab","tabs","onTabChange","props","t","keyboardGroup","key","keys","style","width","children","styles","tabsContainer","variant","SMALL","keyGroupContainer","map","keyGroup","numOfRows","option","text","keysText","create","optionContainer","flexGrow","flexShrink","flexBasis","paddingRight","borderRightWidth","borderRightColor","NEUTRAL_3","gap","flex","borderBottomWidth","borderBottomColor","paddingTop","fontSize","fontWeight"],"sourceRoot":"../../../../../../src","sources":["features/keyboard/components/UnitsLayout/UnitTabs.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,QAAQ,QAAQ,yBAAsB;AAC/C,SAASC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAC/C,SAASC,MAAM,EAAEC,QAAQ,EAAkBC,UAAU,QAAQ,4BAA4B;AACzF,SACEC,+BAA+B,EAE/BC,0CAA0C,QACrC,qBAAkB;AAEzB,SAAiBC,OAAO,QAAQ,yCAAgC;AAAA,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAQhE,OAAO,MAAMC,QAAQ,GAAGA,CAAC;EAAEC,SAAS;EAAEC,IAAI;EAAEC,WAAW;EAAE,GAAGC;AAAqB,CAAC,KAAK;EACrF,MAAMC,CAAC,GAAGV,OAAO,CAAC,CAAC;EACnB,MAAMW,aAAa,GACjBb,+BAA+B,CAACY,CAAC,CAAC,QAAQ,CAAC,CAAW,CAACJ,SAAS,CAACM,GAAG,CAA2B,CAC5FC,IAAI,IAAId,0CAA0C,CAACc,IAAI;EAC5D,oBACEX,IAAA,CAACR,IAAI;IAACoB,KAAK,EAAE;MAAEC,KAAK,EAAE;IAAI,CAAE;IAAAC,QAAA,eAC1BZ,KAAA,CAACV,IAAI;MAACoB,KAAK,EAAEG,MAAM,CAACC,aAAc;MAAAF,QAAA,gBAChCd,IAAA,CAACN,QAAQ;QACPU,SAAS,EAAEA,SAAU;QACrBC,IAAI,EAAEA,IAAK;QACXC,WAAW,EAAEA,WAAY;QACzBM,KAAK,EAAEG,MAAM,CAACV,IAAK;QACnBY,OAAO,EAAEtB,UAAU,CAACuB;MAAM,CAC3B,CAAC,eACFlB,IAAA,CAACR,IAAI;QAACoB,KAAK,EAAEG,MAAM,CAACI,iBAAkB;QAAAL,QAAA,EACnCL,aAAa,CAACW,GAAG,CAAEC,QAAQ,iBAC1BrB,IAAA,CAACV,QAAQ;UACPqB,IAAI,EAAEU,QAAS;UACfC,SAAS,EAAE,CAAE;UAAA,GACTf,KAAK;UACTK,KAAK,EAAE;YACLW,MAAM,EAAE;cACNC,IAAI,EAAET,MAAM,CAACU;YACf;UACF;QAAE,CACH,CACF;MAAC,CACE,CAAC;IAAA,CACH;EAAC,CACH,CAAC;AAEX,CAAC;AAED,MAAMV,MAAM,GAAGxB,UAAU,CAACmC,MAAM,CAAC;EAC/BC,eAAe,EAAE;IACfC,QAAQ,EAAE,CAAC;IACXC,UAAU,EAAE,CAAC;IACbC,SAAS,EAAE,MAAM;IACjBjB,KAAK,EAAE,MAAM;IACbkB,YAAY,EAAE,EAAE;IAChBC,gBAAgB,EAAE,CAAC;IACnBC,gBAAgB,EAAExC,MAAM,CAACyC;EAC3B,CAAC;EAEDlB,aAAa,EAAE;IACbmB,GAAG,EAAE,EAAE;IACPC,IAAI,EAAE;EACR,CAAC;EACD/B,IAAI,EAAE;IACJgC,iBAAiB,EAAE,CAAC;IACpBC,iBAAiB,EAAE7C,MAAM,CAACyC,SAAS;IACnCK,UAAU,EAAE;EACd,CAAC;EACDpB,iBAAiB,EAAE;IACjBgB,GAAG,EAAE;EACP,CAAC;EACDV,QAAQ,EAAE;IACRe,QAAQ,EAAE,EAAE;IACZC,UAAU,EAAE;EACd;AACF,CAAC,CAAC","ignoreList":[]}
+{"version":3,"names":["React","KeysList","StyleSheet","View","COLORS","TabGroup","TabVariant","KEYBOARD_UNITS_GROUPS_BY_LOCALE","MATH_ENTRY_LENGTH_UNITS_SW_KEYBOARD_GROUPS","useText","jsx","_jsx","jsxs","_jsxs","UnitTabs","activeTab","tabs","onTabChange","props","t","keyboardGroup","key","keys","style","width","children","styles","tabsContainer","variant","SMALL","keyGroupContainer","map","keyGroup","numOfRows","container","keysContainer","option","button","text","create","gap","minWidth","fontWeight","fontSize","optionContainer","flexGrow","flexShrink","flexBasis","paddingRight","borderRightWidth","borderRightColor","NEUTRAL_3","flex","borderBottomWidth","borderBottomColor","paddingTop"],"sourceRoot":"../../../../../../src","sources":["features/keyboard/components/UnitsLayout/UnitTabs.tsx"],"mappings":";;AAAA,OAAOA,KAAK,MAAM,OAAO;AACzB,SAASC,QAAQ,QAAQ,yBAAsB;AAC/C,SAASC,UAAU,EAAEC,IAAI,QAAQ,cAAc;AAC/C,SAASC,MAAM,EAAEC,QAAQ,EAAkBC,UAAU,QAAQ,4BAA4B;AACzF,SACEC,+BAA+B,EAE/BC,0CAA0C,QACrC,qBAAkB;AAEzB,SAAiBC,OAAO,QAAQ,yCAAgC;AAAA,SAAAC,GAAA,IAAAC,IAAA,EAAAC,IAAA,IAAAC,KAAA;AAQhE,OAAO,MAAMC,QAAQ,GAAGA,CAAC;EAAEC,SAAS;EAAEC,IAAI;EAAEC,WAAW;EAAE,GAAGC;AAAqB,CAAC,KAAK;EACrF,MAAMC,CAAC,GAAGV,OAAO,CAAC,CAAC;EACnB,MAAMW,aAAa,GACjBb,+BAA+B,CAACY,CAAC,CAAC,QAAQ,CAAC,CAAW,CAACJ,SAAS,CAACM,GAAG,CAA2B,CAC5FC,IAAI,IAAId,0CAA0C,CAACc,IAAI;EAC5D,oBACEX,IAAA,CAACR,IAAI;IAACoB,KAAK,EAAE;MAAEC,KAAK,EAAE;IAAI,CAAE;IAAAC,QAAA,eAC1BZ,KAAA,CAACV,IAAI;MAACoB,KAAK,EAAEG,MAAM,CAACC,aAAc;MAAAF,QAAA,gBAChCd,IAAA,CAACN,QAAQ;QACPU,SAAS,EAAEA,SAAU;QACrBC,IAAI,EAAEA,IAAK;QACXC,WAAW,EAAEA,WAAY;QACzBM,KAAK,EAAEG,MAAM,CAACV,IAAK;QACnBY,OAAO,EAAEtB,UAAU,CAACuB;MAAM,CAC3B,CAAC,eACFlB,IAAA,CAACR,IAAI;QAACoB,KAAK,EAAEG,MAAM,CAACI,iBAAkB;QAAAL,QAAA,EACnCL,aAAa,CAACW,GAAG,CAAEC,QAAQ,iBAC1BrB,IAAA,CAACV,QAAQ;UACPqB,IAAI,EAAEU,QAAS;UACfC,SAAS,EAAE,CAAE;UACbV,KAAK,EAAE;YACLW,SAAS,EAAER,MAAM,CAACS,aAAa;YAC/BC,MAAM,EAAE;cAAEC,MAAM,EAAEX,MAAM,CAACU,MAAM;cAAEE,IAAI,EAAEZ,MAAM,CAACY;YAAK;UACrD,CAAE;UAAA,GACEpB;QAAK,CACV,CACF;MAAC,CACE,CAAC;IAAA,CACH;EAAC,CACH,CAAC;AAEX,CAAC;AAED,MAAMQ,MAAM,GAAGxB,UAAU,CAACqC,MAAM,CAAC;EAC/BJ,aAAa,EAAE;IACbK,GAAG,EAAE;EACP,CAAC;EACDJ,MAAM,EAAE;IACNK,QAAQ,EAAE;EACZ,CAAC;EACDH,IAAI,EAAE;IACJI,UAAU,EAAE,GAAG;IACfC,QAAQ,EAAE;EACZ,CAAC;EACDC,eAAe,EAAE;IACfC,QAAQ,EAAE,CAAC;IACXC,UAAU,EAAE,CAAC;IACbC,SAAS,EAAE,MAAM;IACjBvB,KAAK,EAAE,MAAM;IACbwB,YAAY,EAAE,EAAE;IAChBC,gBAAgB,EAAE,CAAC;IACnBC,gBAAgB,EAAE9C,MAAM,CAAC+C;EAC3B,CAAC;EAEDxB,aAAa,EAAE;IACba,GAAG,EAAE,EAAE;IACPY,IAAI,EAAE;EACR,CAAC;EACDpC,IAAI,EAAE;IACJqC,iBAAiB,EAAE,CAAC;IACpBC,iBAAiB,EAAElD,MAAM,CAAC+C,SAAS;IACnCI,UAAU,EAAE;EACd,CAAC;EACDzB,iBAAiB,EAAE;IACjBU,GAAG,EAAE;EACP;AACF,CAAC,CAAC","ignoreList":[]}

package/dist/module/features/keyboard/components/UnitsLayout/UnitsLayout.js

@@ -2,7 +2,7 @@
 
 import React, { useMemo, useState } from 'react';
 import { KeysList } from "../KeysList/KeysList.js";
-import { StyleSheet, useWindowDimensions, View } from 'react-native';
+import { StyleSheet, View } from 'react-native';
 import { COLORS, FONT_FAMILY, RulerIcon, SelectGroup, SelectOptionSize } from '@magmamath/react-native-ui';
 import { useText } from "../../../../shared/translation/index.js";
 import { AlgebraIcon } from "../../../../shared/icons/AlgebraIcon.js";
@@ -10,10 +10,9 @@ import { RectangleIcon } from "../../../../shared/icons/RectangleIcon.js";
 import { VolumeIcon } from "../../../../shared/icons/VolumeIcon.js";
 import { WeightIcon } from "../../../../shared/icons/WeightIcon.js";
 import { UnitTabs } from "./UnitTabs.js";
-import { KeyboardType } from "../../types/types.js";
+import { KeyboardType } from "../../types.js";
 import { KeyboardUnitsGroupType, MATH_ENTRY_AREA_UNITS_SW_KEYBOARD_GROUPS, MATH_ENTRY_LENGTH_UNITS_SW_KEYBOARD_GROUPS, MATH_ENTRY_VOLUME_UNITS_SW_KEYBOARD_GROUPS, MATH_ENTRY_WEIGHT_UNITS_SW_KEYBOARD_GROUPS } from "./keyboardGroups.js";
 import { KEYBOARD_GROUPS_BY_LOCALE } from "../../constants/keysValues.js";
-import { MAX_WIDTH_FOR_MOBILE_LAYOUT } from "../../constants.js";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 const UNITS_KEYBOARD_GROUPS = new Map([[KeyboardUnitsGroupType.LENGTH, {
   keys: MATH_ENTRY_LENGTH_UNITS_SW_KEYBOARD_GROUPS.keys,
@@ -34,18 +33,13 @@ var SelectedLayout = /*#__PURE__*/function (SelectedLayout) {
   return SelectedLayout;
 }(SelectedLayout || {});
 export const UnitsLayout = props => {
-  const {
-    width
-  } = useWindowDimensions();
-  const [selectedLayout, setSelectedLayout] = useState(width > MAX_WIDTH_FOR_MOBILE_LAYOUT ? SelectedLayout.ALGEBRA : SelectedLayout.UNITS);
+  const [selectedLayout, setSelectedLayout] = useState(SelectedLayout.ALGEBRA);
   const t = useText();
   const basicExtendedKeys = KEYBOARD_GROUPS_BY_LOCALE[t('locale')][KeyboardType.BasicExtended];
   const tabs = useMemo(() => [{
     title: t('keyboard.length'),
     style: {
-      paddingLeft: 0,
-      paddingRight: 32,
-      marginRight: -16
+      paddingHorizontal: 10
     },
     titleStyle: {
       active: {
@@ -78,8 +72,7 @@ export const UnitsLayout = props => {
   }, {
     title: t('keyboard.weight'),
     style: {
-      paddingHorizontal: 10,
-      paddingRight: 0
+      paddingHorizontal: 10
     },
     titleStyle: {
       active: {
@@ -94,40 +87,31 @@ export const UnitsLayout = props => {
     return [{
       title: /*#__PURE__*/_jsx(AlgebraIcon, {
         color: selectedLayout === SelectedLayout.ALGEBRA ? COLORS.NEUTRAL_1 : COLORS.NEUTRAL_9,
-        size: 22
+        size: 16
       }),
-      key: '1',
-      onPressIn: () => {
-        setSelectedLayout(SelectedLayout.ALGEBRA);
-      }
+      key: '1'
     }, {
       title: /*#__PURE__*/_jsx(SelectedIcon, {
         color: selectedLayout === SelectedLayout.UNITS ? COLORS.NEUTRAL_1 : COLORS.NEUTRAL_9,
         size: 16
       }),
-      key: '2',
-      onPressIn: () => {
-        setSelectedLayout(SelectedLayout.UNITS);
-      }
+      key: '2'
     }];
   }, [activeTab, selectedLayout]);
   return /*#__PURE__*/_jsxs(View, {
     style: styles.container,
-    children: [width > MAX_WIDTH_FOR_MOBILE_LAYOUT && /*#__PURE__*/_jsx(SelectGroup, {
+    children: [/*#__PURE__*/_jsx(SelectGroup, {
       numOfRows: 2,
       options: selectOptions,
       size: SelectOptionSize.SMALL,
       style: {
-        container: styles.optionContainer,
-        option: {
-          container: {
-            flexBasis: 45,
-            width: 44
-          }
-        }
+        container: styles.optionContainer
       },
       color: props.color,
-      selectedOptions: [selectedLayout === SelectedLayout.ALGEBRA ? selectOptions[0] : selectOptions[1]]
+      selectedOptions: [selectedLayout === SelectedLayout.ALGEBRA ? selectOptions[0] : selectOptions[1]],
+      onOptionChange: option => {
+        setSelectedLayout(option.key === '1' ? SelectedLayout.ALGEBRA : SelectedLayout.UNITS);
+      }
     }), selectedLayout === SelectedLayout.UNITS ? /*#__PURE__*/_jsx(UnitTabs, {
       tabs: tabs,
       activeTab: activeTab,
@@ -138,7 +122,13 @@ export const UnitsLayout = props => {
     }) : /*#__PURE__*/_jsx(KeysList, {
       keys: basicExtendedKeys.keys,
       numOfRows: 3,
-      ...props
+      ...props,
+      style: {
+        container: styles.basicExtendedContainer,
+        option: {
+          button: styles.key
+        }
+      }
     })]
   });
 };
@@ -147,7 +137,11 @@ const styles = StyleSheet.create({
     display: 'flex',
     flexDirection: 'row',
     gap: 16,
-    paddingRight: 16
+    paddingRight: 16,
+    width: 480
+  },
+  basicExtendedContainer: {
+    gap: 8
   },
   option: {
     minWidth: 42
@@ -157,11 +151,12 @@ const styles = StyleSheet.create({
     flexShrink: 0,
     flexBasis: 'auto',
     width: 'auto',
-    paddingRight: 18,
+    paddingRight: 16,
     borderRightWidth: 1,
-    borderRightColor: COLORS.NEUTRAL_3,
-    maxWidth: 65,
-    gap: 9
+    borderRightColor: COLORS.NEUTRAL_3
+  },
+  key: {
+    width: 42
   }
 });
 //# sourceMappingURL=UnitsLayout.js.map

package/dist/module/features/keyboard/components/UnitsLayout/UnitsLayout.js.map

@@ -1 +1 @@
-{"version":3,"names":["React","useMemo","useState","KeysList","StyleSheet","useWindowDimensions","View","COLORS","FONT_FAMILY","RulerIcon","SelectGroup","SelectOptionSize","useText","AlgebraIcon","RectangleIcon","VolumeIcon","WeightIcon","UnitTabs","KeyboardType","KeyboardUnitsGroupType","MATH_ENTRY_AREA_UNITS_SW_KEYBOARD_GROUPS","MATH_ENTRY_LENGTH_UNITS_SW_KEYBOARD_GROUPS","MATH_ENTRY_VOLUME_UNITS_SW_KEYBOARD_GROUPS","MATH_ENTRY_WEIGHT_UNITS_SW_KEYBOARD_GROUPS","KEYBOARD_GROUPS_BY_LOCALE","MAX_WIDTH_FOR_MOBILE_LAYOUT","jsx","_jsx","jsxs","_jsxs","UNITS_KEYBOARD_GROUPS","Map","LENGTH","keys","icon","AREA","VOLUME","WEIGHT","SelectedLayout","UnitsLayout","props","width","selectedLayout","setSelectedLayout","ALGEBRA","UNITS","t","basicExtendedKeys","BasicExtended","tabs","title","style","paddingLeft","paddingRight","marginRight","titleStyle","active","fontStyle","buenosAiresBold","key","paddingHorizontal","activeTab","setActiveTab","selectOptions","SelectedIcon","get","color","NEUTRAL_1","NEUTRAL_9","size","onPressIn","styles","container","children","numOfRows","options","SMALL","optionContainer","option","flexBasis","selectedOptions","onTabChange","tab","create","display","flexDirection","gap","minWidth","flexGrow","flexShrink","borderRightWidth","borderRightColor","NEUTRAL_3","maxWidth"],"sourceRoot":"../../../../../../src","sources":["features/keyboard/components/UnitsLayout/UnitsLayout.tsx"],"mappings":"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","ignoreList":[]}
+{"version":3,"names":["React","useMemo","useState","KeysList","StyleSheet","View","COLORS","FONT_FAMILY","RulerIcon","SelectGroup","SelectOptionSize","useText","AlgebraIcon","RectangleIcon","VolumeIcon","WeightIcon","UnitTabs","KeyboardType","KeyboardUnitsGroupType","MATH_ENTRY_AREA_UNITS_SW_KEYBOARD_GROUPS","MATH_ENTRY_LENGTH_UNITS_SW_KEYBOARD_GROUPS","MATH_ENTRY_VOLUME_UNITS_SW_KEYBOARD_GROUPS","MATH_ENTRY_WEIGHT_UNITS_SW_KEYBOARD_GROUPS","KEYBOARD_GROUPS_BY_LOCALE","jsx","_jsx","jsxs","_jsxs","UNITS_KEYBOARD_GROUPS","Map","LENGTH","keys","icon","AREA","VOLUME","WEIGHT","SelectedLayout","UnitsLayout","props","selectedLayout","setSelectedLayout","ALGEBRA","t","basicExtendedKeys","BasicExtended","tabs","title","style","paddingHorizontal","titleStyle","active","fontStyle","buenosAiresBold","key","activeTab","setActiveTab","selectOptions","SelectedIcon","get","color","NEUTRAL_1","NEUTRAL_9","size","UNITS","styles","container","children","numOfRows","options","SMALL","optionContainer","selectedOptions","onOptionChange","option","onTabChange","tab","basicExtendedContainer","button","create","display","flexDirection","gap","paddingRight","width","minWidth","flexGrow","flexShrink","flexBasis","borderRightWidth","borderRightColor","NEUTRAL_3"],"sourceRoot":"../../../../../../src","sources":["features/keyboard/components/UnitsLayout/UnitsLayout.tsx"],"mappings":"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","ignoreList":[]}

package/dist/module/features/keyboard/constants/keyboardLayouts.js

@@ -1,6 +1,6 @@
 "use strict";
 
-import { KeyboardType } from "../types/types.js";
+import { KeyboardType } from "../types.js";
 import { AlgebraLayout } from "../components/AlgebraLayout/AlgebraLayout.js";
 import { BasicLayout } from "../components/BasicLayout/BasicLayout.js";
 import { BasicExtendedLayout } from "../components/BasicExtendedLayout/BasicExtendedLayout.js";
@@ -11,7 +11,7 @@ import { BasicExtendedPlusLayout } from "../components/BasicExtendedPlusLayout/B
 export const KEYBOARD_LAYOUTS = {
   [KeyboardType.AlgebraAdvanced]: {
     Component: AlgebraLayout,
-    characterTypes: [6, 19, 20, 21, 22]
+    characterTypes: [6, 19, 21, 22]
   },
   [KeyboardType.Basic]: {
     Component: BasicLayout,
@@ -31,7 +31,7 @@ export const KEYBOARD_LAYOUTS = {
   },
   [KeyboardType.BasicUnits]: {
     Component: UnitsLayout,
-    characterTypes: [5, 14]
+    characterTypes: [5, 14, 20]
   },
   [KeyboardType.BasicExtendedPlus]: {
     Component: BasicExtendedPlusLayout,

package/dist/module/features/keyboard/constants/keyboardLayouts.js.map

@@ -1 +1 @@
-{"version":3,"names":["KeyboardType","AlgebraLayout","BasicLayout","BasicExtendedLayout","TimeBasicLayout","CurrencyBasicLayout","UnitsLayout","BasicExtendedPlusLayout","KEYBOARD_LAYOUTS","AlgebraAdvanced","Component","characterTypes","Basic","BasicExtended","BasicTime","BasicCurrency","BasicUnits","BasicExtendedPlus","getLayoutByCharType","charType","layout","Object","values","includes"],"sourceRoot":"../../../../../src","sources":["features/keyboard/constants/keyboardLayouts.ts"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,mBAAgB;AAC7C,SAASC,aAAa,QAAQ,8CAA2C;AACzE,SAASC,WAAW,QAAQ,0CAAuC;AACnE,SAASC,mBAAmB,QAAQ,0DAAuD;AAC3F,SAASC,eAAe,QAAQ,8CAA2C;AAC3E,SAASC,mBAAmB,QAAQ,kDAA+C;AACnF,SAASC,WAAW,QAAQ,0CAAuC;AACnE,SAASC,uBAAuB,QAAQ,kEAA+D;AAEvG,OAAO,MAAMC,gBAAgB,GAAG;EAC9B,CAACR,YAAY,CAACS,eAAe,GAAG;IAC9BC,SAAS,EAAET,aAAa;IACxBU,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE;EACpC,CAAC;EACD,CAACX,YAAY,CAACY,KAAK,GAAG;IACpBF,SAAS,EAAER,WAAW;IACtBS,cAAc,EAAE,CAAC,EAAE;EACrB,CAAC;EACD,CAACX,YAAY,CAACa,aAAa,GAAG;IAC5BH,SAAS,EAAEP,mBAAmB;IAC9BQ,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE;EACzC,CAAC;EACD,CAACX,YAAY,CAACc,SAAS,GAAG;IACxBJ,SAAS,EAAEN,eAAe;IAC1BO,cAAc,EAAE,CAAC,EAAE;EACrB,CAAC;EACD,CAACX,YAAY,CAACe,aAAa,GAAG;IAC5BL,SAAS,EAAEL,mBAAmB;IAC9BM,cAAc,EAAE,CAAC,EAAE;EACrB,CAAC;EACD,CAACX,YAAY,CAACgB,UAAU,GAAG;IACzBN,SAAS,EAAEJ,WAAW;IACtBK,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE;EACxB,CAAC;EACD,CAACX,YAAY,CAACiB,iBAAiB,GAAG;IAChCP,SAAS,EAAEH,uBAAuB;IAClCI,cAAc,EAAE,CAAC,EAAE,EAAE,EAAE;EACzB;AACF,CAAC;AAED,OAAO,SAASO,mBAAmBA,CAACC,QAAiB,EAAE;EACrD,IAAI,CAACA,QAAQ,EAAE;IACb,OAAOlB,aAAa;EACtB;EAEA,KAAK,MAAMmB,MAAM,IAAIC,MAAM,CAACC,MAAM,CAACd,gBAAgB,CAAC,EAAE;IACpD,IAAIY,MAAM,CAACT,cAAc,CAACY,QAAQ,CAACJ,QAAQ,CAAC,EAAE;MAC5C,OAAOC,MAAM,CAACV,SAAS;IACzB;EACF;EACA,OAAOT,aAAa;AACtB","ignoreList":[]}
+{"version":3,"names":["KeyboardType","AlgebraLayout","BasicLayout","BasicExtendedLayout","TimeBasicLayout","CurrencyBasicLayout","UnitsLayout","BasicExtendedPlusLayout","KEYBOARD_LAYOUTS","AlgebraAdvanced","Component","characterTypes","Basic","BasicExtended","BasicTime","BasicCurrency","BasicUnits","BasicExtendedPlus","getLayoutByCharType","charType","layout","Object","values","includes"],"sourceRoot":"../../../../../src","sources":["features/keyboard/constants/keyboardLayouts.ts"],"mappings":";;AAAA,SAASA,YAAY,QAAQ,aAAU;AACvC,SAASC,aAAa,QAAQ,8CAA2C;AACzE,SAASC,WAAW,QAAQ,0CAAuC;AACnE,SAASC,mBAAmB,QAAQ,0DAAuD;AAC3F,SAASC,eAAe,QAAQ,8CAA2C;AAC3E,SAASC,mBAAmB,QAAQ,kDAA+C;AACnF,SAASC,WAAW,QAAQ,0CAAuC;AACnE,SAASC,uBAAuB,QAAQ,kEAA+D;AAEvG,OAAO,MAAMC,gBAAgB,GAAG;EAC9B,CAACR,YAAY,CAACS,eAAe,GAAG;IAC9BC,SAAS,EAAET,aAAa;IACxBU,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE;EAChC,CAAC;EACD,CAACX,YAAY,CAACY,KAAK,GAAG;IACpBF,SAAS,EAAER,WAAW;IACtBS,cAAc,EAAE,CAAC,EAAE;EACrB,CAAC;EACD,CAACX,YAAY,CAACa,aAAa,GAAG;IAC5BH,SAAS,EAAEP,mBAAmB;IAC9BQ,cAAc,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE;EACzC,CAAC;EACD,CAACX,YAAY,CAACc,SAAS,GAAG;IACxBJ,SAAS,EAAEN,eAAe;IAC1BO,cAAc,EAAE,CAAC,EAAE;EACrB,CAAC;EACD,CAACX,YAAY,CAACe,aAAa,GAAG;IAC5BL,SAAS,EAAEL,mBAAmB;IAC9BM,cAAc,EAAE,CAAC,EAAE;EACrB,CAAC;EACD,CAACX,YAAY,CAACgB,UAAU,GAAG;IACzBN,SAAS,EAAEJ,WAAW;IACtBK,cAAc,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,EAAE;EAC5B,CAAC;EACD,CAACX,YAAY,CAACiB,iBAAiB,GAAG;IAChCP,SAAS,EAAEH,uBAAuB;IAClCI,cAAc,EAAE,CAAC,EAAE,EAAE,EAAE;EACzB;AACF,CAAC;AAED,OAAO,SAASO,mBAAmBA,CAACC,QAAiB,EAAE;EACrD,IAAI,CAACA,QAAQ,EAAE;IACb,OAAOlB,aAAa;EACtB;EAEA,KAAK,MAAMmB,MAAM,IAAIC,MAAM,CAACC,MAAM,CAACd,gBAAgB,CAAC,EAAE;IACpD,IAAIY,MAAM,CAACT,cAAc,CAACY,QAAQ,CAACJ,QAAQ,CAAC,EAAE;MAC5C,OAAOC,MAAM,CAACV,SAAS;IACzB;EACF;EACA,OAAOT,aAAa;AACtB","ignoreList":[]}