@aehrc/smart-forms-renderer 0.5.0 → 0.6.0

package/src/components/FormComponents/ItemParts/{QItemRadioButtonWithOpenLabel.tsx → RadioButtonWithOpenLabel.tsx}

@@ -17,11 +17,11 @@
 
 import type { ChangeEvent } from 'react';
 import React from 'react';
-import { Box } from '@mui/material';
+import Box from '@mui/material/Box';
 import { StandardTextField } from '../Textfield.styles';
-import QItemChoiceRadioSingle from '../QItemChoice/QItemChoiceRadioSingle';
+import ChoiceRadioSingle from '../ChoiceItems/ChoiceRadioSingle';
 
-interface Props {
+interface RadioButtonWithOpenLabelProps {
   value: string | null;
   label: string;
   readOnly: boolean;
@@ -29,7 +29,7 @@ interface Props {
   onInputChange: (input: string) => unknown;
 }
 
-function QItemRadioButtonWithOpenLabel(props: Props) {
+function RadioButtonWithOpenLabel(props: RadioButtonWithOpenLabelProps) {
   const { value, label, readOnly, isSelected, onInputChange } = props;
   function handleInputChange(event: ChangeEvent<HTMLInputElement>) {
     onInputChange(event.target.value);
@@ -37,7 +37,7 @@ function QItemRadioButtonWithOpenLabel(props: Props) {
 
   return (
     <Box data-test="q-item-radio-open-label-box">
-      <QItemChoiceRadioSingle value={value ?? ''} label={label + ':'} readOnly={readOnly} />
+      <ChoiceRadioSingle value={value ?? ''} label={label + ':'} readOnly={readOnly} />
       <StandardTextField
         disabled={!isSelected}
         value={value}
@@ -51,4 +51,4 @@ function QItemRadioButtonWithOpenLabel(props: Props) {
   );
 }
 
-export default QItemRadioButtonWithOpenLabel;
+export default RadioButtonWithOpenLabel;

package/src/components/FormComponents/Lists.styles.ts

@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import { List, styled } from '@mui/material';
-import { alpha } from '@mui/material/styles';
+import List from '@mui/material/List';
+import { alpha, styled } from '@mui/material/styles';
 
 export const PrimarySelectableList = styled(List)(({ theme }) => ({
   '&& .Mui-selected': {

package/src/components/FormComponents/{QItemOpenChoice/QItemOpenChoiceAutocomplete.tsx → OpenChoiceItems/OpenChoiceAutocompleteItem.tsx}

@@ -17,7 +17,13 @@
 
 import type { ChangeEvent, SyntheticEvent } from 'react';
 import React, { useState } from 'react';
-import { Autocomplete, Box, CircularProgress, Fade, Grid, Tooltip } from '@mui/material';
+import Autocomplete from '@mui/material/Autocomplete';
+import Box from '@mui/material/Box';
+import CircularProgress from '@mui/material/CircularProgress';
+import Fade from '@mui/material/Fade';
+import Grid from '@mui/material/Grid';
+import Tooltip from '@mui/material/Tooltip';
+
 import type { Coding, QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
 
 import { createEmptyQrItem } from '../../../utils/qrItem';
@@ -41,7 +47,7 @@ import { AUTOCOMPLETE_DEBOUNCE_DURATION } from '../../../utils/debounce';
 import DisplayInstructions from '../DisplayItem/DisplayInstructions';
 import LabelWrapper from '../ItemParts/ItemLabelWrapper';
 
-interface QItemOpenChoiceAutocompleteProps
+interface OpenChoiceAutocompleteItemProps
   extends PropsWithQrItemChangeHandler<QuestionnaireResponseItem>,
     PropsWithIsRepeatedAttribute,
     PropsWithIsTabledAttribute {
@@ -49,7 +55,7 @@ interface QItemOpenChoiceAutocompleteProps
   qrItem: QuestionnaireResponseItem;
 }
 
-function QItemOpenChoiceAutocomplete(props: QItemOpenChoiceAutocompleteProps) {
+function OpenChoiceAutocompleteItem(props: OpenChoiceAutocompleteItemProps) {
   const { qItem, qrItem, isRepeated, isTabled, onQrItemChange } = props;
   const qrOpenChoice = qrItem ?? createEmptyQrItem(qItem);
 
@@ -186,9 +192,11 @@ function QItemOpenChoiceAutocomplete(props: QItemOpenChoiceAutocompleteProps) {
     </>
   );
 
-  const renderQItemOpenChoiceAutocomplete = isRepeated ? (
-    <>{openChoiceAutocomplete}</>
-  ) : (
+  if (isRepeated) {
+    return <>{openChoiceAutocomplete}</>;
+  }
+
+  return (
     <FullWidthFormComponentBox>
       <Grid container columnSpacing={6}>
         <Grid item xs={5}>
@@ -201,7 +209,6 @@ function QItemOpenChoiceAutocomplete(props: QItemOpenChoiceAutocompleteProps) {
       </Grid>
     </FullWidthFormComponentBox>
   );
-  return <>{renderQItemOpenChoiceAutocomplete}</>;
 }
 
-export default QItemOpenChoiceAutocomplete;
+export default OpenChoiceAutocompleteItem;

package/src/components/FormComponents/{QItemOpenChoice/QItemOpenChoiceCheckboxAnswerOption.tsx → OpenChoiceItems/OpenChoiceCheckboxAnswerOptionItem.tsx}

@@ -16,13 +16,13 @@
  */
 
 import React, { useCallback, useMemo, useState } from 'react';
-import { Grid } from '@mui/material';
-import { CheckBoxOptionType, QItemChoiceOrientation } from '../../../interfaces/choice.enum';
+import Grid from '@mui/material/Grid';
+import { CheckBoxOption, ChoiceItemOrientation } from '../../../interfaces/choice.enum';
 import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
 import { createEmptyQrItem } from '../../../utils/qrItem';
-import QItemCheckboxSingle from '../ItemParts/QItemCheckboxSingle';
+import CheckboxSingle from '../ItemParts/CheckboxSingle';
 import { getOpenLabelText } from '../../../utils/itemControl';
-import QItemCheckboxSingleWithOpenLabel from '../ItemParts/QItemCheckboxSingleWithOpenLabel';
+import CheckboxSingleWithOpenLabel from '../ItemParts/CheckboxSingleWithOpenLabel';
 import { QFormGroup } from '../Item.styles';
 import {
   getOldOpenLabelAnswer,
@@ -39,15 +39,15 @@ import { DEBOUNCE_DURATION } from '../../../utils/debounce';
 import DisplayInstructions from '../DisplayItem/DisplayInstructions';
 import LabelWrapper from '../ItemParts/ItemLabelWrapper';
 
-interface QItemOpenChoiceCheckboxProps
+interface OpenChoiceCheckboxAnswerOptionItemProps
   extends PropsWithQrItemChangeHandler<QuestionnaireResponseItem>,
     PropsWithIsRepeatedAttribute {
   qItem: QuestionnaireItem;
   qrItem: QuestionnaireResponseItem;
-  orientation: QItemChoiceOrientation;
+  orientation: ChoiceItemOrientation;
 }
 
-function QItemOpenChoiceCheckboxAnswerOption(props: QItemOpenChoiceCheckboxProps) {
+function OpenChoiceCheckboxAnswerOptionItem(props: OpenChoiceCheckboxAnswerOptionItemProps) {
   const { qItem, qrItem, isRepeated, onQrItemChange, orientation } = props;
 
   // Init answers
@@ -85,7 +85,7 @@ function QItemOpenChoiceCheckboxAnswerOption(props: QItemOpenChoiceCheckboxProps
           answers,
           answerOptions,
           qrOpenChoiceCheckbox,
-          CheckBoxOptionType.AnswerOption,
+          CheckBoxOption.AnswerOption,
           isRepeated
         );
       } else if (changedOpenLabelValue !== null) {
@@ -95,7 +95,7 @@ function QItemOpenChoiceCheckboxAnswerOption(props: QItemOpenChoiceCheckboxProps
           answers,
           answerOptions,
           qrOpenChoiceCheckbox,
-          CheckBoxOptionType.AnswerOption,
+          CheckBoxOption.AnswerOption,
           isRepeated
         );
       }
@@ -116,11 +116,11 @@ function QItemOpenChoiceCheckboxAnswerOption(props: QItemOpenChoiceCheckboxProps
   ); // Dependencies are tested, debounce is causing eslint to not recognise dependencies
 
   const openChoiceCheckbox = (
-    <QFormGroup row={orientation === QItemChoiceOrientation.Horizontal}>
+    <QFormGroup row={orientation === ChoiceItemOrientation.Horizontal}>
       {qItem.answerOption?.map((option) => {
         if (option['valueCoding']) {
           return (
-            <QItemCheckboxSingle
+            <CheckboxSingle
               key={option.valueCoding.code ?? ''}
               value={option.valueCoding.code ?? ''}
               label={option.valueCoding.display ?? `${option.valueCoding.code}`}
@@ -133,7 +133,7 @@ function QItemOpenChoiceCheckboxAnswerOption(props: QItemOpenChoiceCheckboxProps
           );
         } else if (option['valueString']) {
           return (
-            <QItemCheckboxSingle
+            <CheckboxSingle
               key={option.valueString}
               value={option.valueString}
               label={option.valueString}
@@ -144,7 +144,7 @@ function QItemOpenChoiceCheckboxAnswerOption(props: QItemOpenChoiceCheckboxProps
           );
         } else if (option['valueInteger']) {
           return (
-            <QItemCheckboxSingle
+            <CheckboxSingle
               key={option.valueInteger}
               value={option.valueInteger.toString()}
               label={option.valueInteger.toString()}
@@ -159,7 +159,7 @@ function QItemOpenChoiceCheckboxAnswerOption(props: QItemOpenChoiceCheckboxProps
       })}
 
       {openLabelText ? (
-        <QItemCheckboxSingleWithOpenLabel
+        <CheckboxSingleWithOpenLabel
           value={openLabelValue}
           label={openLabelText}
           isChecked={openLabelChecked}
@@ -191,4 +191,4 @@ function QItemOpenChoiceCheckboxAnswerOption(props: QItemOpenChoiceCheckboxProps
   );
 }
 
-export default QItemOpenChoiceCheckboxAnswerOption;
+export default OpenChoiceCheckboxAnswerOptionItem;

package/src/components/FormComponents/{QItemOpenChoice/QItemOpenChoice.tsx → OpenChoiceItems/OpenChoiceItemSwitcher.tsx}

@@ -16,22 +16,22 @@
  */
 
 import React from 'react';
-import { QItemOpenChoiceControl } from '../../../interfaces/choice.enum';
+import { OpenChoiceItemControl } from '../../../interfaces/choice.enum';
 import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
-import QItemOpenChoiceSelectAnswerOption from './QItemOpenChoiceSelectAnswerOption';
-import QItemOpenChoiceSelectAnswerValueSet from './QItemOpenChoiceSelectAnswerValueSet';
-import QItemOpenChoiceAutocomplete from './QItemOpenChoiceAutocomplete';
+import OpenChoiceSelectAnswerOptionItem from './OpenChoiceSelectAnswerOptionItem';
+import OpenChoiceSelectAnswerValueSetItem from './OpenChoiceSelectAnswerValueSetItem';
+import OpenChoiceAutocompleteItem from './OpenChoiceAutocompleteItem';
 import { getOpenChoiceControlType } from '../../../utils/openChoice';
 import { getChoiceOrientation } from '../../../utils/choice';
-import QItemOpenChoiceCheckboxAnswerOption from './QItemOpenChoiceCheckboxAnswerOption';
-import QItemOpenChoiceRadioAnswerOption from './QItemOpenChoiceRadioAnswerOption';
+import OpenChoiceCheckboxAnswerOptionItem from './OpenChoiceCheckboxAnswerOptionItem';
+import OpenChoiceRadioAnswerOptionItem from './OpenChoiceRadioAnswerOptionItem';
 import type {
   PropsWithIsRepeatedAttribute,
   PropsWithIsTabledAttribute,
   PropsWithQrItemChangeHandler
 } from '../../../interfaces/renderProps.interface';
 
-interface Props
+interface OpenChoiceItemSwitcherProps
   extends PropsWithQrItemChangeHandler<QuestionnaireResponseItem>,
     PropsWithIsRepeatedAttribute,
     PropsWithIsTabledAttribute {
@@ -39,14 +39,14 @@ interface Props
   qrItem: QuestionnaireResponseItem;
 }
 
-function QItemOpenChoice(props: Props) {
+function OpenChoiceItemSwitcher(props: OpenChoiceItemSwitcherProps) {
   const { qItem, qrItem, isRepeated, isTabled, onQrItemChange } = props;
   const orientation = getChoiceOrientation(qItem);
 
   switch (getOpenChoiceControlType(qItem)) {
-    case QItemOpenChoiceControl.Checkbox:
+    case OpenChoiceItemControl.Checkbox:
       return (
-        <QItemOpenChoiceCheckboxAnswerOption
+        <OpenChoiceCheckboxAnswerOptionItem
           qItem={qItem}
           qrItem={qrItem}
           isRepeated={qItem['repeats'] ?? false}
@@ -54,9 +54,9 @@ function QItemOpenChoice(props: Props) {
           orientation={orientation}
         />
       );
-    case QItemOpenChoiceControl.Radio:
+    case OpenChoiceItemControl.Radio:
       return (
-        <QItemOpenChoiceRadioAnswerOption
+        <OpenChoiceRadioAnswerOptionItem
           qItem={qItem}
           qrItem={qrItem}
           isRepeated={qItem['repeats'] ?? false}
@@ -64,9 +64,9 @@ function QItemOpenChoice(props: Props) {
           orientation={orientation}
         />
       );
-    case QItemOpenChoiceControl.Autocomplete:
+    case OpenChoiceItemControl.Autocomplete:
       return (
-        <QItemOpenChoiceAutocomplete
+        <OpenChoiceAutocompleteItem
           qItem={qItem}
           qrItem={qrItem}
           isRepeated={isRepeated}
@@ -74,10 +74,10 @@ function QItemOpenChoice(props: Props) {
           onQrItemChange={onQrItemChange}
         />
       );
-    case QItemOpenChoiceControl.Select:
+    case OpenChoiceItemControl.Select:
       if (qItem.answerValueSet) {
         return (
-          <QItemOpenChoiceSelectAnswerValueSet
+          <OpenChoiceSelectAnswerValueSetItem
             qItem={qItem}
             qrItem={qrItem}
             isRepeated={isRepeated}
@@ -87,7 +87,7 @@ function QItemOpenChoice(props: Props) {
         );
       } else {
         return (
-          <QItemOpenChoiceSelectAnswerOption
+          <OpenChoiceSelectAnswerOptionItem
             qItem={qItem}
             qrItem={qrItem}
             isRepeated={isRepeated}
@@ -101,4 +101,4 @@ function QItemOpenChoice(props: Props) {
   }
 }
 
-export default QItemOpenChoice;
+export default OpenChoiceItemSwitcher;

package/src/components/FormComponents/{QItemOpenChoice/QItemOpenChoiceRadioAnswerOption.tsx → OpenChoiceItems/OpenChoiceRadioAnswerOptionItem.tsx}

@@ -17,17 +17,17 @@
 
 import type { ChangeEvent } from 'react';
 import React, { useState } from 'react';
-import { Grid } from '@mui/material';
-import { QItemChoiceOrientation } from '../../../interfaces/choice.enum';
+import Grid from '@mui/material/Grid';
+import { ChoiceItemOrientation } from '../../../interfaces/choice.enum';
 import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
 import { createEmptyQrItem } from '../../../utils/qrItem';
 import { getOpenLabelText } from '../../../utils/itemControl';
 import { QRadioGroup } from '../Item.styles';
 import { getOldOpenLabelAnswer } from '../../../utils/openChoice';
 import { FullWidthFormComponentBox } from '../../Box.styles';
-import QItemChoiceRadioSingle from '../QItemChoice/QItemChoiceRadioSingle';
+import ChoiceRadioSingle from '../ChoiceItems/ChoiceRadioSingle';
 import { findInAnswerOptions, getQrChoiceValue } from '../../../utils/choice';
-import QItemRadioButtonWithOpenLabel from '../ItemParts/QItemRadioButtonWithOpenLabel';
+import RadioButtonWithOpenLabel from '../ItemParts/RadioButtonWithOpenLabel';
 import useRenderingExtensions from '../../../hooks/useRenderingExtensions';
 import type {
   PropsWithIsRepeatedAttribute,
@@ -36,15 +36,15 @@ import type {
 import DisplayInstructions from '../DisplayItem/DisplayInstructions';
 import LabelWrapper from '../ItemParts/ItemLabelWrapper';
 
-interface QItemOpenChoiceRadioProps
+interface OpenChoiceRadioAnswerOptionItemProps
   extends PropsWithQrItemChangeHandler<QuestionnaireResponseItem>,
     PropsWithIsRepeatedAttribute {
   qItem: QuestionnaireItem;
   qrItem: QuestionnaireResponseItem;
-  orientation: QItemChoiceOrientation;
+  orientation: ChoiceItemOrientation;
 }
 
-function QItemOpenChoiceRadioAnswerOption(props: QItemOpenChoiceRadioProps) {
+function OpenChoiceRadioAnswerOptionItem(props: OpenChoiceRadioAnswerOptionItemProps) {
   const { qItem, qrItem, onQrItemChange, orientation } = props;
 
   // Init answers
@@ -121,7 +121,7 @@ function QItemOpenChoiceRadioAnswerOption(props: QItemOpenChoiceRadioProps) {
 
   const openChoiceRadio = (
     <QRadioGroup
-      row={orientation === QItemChoiceOrientation.Horizontal}
+      row={orientation === ChoiceItemOrientation.Horizontal}
       name={qItem.text}
       id={qItem.id}
       onChange={(e: ChangeEvent<HTMLInputElement>) => handleValueChange(e.target.value, null)}
@@ -130,7 +130,7 @@ function QItemOpenChoiceRadioAnswerOption(props: QItemOpenChoiceRadioProps) {
       {qItem.answerOption?.map((option) => {
         if (option['valueCoding']) {
           return (
-            <QItemChoiceRadioSingle
+            <ChoiceRadioSingle
               key={option.valueCoding.code ?? ''}
               value={option.valueCoding.code ?? ''}
               label={option.valueCoding.display ?? `${option.valueCoding.code}`}
@@ -139,7 +139,7 @@ function QItemOpenChoiceRadioAnswerOption(props: QItemOpenChoiceRadioProps) {
           );
         } else if (option['valueString']) {
           return (
-            <QItemChoiceRadioSingle
+            <ChoiceRadioSingle
               key={option.valueString}
               value={option.valueString}
               label={option.valueString}
@@ -148,7 +148,7 @@ function QItemOpenChoiceRadioAnswerOption(props: QItemOpenChoiceRadioProps) {
           );
         } else if (option['valueInteger']) {
           return (
-            <QItemChoiceRadioSingle
+            <ChoiceRadioSingle
               key={option.valueInteger}
               value={option.valueInteger.toString()}
               label={option.valueInteger.toString()}
@@ -161,7 +161,7 @@ function QItemOpenChoiceRadioAnswerOption(props: QItemOpenChoiceRadioProps) {
       })}
 
       {openLabelText ? (
-        <QItemRadioButtonWithOpenLabel
+        <RadioButtonWithOpenLabel
           value={openLabelValue}
           label={openLabelText}
           readOnly={readOnly}
@@ -187,4 +187,4 @@ function QItemOpenChoiceRadioAnswerOption(props: QItemOpenChoiceRadioProps) {
   );
 }
 
-export default QItemOpenChoiceRadioAnswerOption;
+export default OpenChoiceRadioAnswerOptionItem;

package/src/components/FormComponents/{QItemOpenChoice/QItemOpenChoiceSelectAnswerOption.tsx → OpenChoiceItems/OpenChoiceSelectAnswerOptionItem.tsx}

@@ -17,8 +17,8 @@
 
 import type { SyntheticEvent } from 'react';
 import React from 'react';
-import { Autocomplete, Grid } from '@mui/material';
-
+import Autocomplete from '@mui/material/Autocomplete';
+import Grid from '@mui/material/Grid';
 import type {
   QuestionnaireItem,
   QuestionnaireItemAnswerOption,
@@ -37,7 +37,7 @@ import type {
 import DisplayInstructions from '../DisplayItem/DisplayInstructions';
 import LabelWrapper from '../ItemParts/ItemLabelWrapper';
 
-interface Props
+interface OpenChoiceSelectAnswerOptionItemProps
   extends PropsWithQrItemChangeHandler<QuestionnaireResponseItem>,
     PropsWithIsRepeatedAttribute,
     PropsWithIsTabledAttribute {
@@ -45,7 +45,7 @@ interface Props
   qrItem: QuestionnaireResponseItem;
 }
 
-function QItemOpenChoiceSelectAnswerOption(props: Props) {
+function OpenChoiceSelectAnswerOptionItem(props: OpenChoiceSelectAnswerOptionItemProps) {
   const { qItem, qrItem, isRepeated, isTabled, onQrItemChange } = props;
 
   // Get additional rendering extensions
@@ -128,9 +128,12 @@ function QItemOpenChoiceSelectAnswerOption(props: Props) {
       )}
     />
   );
-  const renderQItemOpenChoiceAutocomplete = isRepeated ? (
-    <>{openOpenChoiceSelectAnswerOption}</>
-  ) : (
+
+  if (isRepeated) {
+    return <>{openOpenChoiceSelectAnswerOption}</>;
+  }
+
+  return (
     <FullWidthFormComponentBox data-test="q-item-open-choice-select-answer-option-box">
       <Grid container columnSpacing={6}>
         <Grid item xs={5}>
@@ -143,7 +146,6 @@ function QItemOpenChoiceSelectAnswerOption(props: Props) {
       </Grid>
     </FullWidthFormComponentBox>
   );
-  return <>{renderQItemOpenChoiceAutocomplete}</>;
 }
 
-export default QItemOpenChoiceSelectAnswerOption;
+export default OpenChoiceSelectAnswerOptionItem;

package/src/components/FormComponents/{QItemOpenChoice/QItemOpenChoiceSelectAnswerValueSet.tsx → OpenChoiceItems/OpenChoiceSelectAnswerValueSetItem.tsx}

@@ -17,8 +17,9 @@
 
 import type { SyntheticEvent } from 'react';
 import React from 'react';
-import { Autocomplete, Grid, Typography } from '@mui/material';
-
+import Autocomplete from '@mui/material/Autocomplete';
+import Grid from '@mui/material/Grid';
+import Typography from '@mui/material/Typography';
 import type { Coding, QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
 import { createEmptyQrItem } from '../../../utils/qrItem';
 import { StandardTextField } from '../Textfield.styles';
@@ -33,7 +34,7 @@ import type {
 import DisplayInstructions from '../DisplayItem/DisplayInstructions';
 import LabelWrapper from '../ItemParts/ItemLabelWrapper';
 
-interface Props
+interface OpenChoiceSelectAnswerValueSetItemProps
   extends PropsWithQrItemChangeHandler<QuestionnaireResponseItem>,
     PropsWithIsRepeatedAttribute,
     PropsWithIsTabledAttribute {
@@ -41,7 +42,7 @@ interface Props
   qrItem: QuestionnaireResponseItem;
 }
 
-function QItemOpenChoiceSelectAnswerValueSet(props: Props) {
+function OpenChoiceSelectAnswerValueSetItem(props: OpenChoiceSelectAnswerValueSetItemProps) {
   const { qItem, qrItem, isRepeated, isTabled, onQrItemChange } = props;
 
   // Init input value
@@ -117,9 +118,11 @@ function QItemOpenChoiceSelectAnswerValueSet(props: Props) {
     </>
   );
 
-  const renderQItemOpenChoiceSelectAnswerValueSet = isRepeated ? (
-    <>{openChoiceSelectAnswerValueSet}</>
-  ) : (
+  if (isRepeated) {
+    return <>{openChoiceSelectAnswerValueSet}</>;
+  }
+
+  return (
     <FullWidthFormComponentBox>
       <Grid container columnSpacing={6}>
         <Grid item xs={5}>
@@ -132,7 +135,6 @@ function QItemOpenChoiceSelectAnswerValueSet(props: Props) {
       </Grid>
     </FullWidthFormComponentBox>
   );
-  return <>{renderQItemOpenChoiceSelectAnswerValueSet}</>;
 }
 
-export default QItemOpenChoiceSelectAnswerValueSet;
+export default OpenChoiceSelectAnswerValueSetItem;

package/src/components/FormComponents/RepeatGroup/AddItemButton.tsx

@@ -16,7 +16,8 @@
  */
 
 import React from 'react';
-import { Box, Button } from '@mui/material';
+import Box from '@mui/material/Box';
+import Button from '@mui/material/Button';
 import AddIcon from '@mui/icons-material/Add';
 import type { RepeatGroupSingle } from '../../../interfaces/repeatGroup.interface';
 

package/src/components/FormComponents/RepeatGroup/DeleteItemButton.tsx

@@ -17,7 +17,7 @@
 
 import React from 'react';
 import { RepeatDeleteTooltip } from '../RepeatItem/RepeatItem.styles';
-import { IconButton } from '@mui/material';
+import IconButton from '@mui/material/IconButton';
 import RemoveCircleOutlineIcon from '@mui/icons-material/RemoveCircleOutline';
 import type { QuestionnaireResponseItem } from 'fhir/r4';
 

package/src/components/FormComponents/RepeatGroup/RepeatGroup.tsx

@@ -20,7 +20,10 @@ import type { PropsWithQrRepeatGroupChangeHandler } from '../../../interfaces/re
 import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
 import useInitialiseRepeatGroups from '../../../hooks/useInitialiseRepeatGroups';
 import { QGroupContainerBox } from '../../Box.styles';
-import { Card, Collapse, Divider } from '@mui/material';
+import Card from '@mui/material/Card';
+import Collapse from '@mui/material/Collapse';
+import Divider from '@mui/material/Divider';
+
 import { QGroupHeadingTypography } from '../Typography.styles';
 import { TransitionGroup } from 'react-transition-group';
 import { createEmptyQrItem } from '../../../utils/qrItem';

package/src/components/FormComponents/RepeatGroup/RepeatGroupItem.tsx

@@ -17,7 +17,7 @@
 
 import React from 'react';
 import { RepeatGroupContainerStack } from '../RepeatItem/RepeatItem.styles';
-import { Box } from '@mui/material';
+import Box from '@mui/material/Box';
 import GroupItem from '../GroupItem/GroupItem';
 import type { PropsWithQrItemChangeHandler } from '../../../interfaces/renderProps.interface';
 import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';

package/src/components/FormComponents/RepeatItem/AddItemButton.tsx

@@ -16,7 +16,8 @@
  */
 
 import React from 'react';
-import { Box, Button } from '@mui/material';
+import Box from '@mui/material/Box';
+import Button from '@mui/material/Button';
 import AddIcon from '@mui/icons-material/Add';
 import type { RepeatAnswer } from '../../../interfaces/repeatItem.interface';
 

package/src/components/FormComponents/RepeatItem/DeleteItemButton.tsx

@@ -17,7 +17,7 @@
 
 import React from 'react';
 import { RepeatDeleteTooltip } from './RepeatItem.styles';
-import { IconButton } from '@mui/material';
+import IconButton from '@mui/material/IconButton';
 import RemoveCircleOutlineIcon from '@mui/icons-material/RemoveCircleOutline';
 import type { QuestionnaireResponseItemAnswer } from 'fhir/r4';
 

package/src/components/FormComponents/RepeatItem/RepeatField.tsx

@@ -16,7 +16,7 @@
  */
 
 import React from 'react';
-import { Box } from '@mui/material';
+import Box from '@mui/material/Box';
 import { RepeatItemContainerStack } from './RepeatItem.styles';
 import SingleItem from '../SingleItem/SingleItem';
 import type {

package/src/components/FormComponents/RepeatItem/RepeatItem.styles.tsx

@@ -15,7 +15,9 @@
  * limitations under the License.
  */
 
-import { Stack, styled, Tooltip } from '@mui/material';
+import Stack from '@mui/material/Stack';
+import { styled } from '@mui/material/styles';
+import Tooltip from '@mui/material/Tooltip';
 
 export const RepeatDeleteTooltip = styled(Tooltip)(() => ({
   marginLeft: 8

package/src/components/FormComponents/RepeatItem/RepeatItem.tsx

@@ -25,7 +25,7 @@ import { FullWidthFormComponentBox } from '../../Box.styles';
 import AddItemButton from './AddItemButton';
 import { TransitionGroup } from 'react-transition-group';
 import RepeatField from './RepeatField';
-import { Collapse } from '@mui/material';
+import Collapse from '@mui/material/Collapse';
 import useInitialiseRepeatAnswers from '../../../hooks/useInitialiseRepeatAnswers';
 import ItemFieldGrid from '../ItemParts/ItemFieldGrid';
 

package/src/components/FormComponents/SingleItem/SingleItemSwitcher.tsx

@@ -16,10 +16,10 @@
  */
 
 import React from 'react';
-import QItemChoice from '../QItemChoice/QItemChoice';
+import ChoiceItemSwitcher from '../ChoiceItems/ChoiceItemSwitcher';
 import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
-import QItemOpenChoice from '../QItemOpenChoice/QItemOpenChoice';
-import { Typography } from '@mui/material';
+import OpenChoiceItemSwitcher from '../OpenChoiceItems/OpenChoiceItemSwitcher';
+import Typography from '@mui/material/Typography';
 import type {
   PropsWithIsRepeatedAttribute,
   PropsWithIsTabledAttribute,
@@ -131,7 +131,7 @@ function SingleItemSwitcher(props: SingleItemSwitcherProps) {
       );
     case 'choice':
       return (
-        <QItemChoice
+        <ChoiceItemSwitcher
           qItem={qItem}
           qrItem={qrItem}
           isRepeated={isRepeated}
@@ -141,7 +141,7 @@ function SingleItemSwitcher(props: SingleItemSwitcherProps) {
       );
     case 'open-choice':
       return (
-        <QItemOpenChoice
+        <OpenChoiceItemSwitcher
           qItem={qItem}
           qrItem={qrItem}
           isRepeated={isRepeated}

package/src/components/FormComponents/StringItem/StringField.tsx

@@ -17,7 +17,7 @@
 
 import React from 'react';
 import type { PropsWithIsTabledAttribute } from '../../../interfaces/renderProps.interface';
-import { InputAdornment } from '@mui/material';
+import InputAdornment from '@mui/material/InputAdornment';
 import { StandardTextField } from '../Textfield.styles';
 import FadingCheckIcon from '../ItemParts/FadingCheckIcon';