@magmamath/students-features 1.8.0 → 1.8.1-rc.0

package/src/features/fluency-teacher/components/table/TableRowAverageProgress.tsx

@@ -0,0 +1,65 @@
+import React from 'react'
+import { StyleSheet, Text, View } from 'react-native'
+import {
+  COLORS,
+  FONT_FAMILY,
+  HeadingVariants,
+  SPACING,
+  Typography,
+} from '@magmamath/react-native-ui'
+
+export type TableRowAverageProgressProps = {
+  percent: number
+  label: string
+}
+
+export const TableRowAverageProgress = ({ percent, label }: TableRowAverageProgressProps) => (
+  <View style={styles.progressTrack}>
+    <View style={[styles.progressFill, { width: `${percent}%` }]} />
+    <View style={styles.progressOverlay}>
+      <Typography variant={HeadingVariants.H9} style={styles.progressPercent}>
+        {percent}%
+      </Typography>
+      <Text style={styles.progressLabel} numberOfLines={1}>
+        {label}
+      </Text>
+    </View>
+  </View>
+)
+
+const styles = StyleSheet.create({
+  progressTrack: {
+    height: 16,
+    borderRadius: 36,
+    backgroundColor: COLORS.NEUTRAL_3,
+    overflow: 'hidden',
+  },
+  progressFill: {
+    position: 'absolute',
+    top: 0,
+    bottom: 0,
+    left: 0,
+    borderRadius: 36,
+    backgroundColor: COLORS.YELLOW_4,
+  },
+  progressOverlay: {
+    position: 'absolute',
+    top: 0,
+    bottom: 0,
+    left: 0,
+    right: 0,
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'space-between',
+    paddingHorizontal: SPACING[200],
+  },
+  progressPercent: {
+    color: COLORS.NEUTRAL_9,
+  },
+  progressLabel: {
+    fontFamily: FONT_FAMILY.buenosAiresSemiBold,
+    fontSize: 10,
+    color: COLORS.NEUTRAL_9,
+    textTransform: 'uppercase',
+  },
+})

package/src/features/fluency-teacher/context/TeacherFluencyContext.ts

@@ -3,7 +3,6 @@ import type { TeacherFluencyModel } from '../model/TeacherFluencyModel'
 
 type TeacherFluencyContextValue = {
   model: TeacherFluencyModel
-  grade: number
 }
 
 const TeacherFluencyContext = createContext<TeacherFluencyContextValue | null>(null)

package/src/features/fluency-teacher/fluencyTeacher.constants.ts

@@ -1,11 +1,5 @@
 import { COLORS } from '@magmamath/react-native-ui'
-import type {
-  LegendItem,
-  OperatorCardConfig,
-  OperatorColumnConfig,
-  OperatorPalette,
-  FluencyOperatorColumn,
-} from './fluencyTeacher.types'
+import { type OperatorColumnConfig } from './fluencyTeacher.types'
 
 export const TEACHER_FLUENCY_GOAL_MINUTES = 25
 
@@ -16,103 +10,33 @@ export enum FluencyOperator {
   DIVISION = 'division',
 }
 
-export enum MasteryLevel {
-  LEARNING = 1,
-  GROWING = 2,
-  STRONG = 3,
-  AUTOMATIC = 4,
-}
-
-export const OPERATOR_PALETTES: Record<FluencyOperator, OperatorPalette> = {
+export const MATRIX_CELL_COLORS: Record<FluencyOperator, Record<number, string>> = {
   [FluencyOperator.ADDITION]: {
-    bands: [COLORS.GREEN_1, COLORS.GREEN_2, COLORS.GREEN_3, COLORS.GREEN_4, COLORS.PRIMARY_GREEN],
-    bandBorders: [
-      COLORS.GREEN_2,
-      COLORS.GREEN_3,
-      COLORS.GREEN_4,
-      COLORS.PRIMARY_GREEN,
-      COLORS.GREEN_6,
-    ],
-    darkText: COLORS.GREEN_8,
-    legendCount: COLORS.GREEN_7,
-    boxBorder: COLORS.GREEN_2,
+    1: COLORS.GREEN_2,
+    2: COLORS.GREEN_3,
+    3: COLORS.PRIMARY_GREEN,
+    4: COLORS.GREEN_6,
   },
   [FluencyOperator.SUBTRACTION]: {
-    bands: [
-      COLORS.ORANGE_1,
-      COLORS.ORANGE_2,
-      COLORS.ORANGE_3,
-      COLORS.ORANGE_4,
-      COLORS.PRIMARY_ORANGE,
-    ],
-    bandBorders: [
-      COLORS.ORANGE_2,
-      COLORS.ORANGE_3,
-      COLORS.ORANGE_4,
-      COLORS.PRIMARY_ORANGE,
-      COLORS.ORANGE_6,
-    ],
-    darkText: COLORS.ORANGE_8,
-    legendCount: COLORS.ORANGE_7,
-    boxBorder: COLORS.ORANGE_2,
+    1: COLORS.ORANGE_2,
+    2: COLORS.ORANGE_3,
+    3: COLORS.PRIMARY_ORANGE,
+    4: COLORS.ORANGE_6,
   },
   [FluencyOperator.MULTIPLICATION]: {
-    bands: [COLORS.BLUE_1, COLORS.BLUE_2, COLORS.BLUE_3, COLORS.BLUE_4, COLORS.PRIMARY_BLUE],
-    bandBorders: [COLORS.BLUE_2, COLORS.BLUE_3, COLORS.BLUE_4, COLORS.PRIMARY_BLUE, COLORS.BLUE_6],
-    darkText: COLORS.BLUE_8,
-    legendCount: COLORS.BLUE_7,
-    boxBorder: COLORS.BLUE_2,
+    1: COLORS.BLUE_2,
+    2: COLORS.BLUE_3,
+    3: COLORS.PRIMARY_BLUE,
+    4: COLORS.BLUE_6,
   },
   [FluencyOperator.DIVISION]: {
-    bands: [
-      COLORS.PURPLE_1,
-      COLORS.PURPLE_2,
-      COLORS.PURPLE_3,
-      COLORS.PURPLE_4,
-      COLORS.PRIMARY_PURPLE,
-    ],
-    bandBorders: [
-      COLORS.PURPLE_2,
-      COLORS.PURPLE_3,
-      COLORS.PURPLE_4,
-      COLORS.PRIMARY_PURPLE,
-      COLORS.PURPLE_6,
-    ],
-    darkText: COLORS.PURPLE_8,
-    legendCount: COLORS.PURPLE_7,
-    boxBorder: COLORS.PURPLE_2,
+    1: COLORS.PURPLE_2,
+    2: COLORS.PURPLE_3,
+    3: COLORS.PRIMARY_PURPLE,
+    4: COLORS.PURPLE_6,
   },
 }
 
-export const MATRIX_CELL_COLORS: Record<FluencyOperator, Record<MasteryLevel, string>> = {
-  [FluencyOperator.ADDITION]: {
-    [MasteryLevel.LEARNING]: COLORS.GREEN_1,
-    [MasteryLevel.GROWING]: COLORS.GREEN_2,
-    [MasteryLevel.STRONG]: COLORS.GREEN_4,
-    [MasteryLevel.AUTOMATIC]: COLORS.GREEN_7,
-  },
-  [FluencyOperator.SUBTRACTION]: {
-    [MasteryLevel.LEARNING]: COLORS.ORANGE_1,
-    [MasteryLevel.GROWING]: COLORS.ORANGE_2,
-    [MasteryLevel.STRONG]: COLORS.ORANGE_4,
-    [MasteryLevel.AUTOMATIC]: COLORS.ORANGE_7,
-  },
-  [FluencyOperator.MULTIPLICATION]: {
-    [MasteryLevel.LEARNING]: COLORS.BLUE_1,
-    [MasteryLevel.GROWING]: COLORS.BLUE_2,
-    [MasteryLevel.STRONG]: COLORS.BLUE_4,
-    [MasteryLevel.AUTOMATIC]: COLORS.BLUE_7,
-  },
-  [FluencyOperator.DIVISION]: {
-    [MasteryLevel.LEARNING]: COLORS.PURPLE_1,
-    [MasteryLevel.GROWING]: COLORS.PURPLE_2,
-    [MasteryLevel.STRONG]: COLORS.PURPLE_4,
-    [MasteryLevel.AUTOMATIC]: COLORS.PURPLE_7,
-  },
-}
-
-export const MATRIX_NOT_STARTED_COLOR = COLORS.NEUTRAL_3
-
 export enum FluencyTableColumn {
   AVERAGE = 'average',
   ADDITION = 'addition',
@@ -121,6 +45,8 @@ export enum FluencyTableColumn {
   DIVISION = 'division',
 }
 
+export type FluencyOperatorColumn = Exclude<FluencyTableColumn, FluencyTableColumn.AVERAGE>
+
 export enum FluencyMathOperatorSymbol {
   ADDITION = '+',
   SUBTRACTION = '−',
@@ -128,57 +54,33 @@ export enum FluencyMathOperatorSymbol {
   DIVISION = '÷',
 }
 
-export const COLUMN_TO_OPERATOR: Record<FluencyOperatorColumn, FluencyOperator> = {
-  [FluencyTableColumn.ADDITION]: FluencyOperator.ADDITION,
-  [FluencyTableColumn.SUBTRACTION]: FluencyOperator.SUBTRACTION,
-  [FluencyTableColumn.MULTIPLICATION]: FluencyOperator.MULTIPLICATION,
-  [FluencyTableColumn.DIVISION]: FluencyOperator.DIVISION,
-}
-
-export const OPERATOR_TO_COLUMN: Record<FluencyOperator, FluencyOperatorColumn> = {
-  [FluencyOperator.ADDITION]: FluencyTableColumn.ADDITION,
-  [FluencyOperator.SUBTRACTION]: FluencyTableColumn.SUBTRACTION,
-  [FluencyOperator.MULTIPLICATION]: FluencyTableColumn.MULTIPLICATION,
-  [FluencyOperator.DIVISION]: FluencyTableColumn.DIVISION,
-}
-
-export const MAX_GRADE_WITH_TWO_OPERATORS = 2
-
-export const TWO_OPERATOR_SET: readonly FluencyOperator[] = [
-  FluencyOperator.ADDITION,
-  FluencyOperator.SUBTRACTION,
-]
-
-export const OPERATOR_CARD_CONFIG: Record<FluencyOperator, OperatorCardConfig> = {
-  [FluencyOperator.ADDITION]: {
+export const TABLE_OPERATOR_COLUMNS: readonly OperatorColumnConfig[] = [
+  {
+    operator: FluencyTableColumn.ADDITION,
     labelKey: 'student.fluency.addition',
     symbol: FluencyMathOperatorSymbol.ADDITION,
+    badgeBg: COLORS.GREEN_3,
+    badgeText: COLORS.GREEN_8,
   },
-  [FluencyOperator.SUBTRACTION]: {
+  {
+    operator: FluencyTableColumn.SUBTRACTION,
     labelKey: 'student.fluency.subtraction',
     symbol: FluencyMathOperatorSymbol.SUBTRACTION,
+    badgeBg: COLORS.ORANGE_3,
+    badgeText: COLORS.ORANGE_8,
   },
-  [FluencyOperator.MULTIPLICATION]: {
-    labelKey: 'student.fluency.multiplication',
-    symbol: FluencyMathOperatorSymbol.MULTIPLICATION,
-  },
-  [FluencyOperator.DIVISION]: {
+  {
+    operator: FluencyTableColumn.DIVISION,
     labelKey: 'student.fluency.division',
     symbol: FluencyMathOperatorSymbol.DIVISION,
+    badgeBg: COLORS.BLUE_3,
+    badgeText: COLORS.BLUE_8,
+  },
+  {
+    operator: FluencyTableColumn.MULTIPLICATION,
+    labelKey: 'student.fluency.multiplication',
+    symbol: FluencyMathOperatorSymbol.MULTIPLICATION,
+    badgeBg: COLORS.PURPLE_2,
+    badgeText: COLORS.PURPLE_8,
   },
-}
-
-export const TABLE_OPERATOR_COLUMNS: readonly OperatorColumnConfig[] = Object.values(
-  FluencyOperator,
-).map((operator) => ({
-  operator: OPERATOR_TO_COLUMN[operator],
-  labelKey: OPERATOR_CARD_CONFIG[operator].labelKey,
-}))
-
-export const LEGEND_LEVELS: readonly LegendItem[] = [
-  { box: MasteryLevel.AUTOMATIC, labelKey: 'student.fluency.masteryMastered' },
-  { box: MasteryLevel.STRONG, labelKey: 'student.fluency.masteryStrong' },
-  { box: MasteryLevel.GROWING, labelKey: 'student.fluency.masteryGrowing' },
-  { box: MasteryLevel.LEARNING, labelKey: 'student.fluency.masteryLearning' },
-  { box: null, labelKey: 'teacher.fluency.progressNotStarted' },
 ]

package/src/features/fluency-teacher/fluencyTeacher.helpers.ts

@@ -1,95 +1,22 @@
 import { COLORS } from '@magmamath/react-native-ui'
-import {
-  COLUMN_TO_OPERATOR,
-  FluencyOperator,
-  FluencyTableColumn,
-  MasteryLevel,
-  MATRIX_NOT_STARTED_COLOR,
-  MAX_GRADE_WITH_TWO_OPERATORS,
-  OPERATOR_PALETTES,
-  TABLE_OPERATOR_COLUMNS,
-  TWO_OPERATOR_SET,
-} from './fluencyTeacher.constants'
+import type { TranslationKey } from '../../i18n/i18n'
 import type {
   ClassFluencySummaryResponse,
   ClassFluencyStats,
   ClassOperatorAverages,
-  DrawerGrid,
   FluencyStudent,
-  OperatorBandColors,
-  OperatorColumnConfig,
   StudentResult,
 } from './fluencyTeacher.types'
 
-export const getCellColor = (
-  box: MasteryLevel | null,
-  colorMap: Record<MasteryLevel, string>,
-): string => (box ? (colorMap[box] ?? MATRIX_NOT_STARTED_COLOR) : MATRIX_NOT_STARTED_COLOR)
+export const getCellColor = (box: number | null, colorMap: Record<number, string>): string =>
+  box ? (colorMap[box] ?? COLORS.NEUTRAL_2) : COLORS.NEUTRAL_2
 
-export const isTwoOperatorGrade = (grade: number) => grade <= MAX_GRADE_WITH_TWO_OPERATORS
-
-export const getTableOperatorColumns = (grade: number): readonly OperatorColumnConfig[] =>
-  isTwoOperatorGrade(grade)
-    ? TABLE_OPERATOR_COLUMNS.filter(({ operator }) =>
-        TWO_OPERATOR_SET.includes(COLUMN_TO_OPERATOR[operator]),
-      )
-    : TABLE_OPERATOR_COLUMNS
-
-export const getOperatorsForGrade = (grade: number): readonly FluencyOperator[] =>
-  isTwoOperatorGrade(grade) ? TWO_OPERATOR_SET : Object.values(FluencyOperator)
-
-export const isColumnVisibleForGrade = (column: FluencyTableColumn, grade: number): boolean =>
-  column === FluencyTableColumn.AVERAGE ||
-  getTableOperatorColumns(grade).some(({ operator }) => operator === column)
-
-export const isCommutativeOperator = (operator: FluencyOperator): boolean =>
-  operator === FluencyOperator.ADDITION || operator === FluencyOperator.MULTIPLICATION
-
-export const getHigherMasteryLevel = (a: MasteryLevel, b: MasteryLevel): MasteryLevel =>
-  a > b ? a : b
-
-const toValidMasteryLevel = (box: MasteryLevel | null): MasteryLevel | null =>
-  box !== null && box >= MasteryLevel.LEARNING && box <= MasteryLevel.AUTOMATIC ? box : null
-
-export const countFactsByMasteryLevel = (
-  grid: DrawerGrid | null,
-  operator: FluencyOperator,
-): Map<MasteryLevel | null, number> => {
-  const counts = new Map<MasteryLevel | null, number>()
-  const commutative = isCommutativeOperator(operator)
-  grid?.rows.forEach((row) =>
-    row.cells.forEach((cell, columnIndex) => {
-      if (cell.isEmpty) return
-      // Commutative grids mirror each fact into (a,b) and (b,a) cells —
-      // count only the upper triangle so each fact is counted once.
-      if (commutative && grid.colLabels[columnIndex] < row.label) return
-      const box = toValidMasteryLevel(cell.box)
-      counts.set(box, (counts.get(box) ?? 0) + 1)
-    }),
-  )
-  return counts
-}
-
-const toBandIndex = (percent: number): number => {
-  if (percent <= 20) return 0
-  if (percent <= 40) return 1
-  if (percent <= 60) return 2
-  if (percent <= 80) return 3
-  return 4
-}
-
-// Dark shades (bands 4-5) need white text to stay readable
-export const getOperatorBandColors = (
-  operator: FluencyOperator,
-  percent: number,
-): OperatorBandColors => {
-  const palette = OPERATOR_PALETTES[operator]
-  const band = toBandIndex(percent)
-  return {
-    background: palette.bands[band],
-    border: palette.bandBorders[band],
-    text: band >= 3 ? COLORS.NEUTRAL_1 : palette.darkText,
-  }
+export const toAverageLabel = (overallPercent: number): TranslationKey => {
+  if (overallPercent >= 0.9) return 'teacher.fluency.progressFluent'
+  if (overallPercent >= 0.65) return 'teacher.fluency.progressProficient'
+  if (overallPercent >= 0.35) return 'teacher.fluency.progressDeveloping'
+  if (overallPercent >= 0.05) return 'teacher.fluency.progressLearning'
+  return 'teacher.fluency.progressNotStarted'
 }
 
 const toPercent = (decimal: number): number => Math.round(decimal * 100)
@@ -141,6 +68,7 @@ export const buildStudentsFluencyTable = ({
         id: row.studentId,
         name: student.name,
         averagePercent: toPercent(row.overallPercent),
+        averageLabel: toAverageLabel(row.overallPercent),
         scores: {
           addition: toPercent(row.byOperator.addition),
           subtraction: toPercent(row.byOperator.subtraction),

package/src/features/fluency-teacher/fluencyTeacher.types.ts

@@ -1,10 +1,5 @@
 import type { TranslationKey } from '../../i18n/i18n'
-import {
-  FluencyMathOperatorSymbol,
-  FluencyOperator,
-  FluencyTableColumn,
-  MasteryLevel,
-} from './fluencyTeacher.constants'
+import { FluencyOperator, FluencyOperatorColumn, FluencyTableColumn } from './fluencyTeacher.constants'
 import { SortingDirection } from '../../shared/common.constants'
 
 type FactId = string
@@ -15,7 +10,7 @@ type FactPosition = {
 }
 
 type FactState = {
-  box: MasteryLevel
+  box: number
   lastAttemptedAt: string | null
   lastSolvedAt: string | null
   attemptsCount: number
@@ -67,8 +62,6 @@ export type ClassFluencySummaryResponse = {
   hardestFacts: TeacherFluencyHardestFact[]
 }
 
-export type FluencyOperatorColumn = Exclude<FluencyTableColumn, FluencyTableColumn.AVERAGE>
-
 export type ClassOperatorAverages = Record<FluencyOperatorColumn, number>
 
 export type ClassFluencyStats = ClassFluencySummaryResponse & {
@@ -95,6 +88,7 @@ export type StudentResult = {
   id: string
   name: string
   averagePercent: number
+  averageLabel: TranslationKey
   scores: StudentOperatorScores
 }
 
@@ -105,38 +99,11 @@ export type StudentDrawerInfo = StudentResult & {
 export type OperatorColumnConfig = {
   operator: FluencyOperatorColumn
   labelKey: TranslationKey
+  symbol: string
+  badgeBg: string
+  badgeText: string
 }
 
-export type OperatorCardConfig = {
-  labelKey: TranslationKey
-  symbol: FluencyMathOperatorSymbol
-}
-
-export type OperatorPalette = {
-  bands: [string, string, string, string, string]
-  bandBorders: [string, string, string, string, string]
-  darkText: string
-  legendCount: string
-  boxBorder: string
-}
-
-export type OperatorBandColors = {
-  background: string
-  border: string
-  text: string
-}
-
-export type LegendItem = {
-  box: MasteryLevel | null
-  labelKey: TranslationKey
-}
-
-export type DrawerGridCell = { box: MasteryLevel | null; isEmpty: boolean }
-
-export type DrawerGridRow = { label: number; cells: DrawerGridCell[] }
-
-export type DrawerGrid = { colLabels: number[]; rows: DrawerGridRow[] }
-
 export type TeacherFluencyGateProps = {
   students: FluencyStudent[]
   grade: number

package/src/features/fluency-teacher/hooks/useDrawerGrid.ts

@@ -2,8 +2,10 @@ import { useMemo } from 'react'
 import { useUnit } from 'effector-react'
 import { useTeacherFluency } from '../context/TeacherFluencyContext'
 import { FluencyOperator } from '../fluencyTeacher.constants'
-import { getHigherMasteryLevel, isCommutativeOperator } from '../fluencyTeacher.helpers'
-import type { DrawerGrid } from '../fluencyTeacher.types'
+
+export type DrawerGridCell = { box: number | null; isEmpty: boolean }
+export type DrawerGridRow = { label: number; cells: DrawerGridCell[] }
+export type DrawerGrid = { colLabels: number[]; rows: DrawerGridRow[] }
 
 export const useDrawerGrid = (operator: FluencyOperator): DrawerGrid | null => {
   const { model } = useTeacherFluency()
@@ -17,7 +19,8 @@ export const useDrawerGrid = (operator: FluencyOperator): DrawerGrid | null => {
 
     const isDivision = operator === FluencyOperator.DIVISION
     const isSubtraction = operator === FluencyOperator.SUBTRACTION
-    const isCommutative = isCommutativeOperator(operator)
+    const isCommutative =
+      operator === FluencyOperator.ADDITION || operator === FluencyOperator.MULTIPLICATION
 
     const maxRow = Math.max(...factList.map((f) => f.position.row))
     const maxCol = Math.max(...factList.map((f) => f.position.column))
@@ -43,7 +46,7 @@ export const useDrawerGrid = (operator: FluencyOperator): DrawerGrid | null => {
         const mirrorBox = mirrorFact?.box ?? null
         const box =
           primaryBox !== null && mirrorBox !== null
-            ? getHigherMasteryLevel(primaryBox, mirrorBox)
+            ? Math.max(primaryBox, mirrorBox)
             : (primaryBox ?? mirrorBox)
 
         return { box, isEmpty: false }

package/src/features/fluency-teacher/hooks/useDrawerMatrix.ts

@@ -1,8 +1,7 @@
 import { useMemo, useState } from 'react'
 import type { LayoutChangeEvent } from 'react-native'
-import { FluencyOperator, MasteryLevel, MATRIX_CELL_COLORS } from '../fluencyTeacher.constants'
-import type { DrawerGrid } from '../fluencyTeacher.types'
-import { useDrawerGrid } from './useDrawerGrid'
+import { FluencyOperator, MATRIX_CELL_COLORS } from '../fluencyTeacher.constants'
+import { useDrawerGrid, type DrawerGrid } from './useDrawerGrid'
 
 const MATRIX_CELL_GAP = 2
 
@@ -11,7 +10,7 @@ type DrawerMatrixLayout = {
   cellSize: number
   fontSize: number
   borderRadius: number
-  cellColorMap: Record<MasteryLevel, string>
+  cellColorMap: Record<number, string>
   onLayout: (e: LayoutChangeEvent) => void
 }
 

package/src/features/fluency-teacher/model/TeacherFluencyFiltersModel.ts

@@ -8,16 +8,13 @@ export class TeacherFluencyFiltersModel {
   public readonly $search = restore(this.setSearch, '')
 
   public readonly toggleSort = createEvent<FluencyTableColumn>()
-  public readonly resetSort = createEvent()
   public readonly $sort = createStore<SortState>({
     column: FluencyTableColumn.AVERAGE,
     direction: SortingDirection.DESC,
+  }).on(this.toggleSort, (state, column) => {
+    if (state.column !== column) return { column, direction: SortingDirection.DESC }
+    const direction =
+      state.direction === SortingDirection.DESC ? SortingDirection.ASC : SortingDirection.DESC
+    return { column, direction }
   })
-    .reset(this.resetSort)
-    .on(this.toggleSort, (state, column) => {
-      if (state.column !== column) return { column, direction: SortingDirection.DESC }
-      const direction =
-        state.direction === SortingDirection.DESC ? SortingDirection.ASC : SortingDirection.DESC
-      return { column, direction }
-    })
 }

package/src/features/fluency-teacher/model/TeacherFluencyModel.ts

@@ -3,7 +3,6 @@ import { createGate } from 'effector-react'
 import { TeacherFluencyApiModel } from './TeacherFluencyApiModel'
 import { TeacherFluencyFiltersModel } from './TeacherFluencyFiltersModel'
 import { TeacherFluencyTableModel } from './TeacherFluencyTableModel'
-import { isColumnVisibleForGrade } from '../fluencyTeacher.helpers'
 import type { TeacherFluencyGateProps, TeacherFluencyModelProps } from '../fluencyTeacher.types'
 
 export class TeacherFluencyModel {
@@ -27,13 +26,6 @@ export class TeacherFluencyModel {
       target: this.table.reset,
     })
 
-    sample({
-      clock: this.gate.state,
-      source: this.filters.$sort,
-      filter: (sort, { grade }) => !isColumnVisibleForGrade(sort.column, grade),
-      target: this.filters.resetSort,
-    })
-
     sample({
       clock: this.gate.state,
       source: this.table.initFx.pending,

package/dist/commonjs/features/fluency-teacher/assets/DivisionIcon.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["_react","_interopRequireDefault","require","_reactNativeSvg","_interopRequireWildcard","_reactNativeUi","_jsxRuntime","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","hasOwnProperty","call","i","set","DivisionIcon","color","COLORS","NEUTRAL_9","size","jsxs","width","height","viewBox","fill","children","jsx","Path","d","exports"],"sourceRoot":"../../../../../src","sources":["features/fluency-teacher/assets/DivisionIcon.tsx"],"mappings":";;;;;;AAAA,IAAAA,MAAA,GAAAC,sBAAA,CAAAC,OAAA;AACA,IAAAC,eAAA,GAAAC,uBAAA,CAAAF,OAAA;AACA,IAAAG,cAAA,GAAAH,OAAA;AAA8D,IAAAI,WAAA,GAAAJ,OAAA;AAAA,SAAAK,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAJ,wBAAAI,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAI,UAAA,SAAAJ,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAK,OAAA,EAAAL,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAG,GAAA,CAAAN,CAAA,UAAAG,CAAA,CAAAI,GAAA,CAAAP,CAAA,OAAAQ,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAd,CAAA,oBAAAc,CAAA,OAAAC,cAAA,CAAAC,IAAA,CAAAhB,CAAA,EAAAc,CAAA,SAAAG,CAAA,GAAAP,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAb,CAAA,EAAAc,CAAA,UAAAG,CAAA,KAAAA,CAAA,CAAAV,GAAA,IAAAU,CAAA,CAAAC,GAAA,IAAAP,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAG,CAAA,IAAAT,CAAA,CAAAM,CAAA,IAAAd,CAAA,CAAAc,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAL,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAe,GAAA,CAAAlB,CAAA,EAAAQ,CAAA,GAAAA,CAAA;AAAA,SAAAf,uBAAAO,CAAA,WAAAA,CAAA,IAAAA,CAAA,CAAAI,UAAA,GAAAJ,CAAA,KAAAK,OAAA,EAAAL,CAAA;AAEvD,MAAMmB,YAAY,GAAGA,CAAC;EAAEC,KAAK,GAAGC,qBAAM,CAACC,SAAS;EAAEC,IAAI,GAAG;AAAc,CAAC,kBAC7E,IAAAzB,WAAA,CAAA0B,IAAA,EAAC7B,eAAA,CAAAU,OAAG;EAACoB,KAAK,EAAEF,IAAK;EAACG,MAAM,EAAEH,IAAK;EAACI,OAAO,EAAC,WAAW;EAACC,IAAI,EAAC,MAAM;EAAAC,QAAA,gBAC7D,IAAA/B,WAAA,CAAAgC,GAAA,EAACnC,eAAA,CAAAoC,IAAI;IACHC,CAAC,EAAC,0MAA0M;IAC5MJ,IAAI,EAAER;EAAM,CACb,CAAC,eACF,IAAAtB,WAAA,CAAAgC,GAAA,EAACnC,eAAA,CAAAoC,IAAI;IACHC,CAAC,EAAC,gNAAgN;IAClNJ,IAAI,EAAER;EAAM,CACb,CAAC,eACF,IAAAtB,WAAA,CAAAgC,GAAA,EAACnC,eAAA,CAAAoC,IAAI;IACHC,CAAC,EAAC,wKAAwK;IAC1KJ,IAAI,EAAER;EAAM,CACb,CAAC;AAAA,CACC,CACN;AAAAa,OAAA,CAAAd,YAAA,GAAAA,YAAA","ignoreList":[]}

package/dist/commonjs/features/fluency-teacher/components/matrix/MatrixLegend.js

@@ -1,83 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.MatrixLegend = void 0;
-var _react = _interopRequireDefault(require("react"));
-var _reactNative = require("react-native");
-var _reactNativeUi = require("@magmamath/react-native-ui");
-var _i18n = require("../../../../i18n/i18n.js");
-var _fluencyTeacherConstants = require("../../fluencyTeacher.constants.js");
-var _fluencyTeacherHelpers = require("../../fluencyTeacher.helpers.js");
-var _jsxRuntime = require("react/jsx-runtime");
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const MatrixLegend = ({
-  operator,
-  grid
-}) => {
-  const t = (0, _i18n.useText)();
-  const counts = (0, _fluencyTeacherHelpers.countFactsByMasteryLevel)(grid, operator);
-  const countColor = _fluencyTeacherConstants.OPERATOR_PALETTES[operator].legendCount;
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
-    style: styles.container,
-    children: _fluencyTeacherConstants.LEGEND_LEVELS.map(({
-      box,
-      labelKey
-    }) => /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
-      style: styles.item,
-      children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.View, {
-        style: styles.labelWrap,
-        children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.View, {
-          style: [styles.swatch, {
-            backgroundColor: box === null ? _fluencyTeacherConstants.MATRIX_NOT_STARTED_COLOR : _fluencyTeacherConstants.MATRIX_CELL_COLORS[operator][box]
-          }]
-        }), /*#__PURE__*/(0, _jsxRuntime.jsxs)(_reactNative.Text, {
-          style: styles.label,
-          children: [t(labelKey), ":"]
-        })]
-      }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_reactNative.Text, {
-        style: [styles.count, {
-          color: countColor
-        }],
-        children: counts.get(box) ?? 0
-      })]
-    }, labelKey))
-  });
-};
-exports.MatrixLegend = MatrixLegend;
-const styles = _reactNative.StyleSheet.create({
-  container: {
-    width: 130,
-    gap: _reactNativeUi.SPACING[100],
-    paddingTop: _reactNativeUi.SPACING[200],
-    paddingHorizontal: _reactNativeUi.SPACING[100]
-  },
-  item: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    justifyContent: 'space-between'
-  },
-  labelWrap: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    gap: _reactNativeUi.SPACING[100]
-  },
-  swatch: {
-    width: 10,
-    height: 10,
-    borderRadius: 4
-  },
-  label: {
-    fontFamily: _reactNativeUi.FONT_FAMILY.buenosAires,
-    fontWeight: '400',
-    fontSize: 10,
-    color: _reactNativeUi.COLORS.NEUTRAL_7
-  },
-  count: {
-    fontFamily: _reactNativeUi.FONT_FAMILY.buenosAiresSemiBold,
-    fontWeight: '600',
-    fontSize: 13
-  }
-});
-//# sourceMappingURL=MatrixLegend.js.map