@magmamath/students-features 1.3.9 → 1.3.10-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@magmamath/students-features",
-  "version": "1.3.9",
+  "version": "1.3.10-rc.0",
   "description": "Magmamath features library",
   "source": "src/index.ts",
   "main": "src/index.ts",
@@ -19,6 +19,7 @@
   },
   "peerDependencies": {
     "@magmamath/frontend-config": "1.1.3",
+    "@magmamath/react-native-draw-board": "*",
     "@magmamath/react-native-ui": "*",
     "@matteappen/skills-utils": "^3.7.1",
     "@react-native-masked-view/masked-view": "*",
@@ -40,6 +41,7 @@
   },
   "devDependencies": {
     "@magmamath/frontend-config": "1.1.3",
+    "@magmamath/react-native-draw-board": "1.8.2-rc.3",
     "@magmamath/react-native-ui": "0.4.83",
     "@matteappen/skills-utils": "^3.7.1",
     "@react-native-masked-view/masked-view": "^0.3.2",

package/src/features/chatbot/helpers.ts

@@ -66,7 +66,6 @@ export function prepareChatRequestPayload(
     answerOptions,
     answer,
     chatHistory,
-    assignmentGrade,
   } = payload
 
   if (freeTextMessage) {
@@ -107,7 +106,6 @@ export function prepareChatRequestPayload(
       ...(imageAltText && { altText: imageAltText }),
       ...(!!problemStandards?.length && { problemStandards }),
       ...(!!answerOptions?.length && { answerOptions }),
-      ...(assignmentGrade !== undefined && { assignmentGrade }),
     },
   }
 }

package/src/features/chatbot/model/ChatBotModel.ts

@@ -245,7 +245,6 @@ export class ChatbotModel {
             imageAltText: context.imageDescription,
             imageCdnId: context.imageCdnId,
             conversationId: cache[key].conversationId,
-            assignmentGrade: context.assignmentGrade,
             ...(isFreeText && { freeTextMessage: message }),
             ...(context.assignmentId && {
               chatHistory: {

package/src/features/chatbot/types/api.types.ts

@@ -64,7 +64,6 @@ export type PostMessagePayload = {
   freeTextMessage?: string
   conversationId?: string | null
   chatHistory?: ChatHistory
-  assignmentGrade?: number
 }
 
 export type PostMessageResponse = {
@@ -129,7 +128,6 @@ export type ChatHintPayload = {
   hintNumber: number
   studentInput: string
   answerOptions?: string[]
-  assignmentGrade?: number
 }
 
 export type ChatHintResponse = {

package/src/features/chatbot/types/model.types.ts

@@ -152,7 +152,6 @@ export type ChatbotContext = {
   problemStandards?: ProblemStandard[]
   assignmentId?: string
   problemId?: string
-  assignmentGrade?: number
 }
 
 export type ReinitConversationProps = {

package/src/features/interfaceMode/index.ts

@@ -0,0 +1,3 @@
+export { isSimpleGrade } from './interfaceMode.helpers'
+export { InterfaceMode, MAX_SIMPLE_MODE_GRADE } from './interfaceMode.constants'
+export { InterfaceModeModel } from './model/InterfaceModeModel'

package/src/features/interfaceMode/interfaceMode.constants.ts

@@ -0,0 +1,24 @@
+export const MAX_SIMPLE_MODE_GRADE = 2
+
+export enum Grade {
+  OTHER = -1,
+  K = 0,
+  FIRST = 1,
+  SECOND = 2,
+  THIRD = 3,
+  FOURTH = 4,
+  FIFTH = 5,
+  SIXTH = 6,
+  SEVENTH = 7,
+  EIGHTH = 8,
+  NINTH = 9,
+  TENTH = 10,
+  ELEVENTH = 11,
+  TWELFTH = 12,
+}
+
+export enum InterfaceMode {
+  REGULAR = 'REGULAR',
+  SIMPLE = 'SIMPLE',
+}
+

package/src/features/interfaceMode/interfaceMode.helpers.ts

@@ -0,0 +1,79 @@
+import { Grade, InterfaceMode } from './interfaceMode.constants'
+import { AnswerType } from '../../types/answerTypes'
+import { MyScriptMathCharacterTypes } from '../../types/characterTypes'
+import { ToolBarVariants } from '@magmamath/react-native-draw-board'
+import { Locale } from '@magmamath/frontend-config'
+
+const isValidGrade = (grade: Grade | null | undefined): grade is Grade => {
+  return grade !== null && grade !== undefined
+}
+
+export const isSimpleGrade = (grade: Grade | null | undefined) => {
+  return isValidGrade(grade) && grade >= Grade.K && grade <= Grade.SECOND
+}
+
+type GetIsSimpleModeProps = {
+  userGrade: Grade | null | undefined
+  isPracticeMode: boolean
+  practiceModeGrade: Grade | null | undefined
+  assignmentClassGrade: Grade | null | undefined
+}
+
+export const getIsSimpleMode = ({
+  userGrade,
+  isPracticeMode,
+  practiceModeGrade,
+  assignmentClassGrade,
+}: GetIsSimpleModeProps): boolean => {
+  if (isPracticeMode) return isSimpleGrade(practiceModeGrade)
+  const grade =
+    !isValidGrade(userGrade) || userGrade === Grade.OTHER
+      ? assignmentClassGrade
+      : userGrade
+
+  return isSimpleGrade(grade)
+}
+
+type GetAnswerAreaModeProps = {
+  isPracticeMode: boolean
+  answerType: AnswerType
+  characterType: MyScriptMathCharacterTypes
+  hasAnswerVariants: boolean
+}
+
+export const getAnswerAreaMode = ({
+  isPracticeMode,
+  answerType,
+  characterType,
+  hasAnswerVariants,
+}: GetAnswerAreaModeProps): InterfaceMode => {
+  const isHandwritingNumbersWhole =
+    answerType === AnswerType.HANDWRITING &&
+    characterType === MyScriptMathCharacterTypes.NUMBERS_WHOLE
+
+  if (isPracticeMode || hasAnswerVariants || isHandwritingNumbersWhole) {
+    return InterfaceMode.SIMPLE
+  }
+
+  return InterfaceMode.REGULAR
+}
+
+type GetToolbarModeProps = {
+  isSimpleModeGrade: boolean
+  grade: Grade | null | undefined
+  locale: Locale
+}
+
+export const getToolbarMode = ({
+  isSimpleModeGrade,
+  grade,
+  locale,
+}: GetToolbarModeProps): ToolBarVariants => {
+  const isUSOrCA = locale === Locale.US || locale === Locale.CA
+  const gradeThreshold = isUSOrCA ? Grade.SIXTH : Grade.SEVENTH
+  const isAdvanced = isValidGrade(grade) && grade >= gradeThreshold
+
+  if (isAdvanced) return ToolBarVariants.ADVANCED
+  if (isSimpleModeGrade) return ToolBarVariants.SIMPLE
+  return ToolBarVariants.COMMON
+}

package/src/features/interfaceMode/model/InterfaceModeModel.ts

@@ -0,0 +1,115 @@
+import { createStore, sample, Store } from 'effector'
+import { Grade, InterfaceMode } from '../interfaceMode.constants'
+import { getAnswerAreaMode, getIsSimpleMode, getToolbarMode } from '../interfaceMode.helpers'
+import { ToolBarVariants } from '@magmamath/react-native-draw-board'
+import { AnswerType } from '../../../types/answerTypes'
+import { MyScriptMathCharacterTypes } from '../../../types/characterTypes'
+import { Locale } from '@magmamath/frontend-config'
+
+const INITIAL_STATE = {
+  toolbar: ToolBarVariants.COMMON,
+  answerArea: InterfaceMode.REGULAR,
+  general: InterfaceMode.REGULAR,
+}
+
+type NullableGrade = Grade | null
+
+export class InterfaceModeModel {
+  public readonly $mode = createStore(INITIAL_STATE)
+
+  private $userGrade: Store<NullableGrade> = createStore<NullableGrade>(null)
+  private $isPracticeMode: Store<boolean> = createStore(false)
+  private $practiceModeGrade: Store<NullableGrade> = createStore<NullableGrade>(null)
+  private $classGrade: Store<NullableGrade> = createStore<NullableGrade>(null)
+  private $locale: Store<Locale> = createStore(Locale.US)
+  private $answerType: Store<AnswerType> = createStore(AnswerType.HANDWRITING)
+  private $characterType: Store<MyScriptMathCharacterTypes> = createStore(MyScriptMathCharacterTypes.NUMBERS_WHOLE)
+  private $hasAnswerVariants: Store<boolean> = createStore(false)
+
+  bindUserGrade($store: Store<NullableGrade>) {
+    this.$userGrade = $store
+    return this
+  }
+
+  bindPracticeMode($store: Store<boolean>) {
+    this.$isPracticeMode = $store
+    return this
+  }
+
+  bindPracticeModeGrade($store: Store<NullableGrade>) {
+    this.$practiceModeGrade = $store
+    return this
+  }
+
+  bindClassGrade($store: Store<NullableGrade>) {
+    this.$classGrade = $store
+    return this
+  }
+
+  bindLocale($store: Store<Locale>) {
+    this.$locale = $store
+    return this
+  }
+
+  bindAnswerType($store: Store<AnswerType>) {
+    this.$answerType = $store
+    return this
+  }
+
+  bindCharacterType($store: Store<MyScriptMathCharacterTypes>) {
+    this.$characterType = $store
+    return this
+  }
+
+  bindHasAnswerVariants($store: Store<boolean>) {
+    this.$hasAnswerVariants = $store
+    return this
+  }
+
+  init() {
+    sample({
+      source: {
+        userGrade: this.$userGrade,
+        locale: this.$locale,
+        isPracticeMode: this.$isPracticeMode,
+        practiceModeGrade: this.$practiceModeGrade,
+        assignmentClassGrade: this.$classGrade,
+        answerType: this.$answerType,
+        characterType: this.$characterType,
+        hasAnswerVariants: this.$hasAnswerVariants,
+      },
+      fn: ({
+        locale,
+        userGrade,
+        isPracticeMode,
+        practiceModeGrade,
+        assignmentClassGrade,
+        answerType,
+        characterType,
+        hasAnswerVariants,
+      }) => {
+        const isSimpleMode = getIsSimpleMode({
+          userGrade,
+          isPracticeMode,
+          practiceModeGrade,
+          assignmentClassGrade,
+        })
+
+        return {
+          general: isSimpleMode ? InterfaceMode.SIMPLE : InterfaceMode.REGULAR,
+          toolbar: getToolbarMode({
+            isSimpleModeGrade: isSimpleMode,
+            grade: assignmentClassGrade ?? practiceModeGrade,
+            locale,
+          }),
+          answerArea: isSimpleMode
+            ? getAnswerAreaMode({ isPracticeMode, answerType, characterType, hasAnswerVariants })
+            : InterfaceMode.REGULAR,
+        }
+      },
+      target: this.$mode,
+    })
+
+    return this
+  }
+}

package/src/types/answerTypes.ts

@@ -0,0 +1,7 @@
+export enum AnswerType {
+  HANDWRITING = 0,
+  SINGLE_CHOICE = 1,
+  MULTIPLE_CHOICE = 2,
+  ORDERED_CHOICE = 3,
+  OPEN_ENDED = 11,
+}

package/.claude/settings.local.json

@@ -1,25 +0,0 @@
-{
-  "permissions": {
-    "allow": [
-      "Bash(npx tsc:*)",
-      "Bash(find /Users/alesiaskarakhod/Work/students-features -name rn-draw-area -o -name *draw*area*)",
-      "Bash(grep:*)",
-      "Bash(find /Users/alesiaskarakhod/Work/magmamath-tools -type f -name \"*.ts*\" ! -path \"*/node_modules/*\" ! -path \"*/.next/*\" ! -path \"*/dist/*\" -exec grep -l \"convertLatexToBrackets\\\\|convertBracketsToLatex\" {})",
-      "Bash(find /Users/alesiaskarakhod/Work/magmamath-tools -type f \\\\\\(-name *.test.ts* -o -name *.spec.ts* \\\\\\))",
-      "Bash(ls jest.config* vitest.config* tsconfig*)",
-      "Bash(npm ls:*)",
-      "Read(//Users/alesiaskarakhod/node_modules/.bin/**)",
-      "Bash(yarn add:*)",
-      "Bash(npx jest:*)",
-      "Bash(node:*)",
-      "Bash(npx ts-node:*)",
-      "Bash(find /Users/alesiaskarakhod/Work/magmamath-tools/packages -name jest.config.* -o -name *.test.ts -o -name *.test.js -o -name *.spec.ts)",
-      "Bash(find /Users/alesiaskarakhod/Work/magmamath-tools/packages -maxdepth 3 -type f \\\\\\(-name *.test.ts -o -name *.spec.ts -o -name *.test.tsx -o -name *.spec.tsx \\\\\\))",
-      "Bash(find /Users/alesiaskarakhod/Work/magmamath-tools -type f \\\\\\(-name *.test.ts -o -name *.test.tsx -o -name *.spec.ts -o -name *.spec.tsx \\\\\\))",
-      "Bash(yarn test:*)",
-      "Bash(npx vitest:*)",
-      "Bash(npx tsup:*)",
-      "Bash(find /Users/alesiaskarakhod/Work/react-native/node_modules/@magmamath/frontend-config -name *.d.ts -o -name *.js)"
-    ]
-  }
-}

package/.editorconfig

@@ -1,15 +0,0 @@
-# EditorConfig helps developers define and maintain consistent
-# coding styles between different editors and IDEs
-# editorconfig.org
-
-root = true
-
-[*]
-
-indent_style = space
-indent_size = 2
-
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true

package/.eslintignore

@@ -1,2 +0,0 @@
-node_modules/
-./lib/

package/.eslintrc

@@ -1,22 +0,0 @@
-{
-  "env": {
-    "browser": true,
-    "es2020": true
-  },
-  "extends": [
-    "eslint:recommended",
-    "plugin:@typescript-eslint/recommended",
-    "plugin:react-hooks/recommended",
-    "plugin:storybook/recommended",
-    "prettier"
-  ],
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "ecmaVersion": "latest",
-    "sourceType": "module"
-  },
-  "plugins": ["react-refresh"],
-  "rules": {
-    "react-refresh/only-export-components": "warn"
-  }
-}

package/.gitattributes

@@ -1,3 +0,0 @@
-*.pbxproj -text
-# specific for windows script files
-*.bat text eol=crlf

package/.github/actions/setup/action.yml

@@ -1,37 +0,0 @@
-name: Setup
-description: Setup Node.js and install dependencies
-
-inputs:
-  npmrc-auth-token:
-    required: true
-
-runs:
-  using: composite
-  steps:
-    - name: Setup Node.js
-      uses: actions/setup-node@v4
-      with:
-        node-version-file: .nvmrc
-
-    - name: Create .npmrc
-      shell: bash
-      run: |
-        echo "registry=https://registry.npmjs.org" > .npmrc
-        echo "//registry.npmjs.org/:_authToken=${{ inputs.npmrc-auth-token }}" >> .npmrc
-
-    - name: Cache dependencies
-      id: yarn-cache
-      uses: actions/cache@v4
-      with:
-        path: |
-          **/node_modules
-          .yarn/install-state.gz
-        key: ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}-${{ hashFiles('**/package.json', '!node_modules/**') }}
-        restore-keys: |
-          ${{ runner.os }}-yarn-${{ hashFiles('yarn.lock') }}
-          ${{ runner.os }}-yarn-
-
-    - name: Install dependencies
-      if: steps.yarn-cache.outputs.cache-hit != 'true'
-      run: yarn install --immutable
-      shell: bash

package/.github/workflows/ci.yml

@@ -1,73 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - main
-  pull_request:
-    branches:
-      - main
-  merge_group:
-    types:
-      - checks_requested
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup
-        uses: ./.github/actions/setup
-        with:
-          npmrc-auth-token: ${{ secrets.MAGMA_NPMRC_TOKEN }}
-
-      - name: Lint files
-        run: yarn lint
-
-      - name: Typecheck files
-        run: yarn typecheck
-
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup
-        uses: ./.github/actions/setup
-        with:
-          npmrc-auth-token: ${{ secrets.MAGMA_NPMRC_TOKEN }}
-
-      - name: Run unit tests
-        run: yarn test --maxWorkers=2 --coverage
-
-  build-library:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup
-        uses: ./.github/actions/setup
-        with:
-          npmrc-auth-token: ${{ secrets.MAGMA_NPMRC_TOKEN }}
-
-      - name: Build package
-        run: yarn prepare
-
-  build-web:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup
-        uses: ./.github/actions/setup
-        with:
-          npmrc-auth-token: ${{ secrets.MAGMA_NPMRC_TOKEN }}
-
-      - name: Build example for Web
-        run: |
-          yarn example expo export --platform web

package/.gitignore

@@ -1,84 +0,0 @@
-# OSX
-#
-.DS_Store
-
-# XDE
-.expo/
-
-# VSCode
-.vscode/
-jsconfig.json
-
-# Xcode
-#
-build/
-*.pbxuser
-!default.pbxuser
-*.mode1v3
-!default.mode1v3
-*.mode2v3
-!default.mode2v3
-*.perspectivev3
-!default.perspectivev3
-xcuserdata
-*.xccheckout
-*.moved-aside
-DerivedData
-*.hmap
-*.ipa
-*.xcuserstate
-project.xcworkspace
-
-# Android/IJ
-#
-.classpath
-.cxx
-.gradle
-.idea
-.project
-.settings
-local.properties
-android.iml
-
-# Cocoapods
-#
-example/ios/Pods
-
-# Ruby
-example/vendor/
-
-# node.js
-#
-node_modules/
-npm-debug.log
-yarn-debug.log
-yarn-error.log
-
-# BUCK
-buck-out/
-\.buckd/
-android/app/libs
-android/keystores/debug.keystore
-
-# Yarn
-.yarn/*
-!.yarn/patches
-!.yarn/plugins
-!.yarn/releases
-!.yarn/sdks
-!.yarn/versions
-
-# Expo
-.expo/
-
-# Turborepo
-.turbo/
-
-# generated by bob
-dist/
-!src/lib/
-
-# React Native Codegen
-ios/generated
-android/generated
-.npmrc

package/.idea/.gitignore

@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Editor-based HTTP Client requests
-/httpRequests/
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml

package/.idea/codeStyles/Project.xml

@@ -1,62 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <option name="LINE_SEPARATOR" value="&#10;" />
-    <HTMLCodeStyleSettings>
-      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-    </HTMLCodeStyleSettings>
-    <JSCodeStyleSettings version="0">
-      <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </JSCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </TypeScriptCodeStyleSettings>
-    <VueCodeStyleSettings>
-      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
-      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
-    </VueCodeStyleSettings>
-    <codeStyleSettings language="HTML">
-      <option name="SOFT_MARGINS" value="100" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JavaScript">
-      <option name="SOFT_MARGINS" value="100" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <option name="SOFT_MARGINS" value="100" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="Vue">
-      <option name="SOFT_MARGINS" value="100" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

package/.idea/copilot.data.migration.agent.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AgentMigrationStateService">
-    <option name="migrationStatus" value="COMPLETED" />
-  </component>
-</project>

package/.idea/copilot.data.migration.ask.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="AskMigrationStateService">
-    <option name="migrationStatus" value="COMPLETED" />
-  </component>
-</project>

package/.idea/copilot.data.migration.ask2agent.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="Ask2AgentMigrationStateService">
-    <option name="migrationStatus" value="COMPLETED" />
-  </component>
-</project>