@magmamath/students-features 0.9.103-rc.0 → 0.9.103

package/.idea/workspace.xml

@@ -4,9 +4,7 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="ce1b67e5-e42c-4dab-8d84-832433eb9fe4" name="Changes" comment="chore: version update">
-      <change beforePath="$PROJECT_DIR$/src/features/keyboard/components/UnitsLayout/hooks/useUnitTabs.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/features/keyboard/components/UnitsLayout/hooks/useUnitTabs.ts" afterDir="false" />
-    </list>
+    <list default="true" id="ce1b67e5-e42c-4dab-8d84-832433eb9fe4" name="Changes" comment="fix: added new mobile breakpoints for basic and algebra layout" />
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
@@ -23,7 +21,7 @@
   <component name="Git.Settings">
     <option name="RECENT_BRANCH_BY_REPOSITORY">
       <map>
-        <entry key="$PROJECT_DIR$" value="main" />
+        <entry key="$PROJECT_DIR$" value="feature/3307-keyboard-breakpoints" />
       </map>
     </option>
     <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
@@ -192,39 +190,9 @@
       <workItem from="1765907874976" duration="1725000" />
       <workItem from="1765997348478" duration="98000" />
       <workItem from="1765997880566" duration="9660000" />
-      <workItem from="1766415953458" duration="2208000" />
-    </task>
-    <task id="LOCAL-00044" summary="feat: added mobile layout for basic extended plus">
-      <option name="closed" value="true" />
-      <created>1759751740841</created>
-      <option name="number" value="00044" />
-      <option name="presentableId" value="LOCAL-00044" />
-      <option name="project" value="LOCAL" />
-      <updated>1759751740841</updated>
-    </task>
-    <task id="LOCAL-00045" summary="feat: added mobile layout for units">
-      <option name="closed" value="true" />
-      <created>1759754017450</created>
-      <option name="number" value="00045" />
-      <option name="presentableId" value="LOCAL-00045" />
-      <option name="project" value="LOCAL" />
-      <updated>1759754017450</updated>
-    </task>
-    <task id="LOCAL-00046" summary="feat: added mobile basic layout">
-      <option name="closed" value="true" />
-      <created>1759758990849</created>
-      <option name="number" value="00046" />
-      <option name="presentableId" value="LOCAL-00046" />
-      <option name="project" value="LOCAL" />
-      <updated>1759758990849</updated>
-    </task>
-    <task id="LOCAL-00047" summary="chore: version update">
-      <option name="closed" value="true" />
-      <created>1759762164134</created>
-      <option name="number" value="00047" />
-      <option name="presentableId" value="LOCAL-00047" />
-      <option name="project" value="LOCAL" />
-      <updated>1759762164134</updated>
+      <workItem from="1766415953458" duration="2436000" />
+      <workItem from="1766487717021" duration="4617000" />
+      <workItem from="1766498143970" duration="4657000" />
     </task>
     <task id="LOCAL-00048" summary="feat: updated mobile numpad padding for advanced characters">
       <option name="closed" value="true" />
@@ -586,7 +554,39 @@
       <option name="project" value="LOCAL" />
       <updated>1766048046880</updated>
     </task>
-    <option name="localTasksCounter" value="93" />
+    <task id="LOCAL-00093" summary="feat: added breakpoints for tabs keyboard">
+      <option name="closed" value="true" />
+      <created>1766418763276</created>
+      <option name="number" value="00093" />
+      <option name="presentableId" value="LOCAL-00093" />
+      <option name="project" value="LOCAL" />
+      <updated>1766418763276</updated>
+    </task>
+    <task id="LOCAL-00094" summary="chore: code refactoring">
+      <option name="closed" value="true" />
+      <created>1766497346123</created>
+      <option name="number" value="00094" />
+      <option name="presentableId" value="LOCAL-00094" />
+      <option name="project" value="LOCAL" />
+      <updated>1766497346123</updated>
+    </task>
+    <task id="LOCAL-00095" summary="fix: import fix">
+      <option name="closed" value="true" />
+      <created>1766497738723</created>
+      <option name="number" value="00095" />
+      <option name="presentableId" value="LOCAL-00095" />
+      <option name="project" value="LOCAL" />
+      <updated>1766497738723</updated>
+    </task>
+    <task id="LOCAL-00096" summary="fix: added new mobile breakpoints for basic and algebra layout">
+      <option name="closed" value="true" />
+      <created>1766502402788</created>
+      <option name="number" value="00096" />
+      <option name="presentableId" value="LOCAL-00096" />
+      <option name="project" value="LOCAL" />
+      <updated>1766502402788</updated>
+    </task>
+    <option name="localTasksCounter" value="97" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -604,9 +604,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value="chore: algebra layout refactored" />
-    <MESSAGE value="chore: numpad refactoring" />
-    <MESSAGE value="chore: unitTabs refactoring" />
     <MESSAGE value="feat: added rn styles updates" />
     <MESSAGE value="chore: code refactoring for localization" />
     <MESSAGE value="fix: removed basic plus mobile layout" />
@@ -621,7 +618,6 @@
     <MESSAGE value="feat: added new spreadsheet buttons animation" />
     <MESSAGE value="chore: version change" />
     <MESSAGE value="fix: passed props correctly" />
-    <MESSAGE value="chore: code refactoring" />
     <MESSAGE value="chore: changed version" />
     <MESSAGE value="feat: added slash to spreadsheet keyboard layout" />
     <MESSAGE value="chore: updated imports" />
@@ -629,7 +625,11 @@
     <MESSAGE value="fix: updated mathfield value for square brackets" />
     <MESSAGE value="feat: added time layout to units" />
     <MESSAGE value="chore: version update" />
-    <option name="LAST_COMMIT_MESSAGE" value="chore: version update" />
+    <MESSAGE value="feat: added breakpoints for tabs keyboard" />
+    <MESSAGE value="chore: code refactoring" />
+    <MESSAGE value="fix: import fix" />
+    <MESSAGE value="fix: added new mobile breakpoints for basic and algebra layout" />
+    <option name="LAST_COMMIT_MESSAGE" value="fix: added new mobile breakpoints for basic and algebra layout" />
   </component>
   <component name="github-copilot-workspace">
     <instructionFileLocations>

package/dist/commonjs/features/keyboard/components/UnitsLayout/helpers.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getSelectOptions = void 0;
+exports.isKeyboardUnitsGroupType = exports.getSelectOptions = void 0;
 var _reactNativeUi = require("@magmamath/react-native-ui");
 var _keyboardGroups = require("./keyboardGroups.js");
 var _react = _interopRequireDefault(require("react"));
@@ -43,4 +43,6 @@ const getSelectOptions = ({
   }
 };
 exports.getSelectOptions = getSelectOptions;
+const isKeyboardUnitsGroupType = k => Object.values(_types.KeyboardUnitsGroupType).includes(k);
+exports.isKeyboardUnitsGroupType = isKeyboardUnitsGroupType;
 //# sourceMappingURL=helpers.js.map

package/dist/commonjs/features/keyboard/components/UnitsLayout/helpers.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNativeUi","require","_keyboardGroups","_react","_interopRequireDefault","_types","_AlgebraIcon","_jsxRuntime","e","__esModule","default","getSelectOptions","activeTabKey","selectedLayout","setSelectedLayout","onLayoutChange","SelectedIcon","UNITS_KEYBOARD_GROUPS","get","icon","RulerIcon","key","SelectedLayout","ALGEBRA","title","jsx","AlgebraIcon","color","COLORS","NEUTRAL_1","NEUTRAL_9","size","onPressIn","UNITS","exports"],"sourceRoot":"../../../../../../src","sources":["features/keyboard/components/UnitsLayout/helpers.tsx"],"mappings":";;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,MAAA,GAAAJ,OAAA;AACA,IAAAK,YAAA,GAAAL,OAAA;AAAkE,IAAAM,WAAA,GAAAN,OAAA;AAAA,SAAAG,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAS3D,MAAMG,gBAAgB,GAAGA,CAAC;EAC/BC,YAAY;EACZC,cAAc;EACdC,iBAAiB;EACjBC;AAC2B,CAAC,KAAK;EACjC;IACE,MAAMC,YAAY,GAAGC,qCAAqB,CAACC,GAAG,CAACN,YAAY,CAAC,EAAEO,IAAI,IAAIC,wBAAS;IAE/E,OAAO,CACL;MACEC,GAAG,EAAEC,qBAAc,CAACC,OAAO;MAC3BC,KAAK,eACH,IAAAjB,WAAA,CAAAkB,GAAA,EAACnB,YAAA,CAAAoB,WAAW;QACVC,KAAK,EAAEd,cAAc,KAAKS,qBAAc,CAACC,OAAO,GAAGK,qBAAM,CAACC,SAAS,GAAGD,qBAAM,CAACE,SAAU;QACvFC,IAAI,EAAE;MAAG,CACV,CACF;MACDC,SAAS,EAAEA,CAAA,KAAM;QACflB,iBAAiB,CAACQ,qBAAc,CAACC,OAAO,CAAC;QACzCR,cAAc,GAAG,KAAK,CAAC;MACzB;IACF,CAAC,EACD;MACEM,GAAG,EAAEC,qBAAc,CAACW,KAAK;MACzBT,KAAK,eACH,IAAAjB,WAAA,CAAAkB,GAAA,EAACT,YAAY;QACXW,KAAK,EAAEd,cAAc,KAAKS,qBAAc,CAACW,KAAK,GAAGL,qBAAM,CAACC,SAAS,GAAGD,qBAAM,CAACE,SAAU;QACrFC,IAAI,EAAE;MAAG,CACV,CACF;MACDC,SAAS,EAAEA,CAAA,KAAM;QACflB,iBAAiB,CAACQ,qBAAc,CAACW,KAAK,CAAC;QACvClB,cAAc,GAAG,IAAI,CAAC;MACxB;IACF,CAAC,CACF;EACH;AACF,CAAC;AAAAmB,OAAA,CAAAvB,gBAAA,GAAAA,gBAAA","ignoreList":[]}
+{"version":3,"names":["_reactNativeUi","require","_keyboardGroups","_react","_interopRequireDefault","_types","_AlgebraIcon","_jsxRuntime","e","__esModule","default","getSelectOptions","activeTabKey","selectedLayout","setSelectedLayout","onLayoutChange","SelectedIcon","UNITS_KEYBOARD_GROUPS","get","icon","RulerIcon","key","SelectedLayout","ALGEBRA","title","jsx","AlgebraIcon","color","COLORS","NEUTRAL_1","NEUTRAL_9","size","onPressIn","UNITS","exports","isKeyboardUnitsGroupType","k","Object","values","KeyboardUnitsGroupType","includes"],"sourceRoot":"../../../../../../src","sources":["features/keyboard/components/UnitsLayout/helpers.tsx"],"mappings":";;;;;;AAAA,IAAAA,cAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAC,sBAAA,CAAAH,OAAA;AACA,IAAAI,MAAA,GAAAJ,OAAA;AACA,IAAAK,YAAA,GAAAL,OAAA;AAAkE,IAAAM,WAAA,GAAAN,OAAA;AAAA,SAAAG,uBAAAI,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAS3D,MAAMG,gBAAgB,GAAGA,CAAC;EAC/BC,YAAY;EACZC,cAAc;EACdC,iBAAiB;EACjBC;AAC2B,CAAC,KAAK;EACjC;IACE,MAAMC,YAAY,GAAGC,qCAAqB,CAACC,GAAG,CAACN,YAAY,CAAC,EAAEO,IAAI,IAAIC,wBAAS;IAE/E,OAAO,CACL;MACEC,GAAG,EAAEC,qBAAc,CAACC,OAAO;MAC3BC,KAAK,eACH,IAAAjB,WAAA,CAAAkB,GAAA,EAACnB,YAAA,CAAAoB,WAAW;QACVC,KAAK,EAAEd,cAAc,KAAKS,qBAAc,CAACC,OAAO,GAAGK,qBAAM,CAACC,SAAS,GAAGD,qBAAM,CAACE,SAAU;QACvFC,IAAI,EAAE;MAAG,CACV,CACF;MACDC,SAAS,EAAEA,CAAA,KAAM;QACflB,iBAAiB,CAACQ,qBAAc,CAACC,OAAO,CAAC;QACzCR,cAAc,GAAG,KAAK,CAAC;MACzB;IACF,CAAC,EACD;MACEM,GAAG,EAAEC,qBAAc,CAACW,KAAK;MACzBT,KAAK,eACH,IAAAjB,WAAA,CAAAkB,GAAA,EAACT,YAAY;QACXW,KAAK,EAAEd,cAAc,KAAKS,qBAAc,CAACW,KAAK,GAAGL,qBAAM,CAACC,SAAS,GAAGD,qBAAM,CAACE,SAAU;QACrFC,IAAI,EAAE;MAAG,CACV,CACF;MACDC,SAAS,EAAEA,CAAA,KAAM;QACflB,iBAAiB,CAACQ,qBAAc,CAACW,KAAK,CAAC;QACvClB,cAAc,GAAG,IAAI,CAAC;MACxB;IACF,CAAC,CACF;EACH;AACF,CAAC;AAAAmB,OAAA,CAAAvB,gBAAA,GAAAA,gBAAA;AAEM,MAAMwB,wBAAwB,GAAIC,CAAS,IAC/CC,MAAM,CAACC,MAAM,CAACC,6BAAsB,CAAC,CAAcC,QAAQ,CAACJ,CAAC,CAAC;AAAAF,OAAA,CAAAC,wBAAA,GAAAA,wBAAA","ignoreList":[]}

package/dist/commonjs/features/keyboard/components/UnitsLayout/hooks/useUnitTabs.js

@@ -8,6 +8,7 @@ var _index = require("../../../../../shared/translation/index.js");
 var _react = require("react");
 var _types = require("../types.js");
 var _reactNative = require("react-native");
+var _helpers = require("../helpers.js");
 const useUnitTabs = () => {
   const t = (0, _index.useText)();
   const {
@@ -15,8 +16,7 @@ const useUnitTabs = () => {
   } = (0, _reactNative.useWindowDimensions)();
   const allTabs = (0, _react.useMemo)(() => [{
     title: t('keyboard.length'),
-    key: _types.KeyboardUnitsGroupType.LENGTH,
-    minWidth: 1005
+    key: _types.KeyboardUnitsGroupType.LENGTH
   }, {
     title: t('keyboard.area'),
     key: _types.KeyboardUnitsGroupType.AREA,
@@ -24,7 +24,7 @@ const useUnitTabs = () => {
   }, {
     title: t('keyboard.volume'),
     key: _types.KeyboardUnitsGroupType.VOLUME,
-    minWidth: 1005
+    minWidth: 1060
   }, {
     title: t('keyboard.weight'),
     key: _types.KeyboardUnitsGroupType.WEIGHT,
@@ -34,17 +34,19 @@ const useUnitTabs = () => {
     key: _types.KeyboardUnitsGroupType.TIME,
     minWidth: 1125
   }], [t]);
-  const tabs = (0, _react.useMemo)(() => allTabs.filter(tab => width >= tab.minWidth), [allTabs, width]);
-  const [activeTab, setActiveTab] = (0, _react.useState)(() => tabs[0]);
-  (0, _react.useEffect)(() => {
-    if (!tabs.length) return;
-    const stillVisible = tabs.some(t => t.key === activeTab?.key);
-    if (!stillVisible) setActiveTab(tabs[0]);
-  }, [tabs, activeTab?.key]);
+  const tabs = (0, _react.useMemo)(() => allTabs.filter(tab => tab.minWidth === undefined || width >= tab.minWidth), [allTabs, width]);
+  const [activeKey, setActiveKey] = (0, _react.useState)(() => tabs[0]?.key);
+  const activeTab = (0, _react.useMemo)(() => {
+    return tabs.find(t => t?.key && t.key === activeKey) ?? tabs[0];
+  }, [tabs, activeKey]);
   return {
     tabs,
     activeTab,
-    setActiveTab
+    setActiveTab: tab => {
+      if ((0, _helpers.isKeyboardUnitsGroupType)(tab.key)) {
+        setActiveKey(tab.key);
+      }
+    }
   };
 };
 exports.useUnitTabs = useUnitTabs;

package/dist/commonjs/features/keyboard/components/UnitsLayout/hooks/useUnitTabs.js.map

@@ -1 +1 @@
-{"version":3,"names":["_index","require","_react","_types","_reactNative","useUnitTabs","t","useText","width","useWindowDimensions","allTabs","useMemo","title","key","KeyboardUnitsGroupType","LENGTH","minWidth","AREA","VOLUME","WEIGHT","TIME","tabs","filter","tab","activeTab","setActiveTab","useState","useEffect","length","stillVisible","some","exports"],"sourceRoot":"../../../../../../../src","sources":["features/keyboard/components/UnitsLayout/hooks/useUnitTabs.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AAEA,IAAAE,MAAA,GAAAF,OAAA;AACA,IAAAG,YAAA,GAAAH,OAAA;AAMO,MAAMI,WAAW,GAAGA,CAAA,KAAM;EAC/B,MAAMC,CAAC,GAAG,IAAAC,cAAO,EAAC,CAAC;EACnB,MAAM;IAAEC;EAAM,CAAC,GAAG,IAAAC,gCAAmB,EAAC,CAAC;EAEvC,MAAMC,OAAO,GAAG,IAAAC,cAAO,EACrB,MAAM,CACJ;IACEC,KAAK,EAAEN,CAAC,CAAC,iBAAiB,CAAC;IAC3BO,GAAG,EAAEC,6BAAsB,CAACC,MAAM;IAClCC,QAAQ,EAAE;EACZ,CAAC,EACD;IACEJ,KAAK,EAAEN,CAAC,CAAC,eAAe,CAAC;IACzBO,GAAG,EAAEC,6BAAsB,CAACG,IAAI;IAChCD,QAAQ,EAAE;EACZ,CAAC,EACD;IACEJ,KAAK,EAAEN,CAAC,CAAC,iBAAiB,CAAC;IAC3BO,GAAG,EAAEC,6BAAsB,CAACI,MAAM;IAClCF,QAAQ,EAAE;EACZ,CAAC,EACD;IACEJ,KAAK,EAAEN,CAAC,CAAC,iBAAiB,CAAC;IAC3BO,GAAG,EAAEC,6BAAsB,CAACK,MAAM;IAClCH,QAAQ,EAAE;EACZ,CAAC,EACD;IACEJ,KAAK,EAAEN,CAAC,CAAC,eAAe,CAAC;IACzBO,GAAG,EAAEC,6BAAsB,CAACM,IAAI;IAChCJ,QAAQ,EAAE;EACZ,CAAC,CACF,EACD,CAACV,CAAC,CACJ,CAAC;EAED,MAAMe,IAAI,GAAG,IAAAV,cAAO,EAAC,MAAMD,OAAO,CAACY,MAAM,CAAEC,GAAG,IAAKf,KAAK,IAAIe,GAAG,CAACP,QAAQ,CAAC,EAAE,CAACN,OAAO,EAAEF,KAAK,CAAC,CAAC;EAE5F,MAAM,CAACgB,SAAS,EAAEC,YAAY,CAAC,GAAG,IAAAC,eAAQ,EAAiB,MAAML,IAAI,CAAC,CAAC,CAAC,CAAC;EAEzE,IAAAM,gBAAS,EAAC,MAAM;IACd,IAAI,CAACN,IAAI,CAACO,MAAM,EAAE;IAClB,MAAMC,YAAY,GAAGR,IAAI,CAACS,IAAI,CAAExB,CAAC,IAAKA,CAAC,CAACO,GAAG,KAAKW,SAAS,EAAEX,GAAG,CAAC;IAC/D,IAAI,CAACgB,YAAY,EAAEJ,YAAY,CAACJ,IAAI,CAAC,CAAC,CAAC,CAAC;EAC1C,CAAC,EAAE,CAACA,IAAI,EAAEG,SAAS,EAAEX,GAAG,CAAC,CAAC;EAE1B,OAAO;IAAEQ,IAAI;IAAEG,SAAS;IAAEC;EAAa,CAAC;AAC1C,CAAC;AAAAM,OAAA,CAAA1B,WAAA,GAAAA,WAAA","ignoreList":[]}
+{"version":3,"names":["_index","require","_react","_types","_reactNative","_helpers","useUnitTabs","t","useText","width","useWindowDimensions","allTabs","useMemo","title","key","KeyboardUnitsGroupType","LENGTH","AREA","minWidth","VOLUME","WEIGHT","TIME","tabs","filter","tab","undefined","activeKey","setActiveKey","useState","activeTab","find","setActiveTab","isKeyboardUnitsGroupType","exports"],"sourceRoot":"../../../../../../../src","sources":["features/keyboard/components/UnitsLayout/hooks/useUnitTabs.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AACA,IAAAE,MAAA,GAAAF,OAAA;AACA,IAAAG,YAAA,GAAAH,OAAA;AAEA,IAAAI,QAAA,GAAAJ,OAAA;AAEO,MAAMK,WAAW,GAAGA,CAAA,KAAM;EAC/B,MAAMC,CAAC,GAAG,IAAAC,cAAO,EAAC,CAAC;EACnB,MAAM;IAAEC;EAAM,CAAC,GAAG,IAAAC,gCAAmB,EAAC,CAAC;EAEvC,MAAMC,OAAO,GAAG,IAAAC,cAAO,EACrB,MAAM,CACJ;IAAEC,KAAK,EAAEN,CAAC,CAAC,iBAAiB,CAAC;IAAEO,GAAG,EAAEC,6BAAsB,CAACC;EAAO,CAAC,EACnE;IAAEH,KAAK,EAAEN,CAAC,CAAC,eAAe,CAAC;IAAEO,GAAG,EAAEC,6BAAsB,CAACE,IAAI;IAAEC,QAAQ,EAAE;EAAK,CAAC,EAC/E;IAAEL,KAAK,EAAEN,CAAC,CAAC,iBAAiB,CAAC;IAAEO,GAAG,EAAEC,6BAAsB,CAACI,MAAM;IAAED,QAAQ,EAAE;EAAK,CAAC,EACnF;IAAEL,KAAK,EAAEN,CAAC,CAAC,iBAAiB,CAAC;IAAEO,GAAG,EAAEC,6BAAsB,CAACK,MAAM;IAAEF,QAAQ,EAAE;EAAK,CAAC,EACnF;IAAEL,KAAK,EAAEN,CAAC,CAAC,eAAe,CAAC;IAAEO,GAAG,EAAEC,6BAAsB,CAACM,IAAI;IAAEH,QAAQ,EAAE;EAAK,CAAC,CAChF,EACD,CAACX,CAAC,CACJ,CAAC;EAED,MAAMe,IAAI,GAAG,IAAAV,cAAO,EAClB,MAAMD,OAAO,CAACY,MAAM,CAAEC,GAAG,IAAKA,GAAG,CAACN,QAAQ,KAAKO,SAAS,IAAIhB,KAAK,IAAIe,GAAG,CAACN,QAAQ,CAAC,EAClF,CAACP,OAAO,EAAEF,KAAK,CACjB,CAAC;EAED,MAAM,CAACiB,SAAS,EAAEC,YAAY,CAAC,GAAG,IAAAC,eAAQ,EAAqC,MAAMN,IAAI,CAAC,CAAC,CAAC,EAAER,GAAG,CAAC;EAElG,MAAMe,SAAS,GAAG,IAAAjB,cAAO,EAAC,MAAM;IAC9B,OAAOU,IAAI,CAACQ,IAAI,CAAEvB,CAAC,IAAKA,CAAC,EAAEO,GAAG,IAAIP,CAAC,CAACO,GAAG,KAAKY,SAAS,CAAC,IAAIJ,IAAI,CAAC,CAAC,CAAC;EACnE,CAAC,EAAE,CAACA,IAAI,EAAEI,SAAS,CAAC,CAAC;EAErB,OAAO;IACLJ,IAAI;IACJO,SAAS;IACTE,YAAY,EAAGP,GAAmB,IAAK;MACrC,IAAI,IAAAQ,iCAAwB,EAACR,GAAG,CAACV,GAAG,CAAC,EAAE;QACrCa,YAAY,CAACH,GAAG,CAACV,GAAG,CAAC;MACvB;IACF;EACF,CAAC;AACH,CAAC;AAAAmB,OAAA,CAAA3B,WAAA,GAAAA,WAAA","ignoreList":[]}

package/dist/commonjs/features/keyboard/components/UnitsLayout/types.js.map

@@ -1 +1 @@
-{"version":3,"names":["SelectedLayout","exports","KeyboardUnitsGroupType"],"sourceRoot":"../../../../../../src","sources":["features/keyboard/components/UnitsLayout/types.ts"],"mappings":";;;;;;IAEYA,cAAc,GAAAC,OAAA,CAAAD,cAAA,0BAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAA,OAAdA,cAAc;AAAA;AAAA,IAKdE,sBAAsB,GAAAD,OAAA,CAAAC,sBAAA,0BAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAA,OAAtBA,sBAAsB;AAAA","ignoreList":[]}
+{"version":3,"names":["SelectedLayout","exports","KeyboardUnitsGroupType"],"sourceRoot":"../../../../../../src","sources":["features/keyboard/components/UnitsLayout/types.ts"],"mappings":";;;;;;IAGYA,cAAc,GAAAC,OAAA,CAAAD,cAAA,0BAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAA,OAAdA,cAAc;AAAA;AAAA,IAKdE,sBAAsB,GAAAD,OAAA,CAAAC,sBAAA,0BAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAA,OAAtBA,sBAAsB;AAAA","ignoreList":[]}

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

@@ -3,7 +3,7 @@
 import { COLORS, RulerIcon } from '@magmamath/react-native-ui';
 import { UNITS_KEYBOARD_GROUPS } from "./keyboardGroups.js";
 import React from 'react';
-import { SelectedLayout } from "./types.js";
+import { KeyboardUnitsGroupType, SelectedLayout } from "./types.js";
 import { AlgebraIcon } from "../../../../shared/icons/AlgebraIcon.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 export const getSelectOptions = ({
@@ -37,4 +37,5 @@ export const getSelectOptions = ({
     }];
   }
 };
+export const isKeyboardUnitsGroupType = k => Object.values(KeyboardUnitsGroupType).includes(k);
 //# sourceMappingURL=helpers.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["COLORS","RulerIcon","UNITS_KEYBOARD_GROUPS","React","SelectedLayout","AlgebraIcon","jsx","_jsx","getSelectOptions","activeTabKey","selectedLayout","setSelectedLayout","onLayoutChange","SelectedIcon","get","icon","key","ALGEBRA","title","color","NEUTRAL_1","NEUTRAL_9","size","onPressIn","UNITS"],"sourceRoot":"../../../../../../src","sources":["features/keyboard/components/UnitsLayout/helpers.tsx"],"mappings":";;AAAA,SAASA,MAAM,EAAEC,SAAS,QAAQ,4BAA4B;AAC9D,SAASC,qBAAqB,QAAQ,qBAAkB;AACxD,OAAOC,KAAK,MAAM,OAAO;AACzB,SAAiCC,cAAc,QAAQ,YAAS;AAChE,SAASC,WAAW,QAAQ,yCAAsC;AAAA,SAAAC,GAAA,IAAAC,IAAA;AASlE,OAAO,MAAMC,gBAAgB,GAAGA,CAAC;EAC/BC,YAAY;EACZC,cAAc;EACdC,iBAAiB;EACjBC;AAC2B,CAAC,KAAK;EACjC;IACE,MAAMC,YAAY,GAAGX,qBAAqB,CAACY,GAAG,CAACL,YAAY,CAAC,EAAEM,IAAI,IAAId,SAAS;IAE/E,OAAO,CACL;MACEe,GAAG,EAAEZ,cAAc,CAACa,OAAO;MAC3BC,KAAK,eACHX,IAAA,CAACF,WAAW;QACVc,KAAK,EAAET,cAAc,KAAKN,cAAc,CAACa,OAAO,GAAGjB,MAAM,CAACoB,SAAS,GAAGpB,MAAM,CAACqB,SAAU;QACvFC,IAAI,EAAE;MAAG,CACV,CACF;MACDC,SAAS,EAAEA,CAAA,KAAM;QACfZ,iBAAiB,CAACP,cAAc,CAACa,OAAO,CAAC;QACzCL,cAAc,GAAG,KAAK,CAAC;MACzB;IACF,CAAC,EACD;MACEI,GAAG,EAAEZ,cAAc,CAACoB,KAAK;MACzBN,KAAK,eACHX,IAAA,CAACM,YAAY;QACXM,KAAK,EAAET,cAAc,KAAKN,cAAc,CAACoB,KAAK,GAAGxB,MAAM,CAACoB,SAAS,GAAGpB,MAAM,CAACqB,SAAU;QACrFC,IAAI,EAAE;MAAG,CACV,CACF;MACDC,SAAS,EAAEA,CAAA,KAAM;QACfZ,iBAAiB,CAACP,cAAc,CAACoB,KAAK,CAAC;QACvCZ,cAAc,GAAG,IAAI,CAAC;MACxB;IACF,CAAC,CACF;EACH;AACF,CAAC","ignoreList":[]}
+{"version":3,"names":["COLORS","RulerIcon","UNITS_KEYBOARD_GROUPS","React","KeyboardUnitsGroupType","SelectedLayout","AlgebraIcon","jsx","_jsx","getSelectOptions","activeTabKey","selectedLayout","setSelectedLayout","onLayoutChange","SelectedIcon","get","icon","key","ALGEBRA","title","color","NEUTRAL_1","NEUTRAL_9","size","onPressIn","UNITS","isKeyboardUnitsGroupType","k","Object","values","includes"],"sourceRoot":"../../../../../../src","sources":["features/keyboard/components/UnitsLayout/helpers.tsx"],"mappings":";;AAAA,SAASA,MAAM,EAAEC,SAAS,QAAQ,4BAA4B;AAC9D,SAASC,qBAAqB,QAAQ,qBAAkB;AACxD,OAAOC,KAAK,MAAM,OAAO;AACzB,SAASC,sBAAsB,EAAEC,cAAc,QAAQ,YAAS;AAChE,SAASC,WAAW,QAAQ,yCAAsC;AAAA,SAAAC,GAAA,IAAAC,IAAA;AASlE,OAAO,MAAMC,gBAAgB,GAAGA,CAAC;EAC/BC,YAAY;EACZC,cAAc;EACdC,iBAAiB;EACjBC;AAC2B,CAAC,KAAK;EACjC;IACE,MAAMC,YAAY,GAAGZ,qBAAqB,CAACa,GAAG,CAACL,YAAY,CAAC,EAAEM,IAAI,IAAIf,SAAS;IAE/E,OAAO,CACL;MACEgB,GAAG,EAAEZ,cAAc,CAACa,OAAO;MAC3BC,KAAK,eACHX,IAAA,CAACF,WAAW;QACVc,KAAK,EAAET,cAAc,KAAKN,cAAc,CAACa,OAAO,GAAGlB,MAAM,CAACqB,SAAS,GAAGrB,MAAM,CAACsB,SAAU;QACvFC,IAAI,EAAE;MAAG,CACV,CACF;MACDC,SAAS,EAAEA,CAAA,KAAM;QACfZ,iBAAiB,CAACP,cAAc,CAACa,OAAO,CAAC;QACzCL,cAAc,GAAG,KAAK,CAAC;MACzB;IACF,CAAC,EACD;MACEI,GAAG,EAAEZ,cAAc,CAACoB,KAAK;MACzBN,KAAK,eACHX,IAAA,CAACM,YAAY;QACXM,KAAK,EAAET,cAAc,KAAKN,cAAc,CAACoB,KAAK,GAAGzB,MAAM,CAACqB,SAAS,GAAGrB,MAAM,CAACsB,SAAU;QACrFC,IAAI,EAAE;MAAG,CACV,CACF;MACDC,SAAS,EAAEA,CAAA,KAAM;QACfZ,iBAAiB,CAACP,cAAc,CAACoB,KAAK,CAAC;QACvCZ,cAAc,GAAG,IAAI,CAAC;MACxB;IACF,CAAC,CACF;EACH;AACF,CAAC;AAED,OAAO,MAAMa,wBAAwB,GAAIC,CAAS,IAC/CC,MAAM,CAACC,MAAM,CAACzB,sBAAsB,CAAC,CAAc0B,QAAQ,CAACH,CAAC,CAAC","ignoreList":[]}

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

@@ -1,9 +1,10 @@
 "use strict";
 
 import { useText } from "../../../../../shared/translation/index.js";
-import { useEffect, useMemo, useState } from 'react';
+import { useMemo, useState } from 'react';
 import { KeyboardUnitsGroupType } from "../types.js";
 import { useWindowDimensions } from 'react-native';
+import { isKeyboardUnitsGroupType } from "../helpers.js";
 export const useUnitTabs = () => {
   const t = useText();
   const {
@@ -11,8 +12,7 @@ export const useUnitTabs = () => {
   } = useWindowDimensions();
   const allTabs = useMemo(() => [{
     title: t('keyboard.length'),
-    key: KeyboardUnitsGroupType.LENGTH,
-    minWidth: 1005
+    key: KeyboardUnitsGroupType.LENGTH
   }, {
     title: t('keyboard.area'),
     key: KeyboardUnitsGroupType.AREA,
@@ -20,7 +20,7 @@ export const useUnitTabs = () => {
   }, {
     title: t('keyboard.volume'),
     key: KeyboardUnitsGroupType.VOLUME,
-    minWidth: 1005
+    minWidth: 1060
   }, {
     title: t('keyboard.weight'),
     key: KeyboardUnitsGroupType.WEIGHT,
@@ -30,17 +30,19 @@ export const useUnitTabs = () => {
     key: KeyboardUnitsGroupType.TIME,
     minWidth: 1125
   }], [t]);
-  const tabs = useMemo(() => allTabs.filter(tab => width >= tab.minWidth), [allTabs, width]);
-  const [activeTab, setActiveTab] = useState(() => tabs[0]);
-  useEffect(() => {
-    if (!tabs.length) return;
-    const stillVisible = tabs.some(t => t.key === activeTab?.key);
-    if (!stillVisible) setActiveTab(tabs[0]);
-  }, [tabs, activeTab?.key]);
+  const tabs = useMemo(() => allTabs.filter(tab => tab.minWidth === undefined || width >= tab.minWidth), [allTabs, width]);
+  const [activeKey, setActiveKey] = useState(() => tabs[0]?.key);
+  const activeTab = useMemo(() => {
+    return tabs.find(t => t?.key && t.key === activeKey) ?? tabs[0];
+  }, [tabs, activeKey]);
   return {
     tabs,
     activeTab,
-    setActiveTab
+    setActiveTab: tab => {
+      if (isKeyboardUnitsGroupType(tab.key)) {
+        setActiveKey(tab.key);
+      }
+    }
   };
 };
 //# sourceMappingURL=useUnitTabs.js.map

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

@@ -1 +1 @@
-{"version":3,"names":["useText","useEffect","useMemo","useState","KeyboardUnitsGroupType","useWindowDimensions","useUnitTabs","t","width","allTabs","title","key","LENGTH","minWidth","AREA","VOLUME","WEIGHT","TIME","tabs","filter","tab","activeTab","setActiveTab","length","stillVisible","some"],"sourceRoot":"../../../../../../../src","sources":["features/keyboard/components/UnitsLayout/hooks/useUnitTabs.ts"],"mappings":";;AAAA,SAASA,OAAO,QAAQ,4CAAmC;AAC3D,SAASC,SAAS,EAAEC,OAAO,EAAEC,QAAQ,QAAQ,OAAO;AAEpD,SAASC,sBAAsB,QAAQ,aAAU;AACjD,SAASC,mBAAmB,QAAQ,cAAc;AAMlD,OAAO,MAAMC,WAAW,GAAGA,CAAA,KAAM;EAC/B,MAAMC,CAAC,GAAGP,OAAO,CAAC,CAAC;EACnB,MAAM;IAAEQ;EAAM,CAAC,GAAGH,mBAAmB,CAAC,CAAC;EAEvC,MAAMI,OAAO,GAAGP,OAAO,CACrB,MAAM,CACJ;IACEQ,KAAK,EAAEH,CAAC,CAAC,iBAAiB,CAAC;IAC3BI,GAAG,EAAEP,sBAAsB,CAACQ,MAAM;IAClCC,QAAQ,EAAE;EACZ,CAAC,EACD;IACEH,KAAK,EAAEH,CAAC,CAAC,eAAe,CAAC;IACzBI,GAAG,EAAEP,sBAAsB,CAACU,IAAI;IAChCD,QAAQ,EAAE;EACZ,CAAC,EACD;IACEH,KAAK,EAAEH,CAAC,CAAC,iBAAiB,CAAC;IAC3BI,GAAG,EAAEP,sBAAsB,CAACW,MAAM;IAClCF,QAAQ,EAAE;EACZ,CAAC,EACD;IACEH,KAAK,EAAEH,CAAC,CAAC,iBAAiB,CAAC;IAC3BI,GAAG,EAAEP,sBAAsB,CAACY,MAAM;IAClCH,QAAQ,EAAE;EACZ,CAAC,EACD;IACEH,KAAK,EAAEH,CAAC,CAAC,eAAe,CAAC;IACzBI,GAAG,EAAEP,sBAAsB,CAACa,IAAI;IAChCJ,QAAQ,EAAE;EACZ,CAAC,CACF,EACD,CAACN,CAAC,CACJ,CAAC;EAED,MAAMW,IAAI,GAAGhB,OAAO,CAAC,MAAMO,OAAO,CAACU,MAAM,CAAEC,GAAG,IAAKZ,KAAK,IAAIY,GAAG,CAACP,QAAQ,CAAC,EAAE,CAACJ,OAAO,EAAED,KAAK,CAAC,CAAC;EAE5F,MAAM,CAACa,SAAS,EAAEC,YAAY,CAAC,GAAGnB,QAAQ,CAAiB,MAAMe,IAAI,CAAC,CAAC,CAAC,CAAC;EAEzEjB,SAAS,CAAC,MAAM;IACd,IAAI,CAACiB,IAAI,CAACK,MAAM,EAAE;IAClB,MAAMC,YAAY,GAAGN,IAAI,CAACO,IAAI,CAAElB,CAAC,IAAKA,CAAC,CAACI,GAAG,KAAKU,SAAS,EAAEV,GAAG,CAAC;IAC/D,IAAI,CAACa,YAAY,EAAEF,YAAY,CAACJ,IAAI,CAAC,CAAC,CAAC,CAAC;EAC1C,CAAC,EAAE,CAACA,IAAI,EAAEG,SAAS,EAAEV,GAAG,CAAC,CAAC;EAE1B,OAAO;IAAEO,IAAI;IAAEG,SAAS;IAAEC;EAAa,CAAC;AAC1C,CAAC","ignoreList":[]}
+{"version":3,"names":["useText","useMemo","useState","KeyboardUnitsGroupType","useWindowDimensions","isKeyboardUnitsGroupType","useUnitTabs","t","width","allTabs","title","key","LENGTH","AREA","minWidth","VOLUME","WEIGHT","TIME","tabs","filter","tab","undefined","activeKey","setActiveKey","activeTab","find","setActiveTab"],"sourceRoot":"../../../../../../../src","sources":["features/keyboard/components/UnitsLayout/hooks/useUnitTabs.ts"],"mappings":";;AAAA,SAASA,OAAO,QAAQ,4CAAmC;AAC3D,SAASC,OAAO,EAAEC,QAAQ,QAAQ,OAAO;AACzC,SAASC,sBAAsB,QAAiB,aAAU;AAC1D,SAASC,mBAAmB,QAAQ,cAAc;AAElD,SAASC,wBAAwB,QAAQ,eAAY;AAErD,OAAO,MAAMC,WAAW,GAAGA,CAAA,KAAM;EAC/B,MAAMC,CAAC,GAAGP,OAAO,CAAC,CAAC;EACnB,MAAM;IAAEQ;EAAM,CAAC,GAAGJ,mBAAmB,CAAC,CAAC;EAEvC,MAAMK,OAAO,GAAGR,OAAO,CACrB,MAAM,CACJ;IAAES,KAAK,EAAEH,CAAC,CAAC,iBAAiB,CAAC;IAAEI,GAAG,EAAER,sBAAsB,CAACS;EAAO,CAAC,EACnE;IAAEF,KAAK,EAAEH,CAAC,CAAC,eAAe,CAAC;IAAEI,GAAG,EAAER,sBAAsB,CAACU,IAAI;IAAEC,QAAQ,EAAE;EAAK,CAAC,EAC/E;IAAEJ,KAAK,EAAEH,CAAC,CAAC,iBAAiB,CAAC;IAAEI,GAAG,EAAER,sBAAsB,CAACY,MAAM;IAAED,QAAQ,EAAE;EAAK,CAAC,EACnF;IAAEJ,KAAK,EAAEH,CAAC,CAAC,iBAAiB,CAAC;IAAEI,GAAG,EAAER,sBAAsB,CAACa,MAAM;IAAEF,QAAQ,EAAE;EAAK,CAAC,EACnF;IAAEJ,KAAK,EAAEH,CAAC,CAAC,eAAe,CAAC;IAAEI,GAAG,EAAER,sBAAsB,CAACc,IAAI;IAAEH,QAAQ,EAAE;EAAK,CAAC,CAChF,EACD,CAACP,CAAC,CACJ,CAAC;EAED,MAAMW,IAAI,GAAGjB,OAAO,CAClB,MAAMQ,OAAO,CAACU,MAAM,CAAEC,GAAG,IAAKA,GAAG,CAACN,QAAQ,KAAKO,SAAS,IAAIb,KAAK,IAAIY,GAAG,CAACN,QAAQ,CAAC,EAClF,CAACL,OAAO,EAAED,KAAK,CACjB,CAAC;EAED,MAAM,CAACc,SAAS,EAAEC,YAAY,CAAC,GAAGrB,QAAQ,CAAqC,MAAMgB,IAAI,CAAC,CAAC,CAAC,EAAEP,GAAG,CAAC;EAElG,MAAMa,SAAS,GAAGvB,OAAO,CAAC,MAAM;IAC9B,OAAOiB,IAAI,CAACO,IAAI,CAAElB,CAAC,IAAKA,CAAC,EAAEI,GAAG,IAAIJ,CAAC,CAACI,GAAG,KAAKW,SAAS,CAAC,IAAIJ,IAAI,CAAC,CAAC,CAAC;EACnE,CAAC,EAAE,CAACA,IAAI,EAAEI,SAAS,CAAC,CAAC;EAErB,OAAO;IACLJ,IAAI;IACJM,SAAS;IACTE,YAAY,EAAGN,GAAmB,IAAK;MACrC,IAAIf,wBAAwB,CAACe,GAAG,CAACT,GAAG,CAAC,EAAE;QACrCY,YAAY,CAACH,GAAG,CAACT,GAAG,CAAC;MACvB;IACF;EACF,CAAC;AACH,CAAC","ignoreList":[]}

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

@@ -1 +1 @@
-{"version":3,"names":["SelectedLayout","KeyboardUnitsGroupType"],"sourceRoot":"../../../../../../src","sources":["features/keyboard/components/UnitsLayout/types.ts"],"mappings":";;AAEA,WAAYA,cAAc,0BAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAA,OAAdA,cAAc;AAAA;AAK1B,WAAYC,sBAAsB,0BAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAA,OAAtBA,sBAAsB;AAAA","ignoreList":[]}
+{"version":3,"names":["SelectedLayout","KeyboardUnitsGroupType"],"sourceRoot":"../../../../../../src","sources":["features/keyboard/components/UnitsLayout/types.ts"],"mappings":";;AAGA,WAAYA,cAAc,0BAAdA,cAAc;EAAdA,cAAc;EAAdA,cAAc;EAAA,OAAdA,cAAc;AAAA;AAK1B,WAAYC,sBAAsB,0BAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAtBA,sBAAsB;EAAA,OAAtBA,sBAAsB;AAAA","ignoreList":[]}

package/dist/typescript/commonjs/features/keyboard/components/UnitsLayout/helpers.d.ts

@@ -11,5 +11,6 @@ export declare const getSelectOptions: ({ activeTabKey, selectedLayout, setSelec
     title: React.JSX.Element;
     onPressIn: () => void;
 }[];
+export declare const isKeyboardUnitsGroupType: (k: string) => k is KeyboardUnitsGroupType;
 export {};
 //# sourceMappingURL=helpers.d.ts.map

package/dist/typescript/commonjs/features/keyboard/components/UnitsLayout/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/keyboard/components/UnitsLayout/helpers.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAGhE,KAAK,2BAA2B,GAAG;IACjC,YAAY,EAAE,sBAAsB,CAAA;IACpC,cAAc,EAAE,cAAc,CAAA;IAC9B,iBAAiB,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAA;IACnD,cAAc,CAAC,EAAE,CAAC,iBAAiB,EAAE,OAAO,KAAK,IAAI,CAAA;CACtD,CAAA;AAED,eAAO,MAAM,gBAAgB,yEAK1B,2BAA2B;;;;GAiC7B,CAAA"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/keyboard/components/UnitsLayout/helpers.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAGhE,KAAK,2BAA2B,GAAG;IACjC,YAAY,EAAE,sBAAsB,CAAA;IACpC,cAAc,EAAE,cAAc,CAAA;IAC9B,iBAAiB,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAA;IACnD,cAAc,CAAC,EAAE,CAAC,iBAAiB,EAAE,OAAO,KAAK,IAAI,CAAA;CACtD,CAAA;AAED,eAAO,MAAM,gBAAgB,yEAK1B,2BAA2B;;;;GAiC7B,CAAA;AAED,eAAO,MAAM,wBAAwB,MAAO,MAAM,KAAG,CAAC,IAAI,sBACO,CAAA"}

package/dist/typescript/commonjs/features/keyboard/components/UnitsLayout/hooks/useUnitTabs.d.ts

@@ -1,11 +1,8 @@
+import { UnitTab } from '../types';
 import { TabOptionProps } from '@magmamath/react-native-ui';
-type UnitTab = TabOptionProps & {
-    minWidth: number;
-};
 export declare const useUnitTabs: () => {
     tabs: UnitTab[];
-    activeTab: TabOptionProps;
-    setActiveTab: import("react").Dispatch<import("react").SetStateAction<TabOptionProps>>;
+    activeTab: UnitTab;
+    setActiveTab: (tab: TabOptionProps) => void;
 };
-export {};
 //# sourceMappingURL=useUnitTabs.d.ts.map

package/dist/typescript/commonjs/features/keyboard/components/UnitsLayout/hooks/useUnitTabs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useUnitTabs.d.ts","sourceRoot":"","sources":["../../../../../../../../src/features/keyboard/components/UnitsLayout/hooks/useUnitTabs.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAI3D,KAAK,OAAO,GAAG,cAAc,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,WAAW;;;;CA8CvB,CAAA"}
+{"version":3,"file":"useUnitTabs.d.ts","sourceRoot":"","sources":["../../../../../../../../src/features/keyboard/components/UnitsLayout/hooks/useUnitTabs.ts"],"names":[],"mappings":"AAEA,OAAO,EAA0B,OAAO,EAAE,MAAM,UAAU,CAAA;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAG3D,eAAO,MAAM,WAAW;;;wBA6BA,cAAc;CAMrC,CAAA"}

package/dist/typescript/commonjs/features/keyboard/components/UnitsLayout/types.d.ts

@@ -1,4 +1,5 @@
 import { KeyboardGroup, KeyboardKey } from '@magmamath/students-features';
+import { TabOptionProps } from '@magmamath/react-native-ui';
 export declare enum SelectedLayout {
     ALGEBRA = "algebra",
     UNITS = "units"
@@ -13,4 +14,8 @@ export declare enum KeyboardUnitsGroupType {
 export type UnitKeyboardGroups = {
     keys: KeyboardKey[][];
 } & Omit<KeyboardGroup, 'keys'>;
+export type UnitTab = Omit<TabOptionProps, 'key'> & {
+    key: KeyboardUnitsGroupType;
+    minWidth?: number;
+};
 //# sourceMappingURL=types.d.ts.map

package/dist/typescript/commonjs/features/keyboard/components/UnitsLayout/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/keyboard/components/UnitsLayout/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAEzE,oBAAY,cAAc;IACxB,OAAO,YAAY;IACnB,KAAK,UAAU;CAChB;AAED,oBAAY,sBAAsB;IAChC,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,IAAI,SAAS;CACd;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,WAAW,EAAE,EAAE,CAAA;CACtB,GAAG,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/keyboard/components/UnitsLayout/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAE3D,oBAAY,cAAc;IACxB,OAAO,YAAY;IACnB,KAAK,UAAU;CAChB;AAED,oBAAY,sBAAsB;IAChC,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,IAAI,SAAS;CACd;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,WAAW,EAAE,EAAE,CAAA;CACtB,GAAG,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;AAE/B,MAAM,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,GAAG;IAClD,GAAG,EAAE,sBAAsB,CAAA;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA"}

package/dist/typescript/module/features/keyboard/components/UnitsLayout/helpers.d.ts

@@ -11,5 +11,6 @@ export declare const getSelectOptions: ({ activeTabKey, selectedLayout, setSelec
     title: React.JSX.Element;
     onPressIn: () => void;
 }[];
+export declare const isKeyboardUnitsGroupType: (k: string) => k is KeyboardUnitsGroupType;
 export {};
 //# sourceMappingURL=helpers.d.ts.map

package/dist/typescript/module/features/keyboard/components/UnitsLayout/helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/keyboard/components/UnitsLayout/helpers.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAGhE,KAAK,2BAA2B,GAAG;IACjC,YAAY,EAAE,sBAAsB,CAAA;IACpC,cAAc,EAAE,cAAc,CAAA;IAC9B,iBAAiB,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAA;IACnD,cAAc,CAAC,EAAE,CAAC,iBAAiB,EAAE,OAAO,KAAK,IAAI,CAAA;CACtD,CAAA;AAED,eAAO,MAAM,gBAAgB,yEAK1B,2BAA2B;;;;GAiC7B,CAAA"}
+{"version":3,"file":"helpers.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/keyboard/components/UnitsLayout/helpers.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAE,sBAAsB,EAAE,cAAc,EAAE,MAAM,SAAS,CAAA;AAGhE,KAAK,2BAA2B,GAAG;IACjC,YAAY,EAAE,sBAAsB,CAAA;IACpC,cAAc,EAAE,cAAc,CAAA;IAC9B,iBAAiB,EAAE,CAAC,MAAM,EAAE,cAAc,KAAK,IAAI,CAAA;IACnD,cAAc,CAAC,EAAE,CAAC,iBAAiB,EAAE,OAAO,KAAK,IAAI,CAAA;CACtD,CAAA;AAED,eAAO,MAAM,gBAAgB,yEAK1B,2BAA2B;;;;GAiC7B,CAAA;AAED,eAAO,MAAM,wBAAwB,MAAO,MAAM,KAAG,CAAC,IAAI,sBACO,CAAA"}

package/dist/typescript/module/features/keyboard/components/UnitsLayout/hooks/useUnitTabs.d.ts

@@ -1,11 +1,8 @@
+import { UnitTab } from '../types';
 import { TabOptionProps } from '@magmamath/react-native-ui';
-type UnitTab = TabOptionProps & {
-    minWidth: number;
-};
 export declare const useUnitTabs: () => {
     tabs: UnitTab[];
-    activeTab: TabOptionProps;
-    setActiveTab: import("react").Dispatch<import("react").SetStateAction<TabOptionProps>>;
+    activeTab: UnitTab;
+    setActiveTab: (tab: TabOptionProps) => void;
 };
-export {};
 //# sourceMappingURL=useUnitTabs.d.ts.map

package/dist/typescript/module/features/keyboard/components/UnitsLayout/hooks/useUnitTabs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useUnitTabs.d.ts","sourceRoot":"","sources":["../../../../../../../../src/features/keyboard/components/UnitsLayout/hooks/useUnitTabs.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAI3D,KAAK,OAAO,GAAG,cAAc,GAAG;IAC9B,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,WAAW;;;;CA8CvB,CAAA"}
+{"version":3,"file":"useUnitTabs.d.ts","sourceRoot":"","sources":["../../../../../../../../src/features/keyboard/components/UnitsLayout/hooks/useUnitTabs.ts"],"names":[],"mappings":"AAEA,OAAO,EAA0B,OAAO,EAAE,MAAM,UAAU,CAAA;AAE1D,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAG3D,eAAO,MAAM,WAAW;;;wBA6BA,cAAc;CAMrC,CAAA"}

package/dist/typescript/module/features/keyboard/components/UnitsLayout/types.d.ts

@@ -1,4 +1,5 @@
 import { KeyboardGroup, KeyboardKey } from '@magmamath/students-features';
+import { TabOptionProps } from '@magmamath/react-native-ui';
 export declare enum SelectedLayout {
     ALGEBRA = "algebra",
     UNITS = "units"
@@ -13,4 +14,8 @@ export declare enum KeyboardUnitsGroupType {
 export type UnitKeyboardGroups = {
     keys: KeyboardKey[][];
 } & Omit<KeyboardGroup, 'keys'>;
+export type UnitTab = Omit<TabOptionProps, 'key'> & {
+    key: KeyboardUnitsGroupType;
+    minWidth?: number;
+};
 //# sourceMappingURL=types.d.ts.map

package/dist/typescript/module/features/keyboard/components/UnitsLayout/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/keyboard/components/UnitsLayout/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAEzE,oBAAY,cAAc;IACxB,OAAO,YAAY;IACnB,KAAK,UAAU;CAChB;AAED,oBAAY,sBAAsB;IAChC,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,IAAI,SAAS;CACd;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,WAAW,EAAE,EAAE,CAAA;CACtB,GAAG,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/keyboard/components/UnitsLayout/types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AACzE,OAAO,EAAE,cAAc,EAAE,MAAM,4BAA4B,CAAA;AAE3D,oBAAY,cAAc;IACxB,OAAO,YAAY;IACnB,KAAK,UAAU;CAChB;AAED,oBAAY,sBAAsB;IAChC,MAAM,WAAW;IACjB,IAAI,SAAS;IACb,MAAM,WAAW;IACjB,MAAM,WAAW;IACjB,IAAI,SAAS;CACd;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,WAAW,EAAE,EAAE,CAAA;CACtB,GAAG,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAA;AAE/B,MAAM,MAAM,OAAO,GAAG,IAAI,CAAC,cAAc,EAAE,KAAK,CAAC,GAAG;IAClD,GAAG,EAAE,sBAAsB,CAAA;IAC3B,QAAQ,CAAC,EAAE,MAAM,CAAA;CAClB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magmamath/students-features",
-  "version": "0.9.103-rc.0",
+  "version": "0.9.103",
   "description": "Magmamath features library",
   "source": "src/index.ts",
   "main": "src/index.ts",

package/src/features/keyboard/components/UnitsLayout/helpers.tsx

@@ -50,3 +50,6 @@ export const getSelectOptions = ({
     ]
   }
 }
+
+export const isKeyboardUnitsGroupType = (k: string): k is KeyboardUnitsGroupType =>
+  (Object.values(KeyboardUnitsGroupType) as string[]).includes(k)

package/src/features/keyboard/components/UnitsLayout/hooks/useUnitTabs.ts

@@ -1,12 +1,9 @@
 import { useText } from '../../../../../shared/translation'
-import { useEffect, useMemo, useState } from 'react'
-import { TabOptionProps } from '@magmamath/react-native-ui'
-import { KeyboardUnitsGroupType } from '../types'
+import { useMemo, useState } from 'react'
+import { KeyboardUnitsGroupType, UnitTab } from '../types'
 import { useWindowDimensions } from 'react-native'
-
-type UnitTab = TabOptionProps & {
-  minWidth: number
-}
+import { TabOptionProps } from '@magmamath/react-native-ui'
+import { isKeyboardUnitsGroupType } from '../helpers'
 
 export const useUnitTabs = () => {
   const t = useText()
@@ -14,44 +11,33 @@ export const useUnitTabs = () => {
 
   const allTabs = useMemo<UnitTab[]>(
     () => [
-      {
-        title: t('keyboard.length'),
-        key: KeyboardUnitsGroupType.LENGTH,
-        minWidth: 1005,
-      },
-      {
-        title: t('keyboard.area'),
-        key: KeyboardUnitsGroupType.AREA,
-        minWidth: 1005,
-      },
-      {
-        title: t('keyboard.volume'),
-        key: KeyboardUnitsGroupType.VOLUME,
-        minWidth: 1005,
-      },
-      {
-        title: t('keyboard.weight'),
-        key: KeyboardUnitsGroupType.WEIGHT,
-        minWidth: 1060,
-      },
-      {
-        title: t('keyboard.time'),
-        key: KeyboardUnitsGroupType.TIME,
-        minWidth: 1125,
-      },
+      { title: t('keyboard.length'), key: KeyboardUnitsGroupType.LENGTH },
+      { title: t('keyboard.area'), key: KeyboardUnitsGroupType.AREA, minWidth: 1005 },
+      { title: t('keyboard.volume'), key: KeyboardUnitsGroupType.VOLUME, minWidth: 1060 },
+      { title: t('keyboard.weight'), key: KeyboardUnitsGroupType.WEIGHT, minWidth: 1060 },
+      { title: t('keyboard.time'), key: KeyboardUnitsGroupType.TIME, minWidth: 1125 },
     ],
     [t],
   )
 
-  const tabs = useMemo(() => allTabs.filter((tab) => width >= tab.minWidth), [allTabs, width])
+  const tabs = useMemo(
+    () => allTabs.filter((tab) => tab.minWidth === undefined || width >= tab.minWidth),
+    [allTabs, width],
+  )
 
-  const [activeTab, setActiveTab] = useState<TabOptionProps>(() => tabs[0])
+  const [activeKey, setActiveKey] = useState<KeyboardUnitsGroupType | undefined>(() => tabs[0]?.key)
 
-  useEffect(() => {
-    if (!tabs.length) return
-    const stillVisible = tabs.some((t) => t.key === activeTab?.key)
-    if (!stillVisible) setActiveTab(tabs[0])
-  }, [tabs, activeTab?.key])
+  const activeTab = useMemo(() => {
+    return tabs.find((t) => t?.key && t.key === activeKey) ?? tabs[0]
+  }, [tabs, activeKey])
 
-  return { tabs, activeTab, setActiveTab }
+  return {
+    tabs,
+    activeTab,
+    setActiveTab: (tab: TabOptionProps) => {
+      if (isKeyboardUnitsGroupType(tab.key)) {
+        setActiveKey(tab.key)
+      }
+    },
+  }
 }

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

@@ -1,4 +1,5 @@
 import { KeyboardGroup, KeyboardKey } from '@magmamath/students-features'
+import { TabOptionProps } from '@magmamath/react-native-ui'
 
 export enum SelectedLayout {
   ALGEBRA = 'algebra',
@@ -16,3 +17,8 @@ export enum KeyboardUnitsGroupType {
 export type UnitKeyboardGroups = {
   keys: KeyboardKey[][]
 } & Omit<KeyboardGroup, 'keys'>
+
+export type UnitTab = Omit<TabOptionProps, 'key'> & {
+  key: KeyboardUnitsGroupType
+  minWidth?: number
+}