@magmamath/students-features 1.2.1-rc.33 → 1.2.1-rc.35
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commonjs/features/pmProgress/components/header/PmProgressHeader.js +6 -4
- package/dist/commonjs/features/pmProgress/components/header/PmProgressHeader.js.map +1 -1
- package/dist/commonjs/features/pmProgress/components/list/Fluency.js +6 -2
- package/dist/commonjs/features/pmProgress/components/list/Fluency.js.map +1 -1
- package/dist/module/features/pmProgress/components/header/PmProgressHeader.js +6 -4
- package/dist/module/features/pmProgress/components/header/PmProgressHeader.js.map +1 -1
- package/dist/module/features/pmProgress/components/list/Fluency.js +7 -3
- package/dist/module/features/pmProgress/components/list/Fluency.js.map +1 -1
- package/dist/typescript/commonjs/features/pmProgress/components/header/PmProgressHeader.d.ts.map +1 -1
- package/dist/typescript/commonjs/features/pmProgress/components/list/Fluency.d.ts.map +1 -1
- package/dist/typescript/module/features/pmProgress/components/header/PmProgressHeader.d.ts.map +1 -1
- package/dist/typescript/module/features/pmProgress/components/list/Fluency.d.ts.map +1 -1
- package/package.json +4 -4
- package/src/features/pmProgress/components/header/PmProgressHeader.tsx +7 -4
- package/src/features/pmProgress/components/list/Fluency.tsx +7 -3
|
@@ -51,6 +51,8 @@ const PmProgressHeader = () => {
|
|
|
51
51
|
const isDomainCompleted = domain.standards.every(standard => standard.isCompleted);
|
|
52
52
|
return !isFluency && !isDomainCompleted;
|
|
53
53
|
}));
|
|
54
|
+
const isLoading = loaderOpeningId === _pmProgressConstants.OpeningLoaderId.START_BUTTON;
|
|
55
|
+
const isSkillOpeningActionPending = loaderOpeningId !== null;
|
|
54
56
|
return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
|
|
55
57
|
style: styles.container,
|
|
56
58
|
children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
|
|
@@ -128,10 +130,10 @@ const PmProgressHeader = () => {
|
|
|
128
130
|
model.solving.setLoaderOpeningId(null);
|
|
129
131
|
}
|
|
130
132
|
},
|
|
131
|
-
disabled:
|
|
132
|
-
isLoading:
|
|
133
|
-
isActive:
|
|
134
|
-
withPulsation: !!nextUp
|
|
133
|
+
disabled: isSkillOpeningActionPending,
|
|
134
|
+
isLoading: isLoading,
|
|
135
|
+
isActive: isLoading,
|
|
136
|
+
withPulsation: !!nextUp && !isLoading && !isSkillOpeningActionPending
|
|
135
137
|
})]
|
|
136
138
|
})]
|
|
137
139
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_reactNativeUi","_SketchArrowRight","_SliceDiamondIcon","_index","_effectorReact","_PmProgressContext","_pmProgressHelpers","_pmProgressConstants","_StartButton","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","menuItemProps","style","text","whiteSpace","PmProgressHeader","useText","model","onStartPress","customGradeLabels","readOnly","usePmProgress","isDropdownOpen","setIsDropdownOpen","useState","grade","useUnit","tree","$grade","grades","useStoreMap","store","$grades","keys","fn","map","key","value","title","formatGradeLabel","disabled","isLocked","loaderOpeningId","solving","$loaderOpeningId","nextUp","$domains","domains","find","domain","isFluency","isFluencyDomain","isDomainCompleted","standards","every","standard","isCompleted","jsxs","View","styles","container","children","jsx","Typography","variant","HeadingVariants","H2","dark","Dropdown","isOpen","onDismiss","anchor","Button","ButtonVariant","TERTIARY","onPress","prev","H8","caret","CaretUpIcon","color","COLORS","NEUTRAL_9","CaretDownIcon","Menu","menu","items","onItemPress","item","setGrade","Fragment","content","subtitle","row","tilted","H7","muted","diamond","SliceDiamondIcon","arrow","SketchArrowRight","StartButton","setLoaderOpeningId","
|
|
1
|
+
{"version":3,"names":["_react","_interopRequireWildcard","require","_reactNative","_reactNativeUi","_SketchArrowRight","_SliceDiamondIcon","_index","_effectorReact","_PmProgressContext","_pmProgressHelpers","_pmProgressConstants","_StartButton","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","menuItemProps","style","text","whiteSpace","PmProgressHeader","useText","model","onStartPress","customGradeLabels","readOnly","usePmProgress","isDropdownOpen","setIsDropdownOpen","useState","grade","useUnit","tree","$grade","grades","useStoreMap","store","$grades","keys","fn","map","key","value","title","formatGradeLabel","disabled","isLocked","loaderOpeningId","solving","$loaderOpeningId","nextUp","$domains","domains","find","domain","isFluency","isFluencyDomain","isDomainCompleted","standards","every","standard","isCompleted","isLoading","OpeningLoaderId","START_BUTTON","isSkillOpeningActionPending","jsxs","View","styles","container","children","jsx","Typography","variant","HeadingVariants","H2","dark","Dropdown","isOpen","onDismiss","anchor","Button","ButtonVariant","TERTIARY","onPress","prev","H8","caret","CaretUpIcon","color","COLORS","NEUTRAL_9","CaretDownIcon","Menu","menu","items","onItemPress","item","setGrade","Fragment","content","subtitle","row","tilted","H7","muted","diamond","SliceDiamondIcon","arrow","SketchArrowRight","StartButton","setLoaderOpeningId","skill","start","type","SolvingFlow","MAGMA","isActive","withPulsation","exports","SMALL_SCREEN_THRESHOLD","SMALL_SCREEN_MENU_MAX_HEIGHT","WINDOW_HEIGHT","Dimensions","height","MENU_MAX_HEIGHT","StyleSheet","create","flexDirection","justifyContent","alignItems","marginBottom","SPACING","zIndex","gap","marginLeft","top","minWidth","overflow","maxHeight","Platform","select","web","scrollbarWidth","transform","rotate","marginRight","NEUTRAL_8","bottom"],"sourceRoot":"../../../../../../src","sources":["features/pmProgress/components/header/PmProgressHeader.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -24,6 +24,7 @@ const Fluency = ({
|
|
|
24
24
|
onStandardPress
|
|
25
25
|
} = (0, _PmProgressContext.usePmProgress)();
|
|
26
26
|
const expandedId = (0, _effectorReact.useUnit)(model.highlight.$expandedId);
|
|
27
|
+
const hoveredId = (0, _effectorReact.useUnit)(model.highlight.$hoveredId);
|
|
27
28
|
const loaderOpeningId = (0, _effectorReact.useUnit)(model.solving.$loaderOpeningId);
|
|
28
29
|
if (!data) return null;
|
|
29
30
|
return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
|
|
@@ -38,7 +39,9 @@ const Fluency = ({
|
|
|
38
39
|
})),
|
|
39
40
|
progress: data.scorePercentage,
|
|
40
41
|
color: _reactNativeUi.COLORS.PRIMARY_ORANGE,
|
|
41
|
-
onPress: () => model.highlight.expand(
|
|
42
|
+
onPress: () => model.highlight.expand(data.domainId),
|
|
43
|
+
onHoverIn: () => model.highlight.hover(data.domainId),
|
|
44
|
+
onHoverOut: () => model.highlight.hover(null),
|
|
42
45
|
onItemPress: async item => {
|
|
43
46
|
try {
|
|
44
47
|
model.solving.setLoaderOpeningId(item.id);
|
|
@@ -54,7 +57,8 @@ const Fluency = ({
|
|
|
54
57
|
loadingItemId: loaderOpeningId,
|
|
55
58
|
isFirst: true,
|
|
56
59
|
isLast: true,
|
|
57
|
-
isExpanded: expandedId ===
|
|
60
|
+
isExpanded: expandedId === data.domainId,
|
|
61
|
+
isHighlighted: hoveredId === data.domainId || expandedId === data.domainId,
|
|
58
62
|
icon: /*#__PURE__*/(0, _jsxRuntime.jsx)(_SliceDiamondIcon.SliceDiamondIcon, {
|
|
59
63
|
color: _reactNativeUi.COLORS.PRIMARY_ORANGE
|
|
60
64
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_ListCard","_reactNativeUi","_SliceDiamondIcon","_index","_effectorReact","_pmProgressConstants","_PmProgressContext","_jsxRuntime","e","__esModule","default","Fluency","data","t","useText","model","onStandardPress","usePmProgress","expandedId","useUnit","highlight","$expandedId","loaderOpeningId","solving","$loaderOpeningId","jsxs","View","style","styles","container","children","jsx","separator","ListCard","title","items","standards","map","standard","id","standardId","progress","scorePercentage","color","COLORS","PRIMARY_ORANGE","onPress","expand","
|
|
1
|
+
{"version":3,"names":["_react","_interopRequireDefault","require","_reactNative","_ListCard","_reactNativeUi","_SliceDiamondIcon","_index","_effectorReact","_pmProgressConstants","_PmProgressContext","_jsxRuntime","e","__esModule","default","Fluency","data","t","useText","model","onStandardPress","usePmProgress","expandedId","useUnit","highlight","$expandedId","hoveredId","$hoveredId","loaderOpeningId","solving","$loaderOpeningId","jsxs","View","style","styles","container","children","jsx","separator","ListCard","title","items","standards","map","standard","id","standardId","progress","scorePercentage","color","COLORS","PRIMARY_ORANGE","onPress","expand","domainId","onHoverIn","hover","onHoverOut","onItemPress","item","setLoaderOpeningId","skill","start","type","SolvingFlow","STANDARD","loadingItemId","isFirst","isLast","isExpanded","isHighlighted","icon","SliceDiamondIcon","exports","StyleSheet","create","marginBottom","SPACING","height","marginHorizontal","marginVertical","backgroundColor","NEUTRAL_4"],"sourceRoot":"../../../../../../src","sources":["features/pmProgress/components/list/Fluency.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,YAAA,GAAAD,OAAA;AACA,IAAAE,SAAA,GAAAF,OAAA;AACA,IAAAG,cAAA,GAAAH,OAAA;AACA,IAAAI,iBAAA,GAAAJ,OAAA;AACA,IAAAK,MAAA,GAAAL,OAAA;AACA,IAAAM,cAAA,GAAAN,OAAA;AACA,IAAAO,oBAAA,GAAAP,OAAA;AAEA,IAAAQ,kBAAA,GAAAR,OAAA;AAA+D,IAAAS,WAAA,GAAAT,OAAA;AAAA,SAAAD,uBAAAW,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAC,UAAA,GAAAD,CAAA,KAAAE,OAAA,EAAAF,CAAA;AAMxD,MAAMG,OAAO,GAAGA,CAAC;EAAEC;AAAmB,CAAC,KAAK;EACjD,MAAMC,CAAC,GAAG,IAAAC,cAAO,EAAC,CAAC;EACnB,MAAM;IAAEC,KAAK;IAAEC;EAAgB,CAAC,GAAG,IAAAC,gCAAa,EAAC,CAAC;EAClD,MAAMC,UAAU,GAAG,IAAAC,sBAAO,EAACJ,KAAK,CAACK,SAAS,CAACC,WAAW,CAAC;EACvD,MAAMC,SAAS,GAAG,IAAAH,sBAAO,EAACJ,KAAK,CAACK,SAAS,CAACG,UAAU,CAAC;EACrD,MAAMC,eAAe,GAAG,IAAAL,sBAAO,EAACJ,KAAK,CAACU,OAAO,CAACC,gBAAgB,CAAC;EAE/D,IAAI,CAACd,IAAI,EAAE,OAAO,IAAI;EAEtB,oBACE,IAAAL,WAAA,CAAAoB,IAAA,EAAC5B,YAAA,CAAA6B,IAAI;IAACC,KAAK,EAAEC,MAAM,CAACC,SAAU;IAAAC,QAAA,gBAC5B,IAAAzB,WAAA,CAAA0B,GAAA,EAAClC,YAAA,CAAA6B,IAAI;MAACC,KAAK,EAAEC,MAAM,CAACI;IAAU,CAAE,CAAC,eACjC,IAAA3B,WAAA,CAAA0B,GAAA,EAACjC,SAAA,CAAAmC,QAAQ;MACPC,KAAK,EAAEvB,CAAC,CAAC,oBAAoB,CAAE;MAC/BwB,KAAK,EAAEzB,IAAI,CAAC0B,SAAS,CAACC,GAAG,CAAEC,QAAQ,KAAM;QAAE,GAAGA,QAAQ;QAAEC,EAAE,EAAED,QAAQ,CAACE;MAAW,CAAC,CAAC,CAAE;MACpFC,QAAQ,EAAE/B,IAAI,CAACgC,eAAgB;MAC/BC,KAAK,EAAEC,qBAAM,CAACC,cAAe;MAC7BC,OAAO,EAAEA,CAAA,KAAMjC,KAAK,CAACK,SAAS,CAAC6B,MAAM,CAACrC,IAAI,CAACsC,QAAQ,CAAE;MACrDC,SAAS,EAAEA,CAAA,KAAMpC,KAAK,CAACK,SAAS,CAACgC,KAAK,CAACxC,IAAI,CAACsC,QAAQ,CAAE;MACtDG,UAAU,EAAEA,CAAA,KAAMtC,KAAK,CAACK,SAAS,CAACgC,KAAK,CAAC,IAAI,CAAE;MAC9CE,WAAW,EAAE,MAAOC,IAAI,IAAK;QAC3B,IAAI;UACFxC,KAAK,CAACU,OAAO,CAAC+B,kBAAkB,CAACD,IAAI,CAACd,EAAE,CAAC;UACzC,MAAMgB,KAAK,GAAG,MAAM1C,KAAK,CAACU,OAAO,CAACiC,KAAK,CAAC;YACtCC,IAAI,EAAEC,gCAAW,CAACC,QAAQ;YAC1BnB,UAAU,EAAEa,IAAI,CAACb;UACnB,CAAC,CAAC;UACF,MAAM1B,eAAe,GAAGyC,KAAK,CAAC;QAChC,CAAC,SAAS;UACR1C,KAAK,CAACU,OAAO,CAAC+B,kBAAkB,CAAC,IAAI,CAAC;QACxC;MACF,CAAE;MACFM,aAAa,EAAEtC,eAAgB;MAC/BuC,OAAO;MACPC,MAAM;MACNC,UAAU,EAAE/C,UAAU,KAAKN,IAAI,CAACsC,QAAS;MACzCgB,aAAa,EAAE5C,SAAS,KAAKV,IAAI,CAACsC,QAAQ,IAAIhC,UAAU,KAAKN,IAAI,CAACsC,QAAS;MAC3EiB,IAAI,eAAE,IAAA5D,WAAA,CAAA0B,GAAA,EAAC/B,iBAAA,CAAAkE,gBAAgB;QAACvB,KAAK,EAAEC,qBAAM,CAACC;MAAe,CAAE;IAAE,CAC1D,CAAC;EAAA,CACE,CAAC;AAEX,CAAC;AAAAsB,OAAA,CAAA1D,OAAA,GAAAA,OAAA;AAED,MAAMmB,MAAM,GAAGwC,uBAAU,CAACC,MAAM,CAAC;EAC/BxC,SAAS,EAAE;IACTyC,YAAY,EAAEC,sBAAO,CAAC,GAAG;EAC3B,CAAC;EACDvC,SAAS,EAAE;IACTwC,MAAM,EAAE,CAAC;IACTC,gBAAgB,EAAEF,sBAAO,CAAC,GAAG,CAAC;IAC9BG,cAAc,EAAEH,sBAAO,CAAC,GAAG,CAAC;IAC5BI,eAAe,EAAE/B,qBAAM,CAACgC;EAC1B;AACF,CAAC,CAAC","ignoreList":[]}
|
|
@@ -45,6 +45,8 @@ export const PmProgressHeader = () => {
|
|
|
45
45
|
const isDomainCompleted = domain.standards.every(standard => standard.isCompleted);
|
|
46
46
|
return !isFluency && !isDomainCompleted;
|
|
47
47
|
}));
|
|
48
|
+
const isLoading = loaderOpeningId === OpeningLoaderId.START_BUTTON;
|
|
49
|
+
const isSkillOpeningActionPending = loaderOpeningId !== null;
|
|
48
50
|
return /*#__PURE__*/_jsxs(View, {
|
|
49
51
|
style: styles.container,
|
|
50
52
|
children: [/*#__PURE__*/_jsxs(View, {
|
|
@@ -122,10 +124,10 @@ export const PmProgressHeader = () => {
|
|
|
122
124
|
model.solving.setLoaderOpeningId(null);
|
|
123
125
|
}
|
|
124
126
|
},
|
|
125
|
-
disabled:
|
|
126
|
-
isLoading:
|
|
127
|
-
isActive:
|
|
128
|
-
withPulsation: !!nextUp
|
|
127
|
+
disabled: isSkillOpeningActionPending,
|
|
128
|
+
isLoading: isLoading,
|
|
129
|
+
isActive: isLoading,
|
|
130
|
+
withPulsation: !!nextUp && !isLoading && !isSkillOpeningActionPending
|
|
129
131
|
})]
|
|
130
132
|
})]
|
|
131
133
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","useState","Dimensions","Platform","StyleSheet","View","Button","ButtonVariant","CaretDownIcon","CaretUpIcon","COLORS","Dropdown","HeadingVariants","Menu","SPACING","Typography","SketchArrowRight","SliceDiamondIcon","useText","useUnit","useStoreMap","usePmProgress","formatGradeLabel","isFluencyDomain","OpeningLoaderId","SolvingFlow","StartButton","jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","menuItemProps","style","text","whiteSpace","PmProgressHeader","t","model","onStartPress","customGradeLabels","readOnly","isDropdownOpen","setIsDropdownOpen","grade","tree","$grade","grades","store","$grades","keys","fn","map","key","value","title","disabled","isLocked","loaderOpeningId","solving","$loaderOpeningId","nextUp","$domains","domains","find","domain","isFluency","isDomainCompleted","standards","every","standard","isCompleted","styles","container","children","variant","H2","dark","isOpen","onDismiss","anchor","TERTIARY","onPress","prev","H8","caret","color","NEUTRAL_9","menu","items","onItemPress","item","setGrade","content","subtitle","row","tilted","H7","muted","diamond","arrow","setLoaderOpeningId","
|
|
1
|
+
{"version":3,"names":["React","useState","Dimensions","Platform","StyleSheet","View","Button","ButtonVariant","CaretDownIcon","CaretUpIcon","COLORS","Dropdown","HeadingVariants","Menu","SPACING","Typography","SketchArrowRight","SliceDiamondIcon","useText","useUnit","useStoreMap","usePmProgress","formatGradeLabel","isFluencyDomain","OpeningLoaderId","SolvingFlow","StartButton","jsx","_jsx","jsxs","_jsxs","Fragment","_Fragment","menuItemProps","style","text","whiteSpace","PmProgressHeader","t","model","onStartPress","customGradeLabels","readOnly","isDropdownOpen","setIsDropdownOpen","grade","tree","$grade","grades","store","$grades","keys","fn","map","key","value","title","disabled","isLocked","loaderOpeningId","solving","$loaderOpeningId","nextUp","$domains","domains","find","domain","isFluency","isDomainCompleted","standards","every","standard","isCompleted","isLoading","START_BUTTON","isSkillOpeningActionPending","styles","container","children","variant","H2","dark","isOpen","onDismiss","anchor","TERTIARY","onPress","prev","H8","caret","color","NEUTRAL_9","menu","items","onItemPress","item","setGrade","content","subtitle","row","tilted","H7","muted","diamond","arrow","setLoaderOpeningId","skill","start","type","MAGMA","isActive","withPulsation","SMALL_SCREEN_THRESHOLD","SMALL_SCREEN_MENU_MAX_HEIGHT","WINDOW_HEIGHT","get","height","MENU_MAX_HEIGHT","create","flexDirection","justifyContent","alignItems","marginBottom","zIndex","gap","marginLeft","top","minWidth","overflow","maxHeight","select","web","scrollbarWidth","transform","rotate","marginRight","NEUTRAL_8","bottom"],"sourceRoot":"../../../../../../src","sources":["features/pmProgress/components/header/PmProgressHeader.tsx"],"mappings":"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","ignoreList":[]}
|
|
@@ -7,7 +7,7 @@ import { COLORS, SPACING } from '@magmamath/react-native-ui';
|
|
|
7
7
|
import { SliceDiamondIcon } from "../../../../shared/icons/SliceDiamondIcon.js";
|
|
8
8
|
import { useText } from "../../../../shared/translation/index.js";
|
|
9
9
|
import { useUnit } from 'effector-react';
|
|
10
|
-
import {
|
|
10
|
+
import { SolvingFlow } from "../../shared/pmProgress.constants.js";
|
|
11
11
|
import { usePmProgress } from "../../context/PmProgressContext.js";
|
|
12
12
|
import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
|
|
13
13
|
export const Fluency = ({
|
|
@@ -19,6 +19,7 @@ export const Fluency = ({
|
|
|
19
19
|
onStandardPress
|
|
20
20
|
} = usePmProgress();
|
|
21
21
|
const expandedId = useUnit(model.highlight.$expandedId);
|
|
22
|
+
const hoveredId = useUnit(model.highlight.$hoveredId);
|
|
22
23
|
const loaderOpeningId = useUnit(model.solving.$loaderOpeningId);
|
|
23
24
|
if (!data) return null;
|
|
24
25
|
return /*#__PURE__*/_jsxs(View, {
|
|
@@ -33,7 +34,9 @@ export const Fluency = ({
|
|
|
33
34
|
})),
|
|
34
35
|
progress: data.scorePercentage,
|
|
35
36
|
color: COLORS.PRIMARY_ORANGE,
|
|
36
|
-
onPress: () => model.highlight.expand(
|
|
37
|
+
onPress: () => model.highlight.expand(data.domainId),
|
|
38
|
+
onHoverIn: () => model.highlight.hover(data.domainId),
|
|
39
|
+
onHoverOut: () => model.highlight.hover(null),
|
|
37
40
|
onItemPress: async item => {
|
|
38
41
|
try {
|
|
39
42
|
model.solving.setLoaderOpeningId(item.id);
|
|
@@ -49,7 +52,8 @@ export const Fluency = ({
|
|
|
49
52
|
loadingItemId: loaderOpeningId,
|
|
50
53
|
isFirst: true,
|
|
51
54
|
isLast: true,
|
|
52
|
-
isExpanded: expandedId ===
|
|
55
|
+
isExpanded: expandedId === data.domainId,
|
|
56
|
+
isHighlighted: hoveredId === data.domainId || expandedId === data.domainId,
|
|
53
57
|
icon: /*#__PURE__*/_jsx(SliceDiamondIcon, {
|
|
54
58
|
color: COLORS.PRIMARY_ORANGE
|
|
55
59
|
})
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["React","StyleSheet","View","ListCard","COLORS","SPACING","SliceDiamondIcon","useText","useUnit","
|
|
1
|
+
{"version":3,"names":["React","StyleSheet","View","ListCard","COLORS","SPACING","SliceDiamondIcon","useText","useUnit","SolvingFlow","usePmProgress","jsx","_jsx","jsxs","_jsxs","Fluency","data","t","model","onStandardPress","expandedId","highlight","$expandedId","hoveredId","$hoveredId","loaderOpeningId","solving","$loaderOpeningId","style","styles","container","children","separator","title","items","standards","map","standard","id","standardId","progress","scorePercentage","color","PRIMARY_ORANGE","onPress","expand","domainId","onHoverIn","hover","onHoverOut","onItemPress","item","setLoaderOpeningId","skill","start","type","STANDARD","loadingItemId","isFirst","isLast","isExpanded","isHighlighted","icon","create","marginBottom","height","marginHorizontal","marginVertical","backgroundColor","NEUTRAL_4"],"sourceRoot":"../../../../../../src","sources":["features/pmProgress/components/list/Fluency.tsx"],"mappings":"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","ignoreList":[]}
|
package/dist/typescript/commonjs/features/pmProgress/components/header/PmProgressHeader.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PmProgressHeader.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/pmProgress/components/header/PmProgressHeader.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAA;AA8BvC,eAAO,MAAM,gBAAgB,
|
|
1
|
+
{"version":3,"file":"PmProgressHeader.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/pmProgress/components/header/PmProgressHeader.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAA;AA8BvC,eAAO,MAAM,gBAAgB,yBAmH5B,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Fluency.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/pmProgress/components/list/Fluency.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAQzB,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAGtD,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;CACzB,CAAA;AAED,eAAO,MAAM,OAAO,aAAc,YAAY,
|
|
1
|
+
{"version":3,"file":"Fluency.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/pmProgress/components/list/Fluency.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAQzB,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAGtD,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;CACzB,CAAA;AAED,eAAO,MAAM,OAAO,aAAc,YAAY,6BAyC7C,CAAA"}
|
package/dist/typescript/module/features/pmProgress/components/header/PmProgressHeader.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PmProgressHeader.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/pmProgress/components/header/PmProgressHeader.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAA;AA8BvC,eAAO,MAAM,gBAAgB,
|
|
1
|
+
{"version":3,"file":"PmProgressHeader.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/pmProgress/components/header/PmProgressHeader.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAmB,MAAM,OAAO,CAAA;AA8BvC,eAAO,MAAM,gBAAgB,yBAmH5B,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Fluency.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/pmProgress/components/list/Fluency.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAQzB,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAGtD,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;CACzB,CAAA;AAED,eAAO,MAAM,OAAO,aAAc,YAAY,
|
|
1
|
+
{"version":3,"file":"Fluency.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/pmProgress/components/list/Fluency.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAQzB,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAA;AAGtD,KAAK,YAAY,GAAG;IAClB,IAAI,EAAE,MAAM,GAAG,SAAS,CAAA;CACzB,CAAA;AAED,eAAO,MAAM,OAAO,aAAc,YAAY,6BAyC7C,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@magmamath/students-features",
|
|
3
|
-
"version": "1.2.1-rc.
|
|
3
|
+
"version": "1.2.1-rc.35",
|
|
4
4
|
"description": "Magmamath features library",
|
|
5
5
|
"source": "src/index.ts",
|
|
6
6
|
"main": "src/index.ts",
|
|
@@ -21,7 +21,7 @@
|
|
|
21
21
|
"d3-shape": "3.2.0"
|
|
22
22
|
},
|
|
23
23
|
"peerDependencies": {
|
|
24
|
-
"@magmamath/frontend-config": "1.1.
|
|
24
|
+
"@magmamath/frontend-config": "1.1.3",
|
|
25
25
|
"@magmamath/react-native-ui": "*",
|
|
26
26
|
"@matteappen/skills-utils": "^3.7.1",
|
|
27
27
|
"@react-native-masked-view/masked-view": "*",
|
|
@@ -42,7 +42,7 @@
|
|
|
42
42
|
"react-native-svg": "^15.10.0"
|
|
43
43
|
},
|
|
44
44
|
"devDependencies": {
|
|
45
|
-
"@magmamath/frontend-config": "1.1.
|
|
45
|
+
"@magmamath/frontend-config": "1.1.3",
|
|
46
46
|
"@magmamath/react-native-ui": "0.4.83",
|
|
47
47
|
"@matteappen/skills-utils": "^3.7.1",
|
|
48
48
|
"@react-native-masked-view/masked-view": "^0.3.2",
|
|
@@ -60,7 +60,7 @@
|
|
|
60
60
|
"eslint": "^8.51.0",
|
|
61
61
|
"eslint-config-prettier": "^9.0.0",
|
|
62
62
|
"eslint-plugin-prettier": "^5.0.1",
|
|
63
|
-
"@magmamath/frontend-config": "1.1.
|
|
63
|
+
"@magmamath/frontend-config": "1.1.3",
|
|
64
64
|
"expo": "^52.0.47",
|
|
65
65
|
"expo-audio": "^1.1.1",
|
|
66
66
|
"jest": "^29.7.0",
|
|
@@ -56,6 +56,9 @@ export const PmProgressHeader = () => {
|
|
|
56
56
|
}),
|
|
57
57
|
)
|
|
58
58
|
|
|
59
|
+
const isLoading = loaderOpeningId === OpeningLoaderId.START_BUTTON
|
|
60
|
+
const isSkillOpeningActionPending = loaderOpeningId !== null
|
|
61
|
+
|
|
59
62
|
return (
|
|
60
63
|
<View style={styles.container}>
|
|
61
64
|
<View style={styles.title}>
|
|
@@ -131,10 +134,10 @@ export const PmProgressHeader = () => {
|
|
|
131
134
|
model.solving.setLoaderOpeningId(null)
|
|
132
135
|
}
|
|
133
136
|
}}
|
|
134
|
-
disabled={
|
|
135
|
-
isLoading={
|
|
136
|
-
isActive={
|
|
137
|
-
withPulsation={!!nextUp}
|
|
137
|
+
disabled={isSkillOpeningActionPending}
|
|
138
|
+
isLoading={isLoading}
|
|
139
|
+
isActive={isLoading}
|
|
140
|
+
withPulsation={!!nextUp && !isLoading && !isSkillOpeningActionPending}
|
|
138
141
|
/>
|
|
139
142
|
</View>
|
|
140
143
|
)}
|
|
@@ -5,7 +5,7 @@ import { COLORS, SPACING } from '@magmamath/react-native-ui'
|
|
|
5
5
|
import { SliceDiamondIcon } from '../../../../shared/icons/SliceDiamondIcon'
|
|
6
6
|
import { useText } from '../../../../shared/translation'
|
|
7
7
|
import { useUnit } from 'effector-react'
|
|
8
|
-
import {
|
|
8
|
+
import { SolvingFlow } from '../../shared/pmProgress.constants'
|
|
9
9
|
import { Domain } from '../../shared/pmProgress.types'
|
|
10
10
|
import { usePmProgress } from '../../context/PmProgressContext'
|
|
11
11
|
|
|
@@ -17,6 +17,7 @@ export const Fluency = ({ data }: FluencyProps) => {
|
|
|
17
17
|
const t = useText()
|
|
18
18
|
const { model, onStandardPress } = usePmProgress()
|
|
19
19
|
const expandedId = useUnit(model.highlight.$expandedId)
|
|
20
|
+
const hoveredId = useUnit(model.highlight.$hoveredId)
|
|
20
21
|
const loaderOpeningId = useUnit(model.solving.$loaderOpeningId)
|
|
21
22
|
|
|
22
23
|
if (!data) return null
|
|
@@ -29,7 +30,9 @@ export const Fluency = ({ data }: FluencyProps) => {
|
|
|
29
30
|
items={data.standards.map((standard) => ({ ...standard, id: standard.standardId }))}
|
|
30
31
|
progress={data.scorePercentage}
|
|
31
32
|
color={COLORS.PRIMARY_ORANGE}
|
|
32
|
-
onPress={() => model.highlight.expand(
|
|
33
|
+
onPress={() => model.highlight.expand(data.domainId)}
|
|
34
|
+
onHoverIn={() => model.highlight.hover(data.domainId)}
|
|
35
|
+
onHoverOut={() => model.highlight.hover(null)}
|
|
33
36
|
onItemPress={async (item) => {
|
|
34
37
|
try {
|
|
35
38
|
model.solving.setLoaderOpeningId(item.id)
|
|
@@ -45,7 +48,8 @@ export const Fluency = ({ data }: FluencyProps) => {
|
|
|
45
48
|
loadingItemId={loaderOpeningId}
|
|
46
49
|
isFirst
|
|
47
50
|
isLast
|
|
48
|
-
isExpanded={expandedId ===
|
|
51
|
+
isExpanded={expandedId === data.domainId}
|
|
52
|
+
isHighlighted={hoveredId === data.domainId || expandedId === data.domainId}
|
|
49
53
|
icon={<SliceDiamondIcon color={COLORS.PRIMARY_ORANGE} />}
|
|
50
54
|
/>
|
|
51
55
|
</View>
|