@tellescope/react-components 1.157.1 → 1.158.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tellescope/react-components",
-  "version": "1.157.1",
+  "version": "1.158.0",
   "description": "",
   "main": "./lib/cjs/index.js",
   "module": "./lib/esm/index.js",
@@ -47,13 +47,13 @@
     "@reduxjs/toolkit": "^1.6.2",
     "@stripe/react-stripe-js": "^2.9.0",
     "@stripe/stripe-js": "^1.52.1",
-    "@tellescope/constants": "^1.157.1",
-    "@tellescope/sdk": "^1.157.1",
-    "@tellescope/types-client": "^1.157.1",
-    "@tellescope/types-models": "^1.157.1",
-    "@tellescope/types-utilities": "^1.157.1",
-    "@tellescope/utilities": "^1.157.1",
-    "@tellescope/validation": "^1.157.1",
+    "@tellescope/constants": "^1.158.0",
+    "@tellescope/sdk": "^1.158.0",
+    "@tellescope/types-client": "^1.158.0",
+    "@tellescope/types-models": "^1.158.0",
+    "@tellescope/types-utilities": "^1.158.0",
+    "@tellescope/utilities": "^1.158.0",
+    "@tellescope/validation": "^1.158.0",
     "@typescript-eslint/eslint-plugin": "^4.33.0",
     "@typescript-eslint/parser": "^4.33.0",
     "css-to-react-native": "^3.0.0",
@@ -80,7 +80,7 @@
     "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0",
     "react-native": "^0.65.0 || ^0.66.0 || ^0.67.0 || ^0.68.0 || ^0.71.0"
   },
-  "gitHead": "5019608eaa05afae077c4bf4551306a31f60cb73",
+  "gitHead": "0ed357b60dd15c474a84c6eb595eead1b4c33847",
   "publishConfig": {
     "access": "public"
   }

package/src/Forms/hooks.tsx

@@ -198,6 +198,7 @@ export const getNextField = (activeField: FormFieldNode, currentValue: Response,
   urlLogicValue?: string,
   dateOfBirth?: string,
   gender?: string,
+  state?: string,
   form?: Form,
   activeResponses?: FormResponseValue[], // current and previous answers (not future answers)
 }) => {
@@ -600,6 +601,7 @@ export const useTellescopeForm = ({ form, urlLogicValue, customization, carePlan
       disabled: !!(existingResponses?.find(r => r.fieldId === f.id)?.answer?.value && f.disabledWhenPrepopulated),
       // keep consistent with onFieldChange
       computedValueKey: (
+        // the height typeof is unnecessary (no actual type comparison), but don't change without testing both number and height question types
         f?.intakeField === 'height' && typeof existingResponses?.find(r => r.fieldId === f.id)?.answer?.value
           ? 'Height'
       : f?.intakeField === 'weight' && typeof existingResponses?.find(r => r.fieldId === f.id)?.answer?.value === 'number'
@@ -608,6 +610,8 @@ export const useTellescopeForm = ({ form, urlLogicValue, customization, carePlan
           ? 'Date of Birth'
       : f?.intakeField === 'gender' && ['multiple_choice', 'Dropdown'].includes(existingResponses?.find(r => r.fieldId === f.id)?.answer?.type || '')
           ? 'Gender'
+      : f?.intakeField === 'Address' && existingResponses?.find(r => r.fieldId === f.id && r.answer.type === 'Address')
+          ? 'State'
           : undefined
       ) as any,  
       answer: { 
@@ -1060,6 +1064,7 @@ export const useTellescopeForm = ({ form, urlLogicValue, customization, carePlan
         activeResponses: responses.filter(r => r.includeInSubmit),
         dateOfBirth: enduser?.dateOfBirth,
         gender: enduser?.gender,
+        state: enduser?.state,
       })
     )
   )
@@ -1275,6 +1280,7 @@ export const useTellescopeForm = ({ form, urlLogicValue, customization, carePlan
         activeResponses: responses.filter(r => r.includeInSubmit),
         dateOfBirth: enduser?.dateOfBirth,
         gender: enduser?.gender,
+        state: enduser?.state,
       })
 
       // when autoadvancing, prevent adding duplicates by checking whether already on stack
@@ -1341,6 +1347,8 @@ export const useTellescopeForm = ({ form, urlLogicValue, customization, carePlan
           ? 'Date of Birth'
       : field?.intakeField === 'gender' && (r.answer.type === 'Dropdown' || r.answer.type === 'multiple_choice')
           ? 'Gender'
+      : field?.intakeField === 'Address' && r.answer.type === 'Address'
+          ? 'State'
           : undefined
       )
     })))

package/src/Forms/inputs.tsx

@@ -13,7 +13,7 @@ import LinearProgress from '@mui/material/LinearProgress';
 import DatePicker from "react-datepicker";
 import { datepickerCSS } from "./css/react-datepicker" // avoids build issue with RN
 import { CancelIcon, FileBlob, IconButton, LabeledIconButton, LoadingButton, Styled, form_display_text_for_language, isDateString, useProducts, useResolvedSession } from ".."
-import { CalendarEvent, DatabaseRecord, FormField } from "@tellescope/types-client"
+import { AllergyCode, CalendarEvent, DatabaseRecord, FormField } from "@tellescope/types-client"
 import { css } from '@emotion/css'
 import { DragDropContext, Droppable, Draggable } from "react-beautiful-dnd";
 import DragIndicatorIcon from '@mui/icons-material/DragIndicator';
@@ -2992,6 +2992,7 @@ export const AllergiesInput = ({ goToNextField, goToPreviousField, field, value,
     /> 
   )
 }
+const display_with_code = (v: { code: string, display: string }) => `${v.code}: ${first_letter_capitalized(v.display)}`
 
 export const ConditionsInput = ({ goToNextField, goToPreviousField, field, value, onChange, form, formResponseId, ...props }: FormInputProps<'Conditions'>) => {
   const session = useResolvedSession()
@@ -3029,7 +3030,7 @@ export const ConditionsInput = ({ goToNextField, goToPreviousField, field, value
         onChange(v, field.id)
         setResults([])
       }}
-      getOptionLabel={v => first_letter_capitalized(v.display)} filterOptions={o => o}
+      getOptionLabel={display_with_code} filterOptions={o => o}
       inputValue={query} onInputChange={(e, v) => e && setQuery(v) }
       renderInput={(params) => (
         <TextField {...params} InputProps={{ ...params.InputProps, sx: defaultInputProps.sx }}
@@ -3039,7 +3040,7 @@ export const ConditionsInput = ({ goToNextField, goToPreviousField, field, value
       renderTags={(value, getTagProps) =>
         value.map((value, index) => (
           <Chip
-            label={<Typography style={{whiteSpace: 'normal'}}>{value.display}</Typography>}
+            label={<Typography style={{whiteSpace: 'normal'}}>{display_with_code(value)}</Typography>}
             {...getTagProps({ index })}
             sx={{height:"100%", py: 0.5 }}
           />

package/src/state.tsx

@@ -1985,7 +1985,7 @@ export const useTemplates = (options={} as HookOptions<Template>) => {
   )
 }
 export const useForms = (options={} as HookOptions<Form>) => {
-  const session = useSession()
+  const session = useResolvedSession()
   return useListStateHook(
     'forms', useTypedSelector(s => s.forms), session, formsSlice, 
     {