@aehrc/smart-forms-renderer 0.4.0 → 0.6.0

package/src/theme/overrides/Input.ts

@@ -0,0 +1,83 @@
+/*
+ * Copyright 2023 Commonwealth Scientific and Industrial Research
+ * Organisation (CSIRO) ABN 41 687 119 230.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { Theme } from '@mui/material/styles';
+import { alpha } from '@mui/material/styles';
+
+export default function Input(theme: Theme) {
+  return {
+    MuiInputBase: {
+      styleOverrides: {
+        root: {
+          '&.Mui-disabled': {
+            '& svg': { color: theme.palette.text.disabled }
+          }
+        },
+        input: {
+          '&::placeholder': {
+            opacity: 1,
+            color: theme.palette.text.disabled
+          }
+        }
+      }
+    },
+    MuiInput: {
+      styleOverrides: {
+        underline: {
+          '&:before': {
+            borderBottomColor: alpha(theme.palette.grey[500], 0.56)
+          }
+        }
+      }
+    },
+    MuiFilledInput: {
+      styleOverrides: {
+        root: {
+          backgroundColor: alpha(theme.palette.grey[500], 0.12),
+          '&:hover': {
+            backgroundColor: alpha(theme.palette.grey[500], 0.16)
+          },
+          '&.Mui-focused': {
+            backgroundColor: theme.palette.action.focus
+          },
+          '&.Mui-disabled': {
+            backgroundColor: theme.palette.action.disabledBackground
+          }
+        },
+        underline: {
+          '&:before': {
+            borderBottomColor: alpha(theme.palette.grey[500], 0.56)
+          }
+        }
+      }
+    },
+    MuiOutlinedInput: {
+      styleOverrides: {
+        root: {
+          '& .MuiOutlinedInput-notchedOutline': {
+            borderColor: alpha(theme.palette.grey[500], 0.32)
+          },
+          '&.Mui-disabled': {
+            '& .MuiOutlinedInput-notchedOutline': {
+              borderColor: theme.palette.action.disabledBackground
+            }
+          }
+        }
+      }
+    }
+  };
+}

package/src/theme/overrides/Overrides.ts

@@ -0,0 +1,45 @@
+/*
+ * Copyright 2023 Commonwealth Scientific and Industrial Research
+ * Organisation (CSIRO) ABN 41 687 119 230.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import Card from './Card';
+import Paper from './Paper';
+import Input from './Input';
+import Table from './Table';
+import Button from './Button';
+import Backdrop from './Backdrop';
+import Typography from './Typography';
+import Autocomplete from './Autocomplete';
+import Accordion from './Accordion';
+import SpeedDial from './SpeedDial';
+import type { Theme } from '@mui/material/styles';
+
+function ComponentsOverrides(theme: Theme) {
+  return Object.assign(
+    Accordion(theme),
+    Card(theme),
+    Table(theme),
+    Input(theme),
+    Paper(),
+    Button(theme),
+    Backdrop(theme),
+    Typography(theme),
+    Autocomplete(theme),
+    SpeedDial(theme)
+  );
+}
+
+export default ComponentsOverrides;

package/src/{interfaces/answerExpression.interface.js → theme/overrides/Paper.ts}

@@ -14,5 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export {};
-//# sourceMappingURL=answerExpression.interface.js.map
+
+export default function Paper() {
+  return {
+    MuiPaper: {
+      defaultProps: {
+        elevation: 0
+      },
+      styleOverrides: {
+        root: {
+          backgroundImage: 'none'
+        }
+      }
+    }
+  };
+}

package/src/{hooks/useInitialiseGroupTable.js → theme/overrides/SpeedDial.ts}

@@ -14,23 +14,23 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { nanoid } from 'nanoid';
-function useInitialiseGroupTable(qrItems) {
-    let initialGroupTableRows = [
-        {
-            nanoId: nanoid(),
-            qrItem: null
+
+import type { Theme } from '@mui/material/styles';
+
+export default function SpeedDial(theme: Theme) {
+  return {
+    MuiSpeedDialAction: {
+      styleOverrides: {
+        staticTooltipLabel: {
+          backgroundColor: theme.palette.grey[600],
+          color: theme.palette.common.white,
+          fontSize: theme.typography.subtitle2.fontSize,
+          fontWeight: theme.typography.subtitle2.fontWeight,
+          boxShadow: theme.customShadows.z8,
+          maxWidth: 200,
+          whiteSpace: 'nowrap'
         }
-    ];
-    if (qrItems.length > 0) {
-        initialGroupTableRows = qrItems.map((qrItem) => {
-            return {
-                nanoId: nanoid(),
-                qrItem
-            };
-        });
+      }
     }
-    return initialGroupTableRows;
+  };
 }
-export default useInitialiseGroupTable;
-//# sourceMappingURL=useInitialiseGroupTable.js.map

package/src/{hooks/useBackToTop.js → theme/overrides/Table.ts}

@@ -14,13 +14,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { useEffect } from 'react';
-import { useLocation } from 'react-router-dom';
-function useBackToTop() {
-    const { pathname } = useLocation();
-    useEffect(() => {
-        window.scrollTo(0, 0);
-    }, [pathname]);
+
+import type { Theme } from '@mui/material/styles';
+
+export default function Table(theme: Theme) {
+  return {
+    MuiTableCell: {
+      styleOverrides: {
+        head: {
+          color: theme.palette.text.secondary,
+          backgroundColor: theme.palette.customBackground.neutral
+        }
+      }
+    }
+  };
 }
-export default useBackToTop;
-//# sourceMappingURL=useBackToTop.js.map

package/src/theme/overrides/Typography.ts

@@ -0,0 +1,33 @@
+/*
+ * Copyright 2023 Commonwealth Scientific and Industrial Research
+ * Organisation (CSIRO) ABN 41 687 119 230.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { Theme } from '@mui/material/styles';
+
+export default function Typography(theme: Theme) {
+  return {
+    MuiTypography: {
+      styleOverrides: {
+        paragraph: {
+          marginBottom: theme.spacing(2)
+        },
+        gutterBottom: {
+          marginBottom: theme.spacing(1)
+        }
+      }
+    }
+  };
+}

package/src/theme/palette.ts

@@ -0,0 +1,99 @@
+/*
+ * Copyright 2023 Commonwealth Scientific and Industrial Research
+ * Organisation (CSIRO) ABN 41 687 119 230.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { PaletteColor, PaletteColorOptions, PaletteOptions } from '@mui/material/styles';
+import { alpha } from '@mui/material/styles';
+import { grey } from '@mui/material/colors';
+
+declare module '@mui/material/styles' {
+  // noinspection JSUnusedGlobalSymbols
+  interface Palette {
+    accent1: PaletteColor;
+    accent2: PaletteColor;
+    pale: {
+      primary: string;
+      secondary: string;
+    };
+    customBackground: {
+      neutral: string;
+    };
+  }
+
+  // noinspection JSUnusedGlobalSymbols
+  interface PaletteOptions {
+    accent1?: PaletteColorOptions;
+    accent2?: PaletteColorOptions;
+    pale?: {
+      primary: string;
+      secondary: string;
+    };
+    customBackground?: {
+      neutral: string;
+    };
+  }
+}
+
+const SECONDARY = {
+  light: '#7ac298',
+  main: '#229954',
+  dark: '#145c32',
+  contrastText: '#fff'
+};
+
+const palette: PaletteOptions = {
+  common: { black: '#000', white: '#fff' },
+  secondary: SECONDARY,
+  accent1: {
+    main: '#d2e0f6',
+    light: '#e9f0fa',
+    dark: '#bcd1f1'
+  },
+  accent2: {
+    main: '#d5f5e3',
+    light: '#eafaf1',
+    dark: '#abebc6'
+  },
+  pale: {
+    primary: '#D6EBFC',
+    secondary: '#D3EBDD'
+  },
+  divider: alpha(grey['500'], 0.24),
+  text: {
+    primary: grey['800'],
+    secondary: grey['600'],
+    disabled: grey['500']
+  },
+  background: {
+    paper: '#fff',
+    default: grey['50']
+  },
+  customBackground: {
+    neutral: '#F4F6F8'
+  },
+  action: {
+    active: grey['600'],
+    hover: alpha(grey['500'], 0.08),
+    selected: alpha(grey['500'], 0.16),
+    disabled: alpha(grey['500'], 0.8),
+    disabledBackground: alpha(grey['500'], 0.24),
+    focus: alpha(grey['500'], 0.24),
+    hoverOpacity: 0.08,
+    disabledOpacity: 0.48
+  }
+};
+
+export default palette;

package/src/theme/shadows.ts

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2023 Commonwealth Scientific and Industrial Research
+ * Organisation (CSIRO) ABN 41 687 119 230.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { alpha } from '@mui/material/styles';
+import { grey } from '@mui/material/colors';
+
+function shadows() {
+  const transparent1 = alpha(grey['500'], 0.2);
+  const transparent2 = alpha(grey['500'], 0.14);
+  const transparent3 = alpha(grey['500'], 0.12);
+  return [
+    'none',
+    `0px 2px 1px -1px ${transparent1},0px 1px 1px 0px ${transparent2},0px 1px 3px 0px ${transparent3}`,
+    `0px 3px 1px -2px ${transparent1},0px 2px 2px 0px ${transparent2},0px 1px 5px 0px ${transparent3}`,
+    `0px 3px 3px -2px ${transparent1},0px 3px 4px 0px ${transparent2},0px 1px 8px 0px ${transparent3}`,
+    `0px 2px 4px -1px ${transparent1},0px 4px 5px 0px ${transparent2},0px 1px 10px 0px ${transparent3}`,
+    `0px 3px 5px -1px ${transparent1},0px 5px 8px 0px ${transparent2},0px 1px 14px 0px ${transparent3}`,
+    `0px 3px 5px -1px ${transparent1},0px 6px 10px 0px ${transparent2},0px 1px 18px 0px ${transparent3}`,
+    `0px 4px 5px -2px ${transparent1},0px 7px 10px 1px ${transparent2},0px 2px 16px 1px ${transparent3}`,
+    `0px 5px 5px -3px ${transparent1},0px 8px 10px 1px ${transparent2},0px 3px 14px 2px ${transparent3}`,
+    `0px 5px 6px -3px ${transparent1},0px 9px 12px 1px ${transparent2},0px 3px 16px 2px ${transparent3}`,
+    `0px 6px 6px -3px ${transparent1},0px 10px 14px 1px ${transparent2},0px 4px 18px 3px ${transparent3}`,
+    `0px 6px 7px -4px ${transparent1},0px 11px 15px 1px ${transparent2},0px 4px 20px 3px ${transparent3}`,
+    `0px 7px 8px -4px ${transparent1},0px 12px 17px 2px ${transparent2},0px 5px 22px 4px ${transparent3}`,
+    `0px 7px 8px -4px ${transparent1},0px 13px 19px 2px ${transparent2},0px 5px 24px 4px ${transparent3}`,
+    `0px 7px 9px -4px ${transparent1},0px 14px 21px 2px ${transparent2},0px 5px 26px 4px ${transparent3}`,
+    `0px 8px 9px -5px ${transparent1},0px 15px 22px 2px ${transparent2},0px 6px 28px 5px ${transparent3}`,
+    `0px 8px 10px -5px ${transparent1},0px 16px 24px 2px ${transparent2},0px 6px 30px 5px ${transparent3}`,
+    `0px 8px 11px -5px ${transparent1},0px 17px 26px 2px ${transparent2},0px 6px 32px 5px ${transparent3}`,
+    `0px 9px 11px -5px ${transparent1},0px 18px 28px 2px ${transparent2},0px 7px 34px 6px ${transparent3}`,
+    `0px 9px 12px -6px ${transparent1},0px 19px 29px 2px ${transparent2},0px 7px 36px 6px ${transparent3}`,
+    `0px 10px 13px -6px ${transparent1},0px 20px 31px 3px ${transparent2},0px 8px 38px 7px ${transparent3}`,
+    `0px 10px 13px -6px ${transparent1},0px 21px 33px 3px ${transparent2},0px 8px 40px 7px ${transparent3}`,
+    `0px 10px 14px -6px ${transparent1},0px 22px 35px 3px ${transparent2},0px 8px 42px 7px ${transparent3}`,
+    `0px 11px 14px -7px ${transparent1},0px 23px 36px 3px ${transparent2},0px 9px 44px 8px ${transparent3}`,
+    `0px 11px 15px -7px ${transparent1},0px 24px 38px 3px ${transparent2},0px 9px 46px 8px ${transparent3}`
+  ];
+}
+
+export default shadows();

package/src/theme/typography.ts

@@ -0,0 +1,114 @@
+/*
+ * Copyright 2023 Commonwealth Scientific and Industrial Research
+ * Organisation (CSIRO) ABN 41 687 119 230.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+export function pxToRem(value: number) {
+  return `${value / 16}rem`;
+}
+
+export function responsiveFontSizes(props: { sm: number; md: number; lg: number }) {
+  const { sm, md, lg } = props;
+  return {
+    '@media (min-width:600px)': {
+      fontSize: pxToRem(sm)
+    },
+    '@media (min-width:900px)': {
+      fontSize: pxToRem(md)
+    },
+    '@media (min-width:1200px)': {
+      fontSize: pxToRem(lg)
+    }
+  };
+}
+
+// ----------------------------------------------------------------------
+
+const typography = {
+  fontFamily: ['Inter', 'sans-serif', 'Roboto', 'Arial', '"Helvetica Neue"', 'Helvetica'].join(','),
+  fontWeightRegular: 400,
+  fontWeightMedium: 600,
+  fontWeightBold: 700,
+  h1: {
+    fontWeight: 800,
+    lineHeight: 80 / 64,
+    fontSize: pxToRem(36),
+    ...responsiveFontSizes({ sm: 40, md: 48, lg: 54 })
+  },
+  h2: {
+    fontWeight: 800,
+    lineHeight: 64 / 48,
+    fontSize: pxToRem(28),
+    ...responsiveFontSizes({ sm: 32, md: 34, lg: 36 })
+  },
+  h3: {
+    fontWeight: 700,
+    lineHeight: 1.5,
+    fontSize: pxToRem(20),
+    ...responsiveFontSizes({ sm: 22, md: 26, lg: 28 })
+  },
+  h4: {
+    fontWeight: 700,
+    lineHeight: 1.5,
+    fontSize: pxToRem(16),
+    ...responsiveFontSizes({ sm: 18, md: 20, lg: 20 })
+  },
+  h5: {
+    fontWeight: 700,
+    lineHeight: 1.5,
+    fontSize: pxToRem(14),
+    ...responsiveFontSizes({ sm: 15, md: 16, lg: 16 })
+  },
+  h6: {
+    fontWeight: 700,
+    lineHeight: 28 / 18,
+    fontSize: pxToRem(13),
+    ...responsiveFontSizes({ sm: 14, md: 14, lg: 14 })
+  },
+  subtitle1: {
+    fontWeight: 600,
+    lineHeight: 1.5,
+    fontSize: pxToRem(13)
+  },
+  subtitle2: {
+    fontWeight: 600,
+    lineHeight: 22 / 14,
+    fontSize: pxToRem(11)
+  },
+  body1: {
+    lineHeight: 1.5,
+    fontSize: pxToRem(12)
+  },
+  body2: {
+    lineHeight: 22 / 14,
+    fontSize: pxToRem(11)
+  },
+  caption: {
+    lineHeight: 1.5,
+    fontSize: pxToRem(10)
+  },
+  overline: {
+    fontWeight: 700,
+    lineHeight: 1.5,
+    fontSize: pxToRem(10)
+  },
+  button: {
+    fontWeight: 700,
+    lineHeight: 24 / 14,
+    fontSize: pxToRem(12)
+  }
+};
+
+export default typography;

package/src/utils/choice.ts

@@ -23,7 +23,7 @@ import type {
   QuestionnaireResponseItem,
   QuestionnaireResponseItemAnswer
 } from 'fhir/r4';
-import { QItemChoiceControl, QItemChoiceOrientation } from '../interfaces/choice.enum';
+import { ChoiceItemControl, ChoiceItemOrientation } from '../interfaces/choice.enum';
 import { isSpecificItemControl } from './itemControl';
 
 /**
@@ -34,27 +34,27 @@ import { isSpecificItemControl } from './itemControl';
 export function getChoiceControlType(qItem: QuestionnaireItem) {
   const dropdownOptionsCount = 5;
   if (isSpecificItemControl(qItem, 'autocomplete')) {
-    return QItemChoiceControl.Autocomplete;
+    return ChoiceItemControl.Autocomplete;
   }
 
   if (isSpecificItemControl(qItem, 'check-box')) {
-    return QItemChoiceControl.Checkbox;
+    return ChoiceItemControl.Checkbox;
   }
 
   if (isSpecificItemControl(qItem, 'radio-button')) {
-    return QItemChoiceControl.Radio;
+    return ChoiceItemControl.Radio;
   }
 
   if (isSpecificItemControl(qItem, 'drop-down')) {
-    return QItemChoiceControl.Select;
+    return ChoiceItemControl.Select;
   }
 
   if (qItem.answerOption) {
     return qItem.answerOption.length > 0 && qItem.answerOption.length < dropdownOptionsCount
-      ? QItemChoiceControl.Radio
-      : QItemChoiceControl.Select;
+      ? ChoiceItemControl.Radio
+      : ChoiceItemControl.Select;
   } else {
-    return QItemChoiceControl.Select;
+    return ChoiceItemControl.Select;
   }
 }
 
@@ -162,7 +162,7 @@ export function updateQrCheckboxAnswers(
  *
  * @author Sean Fong
  */
-export function getChoiceOrientation(qItem: QuestionnaireItem): QItemChoiceOrientation {
+export function getChoiceOrientation(qItem: QuestionnaireItem): ChoiceItemOrientation {
   const itemControl = qItem.extension?.find(
     (extension: Extension) =>
       extension.url === 'http://hl7.org/fhir/StructureDefinition/questionnaire-choiceOrientation'
@@ -171,13 +171,13 @@ export function getChoiceOrientation(qItem: QuestionnaireItem): QItemChoiceOrien
     const code = itemControl.valueCode;
     if (code) {
       if (code === 'horizontal') {
-        return QItemChoiceOrientation.Horizontal;
+        return ChoiceItemOrientation.Horizontal;
       } else if (code === 'vertical') {
-        return QItemChoiceOrientation.Vertical;
+        return ChoiceItemOrientation.Vertical;
       }
     }
   }
-  return QItemChoiceOrientation.Vertical;
+  return ChoiceItemOrientation.Vertical;
 }
 
 /**

package/src/utils/openChoice.ts

@@ -22,7 +22,7 @@ import type {
   QuestionnaireResponseItem,
   QuestionnaireResponseItemAnswer
 } from 'fhir/r4';
-import { CheckBoxOptionType, QItemOpenChoiceControl } from '../interfaces/choice.enum';
+import { CheckBoxOption, OpenChoiceItemControl } from '../interfaces/choice.enum';
 import { isSpecificItemControl } from './itemControl';
 import { findInAnswerOptions, findInAnswerValueSetCodings } from './choice';
 
@@ -37,12 +37,12 @@ export function updateQrOpenChoiceCheckboxAnswers(
   answers: QuestionnaireResponseItemAnswer[],
   answerOptions: QuestionnaireItemAnswerOption[] | Coding[],
   qrChoiceCheckbox: QuestionnaireResponseItem,
-  checkboxOptionType: CheckBoxOptionType,
+  checkboxOptionType: CheckBoxOption,
   isMultiSelection: boolean
 ): QuestionnaireResponseItem | null {
   if (changedOptionAnswer) {
     const newAnswer =
-      checkboxOptionType === CheckBoxOptionType.AnswerOption
+      checkboxOptionType === CheckBoxOption.AnswerOption
         ? findInAnswerOptions(answerOptions, changedOptionAnswer)
         : findInAnswerValueSetCodings(answerOptions, changedOptionAnswer);
     if (!newAnswer) return null;
@@ -50,7 +50,7 @@ export function updateQrOpenChoiceCheckboxAnswers(
     if (isMultiSelection && answers.length > 0) {
       // check if new answer exists in existing answers
       const newAnswerInAnswers =
-        checkboxOptionType === CheckBoxOptionType.AnswerOption
+        checkboxOptionType === CheckBoxOption.AnswerOption
           ? findInAnswerOptions(answers, changedOptionAnswer)
           : findInAnswerValueSetCodings(answers, changedOptionAnswer);
 
@@ -147,13 +147,13 @@ export function getOldOpenLabelAnswer(
  */
 export function getOpenChoiceControlType(qItem: QuestionnaireItem) {
   if (isSpecificItemControl(qItem, 'autocomplete')) {
-    return QItemOpenChoiceControl.Autocomplete;
+    return OpenChoiceItemControl.Autocomplete;
   } else if (isSpecificItemControl(qItem, 'check-box')) {
-    return QItemOpenChoiceControl.Checkbox;
+    return OpenChoiceItemControl.Checkbox;
   } else if (isSpecificItemControl(qItem, 'radio-button')) {
-    return QItemOpenChoiceControl.Radio;
+    return OpenChoiceItemControl.Radio;
   } else {
-    return QItemOpenChoiceControl.Select;
+    return OpenChoiceItemControl.Select;
   }
 }
 

package/src/utils/qItem.ts

@@ -18,7 +18,7 @@
 import type { Extension, Questionnaire, QuestionnaireItem } from 'fhir/r4';
 import { hasHiddenExtension } from './itemControl';
 import { getChoiceControlType } from './choice';
-import { QItemChoiceControl, QItemOpenChoiceControl } from '../interfaces/choice.enum';
+import { ChoiceItemControl, OpenChoiceItemControl } from '../interfaces/choice.enum';
 import { getOpenChoiceControlType } from './openChoice';
 import type { EnableWhenExpression, EnableWhenItems } from '../interfaces/enableWhen.interface';
 
@@ -82,8 +82,8 @@ export function isHiddenByEnableWhens(params: isHiddenByEnableWhensParams): bool
  */
 export function isRepeatItemAndNotCheckbox(qItem: QuestionnaireItem): boolean {
   const isCheckbox =
-    getChoiceControlType(qItem) === QItemChoiceControl.Checkbox ||
-    getOpenChoiceControlType(qItem) === QItemOpenChoiceControl.Checkbox;
+    getChoiceControlType(qItem) === ChoiceItemControl.Checkbox ||
+    getOpenChoiceControlType(qItem) === OpenChoiceItemControl.Checkbox;
 
   return !!qItem['repeats'] && !isCheckbox;
 }

package/src/utils/removeHidden.ts

@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-import {
+import type {
   Questionnaire,
   QuestionnaireItem,
   QuestionnaireResponse,
   QuestionnaireResponseItem
 } from 'fhir/r4';
-import {
+import type {
   EnableWhenExpression,
   EnableWhenItems
 } from 'smart-forms-app/src/types/enableWhen.interface';