@magmamath/students-features 0.4.1 → 0.4.3-rc-0

package/src/features/endOfAssignment/components/NoAnswer/NoAnswer.tsx

@@ -13,8 +13,8 @@ import {
 import { EOAModalContentProps } from '../../types'
 import { NoAnswerContent } from './NoAnswerContent'
 import { PracticeButton } from '../../ui/PracticeButton'
-import { useKeyBoard } from '../../hooks/useKeyboard'
-import { KeyboardKeys } from '../../constants'
+import { useKeyBoard } from '../../../../shared/hooks/useKeyboard'
+import { KeyboardKeys } from '../../../../lib/constants'
 
 export const NoAnswer = ({ model, textContent, onPracticePress }: EOAModalContentProps) => {
   const popUpData = useUnit(model.$popUpData)
@@ -24,8 +24,7 @@ export const NoAnswer = ({ model, textContent, onPracticePress }: EOAModalConten
   const total = stats?.problemsAmount ?? 0
   const buttonColorScheme = isExam ? ButtonColor.YELLOW : ButtonColor.BLUE
 
-  const practiceButtonVisible =
-    !popUpData?.newerAssignmentAvailable && (!isExam || (isExam && !!user?.practiceMode))
+  const practiceButtonVisible = !isExam || !!user?.practiceMode
 
   const handlePrimaryButtonPress = () => {
     isExam ? onPracticePress?.() : model.goToFirstProblemPressed()
@@ -40,14 +39,14 @@ export const NoAnswer = ({ model, textContent, onPracticePress }: EOAModalConten
 
   return (
     <View style={styles.container}>
-      <View style={styles.container}>
+      <View style={styles.textContainer}>
         {!!textContent.title && (
-          <Typography variant="h2" style={{ color: COLORS.NEUTRAL_9 }}>
+          <Typography variant="h2" style={styles.title}>
             {textContent.title}
           </Typography>
         )}
-        {!!textContent.subtitle && (
-          <Typography variant="h4" style={{ color: COLORS.NEUTRAL_7 }}>
+        {!!textContent.subtitle && practiceButtonVisible && (
+          <Typography variant="h4" style={styles.subtitle}>
             {textContent.subtitle}
           </Typography>
         )}
@@ -78,14 +77,25 @@ export const NoAnswer = ({ model, textContent, onPracticePress }: EOAModalConten
 
 const styles = StyleSheet.create({
   container: {
+    height: '100%',
     gap: SPACING[400],
     alignItems: 'center',
+    justifyContent: 'space-between',
   },
   buttonsContainer: {
     flexDirection: 'row',
     alignItems: 'center',
+    justifyContent: 'flex-end',
     gap: SPACING[200],
-    paddingVertical: SPACING[300],
+  },
+  title: {
+    color: COLORS.NEUTRAL_9,
+    marginBottom: SPACING[400],
+    paddingVertical: SPACING[100],
+  },
+  subtitle: { color: COLORS.NEUTRAL_7, paddingVertical: SPACING[100] },
+  textContainer: {
+    alignItems: 'center',
   },
   buttonText: {
     textTransform: 'uppercase',

package/src/features/endOfAssignment/components/NoAnswer/NoAnswerContent.tsx

@@ -60,7 +60,6 @@ const styles = StyleSheet.create({
   container: {
     alignSelf: 'center',
     paddingHorizontal: SPACING[100],
-    marginTop: SPACING[300],
     paddingTop: SPACING[100],
     paddingBottom: 38,
     marginBottom: SPACING[800],

package/src/features/endOfAssignment/constants.ts

@@ -5,10 +5,6 @@ import { AnimatedCardVariant, EOAModalVariant } from './types'
 export const SPARKS_ANIMATION_DELAY = 2000
 export const GOOD_DRAWING_CARD_APPEARENCE_DELAY = 1800
 
-export enum KeyboardKeys {
-  ENTER = 'Enter',
-}
-
 export const MODALS_WITH_BACKGROUND = [
   EOAModalVariant.HAS_CORRECT_ANSWERS,
   EOAModalVariant.HAS_GOOD_DRAWING,

package/src/lib/constants.ts

@@ -0,0 +1,3 @@
+export enum KeyboardKeys {
+    ENTER = 'Enter',
+  }

package/src/lib/helpers/helpers.ts

@@ -1,5 +1,7 @@
 import { getText } from '../../shared/translation/helpers'
 
+export const noop = () => {};
+
 export const generateRandomId = () =>
   Date.now().toString(36) + Math.random().toString(36).substring(2)
 

package/src/{features/endOfAssignment → shared}/hooks/useKeyDownListener.ts

@@ -1,5 +1,6 @@
 import { useEffect, useRef } from 'react'
-import { KeyboardKeys } from '../constants'
+
+import { KeyboardKeys } from '../../lib/constants'
 
 export const useKeyDownListener = (
   callback: (event: KeyboardEvent) => void,

package/src/{features/endOfAssignment → shared}/hooks/useKeyboard.ts

@@ -1,8 +1,7 @@
 import { Platform } from 'react-native';
-import { useKeyDownListener } from './useKeyDownListener';
-
 
-const noop = () => {};
+import { useKeyDownListener } from './useKeyDownListener';
+import { noop } from '../../lib/helpers/helpers';
 
 /**
  * A cross-platform hook for handling keyboard events.

package/dist/commonjs/features/endOfAssignment/hooks/useKeyDownListener.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_react","require","_constants","useKeyDownListener","callback","overrideKeys","KeyboardKeys","ENTER","callbackRef","useRef","current","useEffect","eventHandler","event","includes","key","preventDefault","stopPropagation","document","addEventListener","removeEventListener","exports"],"sourceRoot":"../../../../../src","sources":["features/endOfAssignment/hooks/useKeyDownListener.ts"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,OAAA;AACA,IAAAC,UAAA,GAAAD,OAAA;AAEO,MAAME,kBAAkB,GAAGA,CAChCC,QAAwC,EACxCC,YAAY,GAAG,CAACC,uBAAY,CAACC,KAAK,CAAC,KAChC;EACH,MAAMC,WAAW,GAAG,IAAAC,aAAM,EAACL,QAAQ,CAAC;EACpCI,WAAW,CAACE,OAAO,GAAGN,QAAQ;EAE9B,IAAAO,gBAAS,EAAC,MAAM;IACd,MAAMC,YAAY,GAAIC,KAAoB,IAAK;MAC7C,IAAIR,YAAY,CAACS,QAAQ,CAACD,KAAK,CAACE,GAAmB,CAAC,EAAE;QACpDF,KAAK,CAACG,cAAc,CAAC,CAAC;QACtBH,KAAK,CAACI,eAAe,CAAC,CAAC;MACzB;MAEAT,WAAW,CAACE,OAAO,CAACG,KAAK,CAAC;IAC5B,CAAC;IAEDK,QAAQ,CAACC,gBAAgB,CAAC,SAAS,EAAEP,YAAY,EAAE,IAAI,CAAC;IACxD,OAAO,MAAM;MACXM,QAAQ,CAACE,mBAAmB,CAAC,SAAS,EAAER,YAAY,EAAE,IAAI,CAAC;IAC7D,CAAC;EACH,CAAC,EAAE,EAAE,CAAC;AACR,CAAC;AAAAS,OAAA,CAAAlB,kBAAA,GAAAA,kBAAA","ignoreList":[]}

package/dist/commonjs/features/endOfAssignment/hooks/useKeyboard.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_reactNative","require","_useKeyDownListener","noop","useKeyBoard","exports","Platform","select","native","default","useKeyDownListener"],"sourceRoot":"../../../../../src","sources":["features/endOfAssignment/hooks/useKeyboard.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AACA,IAAAC,mBAAA,GAAAD,OAAA;AAGA,MAAME,IAAI,GAAGA,CAAA,KAAM,CAAC,CAAC;;AAErB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACO,MAAMC,WAAW,GAAAC,OAAA,CAAAD,WAAA,GAAGE,qBAAQ,CAACC,MAAM,CAAC;EACzCC,MAAM,EAAEL,IAAI;EACZM,OAAO,EAAEC;AACX,CAAC,CAAC","ignoreList":[]}

package/dist/module/features/endOfAssignment/hooks/useKeyDownListener.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["useEffect","useRef","KeyboardKeys","useKeyDownListener","callback","overrideKeys","ENTER","callbackRef","current","eventHandler","event","includes","key","preventDefault","stopPropagation","document","addEventListener","removeEventListener"],"sourceRoot":"../../../../../src","sources":["features/endOfAssignment/hooks/useKeyDownListener.ts"],"mappings":";;AAAA,SAASA,SAAS,EAAEC,MAAM,QAAQ,OAAO;AACzC,SAASC,YAAY,QAAQ,iBAAc;AAE3C,OAAO,MAAMC,kBAAkB,GAAGA,CAChCC,QAAwC,EACxCC,YAAY,GAAG,CAACH,YAAY,CAACI,KAAK,CAAC,KAChC;EACH,MAAMC,WAAW,GAAGN,MAAM,CAACG,QAAQ,CAAC;EACpCG,WAAW,CAACC,OAAO,GAAGJ,QAAQ;EAE9BJ,SAAS,CAAC,MAAM;IACd,MAAMS,YAAY,GAAIC,KAAoB,IAAK;MAC7C,IAAIL,YAAY,CAACM,QAAQ,CAACD,KAAK,CAACE,GAAmB,CAAC,EAAE;QACpDF,KAAK,CAACG,cAAc,CAAC,CAAC;QACtBH,KAAK,CAACI,eAAe,CAAC,CAAC;MACzB;MAEAP,WAAW,CAACC,OAAO,CAACE,KAAK,CAAC;IAC5B,CAAC;IAEDK,QAAQ,CAACC,gBAAgB,CAAC,SAAS,EAAEP,YAAY,EAAE,IAAI,CAAC;IACxD,OAAO,MAAM;MACXM,QAAQ,CAACE,mBAAmB,CAAC,SAAS,EAAER,YAAY,EAAE,IAAI,CAAC;IAC7D,CAAC;EACH,CAAC,EAAE,EAAE,CAAC;AACR,CAAC","ignoreList":[]}

package/dist/module/features/endOfAssignment/hooks/useKeyboard.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["Platform","useKeyDownListener","noop","useKeyBoard","select","native","default"],"sourceRoot":"../../../../../src","sources":["features/endOfAssignment/hooks/useKeyboard.ts"],"mappings":";;AAAA,SAASA,QAAQ,QAAQ,cAAc;AACvC,SAASC,kBAAkB,QAAQ,yBAAsB;AAGzD,MAAMC,IAAI,GAAGA,CAAA,KAAM,CAAC,CAAC;;AAErB;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,MAAMC,WAAW,GAAGH,QAAQ,CAACI,MAAM,CAAC;EACzCC,MAAM,EAAEH,IAAI;EACZI,OAAO,EAAEL;AACX,CAAC,CAAC","ignoreList":[]}

package/dist/typescript/commonjs/features/endOfAssignment/hooks/useKeyDownListener.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useKeyDownListener.d.ts","sourceRoot":"","sources":["../../../../../../src/features/endOfAssignment/hooks/useKeyDownListener.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAE3C,eAAO,MAAM,kBAAkB,aACnB,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,wCAqBzC,CAAA"}

package/dist/typescript/commonjs/features/endOfAssignment/hooks/useKeyboard.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useKeyboard.d.ts","sourceRoot":"","sources":["../../../../../../src/features/endOfAssignment/hooks/useKeyboard.ts"],"names":[],"mappings":"AAMA;;;;;;;;GAQG;AACH,eAAO,MAAM,WAAW,0GAGtB,CAAC"}

package/dist/typescript/module/features/endOfAssignment/hooks/useKeyDownListener.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useKeyDownListener.d.ts","sourceRoot":"","sources":["../../../../../../src/features/endOfAssignment/hooks/useKeyDownListener.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,cAAc,CAAA;AAE3C,eAAO,MAAM,kBAAkB,aACnB,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,wCAqBzC,CAAA"}

package/dist/typescript/module/features/endOfAssignment/hooks/useKeyboard.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"useKeyboard.d.ts","sourceRoot":"","sources":["../../../../../../src/features/endOfAssignment/hooks/useKeyboard.ts"],"names":[],"mappings":"AAMA;;;;;;;;GAQG;AACH,eAAO,MAAM,WAAW,0GAGtB,CAAC"}