@magmamath/students-features 1.3.14 → 1.3.15

package/dist/typescript/module/features/pmProgress/components/header/NextUp.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"NextUp.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/pmProgress/components/header/NextUp.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAYzB,eAAO,MAAM,MAAM,yBA4DlB,CAAA"}
+{"version":3,"file":"NextUp.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/pmProgress/components/header/NextUp.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAYzB,eAAO,MAAM,MAAM,yBAqDlB,CAAA"}

package/dist/typescript/module/features/pmProgress/components/standard/StandardTag.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StandardTag.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/pmProgress/components/standard/StandardTag.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAA;AA+G9D,KAAK,gBAAgB,GAAG;IACtB,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,eAAe,CAAA;CACvB,CAAA;AAED,eAAO,MAAM,WAAW,uBAAwB,gBAAgB,6BA6B/D,CAAA"}
+{"version":3,"file":"StandardTag.d.ts","sourceRoot":"","sources":["../../../../../../../src/features/pmProgress/components/standard/StandardTag.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAEzB,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAA;AAgH9D,KAAK,gBAAgB,GAAG;IACtB,OAAO,EAAE,MAAM,CAAA;IACf,KAAK,EAAE,eAAe,CAAA;CACvB,CAAA;AAED,eAAO,MAAM,WAAW,uBAAwB,gBAAgB,6BA6B/D,CAAA"}

package/dist/typescript/module/features/pmProgress/hooks/useNextUpDomain.d.ts

@@ -0,0 +1,5 @@
+export declare const useNextUpDomain: () => {
+    domain: import("..").Domain | null;
+    isFromRecommendation: boolean;
+};
+//# sourceMappingURL=useNextUpDomain.d.ts.map

package/dist/typescript/module/features/pmProgress/hooks/useNextUpDomain.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useNextUpDomain.d.ts","sourceRoot":"","sources":["../../../../../../src/features/pmProgress/hooks/useNextUpDomain.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,eAAe;;;CA0B3B,CAAA"}

package/dist/typescript/module/features/pmProgress/model/PmTreeModel.d.ts

@@ -7,11 +7,11 @@ export declare class PmTreeModel {
     private readonly $stats;
     private readonly $user;
     private readonly setupInitialGrade;
-    private readonly setDomains;
     readonly setGrade: import("effector").EventCallable<number | null>;
     readonly $isInitialized: import("effector").StoreWritable<boolean>;
     readonly $grade: import("effector").StoreWritable<number | null>;
-    readonly $domains: import("effector").StoreWritable<Domain[]>;
+    readonly $domains: import("effector").StoreWritable<Record<number, Domain[]>>;
+    readonly $domainsInGrade: import("effector").Store<Domain[]>;
     readonly $grades: import("effector").StoreWritable<Grade[]>;
     readonly $status: import("effector").StoreWritable<PmProgressStatus | null>;
     constructor(api: PmProgressApi);
@@ -20,6 +20,6 @@ export declare class PmTreeModel {
     private setupFailedAndLockedStatus;
     private setupTreeInit;
     private setupGradeInit;
-    private setupDomainStructure;
+    private setupDomainsInTree;
 }
 //# sourceMappingURL=PmTreeModel.d.ts.map

package/dist/typescript/module/features/pmProgress/model/PmTreeModel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PmTreeModel.d.ts","sourceRoot":"","sources":["../../../../../../src/features/pmProgress/model/PmTreeModel.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,MAAM,EACN,KAAK,EACL,mBAAmB,EAEnB,aAAa,EAEb,WAAW,EACX,mBAAmB,EAEpB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAU/C,OAAO,EAAE,gBAAgB,EAAsB,MAAM,gCAAgC,CAAA;AAGrF,qBAAa,WAAW;IAeV,OAAO,CAAC,QAAQ,CAAC,GAAG;IAdhC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgD;IACtE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0C;IACjE,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiC;IAEvD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAwC;IAC1E,OAAO,CAAC,QAAQ,CAAC,UAAU,CAA0B;IACrD,SAAgB,QAAQ,kDAA+B;IAEvD,SAAgB,cAAc,4CAAqB;IACnD,SAAgB,MAAM,kDAA+B;IACrD,SAAgB,QAAQ,6CAA+B;IACvD,SAAgB,OAAO,4CAA2B;IAClD,SAAgB,OAAO,4DAA6C;gBAEvC,GAAG,EAAE,aAAa;IAY/C,SAAgB,UAAU,uGAUxB;IAEF,SAAgB,gBAAgB,sDAwB9B;IAEF,OAAO,CAAC,0BAA0B;IAelC,OAAO,CAAC,aAAa;IAqBrB,OAAO,CAAC,cAAc;IAyBtB,OAAO,CAAC,oBAAoB;CAkB7B"}
+{"version":3,"file":"PmTreeModel.d.ts","sourceRoot":"","sources":["../../../../../../src/features/pmProgress/model/PmTreeModel.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,MAAM,EACN,KAAK,EACL,mBAAmB,EAEnB,aAAa,EAEb,WAAW,EACX,mBAAmB,EAEpB,MAAM,4BAA4B,CAAA;AACnC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAA;AAW/C,OAAO,EAAE,gBAAgB,EAAsB,MAAM,gCAAgC,CAAA;AAGrF,qBAAa,WAAW;IAiBV,OAAO,CAAC,QAAQ,CAAC,GAAG;IAhBhC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAgD;IACtE,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0C;IACjE,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAiC;IAEvD,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAwC;IAC1E,SAAgB,QAAQ,kDAA+B;IAEvD,SAAgB,cAAc,4CAAqB;IACnD,SAAgB,MAAM,kDAA+B;IACrD,SAAgB,QAAQ,6DAA4C;IACpE,SAAgB,eAAe,qCAE9B;IACD,SAAgB,OAAO,4CAA2B;IAClD,SAAgB,OAAO,4DAA6C;gBAEvC,GAAG,EAAE,aAAa;IAY/C,SAAgB,UAAU,uGAUxB;IAEF,SAAgB,gBAAgB,sDAwB9B;IAEF,OAAO,CAAC,0BAA0B;IAelC,OAAO,CAAC,aAAa;IAqBrB,OAAO,CAAC,cAAc;IAyBtB,OAAO,CAAC,kBAAkB;CAwB3B"}

package/dist/typescript/module/features/pmProgress/shared/pmProgress.constants.d.ts

@@ -26,7 +26,7 @@ export declare enum PmProgressStatus {
 export declare enum SessionStorageKeys {
     SOLVING_QUEUE = "PM_SOLVING_QUEUE",
     GRADE = "PM_GRADE",
-    DOMAINS = "PM_DOMAINS"
+    DOMAINS = "PM_DOMAINS_IN_TREE"
 }
 /**
  * Primary → _4 → _6 variants, cycling through 7 base colors.

package/dist/typescript/module/features/pmProgress/shared/pmProgress.constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pmProgress.constants.d.ts","sourceRoot":"","sources":["../../../../../../src/features/pmProgress/shared/pmProgress.constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,gBAAgB,MAAM,CAAA;AACnC,eAAO,MAAM,2BAA2B,MAAM,CAAA;AAC9C,eAAO,MAAM,kBAAkB,MAAM,CAAA;AAErC,oBAAY,YAAY;IACtB,OAAO,YAAY;IACnB,OAAO,YAAY;CACpB;AAED,oBAAY,iBAAiB;IAC3B,GAAG,QAAQ;IACX,IAAI,SAAS;IACb,SAAS,aAAa;CACvB;AAED,oBAAY,WAAW;IACrB,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,QAAQ,aAAa;CACtB;AAED,oBAAY,eAAe;IACzB,YAAY,iBAAiB;IAC7B,eAAe,oBAAoB;CACpC;AAED,oBAAY,gBAAgB;IAC1B,MAAM,WAAW;IACjB,KAAK,UAAU;CAChB;AAED,oBAAY,kBAAkB;IAC5B,aAAa,qBAAqB;IAClC,KAAK,aAAa;IAClB,OAAO,eAAe;CACvB;AAED;;;GAGG;AACH,eAAO,MAAM,aAAa,2NAmBzB,CAAA;AAED,eAAO,MAAM,oBAAoB;;;;;;GAM9B,CAAA;AAEH,eAAO,MAAM,oBAAoB,2EAmBhC,CAAA;AAED,eAAO,MAAM,sBAAsB,OAAO,CAAA;AAC1C,eAAO,MAAM,sBAAsB,MAAM,CAAA;AACzC,eAAO,MAAM,4BAA4B,MAAM,CAAA;AAC/C,eAAO,MAAM,aAAa,QAAkC,CAAA;AAC5D,eAAO,MAAM,eAAe,QACkE,CAAA"}
+{"version":3,"file":"pmProgress.constants.d.ts","sourceRoot":"","sources":["../../../../../../src/features/pmProgress/shared/pmProgress.constants.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,gBAAgB,MAAM,CAAA;AACnC,eAAO,MAAM,2BAA2B,MAAM,CAAA;AAC9C,eAAO,MAAM,kBAAkB,MAAM,CAAA;AAErC,oBAAY,YAAY;IACtB,OAAO,YAAY;IACnB,OAAO,YAAY;CACpB;AAED,oBAAY,iBAAiB;IAC3B,GAAG,QAAQ;IACX,IAAI,SAAS;IACb,SAAS,aAAa;CACvB;AAED,oBAAY,WAAW;IACrB,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,QAAQ,aAAa;CACtB;AAED,oBAAY,eAAe;IACzB,YAAY,iBAAiB;IAC7B,eAAe,oBAAoB;CACpC;AAED,oBAAY,gBAAgB;IAC1B,MAAM,WAAW;IACjB,KAAK,UAAU;CAChB;AAED,oBAAY,kBAAkB;IAC5B,aAAa,qBAAqB;IAClC,KAAK,aAAa;IAClB,OAAO,uBAAuB;CAC/B;AAED;;;GAGG;AACH,eAAO,MAAM,aAAa,2NAmBzB,CAAA;AAED,eAAO,MAAM,oBAAoB;;;;;;GAM9B,CAAA;AAEH,eAAO,MAAM,oBAAoB,2EAmBhC,CAAA;AAED,eAAO,MAAM,sBAAsB,OAAO,CAAA;AAC1C,eAAO,MAAM,sBAAsB,MAAM,CAAA;AACzC,eAAO,MAAM,4BAA4B,MAAM,CAAA;AAC/C,eAAO,MAAM,aAAa,QAAkC,CAAA;AAC5D,eAAO,MAAM,eAAe,QACkE,CAAA"}

package/dist/typescript/module/features/pmProgress/shared/pmProgress.helpers.d.ts

@@ -40,6 +40,9 @@ type TreeDataReady = {
     grade: number;
 };
 export declare const isTreeDataReady: (source: TreeDataSource) => source is TreeDataReady;
+type TreeDataWithoutGrade = Omit<TreeDataSource, 'grade'>;
+type TreeDataWithoutGradeReady = Omit<TreeDataReady, 'grade'>;
+export declare const isTreeDataWithoutGradeReady: (source: TreeDataWithoutGrade) => source is TreeDataWithoutGradeReady;
 export declare const createChartConfig: (size: number) => PieChartManagerConfig;
 /**
  * Returns all skills from a standard, sorted by difficulty.
@@ -64,6 +67,7 @@ export declare const getAllUncompletedSkills: (domains: Domain[], skillsMapping:
 /** Moves item with the given id to the front: [0,1,2,3,4] with id of 3rd → [3,0,1,2,4] */
 export declare const shiftToBeginningOfArray: (id: string, items: Skill[]) => Skill[];
 export declare const withoutDuplicates: (skills: (Skill | undefined)[]) => Skill[];
+export declare const findDomainBySkillId: (skillId: string, domains: Domain[]) => Domain | undefined;
 export declare const startGradesFrom: (grades: Grade[], startGrade: number) => Grade[];
 export declare const isFluencyDomain: (title: string) => boolean;
 export declare const formatGradeName: (grade: number) => string;

package/dist/typescript/module/features/pmProgress/shared/pmProgress.helpers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pmProgress.helpers.d.ts","sourceRoot":"","sources":["../../../../../../src/features/pmProgress/shared/pmProgress.helpers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,oDAAoD,CAAA;AAChG,OAAO,EACL,MAAM,EACN,cAAc,EACd,KAAK,EACL,KAAK,EACL,aAAa,EACb,aAAa,EACb,mBAAmB,EACnB,IAAI,EACL,MAAM,oBAAoB,CAAA;AAG3B,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,iCAAiC,CAAA;AAE5E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAA;AA0DxD,eAAO,MAAM,kBAAkB,SACvB,sBAAsB,CAAC,MAAM,CAAC,eACvB,mBAAmB,CAAC,aAAa,CAAC,KAC9C,MAAM,EAqBR,CAAA;AAED,KAAK,uBAAuB,GAAG;IAC7B,UAAU,EAAE,MAAM,EAAE,CAAA;IACpB,YAAY,EAAE,MAAM,EAAE,CAAA;IACtB,cAAc,EAAE,MAAM,EAAE,CAAA;IACxB,SAAS,EAAE,MAAM,GAAG,IAAI,GAAG,SAAS,CAAA;CACrC,CAAA;AAED;;;;;;;;;;;;;;;GAeG;AACH,eAAO,MAAM,iBAAiB,6DAK3B,uBAAuB,KAAG,MAAM,GAAG,IAmBrC,CAAA;AAED,eAAO,MAAM,UAAU,OAAQ,MAAM,KAAG,MAKvC,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,IAAI,EAAE,mBAAmB,GAAG,IAAI,CAAA;IAChC,KAAK,EAAE,aAAa,GAAG,IAAI,CAAA;IAC3B,IAAI,EAAE,IAAI,GAAG,IAAI,CAAA;IACjB,KAAK,EAAE,MAAM,GAAG,IAAI,CAAA;CACrB,CAAA;AAED,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,mBAAmB,CAAA;IACzB,KAAK,EAAE,aAAa,CAAA;IACpB,IAAI,EAAE,IAAI,CAAA;IACV,KAAK,EAAE,MAAM,CAAA;CACd,CAAA;AAED,eAAO,MAAM,eAAe,WAAY,cAAc,KAAG,MAAM,IAAI,aAC6B,CAAA;AAEhG,eAAO,MAAM,iBAAiB,SAAU,MAAM,KAAG,qBAoBhD,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,wBAAwB,aACzB,cAAc,iBACT,aAAa,KAC3B,KAAK,EAIgF,CAAA;AAExF;;;GAGG;AACH,eAAO,MAAM,gCAAgC,aACjC,cAAc,iBACT,aAAa,KAC3B,KAAK,EAOP,CAAA;AAED;;;GAGG;AACH,eAAO,MAAM,8BAA8B,WACjC,MAAM,iBACC,aAAa,sBACR,MAAM,KACzB,KAAK,EAG+D,CAAA;AAEvE;;;GAGG;AACH,eAAO,MAAM,uBAAuB,YAAa,MAAM,EAAE,iBAAiB,aAAa,KAAG,KAAK,EAG1B,CAAA;AAErE,0FAA0F;AAC1F,eAAO,MAAM,uBAAuB,OAAQ,MAAM,SAAS,KAAK,EAAE,KAAG,KAAK,EAIzE,CAAA;AAED,eAAO,MAAM,iBAAiB,WAAY,CAAC,KAAK,GAAG,SAAS,CAAC,EAAE,KAAG,KAAK,EAQtE,CAAA;AAGD,eAAO,MAAM,eAAe,WAAY,KAAK,EAAE,cAAc,MAAM,KAAG,KAAK,EAI1E,CAAA;AAED,eAAO,MAAM,eAAe,UAAW,MAAM,YAE5C,CAAA;AAED,eAAO,MAAM,eAAe,UAAW,MAAM,KAAG,MAI/C,CAAA;AAED,eAAO,MAAM,gBAAgB,UAAW,MAAM,oBAAoB,cAAc,KAAG,MAQlF,CAAA;AAED,eAAO,MAAM,aAAa,SAAU,mBAAmB,QAAQ,IAAI,KAAG,KAAK,EAgB1E,CAAA"}
+{"version":3,"file":"pmProgress.helpers.d.ts","sourceRoot":"","sources":["../../../../../../src/features/pmProgress/shared/pmProgress.helpers.ts"],"names":[],"mappings":"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"}

package/package.json

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

package/src/features/pmProgress/components/chart/components/SlicesPaths.tsx

@@ -20,7 +20,7 @@ export const SlicesPaths = ({ slices, pieChartManager, config }: SlicesPathsProp
   const [hoveredId, expandedId, domains] = useUnit([
     model.highlight.$hoveredId,
     model.highlight.$expandedId,
-    model.tree.$domains,
+    model.tree.$domainsInGrade,
   ])
 
   const highlightedId = hoveredId ?? expandedId

package/src/features/pmProgress/components/header/NextUp.tsx

@@ -4,33 +4,26 @@ import { COLORS, HeadingVariants, SPACING, Typography } from '@magmamath/react-n
 import { SketchArrowRight } from '../../../../shared/icons/SketchArrowRight'
 import { SliceDiamondIcon } from '../../../../shared/icons/SliceDiamondIcon'
 import { useText } from '../../../../shared/translation'
-import { useUnit, useStoreMap } from 'effector-react'
+import { useUnit } from 'effector-react'
 import { usePmProgress } from '../../context/PmProgressContext'
-import { isFluencyDomain } from '../../shared/pmProgress.helpers'
 import { OpeningLoaderId, SolvingFlow } from '../../shared/pmProgress.constants'
 import { StartButton } from './StartButton'
+import { useNextUpDomain } from '../../hooks/useNextUpDomain'
 
 export const NextUp = () => {
   const t = useText()
   const { model, onStartPress } = usePmProgress()
+  const nextUp = useNextUpDomain()
 
   const status = useUnit(model.tree.$status)
   const loaderOpeningId = useUnit(model.solving.$loaderOpeningId)
 
-  const nextUp = useStoreMap(model.tree.$domains, (domains) =>
-    domains.find((domain) => {
-      const isFluency = isFluencyDomain(domain.title)
-      const isDomainCompleted = domain.standards.every((standard) => standard.isCompleted)
-      return !isFluency && !isDomainCompleted
-    }),
-  )
-
   const isLoading = loaderOpeningId === OpeningLoaderId.START_BUTTON
   const isSkillOpeningActionPending = !!(loaderOpeningId !== null || status)
 
   return (
     <View style={styles.container}>
-      {nextUp && !status && (
+      {nextUp.domain && !status && (
         <>
           <View style={styles.content}>
             <View style={styles.subtitle}>
@@ -40,10 +33,10 @@ export const NextUp = () => {
             </View>
             <View style={[styles.row, styles.tilted]}>
               <Typography variant={HeadingVariants.H7} style={styles.muted}>
-                {nextUp?.title}
+                {nextUp.domain.title}
               </Typography>
               <View style={styles.diamond}>
-                <SliceDiamondIcon color={nextUp?.color} />
+                <SliceDiamondIcon color={nextUp.domain.color} />
               </View>
             </View>
           </View>

package/src/features/pmProgress/components/insights/PmInsights.tsx

@@ -15,7 +15,7 @@ import {
 export const PmInsights = () => {
   const { model } = usePmProgress()
   const [chartSize, setChartSize] = useState(MAX_PIE_CHART_SIZE)
-  const chartData = useStoreMap(model.tree.$domains, (domains) =>
+  const chartData = useStoreMap(model.tree.$domainsInGrade, (domains) =>
     domains.map((domain) => ({
       value: 1,
       fillPercent: Math.round(domain.scorePercentage),

package/src/features/pmProgress/components/list/PmDomainList.tsx

@@ -11,7 +11,7 @@ import { SolvingFlow } from '../../shared/pmProgress.constants'
 
 export const PmDomainList = () => {
   const { model, onStandardPress } = usePmProgress()
-  const domains = useUnit(model.tree.$domains)
+  const domains = useUnit(model.tree.$domainsInGrade)
   const expandedId = useUnit(model.highlight.$expandedId)
   const hoveredId = useUnit(model.highlight.$hoveredId)
   const loaderOpeningId = useUnit(model.solving.$loaderOpeningId)

package/src/features/pmProgress/components/standard/StandardTag.tsx

@@ -4,6 +4,7 @@ import { PmProgressModel } from '@magmamath/students-features'
 import { SliceDiamondIcon } from '../../../../shared/icons/SliceDiamondIcon'
 import { COLORS, FONT_FAMILY } from '@magmamath/react-native-ui'
 import { useStoreMap } from 'effector-react'
+import { isWeb } from '../../../../shared/common.constants'
 
 type ColorPreset = {
   background: string
@@ -118,7 +119,7 @@ type StandardTagProps = {
 
 export const StandardTag = ({ skillId, model }: StandardTagProps) => {
   const standardInfo = useStoreMap({
-    store: model.tree.$domains,
+    store: model.tree.$domainsInGrade,
     keys: [skillId],
     fn: (domains, [skillId]) => {
       const domain = domains.find((d) => d.standards.some((s) => s.skillIds.includes(skillId)))
@@ -150,7 +151,7 @@ export const StandardTag = ({ skillId, model }: StandardTagProps) => {
 const styles = StyleSheet.create({
   container: {
     minWidth: 110,
-    maxWidth: 350,
+    maxWidth: isWeb ? 350 : 280,
     paddingHorizontal: 8,
     paddingVertical: 4,
     borderRadius: 12,
@@ -165,7 +166,7 @@ const styles = StyleSheet.create({
     elevation: 2,
   },
   textContainer: {
-    flex: 1,
+    ...(isWeb ? { flex: 1 } : { flexShrink: 1 }),
     flexDirection: 'column',
     justifyContent: 'center',
     alignItems: 'flex-start',

package/src/features/pmProgress/hooks/useNextUpDomain.ts

@@ -0,0 +1,31 @@
+import { useUnit, useStoreMap } from 'effector-react'
+import { usePmProgress } from '../context/PmProgressContext'
+import { findDomainBySkillId, isFluencyDomain } from '../shared/pmProgress.helpers'
+
+export const useNextUpDomain = () => {
+  const { model } = usePmProgress()
+  const magmaRecs = useUnit(model.recommendations.$magma)
+  const domainsInTree = useUnit(model.tree.$domains)
+
+  return useStoreMap({
+    store: model.tree.$domainsInGrade,
+    keys: [magmaRecs, domainsInTree],
+    fn: (domainsInGrade) => {
+      const firstRec = magmaRecs.items[0]
+      if (firstRec) {
+        const allDomains = Object.values(domainsInTree).flat()
+        const domain = findDomainBySkillId(firstRec._id, allDomains) ?? null
+        return { domain, isFromRecommendation: true }
+      }
+
+      const domain =
+        domainsInGrade.find((domain) => {
+          const isFluency = isFluencyDomain(domain.title)
+          const isDomainCompleted = domain.standards.every((standard) => standard.isCompleted)
+          return !isFluency && !isDomainCompleted
+        }) ?? null
+
+      return { domain, isFromRecommendation: false }
+    },
+  })
+}

package/src/features/pmProgress/model/PmTreeModel.ts

@@ -1,4 +1,4 @@
-import { attach, createEffect, createEvent, createStore, restore, sample } from 'effector'
+import { attach, combine, createEffect, createEvent, createStore, restore, sample } from 'effector'
 import { createAction } from 'effector-action'
 import {
   Domain,
@@ -18,6 +18,7 @@ import {
   getInitialPmGrade,
   getTreeGrades,
   isTreeDataReady,
+  isTreeDataWithoutGradeReady,
 } from '../shared/pmProgress.helpers'
 import { TreeNormalizer } from '../shared/TreeNormalizer'
 import { persist } from 'effector-storage/session'
@@ -30,12 +31,14 @@ export class PmTreeModel {
   private readonly $user = createStore<User | null>(null)
 
   private readonly setupInitialGrade = createEvent<SetupInitialGradeProps>()
-  private readonly setDomains = createEvent<Domain[]>()
   public readonly setGrade = createEvent<number | null>()
 
   public readonly $isInitialized = createStore(false)
   public readonly $grade = restore(this.setGrade, null)
-  public readonly $domains = restore(this.setDomains, [])
+  public readonly $domains = createStore<Record<number, Domain[]>>({})
+  public readonly $domainsInGrade = combine(this.$domains, this.$grade, (domains, grade) =>
+    grade !== null ? (domains[grade] ?? []) : [],
+  )
   public readonly $grades = createStore<Grade[]>([])
   public readonly $status = createStore<PmProgressStatus | null>(null)
 
@@ -48,7 +51,7 @@ export class PmTreeModel {
     this.setupFailedAndLockedStatus()
     this.setupTreeInit()
     this.setupGradeInit()
-    this.setupDomainStructure()
+    this.setupDomainsInTree()
   }
 
   public readonly initTreeFx = createEffect(async ({ user }: PmProgressGateProps) => {
@@ -150,22 +153,28 @@ export class PmTreeModel {
     })
   }
 
-  private setupDomainStructure() {
+  private setupDomainsInTree() {
     sample({
-      clock: [this.$grade, this.initTreeFx.doneData],
-      source: { tree: this.$tree, stats: this.$stats, user: this.$user, grade: this.$grade },
-      filter: isTreeDataReady,
-      fn: ({ tree, stats, user, grade }) => {
-        const [treeWithUserStats] = enhanceProgressMatrixData(
-          Object.values(tree.treeMapping),
-          stats,
-          [{ entityId: user._id, name: user.fullName }],
-          grade as number,
+      clock: this.initTreeFx.doneData,
+      source: { tree: this.$tree, stats: this.$stats, user: this.$user },
+      filter: isTreeDataWithoutGradeReady,
+      fn: ({ tree, stats, user }) => {
+        const treeNodes = Object.values(tree.treeMapping)
+        const grades = getTreeGrades(tree, user).filter((g) => !g.isLocked)
+
+        return Object.fromEntries(
+          grades.map((grade) => {
+            const [treeWithStats] = enhanceProgressMatrixData(
+              treeNodes,
+              stats,
+              [{ entityId: user._id, name: user.fullName }],
+              grade.value,
+            )
+            return [grade.value, getDomainStructure(treeWithStats, tree.treeMapping)]
+          }),
         )
-
-        return getDomainStructure(treeWithUserStats, tree.treeMapping)
       },
-      target: this.setDomains,
+      target: this.$domains,
     })
   }
 }

package/src/features/pmProgress/shared/pmProgress.constants.ts

@@ -35,7 +35,7 @@ export enum PmProgressStatus {
 export enum SessionStorageKeys {
   SOLVING_QUEUE = 'PM_SOLVING_QUEUE',
   GRADE = 'PM_GRADE',
-  DOMAINS = 'PM_DOMAINS',
+  DOMAINS = 'PM_DOMAINS_IN_TREE',
 }
 
 /**

package/src/features/pmProgress/shared/pmProgress.helpers.ts

@@ -171,6 +171,14 @@ type TreeDataReady = {
 export const isTreeDataReady = (source: TreeDataSource): source is TreeDataReady =>
   source.tree !== null && source.stats !== null && source.user !== null && source.grade !== null
 
+type TreeDataWithoutGrade = Omit<TreeDataSource, 'grade'>
+type TreeDataWithoutGradeReady = Omit<TreeDataReady, 'grade'>
+
+export const isTreeDataWithoutGradeReady = (
+  source: TreeDataWithoutGrade,
+): source is TreeDataWithoutGradeReady =>
+  source.tree !== null && source.stats !== null && source.user !== null
+
 export const createChartConfig = (size: number): PieChartManagerConfig => {
   const OUTER_MARGIN = 5
   return {
@@ -261,6 +269,9 @@ export const withoutDuplicates = (skills: (Skill | undefined)[]): Skill[] => {
   })
 }
 
+export const findDomainBySkillId = (skillId: string, domains: Domain[]): Domain | undefined =>
+  domains.find((d) => d.standards.some((s) => s.skillIds.includes(skillId)))
+
 // Reorders grades starting from the given grade, wrapping around. [1,2,3] with start=2 → [2,3,1]
 export const startGradesFrom = (grades: Grade[], startGrade: number): Grade[] => {
   const index = grades.findIndex(({ value }) => value === startGrade)