@magmamath/students-features 1.3.26-rc.3 → 1.3.26-rc.4

package/dist/module/features/fluency/hooks/useFluencyModePreset.js

@@ -10,7 +10,7 @@ export const useFluencyModePreset = () => {
   const {
     model
   } = useFluency();
-  const mode = useUnit(model.$mode);
+  const mode = useUnit(model.matrix.$mode);
   const preset = FLUENCY_MODE_PRESETS[mode];
   const legendItems = [{
     label: t('student.fluency.notStarted'),
@@ -18,20 +18,29 @@ export const useFluencyModePreset = () => {
     withBorder: true
   }, {
     label: t('student.fluency.masteryLearning'),
-    color: preset.matrix.mastery[FluencyMasteryLevel.LEARNING]
+    color: preset.matrix.levelColors[FluencyMasteryLevel.LEARNING]
   }, {
     label: t('student.fluency.masteryGrowing'),
-    color: preset.matrix.mastery[FluencyMasteryLevel.GROWING]
+    color: preset.matrix.levelColors[FluencyMasteryLevel.GROWING]
   }, {
     label: t('student.fluency.masteryStrong'),
-    color: preset.matrix.mastery[FluencyMasteryLevel.STRONG]
+    color: preset.matrix.levelColors[FluencyMasteryLevel.STRONG]
   }, {
     label: t('student.fluency.masteryMastered'),
-    color: preset.matrix.mastery[FluencyMasteryLevel.MASTERED]
+    color: preset.matrix.levelColors[FluencyMasteryLevel.MASTERED]
   }];
   return {
-    ...preset,
-    legendItems
+    icon: preset.operatorIcon,
+    label: t(preset.matrix.operatorLabel),
+    colors: {
+      level: preset.matrix.levelColors,
+      accent: preset.accentColor,
+      streak: preset.header.streakColor,
+      button: preset.buttonColor
+    },
+    legend: {
+      items: legendItems
+    }
   };
 };
 //# sourceMappingURL=useFluencyModePreset.js.map

package/dist/module/features/fluency/hooks/useFluencyModePreset.js.map

@@ -1 +1 @@
-{"version":3,"names":["useUnit","COLORS","FLUENCY_MODE_PRESETS","FluencyMasteryLevel","useFluency","useText","useFluencyModePreset","t","model","mode","$mode","preset","legendItems","label","color","NEUTRAL_2","withBorder","matrix","mastery","LEARNING","GROWING","STRONG","MASTERED"],"sourceRoot":"../../../../../src","sources":["features/fluency/hooks/useFluencyModePreset.ts"],"mappings":";;AAAA,SAASA,OAAO,QAAQ,gBAAgB;AACxC,SAASC,MAAM,QAAQ,4BAA4B;AACnD,SAASC,oBAAoB,EAAEC,mBAAmB,QAAQ,yBAAsB;AAEhF,SAASC,UAAU,QAAQ,8BAA2B;AACtD,SAASC,OAAO,QAAQ,uBAAoB;AAI5C,OAAO,MAAMC,oBAAoB,GAAGA,CAAA,KAAkC;EACpE,MAAMC,CAAC,GAAGF,OAAO,CAAC,CAAC;EACnB,MAAM;IAAEG;EAAM,CAAC,GAAGJ,UAAU,CAAC,CAAC;EAC9B,MAAMK,IAAI,GAAGT,OAAO,CAACQ,KAAK,CAACE,KAAK,CAAC;EACjC,MAAMC,MAAM,GAAGT,oBAAoB,CAACO,IAAI,CAAC;EAEzC,MAAMG,WAAyB,GAAG,CAChC;IAAEC,KAAK,EAAEN,CAAC,CAAC,4BAA4B,CAAC;IAAEO,KAAK,EAAEb,MAAM,CAACc,SAAS;IAAEC,UAAU,EAAE;EAAK,CAAC,EACrF;IACEH,KAAK,EAAEN,CAAC,CAAC,iCAAiC,CAAC;IAC3CO,KAAK,EAAEH,MAAM,CAACM,MAAM,CAACC,OAAO,CAACf,mBAAmB,CAACgB,QAAQ;EAC3D,CAAC,EACD;IACEN,KAAK,EAAEN,CAAC,CAAC,gCAAgC,CAAC;IAC1CO,KAAK,EAAEH,MAAM,CAACM,MAAM,CAACC,OAAO,CAACf,mBAAmB,CAACiB,OAAO;EAC1D,CAAC,EACD;IACEP,KAAK,EAAEN,CAAC,CAAC,+BAA+B,CAAC;IACzCO,KAAK,EAAEH,MAAM,CAACM,MAAM,CAACC,OAAO,CAACf,mBAAmB,CAACkB,MAAM;EACzD,CAAC,EACD;IACER,KAAK,EAAEN,CAAC,CAAC,iCAAiC,CAAC;IAC3CO,KAAK,EAAEH,MAAM,CAACM,MAAM,CAACC,OAAO,CAACf,mBAAmB,CAACmB,QAAQ;EAC3D,CAAC,CACF;EAED,OAAO;IAAE,GAAGX,MAAM;IAAEC;EAAY,CAAC;AACnC,CAAC","ignoreList":[]}
+{"version":3,"names":["useUnit","COLORS","FLUENCY_MODE_PRESETS","FluencyMasteryLevel","useFluency","useText","useFluencyModePreset","t","model","mode","matrix","$mode","preset","legendItems","label","color","NEUTRAL_2","withBorder","levelColors","LEARNING","GROWING","STRONG","MASTERED","icon","operatorIcon","operatorLabel","colors","level","accent","accentColor","streak","header","streakColor","button","buttonColor","legend","items"],"sourceRoot":"../../../../../src","sources":["features/fluency/hooks/useFluencyModePreset.ts"],"mappings":";;AACA,SAASA,OAAO,QAAQ,gBAAgB;AACxC,SAASC,MAAM,QAAQ,4BAA4B;AAEnD,SAASC,oBAAoB,EAAEC,mBAAmB,QAAQ,yBAAsB;AAEhF,SAASC,UAAU,QAAQ,8BAA2B;AACtD,SAASC,OAAO,QAAQ,uBAAoB;AAc5C,OAAO,MAAMC,oBAAoB,GAAGA,CAAA,KAAkC;EACpE,MAAMC,CAAC,GAAGF,OAAO,CAAC,CAAC;EACnB,MAAM;IAAEG;EAAM,CAAC,GAAGJ,UAAU,CAAC,CAAC;EAC9B,MAAMK,IAAI,GAAGT,OAAO,CAACQ,KAAK,CAACE,MAAM,CAACC,KAAK,CAAC;EACxC,MAAMC,MAAM,GAAGV,oBAAoB,CAACO,IAAI,CAAC;EAEzC,MAAMI,WAAyB,GAAG,CAChC;IAAEC,KAAK,EAAEP,CAAC,CAAC,4BAA4B,CAAC;IAAEQ,KAAK,EAAEd,MAAM,CAACe,SAAS;IAAEC,UAAU,EAAE;EAAK,CAAC,EACrF;IAAEH,KAAK,EAAEP,CAAC,CAAC,iCAAiC,CAAC;IAAEQ,KAAK,EAAEH,MAAM,CAACF,MAAM,CAACQ,WAAW,CAACf,mBAAmB,CAACgB,QAAQ;EAAE,CAAC,EAC/G;IAAEL,KAAK,EAAEP,CAAC,CAAC,gCAAgC,CAAC;IAAEQ,KAAK,EAAEH,MAAM,CAACF,MAAM,CAACQ,WAAW,CAACf,mBAAmB,CAACiB,OAAO;EAAE,CAAC,EAC7G;IAAEN,KAAK,EAAEP,CAAC,CAAC,+BAA+B,CAAC;IAAEQ,KAAK,EAAEH,MAAM,CAACF,MAAM,CAACQ,WAAW,CAACf,mBAAmB,CAACkB,MAAM;EAAE,CAAC,EAC3G;IAAEP,KAAK,EAAEP,CAAC,CAAC,iCAAiC,CAAC;IAAEQ,KAAK,EAAEH,MAAM,CAACF,MAAM,CAACQ,WAAW,CAACf,mBAAmB,CAACmB,QAAQ;EAAE,CAAC,CAChH;EAED,OAAO;IACLC,IAAI,EAAEX,MAAM,CAACY,YAAY;IACzBV,KAAK,EAAEP,CAAC,CAACK,MAAM,CAACF,MAAM,CAACe,aAAa,CAAC;IACrCC,MAAM,EAAE;MACNC,KAAK,EAAEf,MAAM,CAACF,MAAM,CAACQ,WAAW;MAChCU,MAAM,EAAEhB,MAAM,CAACiB,WAAW;MAC1BC,MAAM,EAAElB,MAAM,CAACmB,MAAM,CAACC,WAAW;MACjCC,MAAM,EAAErB,MAAM,CAACsB;IACjB,CAAC;IACDC,MAAM,EAAE;MAAEC,KAAK,EAAEvB;IAAY;EAC/B,CAAC;AACH,CAAC","ignoreList":[]}

package/dist/module/features/fluency/{components/fluency-solving/FluencyNumpad.js → hooks/useFluencyNumpad.js}

@@ -1,13 +1,14 @@
 "use strict";
 
-import React, { useEffect, useState } from 'react';
-import { StyleSheet, View } from 'react-native';
+import React, { useEffect, useRef, useState } from 'react';
 import { useUnit } from 'effector-react';
-import { ButtonStates, COLORS, FONT_FAMILY, SelectGroup, SelectOptionColor, SelectOptionSize, SPACING } from '@magmamath/react-native-ui';
-import { BackspaceIcon } from "../../../../shared/icons/keyboard/BackspaceIcon.js";
-import { useFluency } from "../../context/FluencyContext.js";
-import { useFluencyModePreset } from "../../hooks/useFluencyModePreset.js";
-import { isWeb } from "../../../../shared/common.constants.js";
+import { ButtonStates, COLORS } from '@magmamath/react-native-ui';
+import { BackspaceIcon } from "../../../shared/icons/keyboard/BackspaceIcon.js";
+import { useFluency } from "../context/FluencyContext.js";
+import { useFluencyModePreset } from "./useFluencyModePreset.js";
+import { isWeb } from "../../../shared/common.constants.js";
+import { KeyboardKeys } from "../../../lib/constants.js";
+import { MAX_INPUT_LENGTH } from "../fluency.constants.js";
 import { jsx as _jsx } from "react/jsx-runtime";
 const ACTION_KEY_COLOR_SCHEME = {
   [ButtonStates.DEFAULT]: {
@@ -60,51 +61,36 @@ const NUMPAD_KEYS = [{
   title: '9',
   value: 9
 }, {
-  key: 'backspace',
+  key: KeyboardKeys.BACKSPACE,
   title: /*#__PURE__*/_jsx(BackspaceIcon, {
     size: 20,
     color: COLORS.NEUTRAL_9
   }),
-  value: 'backspace',
+  value: KeyboardKeys.BACKSPACE,
   customColorScheme: ACTION_KEY_COLOR_SCHEME
 }, {
   key: '0',
   title: '0',
   value: 0
 }, {
-  key: 'enter',
+  key: KeyboardKeys.ENTER,
   title: 'Enter',
-  value: 'enter',
+  value: KeyboardKeys.ENTER,
   customColorScheme: ACTION_KEY_COLOR_SCHEME
 }];
-export const FluencyNumpad = ({
+export const useFluencyNumpad = ({
   onEnterPress
 }) => {
   const {
     model
   } = useFluency();
-  const uiMode = useFluencyModePreset();
-  const input = useUnit(model.input.$state);
+  const modePreset = useFluencyModePreset();
+  const answer = useUnit(model.solving.$answer);
   const [pressedKey, setPressedKey] = useState(null);
-  useEffect(() => {
-    if (!isWeb) return;
-    let timeoutId;
-    const handleKeyDown = event => {
-      let numpadKey = null;
-      if (/^\d$/.test(event.key)) numpadKey = event.key;else if (event.key === 'Backspace') numpadKey = 'backspace';else if (event.key === 'Enter') numpadKey = 'enter';
-      if (!numpadKey) return;
-      clearTimeout(timeoutId);
-      setPressedKey(numpadKey);
-      timeoutId = setTimeout(() => setPressedKey(null), 175);
-    };
-    window.addEventListener('keydown', handleKeyDown);
-    return () => {
-      window.removeEventListener('keydown', handleKeyDown);
-      clearTimeout(timeoutId);
-    };
-  }, []);
-  const accentColor = uiMode.accentColor;
-  const accentBorderColor = uiMode.matrix.mastery.mastered;
+  const answerRef = useRef(answer);
+  answerRef.current = answer;
+  const accentColor = modePreset.colors.accent;
+  const accentBorderColor = modePreset.colors.level.mastered;
   const enterAccentScheme = {
     [ButtonStates.DEFAULT]: {
       backgroundColor: accentColor,
@@ -136,61 +122,51 @@ export const FluencyNumpad = ({
     customColorScheme,
     ...props
   }) => {
-    const isEnterKey = value === 'enter';
-    const colorScheme = isEnterKey && input ? enterAccentScheme : customColorScheme;
+    const isEnterKey = value === KeyboardKeys.ENTER;
+    const colorScheme = isEnterKey && answer ? enterAccentScheme : customColorScheme;
     return {
       ...props,
       selected: pressedKey === props.key,
       customColorScheme: colorScheme,
       onPressIn: () => {
-        if (value === 'backspace') return model.input.set({
-          erase: 'latest'
-        });
-        if (value === 'enter') return onEnterPress();
-        model.input.set({
-          value
-        });
-      }
-    };
-  });
-  return /*#__PURE__*/_jsx(View, {
-    style: styles.container,
-    children: /*#__PURE__*/_jsx(SelectGroup, {
-      numOfRows: 4,
-      color: SelectOptionColor.GREY,
-      size: SelectOptionSize.SMALL,
-      options: options,
-      style: {
-        container: styles.grid,
-        row: styles.row,
-        option: {
-          button: styles.optionButton,
-          text: styles.optionText
+        if (value === KeyboardKeys.ENTER) {
+          onEnterPress();
+          return;
+        }
+        if (value === KeyboardKeys.BACKSPACE) {
+          const currentStr = answerRef.current !== null ? answerRef.current.toString() : '';
+          const newStr = currentStr.slice(0, -1);
+          model.solving.setAnswer(newStr ? parseInt(newStr, 10) : null);
+          return;
         }
+        const currentStr = answerRef.current !== null ? answerRef.current.toString() : '';
+        if (currentStr.length >= MAX_INPUT_LENGTH) return;
+        model.solving.setAnswer(parseInt(currentStr + value.toString(), 10));
       }
-    })
+    };
   });
+  useEffect(() => {
+    if (!isWeb) return;
+    let timeoutId;
+    const handleKeyDown = event => {
+      let numpadKey = null;
+      const isEnterKey = event.key === KeyboardKeys.ENTER;
+      const isBackspaceKey = event.key === KeyboardKeys.BACKSPACE;
+      const isDigit = /^\d$/.test(event.key);
+      if (isDigit || isEnterKey || isBackspaceKey) numpadKey = event.key;
+      if (!numpadKey) return;
+      clearTimeout(timeoutId);
+      setPressedKey(numpadKey);
+      timeoutId = setTimeout(() => setPressedKey(null), 175);
+    };
+    window.addEventListener('keydown', handleKeyDown);
+    return () => {
+      window.removeEventListener('keydown', handleKeyDown);
+      clearTimeout(timeoutId);
+    };
+  }, []);
+  return {
+    options
+  };
 };
-const styles = StyleSheet.create({
-  container: {
-    alignItems: 'center',
-    paddingVertical: SPACING[400],
-    marginTop: SPACING[200]
-  },
-  grid: {
-    width: 360,
-    gap: SPACING[200]
-  },
-  row: {
-    gap: SPACING[200]
-  },
-  optionButton: {
-    height: 60
-  },
-  optionText: {
-    fontSize: 24,
-    fontWeight: '700',
-    fontFamily: FONT_FAMILY.buenosAires
-  }
-});
-//# sourceMappingURL=FluencyNumpad.js.map
+//# sourceMappingURL=useFluencyNumpad.js.map

package/dist/module/features/fluency/hooks/useFluencyNumpad.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["React","useEffect","useRef","useState","useUnit","ButtonStates","COLORS","BackspaceIcon","useFluency","useFluencyModePreset","isWeb","KeyboardKeys","MAX_INPUT_LENGTH","jsx","_jsx","ACTION_KEY_COLOR_SCHEME","DEFAULT","backgroundColor","NEUTRAL_3","borderColor","NEUTRAL_5","raiseColor","color","NEUTRAL_9","HOVER","NEUTRAL_2","NEUTRAL_4","NUMPAD_KEYS","key","title","value","BACKSPACE","size","customColorScheme","ENTER","useFluencyNumpad","onEnterPress","model","modePreset","answer","solving","$answer","pressedKey","setPressedKey","answerRef","current","accentColor","colors","accent","accentBorderColor","level","mastered","enterAccentScheme","NEUTRAL_1","PRESSED","ACTIVE","options","map","props","isEnterKey","colorScheme","selected","onPressIn","currentStr","toString","newStr","slice","setAnswer","parseInt","length","timeoutId","handleKeyDown","event","numpadKey","isBackspaceKey","isDigit","test","clearTimeout","setTimeout","window","addEventListener","removeEventListener"],"sourceRoot":"../../../../../src","sources":["features/fluency/hooks/useFluencyNumpad.tsx"],"mappings":"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","ignoreList":[]}

package/dist/module/features/fluency/hooks/useSuccessSound.js

@@ -2,7 +2,6 @@
 
 import { useEffect, useRef } from 'react';
 import { createAudioPlayer } from 'expo-audio';
-// @ts-ignore
 import SUCCESS_SOUND from '../assets/success.mp3';
 export const useSuccessSound = () => {
   const playerRef = useRef(null);

package/dist/module/features/fluency/hooks/useSuccessSound.js.map

@@ -1 +1 @@
-{"version":3,"names":["useEffect","useRef","createAudioPlayer","SUCCESS_SOUND","useSuccessSound","playerRef","player","current","remove","play","seekTo"],"sourceRoot":"../../../../../src","sources":["features/fluency/hooks/useSuccessSound.ts"],"mappings":";;AAAA,SAASA,SAAS,EAAEC,MAAM,QAAQ,OAAO;AACzC,SAAsBC,iBAAiB,QAAQ,YAAY;AAC3D;AACA,OAAOC,aAAa,MAAM,uBAAuB;AAEjD,OAAO,MAAMC,eAAe,GAAGA,CAAA,KAAM;EACnC,MAAMC,SAAS,GAAGJ,MAAM,CAAqB,IAAI,CAAC;EAElDD,SAAS,CAAC,MAAM;IACd,MAAMM,MAAM,GAAGJ,iBAAiB,CAACC,aAAa,CAAC;IAC/CE,SAAS,CAACE,OAAO,GAAGD,MAAM;IAC1B,OAAO,MAAMA,MAAM,CAACE,MAAM,CAAC,CAAC;EAC9B,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMC,IAAI,GAAGA,CAAA,KAAM;IACjBJ,SAAS,CAACE,OAAO,EAAEG,MAAM,CAAC,CAAC,CAAC;IAC5BL,SAAS,CAACE,OAAO,EAAEE,IAAI,CAAC,CAAC;EAC3B,CAAC;EAED,OAAO;IAAEA;EAAK,CAAC;AACjB,CAAC","ignoreList":[]}
+{"version":3,"names":["useEffect","useRef","createAudioPlayer","SUCCESS_SOUND","useSuccessSound","playerRef","player","current","remove","play","seekTo"],"sourceRoot":"../../../../../src","sources":["features/fluency/hooks/useSuccessSound.ts"],"mappings":";;AAAA,SAASA,SAAS,EAAEC,MAAM,QAAQ,OAAO;AACzC,SAAsBC,iBAAiB,QAAQ,YAAY;AAC3D,OAAOC,aAAa,MAAM,uBAAuB;AAEjD,OAAO,MAAMC,eAAe,GAAGA,CAAA,KAAM;EACnC,MAAMC,SAAS,GAAGJ,MAAM,CAAqB,IAAI,CAAC;EAElDD,SAAS,CAAC,MAAM;IACd,MAAMM,MAAM,GAAGJ,iBAAiB,CAACC,aAAa,CAAC;IAC/CE,SAAS,CAACE,OAAO,GAAGD,MAAM;IAC1B,OAAO,MAAMA,MAAM,CAACE,MAAM,CAAC,CAAC;EAC9B,CAAC,EAAE,EAAE,CAAC;EAEN,MAAMC,IAAI,GAAGA,CAAA,KAAM;IACjBJ,SAAS,CAACE,OAAO,EAAEG,MAAM,CAAC,CAAC,CAAC;IAC5BL,SAAS,CAACE,OAAO,EAAEE,IAAI,CAAC,CAAC;EAC3B,CAAC;EAED,OAAO;IAAEA;EAAK,CAAC;AACjB,CAAC","ignoreList":[]}

package/dist/module/features/fluency/model/FluencyApiModel.js

@@ -1,6 +1,11 @@
 "use strict";
 
+import { createEffect } from 'effector';
 export class FluencyApiModel {
-  constructor({}) {}
+  constructor(api) {
+    this.getMatrixFx = createEffect(api.getMatrix);
+    this.getWeeklyStatsFx = createEffect(() => api.getWeeklyStats());
+    this.postAttemptFx = createEffect(api.postAttempt);
+  }
 }
 //# sourceMappingURL=FluencyApiModel.js.map

package/dist/module/features/fluency/model/FluencyApiModel.js.map

@@ -1 +1 @@
-{"version":3,"names":["FluencyApiModel","constructor"],"sourceRoot":"../../../../../src","sources":["features/fluency/model/FluencyApiModel.ts"],"mappings":";;AAEA,OAAO,MAAMA,eAAe,CAAC;EAC3BC,WAAWA,CAAC,CAAkB,CAAC,EAAE,CAAC;AACpC","ignoreList":[]}
+{"version":3,"names":["createEffect","FluencyApiModel","constructor","api","getMatrixFx","getMatrix","getWeeklyStatsFx","getWeeklyStats","postAttemptFx","postAttempt"],"sourceRoot":"../../../../../src","sources":["features/fluency/model/FluencyApiModel.ts"],"mappings":";;AAAA,SAASA,YAAY,QAAgB,UAAU;AAU/C,OAAO,MAAMC,eAAe,CAAC;EAK3BC,WAAWA,CAACC,GAA6B,EAAE;IACzC,IAAI,CAACC,WAAW,GAAGJ,YAAY,CAACG,GAAG,CAACE,SAAS,CAAC;IAC9C,IAAI,CAACC,gBAAgB,GAAGN,YAAY,CAAC,MAAMG,GAAG,CAACI,cAAc,CAAC,CAAC,CAAC;IAChE,IAAI,CAACC,aAAa,GAAGR,YAAY,CAACG,GAAG,CAACM,WAAW,CAAC;EACpD;AACF","ignoreList":[]}

package/dist/module/features/fluency/model/FluencyDaysStreakModel.js

@@ -1,4 +1,11 @@
 "use strict";
 
-export class FluencyDaysStreakModel {}
+import { createStore } from 'effector';
+export class FluencyDaysStreakModel {
+  $stats = createStore(null);
+  constructor(api) {
+    this.api = api;
+    this.$stats.on(this.api.getWeeklyStatsFx.doneData, (_, data) => data);
+  }
+}
 //# sourceMappingURL=FluencyDaysStreakModel.js.map

package/dist/module/features/fluency/model/FluencyDaysStreakModel.js.map

@@ -1 +1 @@
-{"version":3,"names":["FluencyDaysStreakModel"],"sourceRoot":"../../../../../src","sources":["features/fluency/model/FluencyDaysStreakModel.ts"],"mappings":";;AAAA,OAAO,MAAMA,sBAAsB,CAAC","ignoreList":[]}
+{"version":3,"names":["createStore","FluencyDaysStreakModel","$stats","constructor","api","on","getWeeklyStatsFx","doneData","_","data"],"sourceRoot":"../../../../../src","sources":["features/fluency/model/FluencyDaysStreakModel.ts"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,UAAU;AAItC,OAAO,MAAMC,sBAAsB,CAAC;EAClBC,MAAM,GAAGF,WAAW,CAAgC,IAAI,CAAC;EAEzEG,WAAWA,CAAkBC,GAAoB,EAAE;IAAA,KAAtBA,GAAoB,GAApBA,GAAoB;IAC/C,IAAI,CAACF,MAAM,CAACG,EAAE,CAAC,IAAI,CAACD,GAAG,CAACE,gBAAgB,CAACC,QAAQ,EAAE,CAACC,CAAC,EAAEC,IAAI,KAAKA,IAAI,CAAC;EACvE;AACF","ignoreList":[]}

package/dist/module/features/fluency/model/FluencyMatrixModel.js

@@ -1,4 +1,19 @@
 "use strict";
 
-export class FluencyMatrixModel {}
+import { combine, createEvent, createStore, restore } from 'effector';
+import { FluencyMode } from "../fluency.constants.js";
+import { buildMatrixGrid } from "../fluency.helpers.js";
+export class FluencyMatrixModel {
+  setMode = createEvent();
+  $mode = restore(this.setMode, FluencyMode.ADDITION);
+  $data = createStore(null);
+  $matrix = combine(this.$data, this.$mode, (data, mode) => {
+    if (!data) return null;
+    return buildMatrixGrid(data, mode);
+  });
+  constructor(api) {
+    this.api = api;
+    this.$data.on(api.getMatrixFx.doneData, (_, data) => data);
+  }
+}
 //# sourceMappingURL=FluencyMatrixModel.js.map

package/dist/module/features/fluency/model/FluencyMatrixModel.js.map

@@ -1 +1 @@
-{"version":3,"names":["FluencyMatrixModel"],"sourceRoot":"../../../../../src","sources":["features/fluency/model/FluencyMatrixModel.ts"],"mappings":";;AAAA,OAAO,MAAMA,kBAAkB,CAAC","ignoreList":[]}
+{"version":3,"names":["combine","createEvent","createStore","restore","FluencyMode","buildMatrixGrid","FluencyMatrixModel","setMode","$mode","ADDITION","$data","$matrix","data","mode","constructor","api","on","getMatrixFx","doneData","_"],"sourceRoot":"../../../../../src","sources":["features/fluency/model/FluencyMatrixModel.ts"],"mappings":";;AAAA,SAASA,OAAO,EAAEC,WAAW,EAAEC,WAAW,EAAEC,OAAO,QAAQ,UAAU;AACrE,SAASC,WAAW,QAAQ,yBAAsB;AAClD,SAASC,eAAe,QAAQ,uBAAoB;AAIpD,OAAO,MAAMC,kBAAkB,CAAC;EACdC,OAAO,GAAGN,WAAW,CAAc,CAAC;EACpCO,KAAK,GAAGL,OAAO,CAAC,IAAI,CAACI,OAAO,EAAEH,WAAW,CAACK,QAAQ,CAAC;EAEnDC,KAAK,GAAGR,WAAW,CAA2B,IAAI,CAAC;EACnDS,OAAO,GAAGX,OAAO,CAAC,IAAI,CAACU,KAAK,EAAE,IAAI,CAACF,KAAK,EAAE,CAACI,IAAI,EAAEC,IAAI,KAAwB;IAC3F,IAAI,CAACD,IAAI,EAAE,OAAO,IAAI;IACtB,OAAOP,eAAe,CAACO,IAAI,EAAEC,IAAI,CAAC;EACpC,CAAC,CAAC;EAEFC,WAAWA,CAAkBC,GAAoB,EAAE;IAAA,KAAtBA,GAAoB,GAApBA,GAAoB;IAC/C,IAAI,CAACL,KAAK,CAACM,EAAE,CAACD,GAAG,CAACE,WAAW,CAACC,QAAQ,EAAE,CAACC,CAAC,EAAEP,IAAI,KAAKA,IAAI,CAAC;EAC5D;AACF","ignoreList":[]}

package/dist/module/features/fluency/model/FluencyModel.js

@@ -1,44 +1,28 @@
 "use strict";
 
-import { attach, createEvent, restore, sample } from 'effector';
-import { FluencyMode } from "../fluency.constants.js";
+import { sample } from 'effector';
+import { createGate } from 'effector-react';
+import { not } from 'patronum/not';
 import { FluencyDaysStreakModel } from "./FluencyDaysStreakModel.js";
 import { FluencyMatrixModel } from "./FluencyMatrixModel.js";
 import { FluencyApiModel } from "./FluencyApiModel.js";
 import { FluencySolvingModel } from "./FluencySolvingModel.js";
-import { FluencyInputModel } from "./FluencyInputModel.js";
 export class FluencyModel {
-  setMode = createEvent();
-  $mode = restore(this.setMode, FluencyMode.ADDITION);
-  checkAnswer() {
-    return Number(this.input.$state.getState()) === this.solving.$problem.getState().answer;
-  }
+  gate = createGate();
   constructor({
     api
   }) {
     this.api = new FluencyApiModel(api);
-    this.streak = new FluencyDaysStreakModel();
-    this.matrix = new FluencyMatrixModel();
-    this.solving = new FluencySolvingModel();
-    this.input = new FluencyInputModel();
-    this.submitFx = attach({
-      source: {
-        input: this.input.$state,
-        problem: this.solving.$problem
-      },
-      effect: ({
-        input,
-        problem
-      }) => ({
-        isCorrect: Number(input) === problem.answer
-      })
-    });
+    this.streak = new FluencyDaysStreakModel(this.api);
+    this.matrix = new FluencyMatrixModel(this.api);
+    this.solving = new FluencySolvingModel(this.matrix);
+    this.init();
+  }
+  init() {
     sample({
-      clock: this.submitFx.done,
-      fn: () => ({
-        erase: 'all'
-      }),
-      target: this.input.set
+      clock: this.gate.open,
+      filter: not(this.api.getMatrixFx.pending),
+      target: [this.api.getMatrixFx, this.api.getWeeklyStatsFx]
     });
   }
 }

package/dist/module/features/fluency/model/FluencyModel.js.map

@@ -1 +1 @@
-{"version":3,"names":["attach","createEvent","restore","sample","FluencyMode","FluencyDaysStreakModel","FluencyMatrixModel","FluencyApiModel","FluencySolvingModel","FluencyInputModel","FluencyModel","setMode","$mode","ADDITION","checkAnswer","Number","input","$state","getState","solving","$problem","answer","constructor","api","streak","matrix","submitFx","source","problem","effect","isCorrect","clock","done","fn","erase","target","set"],"sourceRoot":"../../../../../src","sources":["features/fluency/model/FluencyModel.ts"],"mappings":";;AAAA,SAASA,MAAM,EAAEC,WAAW,EAAEC,OAAO,EAAEC,MAAM,QAAQ,UAAU;AAE/D,SAASC,WAAW,QAAQ,yBAAsB;AAClD,SAASC,sBAAsB,QAAQ,6BAA0B;AACjE,SAASC,kBAAkB,QAAQ,yBAAsB;AACzD,SAASC,eAAe,QAAQ,sBAAmB;AACnD,SAASC,mBAAmB,QAAQ,0BAAuB;AAC3D,SAASC,iBAAiB,QAAQ,wBAAqB;AAQvD,OAAO,MAAMC,YAAY,CAAC;EAQRC,OAAO,GAAGV,WAAW,CAAc,CAAC;EACpCW,KAAK,GAAGV,OAAO,CAAC,IAAI,CAACS,OAAO,EAAEP,WAAW,CAACS,QAAQ,CAAC;EAE5DC,WAAWA,CAAA,EAAY;IAC5B,OAAOC,MAAM,CAAC,IAAI,CAACC,KAAK,CAACC,MAAM,CAACC,QAAQ,CAAC,CAAC,CAAC,KAAK,IAAI,CAACC,OAAO,CAACC,QAAQ,CAACF,QAAQ,CAAC,CAAC,CAACG,MAAM;EACzF;EAEAC,WAAWA,CAAC;IAAEC;EAAuB,CAAC,EAAE;IACtC,IAAI,CAACA,GAAG,GAAG,IAAIhB,eAAe,CAACgB,GAAG,CAAC;IACnC,IAAI,CAACC,MAAM,GAAG,IAAInB,sBAAsB,CAAC,CAAC;IAC1C,IAAI,CAACoB,MAAM,GAAG,IAAInB,kBAAkB,CAAC,CAAC;IACtC,IAAI,CAACa,OAAO,GAAG,IAAIX,mBAAmB,CAAC,CAAC;IACxC,IAAI,CAACQ,KAAK,GAAG,IAAIP,iBAAiB,CAAC,CAAC;IAEpC,IAAI,CAACiB,QAAQ,GAAG1B,MAAM,CAAC;MACrB2B,MAAM,EAAE;QAAEX,KAAK,EAAE,IAAI,CAACA,KAAK,CAACC,MAAM;QAAEW,OAAO,EAAE,IAAI,CAACT,OAAO,CAACC;MAAS,CAAC;MACpES,MAAM,EAAEA,CAAC;QAAEb,KAAK;QAAEY;MAAQ,CAAC,MAAM;QAAEE,SAAS,EAAEf,MAAM,CAACC,KAAK,CAAC,KAAKY,OAAO,CAACP;MAAO,CAAC;IAClF,CAAC,CAAC;IAEFlB,MAAM,CAAC;MACL4B,KAAK,EAAE,IAAI,CAACL,QAAQ,CAACM,IAAI;MACzBC,EAAE,EAAEA,CAAA,MAAO;QAAEC,KAAK,EAAE;MAAe,CAAC,CAAC;MACrCC,MAAM,EAAE,IAAI,CAACnB,KAAK,CAACoB;IACrB,CAAC,CAAC;EACJ;AACF","ignoreList":[]}
+{"version":3,"names":["sample","createGate","not","FluencyDaysStreakModel","FluencyMatrixModel","FluencyApiModel","FluencySolvingModel","FluencyModel","gate","constructor","api","streak","matrix","solving","init","clock","open","filter","getMatrixFx","pending","target","getWeeklyStatsFx"],"sourceRoot":"../../../../../src","sources":["features/fluency/model/FluencyModel.ts"],"mappings":";;AAAA,SAASA,MAAM,QAAQ,UAAU;AACjC,SAASC,UAAU,QAAQ,gBAAgB;AAC3C,SAASC,GAAG,QAAQ,cAAc;AAClC,SAASC,sBAAsB,QAAQ,6BAA0B;AACjE,SAASC,kBAAkB,QAAQ,yBAAsB;AACzD,SAASC,eAAe,QAAQ,sBAAmB;AACnD,SAASC,mBAAmB,QAAQ,0BAAuB;AAG3D,OAAO,MAAMC,YAAY,CAAC;EACRC,IAAI,GAAGP,UAAU,CAAwB,CAAC;EAO1DQ,WAAWA,CAAC;IAAEC;EAAuB,CAAC,EAAE;IACtC,IAAI,CAACA,GAAG,GAAG,IAAIL,eAAe,CAACK,GAAG,CAAC;IACnC,IAAI,CAACC,MAAM,GAAG,IAAIR,sBAAsB,CAAC,IAAI,CAACO,GAAG,CAAC;IAClD,IAAI,CAACE,MAAM,GAAG,IAAIR,kBAAkB,CAAC,IAAI,CAACM,GAAG,CAAC;IAC9C,IAAI,CAACG,OAAO,GAAG,IAAIP,mBAAmB,CAAC,IAAI,CAACM,MAAM,CAAC;IAEnD,IAAI,CAACE,IAAI,CAAC,CAAC;EACb;EAEQA,IAAIA,CAAA,EAAG;IACbd,MAAM,CAAC;MACLe,KAAK,EAAE,IAAI,CAACP,IAAI,CAACQ,IAAI;MACrBC,MAAM,EAAEf,GAAG,CAAC,IAAI,CAACQ,GAAG,CAACQ,WAAW,CAACC,OAAO,CAAC;MACzCC,MAAM,EAAE,CAAC,IAAI,CAACV,GAAG,CAACQ,WAAW,EAAE,IAAI,CAACR,GAAG,CAACW,gBAAgB;IAC1D,CAAC,CAAC;EACJ;AACF","ignoreList":[]}

package/dist/module/features/fluency/model/FluencySolvingModel.js

@@ -1,11 +1,63 @@
 "use strict";
 
-import { createStore } from 'effector';
+import { createEvent, restore } from 'effector';
+import { SESSION_LENGTH, TIME_THRESHOLD_MS } from "../fluency.constants.js";
+import { calculateNextBox, selectNextFact, toSolvingFacts } from "../components/fluency-solving/fluencySolving.helpers.js";
 export class FluencySolvingModel {
-  $problem = createStore({
-    left: 6,
-    right: 6,
-    answer: 36
-  });
+  reset = createEvent();
+  setAnswer = createEvent();
+  setFacts = createEvent();
+  setCurrent = createEvent();
+  setOutcomes = createEvent();
+  setSessionStartTime = createEvent();
+  setQuestionStartTime = createEvent();
+  $answer = restore(this.setAnswer, null).reset(this.reset);
+  $facts = restore(this.setFacts, []).reset(this.reset);
+  $current = restore(this.setCurrent, null).reset(this.reset);
+  $outcomes = restore(this.setOutcomes, []).reset(this.reset);
+  $sessionStartTime = restore(this.setSessionStartTime, 0).reset(this.reset);
+  $questionStartTime = restore(this.setQuestionStartTime, 0).reset(this.reset);
+  constructor(matrixModel) {
+    this.matrixModel = matrixModel;
+  }
+  start(mode) {
+    const data = this.matrixModel.$data.getState();
+    if (!data) return;
+    const facts = mode ? toSolvingFacts(data.operations[mode].facts, mode) : Object.entries(data.operations).flatMap(([op, operation]) => toSolvingFacts(operation.facts, op));
+    this.setFacts(facts);
+    this.setCurrent(selectNextFact(facts, Date.now()));
+    this.setOutcomes([]);
+    this.setSessionStartTime(Date.now());
+    this.setQuestionStartTime(Date.now());
+  }
+  submit() {
+    const facts = this.$facts.getState();
+    const current = this.$current.getState();
+    const answer = this.$answer.getState();
+    const outcomes = this.$outcomes.getState();
+    if (!current || outcomes.length >= SESSION_LENGTH) return;
+    const timeTakenMs = Date.now() - this.$questionStartTime.getState();
+    const isCorrect = answer !== null && answer === current.answer;
+    const isFast = timeTakenMs < TIME_THRESHOLD_MS;
+    const newBox = calculateNextBox({
+      currentBox: current.box,
+      isCorrect,
+      isFast,
+      sessionStartBox: current.sessionStartBox,
+      hasFailedThisSession: current.hasFailedThisSession
+    });
+    const updatedFact = {
+      ...current,
+      box: newBox,
+      lastSeenMs: Date.now(),
+      hasFailedThisSession: current.hasFailedThisSession || !isCorrect
+    };
+    const updatedFacts = facts.map(f => f.id === current.id ? updatedFact : f);
+    this.setFacts(updatedFacts);
+    this.setCurrent(selectNextFact(updatedFacts, Date.now()));
+    this.setQuestionStartTime(Date.now());
+    this.setOutcomes([...outcomes, isCorrect ? 'correct' : 'wrong']);
+    this.setAnswer(null);
+  }
 }
 //# sourceMappingURL=FluencySolvingModel.js.map

package/dist/module/features/fluency/model/FluencySolvingModel.js.map

@@ -1 +1 @@
-{"version":3,"names":["createStore","FluencySolvingModel","$problem","left","right","answer"],"sourceRoot":"../../../../../src","sources":["features/fluency/model/FluencySolvingModel.ts"],"mappings":";;AAAA,SAASA,WAAW,QAAQ,UAAU;AAQtC,OAAO,MAAMC,mBAAmB,CAAC;EACfC,QAAQ,GAAGF,WAAW,CAAU;IAAEG,IAAI,EAAE,CAAC;IAAEC,KAAK,EAAE,CAAC;IAAEC,MAAM,EAAE;EAAG,CAAC,CAAC;AACpF","ignoreList":[]}
+{"version":3,"names":["createEvent","restore","SESSION_LENGTH","TIME_THRESHOLD_MS","calculateNextBox","selectNextFact","toSolvingFacts","FluencySolvingModel","reset","setAnswer","setFacts","setCurrent","setOutcomes","setSessionStartTime","setQuestionStartTime","$answer","$facts","$current","$outcomes","$sessionStartTime","$questionStartTime","constructor","matrixModel","start","mode","data","$data","getState","facts","operations","Object","entries","flatMap","op","operation","Date","now","submit","current","answer","outcomes","length","timeTakenMs","isCorrect","isFast","newBox","currentBox","box","sessionStartBox","hasFailedThisSession","updatedFact","lastSeenMs","updatedFacts","map","f","id"],"sourceRoot":"../../../../../src","sources":["features/fluency/model/FluencySolvingModel.ts"],"mappings":"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","ignoreList":[]}

package/dist/module/lib/constants.js

@@ -2,6 +2,7 @@
 
 export let KeyboardKeys = /*#__PURE__*/function (KeyboardKeys) {
   KeyboardKeys["ENTER"] = "Enter";
+  KeyboardKeys["BACKSPACE"] = "Backspace";
   return KeyboardKeys;
 }({});
 //# sourceMappingURL=constants.js.map

package/dist/module/lib/constants.js.map

@@ -1 +1 @@
-{"version":3,"names":["KeyboardKeys"],"sourceRoot":"../../../src","sources":["lib/constants.ts"],"mappings":";;AAAA,WAAYA,YAAY,0BAAZA,YAAY;EAAZA,YAAY;EAAA,OAAZA,YAAY;AAAA","ignoreList":[]}
+{"version":3,"names":["KeyboardKeys"],"sourceRoot":"../../../src","sources":["lib/constants.ts"],"mappings":";;AAAA,WAAYA,YAAY,0BAAZA,YAAY;EAAZA,YAAY;EAAZA,YAAY;EAAA,OAAZA,YAAY;AAAA","ignoreList":[]}

package/dist/typescript/commonjs/features/fluency/components/Fluency.d.ts

@@ -3,11 +3,12 @@ import type { FluencyModel } from '../model/FluencyModel';
 import type { FluencyMode } from '../fluency.constants';
 type FluencyProps = {
     model: FluencyModel;
+    grade: number;
     onMenuPress?: () => void;
     onStartPress?: () => void;
     onPracticePress?: () => void;
     onModeSelectPress?: (mode: FluencyMode) => void;
 };
-export declare const Fluency: ({ model, onMenuPress, onStartPress, onPracticePress, onModeSelectPress, }: FluencyProps) => React.JSX.Element;
+export declare const Fluency: ({ model, grade, onMenuPress, onStartPress, onPracticePress, onModeSelectPress, }: FluencyProps) => React.JSX.Element;
 export {};
 //# sourceMappingURL=Fluency.d.ts.map

package/dist/typescript/commonjs/features/fluency/components/Fluency.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Fluency.d.ts","sourceRoot":"","sources":["../../../../../../src/features/fluency/components/Fluency.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAezB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAEzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAKvD,KAAK,YAAY,GAAG;IAClB,KAAK,EAAE,YAAY,CAAA;IACnB,WAAW,CAAC,EAAE,MAAM,IAAI,CAAA;IACxB,YAAY,CAAC,EAAE,MAAM,IAAI,CAAA;IACzB,eAAe,CAAC,EAAE,MAAM,IAAI,CAAA;IAC5B,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,CAAA;CAChD,CAAA;AAED,eAAO,MAAM,OAAO,8EAMjB,YAAY,sBAqCd,CAAA"}
+{"version":3,"file":"Fluency.d.ts","sourceRoot":"","sources":["../../../../../../src/features/fluency/components/Fluency.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAWzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAEvD,KAAK,YAAY,GAAG;IAClB,KAAK,EAAE,YAAY,CAAA;IACnB,KAAK,EAAE,MAAM,CAAA;IACb,WAAW,CAAC,EAAE,MAAM,IAAI,CAAA;IACxB,YAAY,CAAC,EAAE,MAAM,IAAI,CAAA;IACzB,eAAe,CAAC,EAAE,MAAM,IAAI,CAAA;IAC5B,iBAAiB,CAAC,EAAE,CAAC,IAAI,EAAE,WAAW,KAAK,IAAI,CAAA;CAChD,CAAA;AAED,eAAO,MAAM,OAAO,qFAOjB,YAAY,sBA0Bd,CAAA"}

package/dist/typescript/commonjs/features/fluency/components/FluencySolving.d.ts

@@ -3,7 +3,8 @@ import type { FluencyModel } from '../model/FluencyModel';
 type FluencySolvingProps = {
     model: FluencyModel;
     onClosePress?: () => void;
+    onEndModalPress?: () => void;
 };
-export declare const FluencySolving: ({ model, onClosePress }: FluencySolvingProps) => React.JSX.Element;
+export declare const FluencySolving: ({ model, onClosePress, onEndModalPress }: FluencySolvingProps) => React.JSX.Element;
 export {};
 //# sourceMappingURL=FluencySolving.d.ts.map

package/dist/typescript/commonjs/features/fluency/components/FluencySolving.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FluencySolving.d.ts","sourceRoot":"","sources":["../../../../../../src/features/fluency/components/FluencySolving.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAMzD,KAAK,mBAAmB,GAAG;IACzB,KAAK,EAAE,YAAY,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,IAAI,CAAA;CAC1B,CAAA;AAED,eAAO,MAAM,cAAc,4BAA6B,mBAAmB,sBAU1E,CAAA"}
+{"version":3,"file":"FluencySolving.d.ts","sourceRoot":"","sources":["../../../../../../src/features/fluency/components/FluencySolving.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAIzB,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAA;AAQzD,KAAK,mBAAmB,GAAG;IACzB,KAAK,EAAE,YAAY,CAAA;IACnB,YAAY,CAAC,EAAE,MAAM,IAAI,CAAA;IACzB,eAAe,CAAC,EAAE,MAAM,IAAI,CAAA;CAC7B,CAAA;AAED,eAAO,MAAM,cAAc,6CAA8C,mBAAmB,sBA+B3F,CAAA"}

package/dist/typescript/commonjs/features/fluency/components/day-streak-counter/DayStreak.d.ts

@@ -1,10 +1,12 @@
 import React from 'react';
-import type { FluencyModePreset } from '../../fluency.types';
-type StreakStatus = 'missed' | 'gained' | 'today';
+import { StreakStatus } from '../../fluency.constants';
 type StreakDayProps = {
     label: string;
     status: StreakStatus;
-    streakColor: FluencyModePreset['header']['streakColor'];
+    streakColor: {
+        gained: string;
+        todayBorder: string;
+    };
 };
 export declare const StreakDay: ({ label, status, streakColor }: StreakDayProps) => React.JSX.Element;
 export {};

package/dist/typescript/commonjs/features/fluency/components/day-streak-counter/DayStreak.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DayStreak.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/fluency/components/day-streak-counter/DayStreak.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAA;AAK5D,KAAK,YAAY,GAAG,QAAQ,GAAG,QAAQ,GAAG,OAAO,CAAA;AAEjD,KAAK,cAAc,GAAG;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,YAAY,CAAA;IACpB,WAAW,EAAE,iBAAiB,CAAC,QAAQ,CAAC,CAAC,aAAa,CAAC,CAAA;CACxD,CAAA;AAiCD,eAAO,MAAM,SAAS,mCAAoC,cAAc,sBAavE,CAAA"}
+{"version":3,"file":"DayStreak.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/fluency/components/day-streak-counter/DayStreak.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,YAAY,EAAE,MAAM,yBAAyB,CAAA;AAKtD,KAAK,cAAc,GAAG;IACpB,KAAK,EAAE,MAAM,CAAA;IACb,MAAM,EAAE,YAAY,CAAA;IACpB,WAAW,EAAE;QAAE,MAAM,EAAE,MAAM,CAAC;QAAC,WAAW,EAAE,MAAM,CAAA;KAAE,CAAA;CACrD,CAAA;AAuCD,eAAO,MAAM,SAAS,mCAAoC,cAAc,sBAavE,CAAA"}

package/dist/typescript/commonjs/features/fluency/components/day-streak-counter/DayStreakCounter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DayStreakCounter.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/fluency/components/day-streak-counter/DayStreakCounter.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB,eAAO,MAAM,gBAAgB,yBAqC5B,CAAA"}
+{"version":3,"file":"DayStreakCounter.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/fluency/components/day-streak-counter/DayStreakCounter.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkB,MAAM,OAAO,CAAA;AAiCtC,eAAO,MAAM,gBAAgB,yBAwB5B,CAAA"}

package/dist/typescript/commonjs/features/fluency/components/fluency-solving/components/EquationContent.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"EquationContent.d.ts","sourceRoot":"","sources":["../../../../../../../../src/features/fluency/components/fluency-solving/components/EquationContent.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAWzB,KAAK,oBAAoB,GAAG;IAC1B,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,KAAK,CAAC,EAAE,MAAM,CAAA;CACf,CAAA;AAED,eAAO,MAAM,eAAe,yCAA+C,oBAAoB,sBAsB9F,CAAA"}

package/dist/typescript/{module/features/fluency/components/fluency-solving → commonjs/features/fluency/components/fluency-solving/components}/FluencyEquationCard.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import type { SnapStyles } from '../../hooks/useCardSnapAnimation';
+import type { SnapStyles } from '../../../hooks/useCardSnapAnimation';
 type FluencyEquationCardProps = {
     animationStyles: SnapStyles;
 };

package/dist/typescript/commonjs/features/fluency/components/fluency-solving/components/FluencyEquationCard.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"FluencyEquationCard.d.ts","sourceRoot":"","sources":["../../../../../../../../src/features/fluency/components/fluency-solving/components/FluencyEquationCard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAOzB,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,qCAAqC,CAAA;AAErE,KAAK,wBAAwB,GAAG;IAC9B,eAAe,EAAE,UAAU,CAAA;CAC5B,CAAA;AAED,eAAO,MAAM,mBAAmB,wBAAyB,wBAAwB,sBAuBhF,CAAA"}

package/dist/typescript/commonjs/features/fluency/components/fluency-solving/components/FluencyNumpad.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"FluencyNumpad.d.ts","sourceRoot":"","sources":["../../../../../../../../src/features/fluency/components/fluency-solving/components/FluencyNumpad.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAKzB,KAAK,kBAAkB,GAAG;IACxB,YAAY,EAAE,MAAM,IAAI,CAAA;CACzB,CAAA;AAED,eAAO,MAAM,aAAa,qBAAsB,kBAAkB,sBAqBjE,CAAA"}

package/dist/typescript/commonjs/features/fluency/components/fluency-solving/components/FluencySolvingCard.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"FluencySolvingCard.d.ts","sourceRoot":"","sources":["../../../../../../../../src/features/fluency/components/fluency-solving/components/FluencySolvingCard.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA4B,MAAM,OAAO,CAAA;AAahD,eAAO,MAAM,kBAAkB,yBA6D9B,CAAA"}

package/dist/typescript/commonjs/features/fluency/components/fluency-solving/components/FluencySolvingHeader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"FluencySolvingHeader.d.ts","sourceRoot":"","sources":["../../../../../../../../src/features/fluency/components/fluency-solving/components/FluencySolvingHeader.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAgBzB,KAAK,yBAAyB,GAAG;IAC/B,YAAY,CAAC,EAAE,MAAM,IAAI,CAAA;CAC1B,CAAA;AAED,eAAO,MAAM,oBAAoB,qBAAsB,yBAAyB,sBAoB/E,CAAA"}