@aehrc/smart-forms-renderer 1.0.0-alpha.99 → 1.1.0

package/lib/components/FormComponents/ChoiceItems/ChoiceCheckboxAnswerValueSetItem.js.map

@@ -1 +1 @@
-{"version":3,"file":"ChoiceCheckboxAnswerValueSetItem.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceCheckboxAnswerValueSetItem.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ChoiceCheckboxAnswerValueSetItem.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceCheckboxAnswerValueSetItem.tsx"],"names":[],"mappings":"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"}

package/lib/components/FormComponents/ChoiceItems/ChoiceItemSwitcher.d.ts

@@ -1,8 +1,3 @@
-import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
-import type { PropsWithFeedbackFromParentAttribute, PropsWithIsRepeatedAttribute, PropsWithIsTabledRequiredAttribute, PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithParentStylesAttribute, PropsWithQrItemChangeHandler, PropsWithRenderingExtensionsAttribute } from '../../../interfaces/renderProps.interface';
-interface ChoiceItemSwitcherProps extends PropsWithQrItemChangeHandler, PropsWithItemPathAttribute, PropsWithIsRepeatedAttribute, PropsWithIsTabledRequiredAttribute, PropsWithRenderingExtensionsAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithFeedbackFromParentAttribute, PropsWithParentStylesAttribute {
-    qItem: QuestionnaireItem;
-    qrItem: QuestionnaireResponseItem | null;
-}
-declare function ChoiceItemSwitcher(props: ChoiceItemSwitcherProps): import("react/jsx-runtime").JSX.Element;
+import type { BaseItemProps } from '../../../interfaces/renderProps.interface';
+declare function ChoiceItemSwitcher(props: BaseItemProps): import("react/jsx-runtime").JSX.Element;
 export default ChoiceItemSwitcher;

package/lib/components/FormComponents/ChoiceItems/ChoiceItemSwitcher.js

@@ -1,41 +1,56 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+/*
+ * Copyright 2025 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 Typography from '@mui/material/Typography';
 import { ChoiceItemControl } from '../../../interfaces/choice.enum';
+import { getChoiceControlType } from '../../../utils/choice';
+import ChoiceAutocompleteItem from './ChoiceAutocompleteItem';
+import ChoiceCheckboxAnswerOptionItem from './ChoiceCheckboxAnswerOptionItem';
+import ChoiceCheckboxAnswerValueSetItem from './ChoiceCheckboxAnswerValueSetItem';
 import ChoiceRadioAnswerOptionItem from './ChoiceRadioAnswerOptionItem';
+import ChoiceRadioAnswerValueSetItem from './ChoiceRadioAnswerValueSetItem';
 import ChoiceSelectAnswerOptionItem from './ChoiceSelectAnswerOptionItem';
-import ChoiceCheckboxAnswerOptionItem from './ChoiceCheckboxAnswerOptionItem';
-import ChoiceAutocompleteItem from './ChoiceAutocompleteItem';
 import ChoiceSelectAnswerValueSetItem from './ChoiceSelectAnswerValueSetItem';
-import { getChoiceControlType } from '../../../utils/choice';
-import ChoiceRadioAnswerValueSetItem from './ChoiceRadioAnswerValueSetItem';
-import ChoiceCheckboxAnswerValueSetItem from './ChoiceCheckboxAnswerValueSetItem';
-import Typography from '@mui/material/Typography';
 function ChoiceItemSwitcher(props) {
-    var _a, _b;
-    const { qItem, qrItem, itemPath, isRepeated, isTabled, renderingExtensions, parentIsReadOnly, feedbackFromParent, onQrItemChange } = props;
+    const { qItem, qrItem, isRepeated, isTabled, renderingExtensions, parentIsReadOnly, feedbackFromParent, calcExpUpdated, onQrItemChange } = props;
     const choiceControlType = getChoiceControlType(qItem);
     switch (choiceControlType) {
         case ChoiceItemControl.Radio:
             if (qItem.answerOption) {
-                return (_jsx(ChoiceRadioAnswerOptionItem, { qItem: qItem, qrItem: qrItem, itemPath: itemPath, isRepeated: isRepeated, isTabled: isTabled, renderingExtensions: renderingExtensions, parentIsReadOnly: parentIsReadOnly, feedbackFromParent: feedbackFromParent, onQrItemChange: onQrItemChange }));
+                return (_jsx(ChoiceRadioAnswerOptionItem, { qItem: qItem, qrItem: qrItem, isRepeated: isRepeated, isTabled: isTabled, renderingExtensions: renderingExtensions, parentIsReadOnly: parentIsReadOnly, feedbackFromParent: feedbackFromParent, calcExpUpdated: calcExpUpdated, onQrItemChange: onQrItemChange }));
             }
             else {
-                return (_jsx(ChoiceRadioAnswerValueSetItem, { qItem: qItem, qrItem: qrItem, itemPath: itemPath, isRepeated: isRepeated, renderingExtensions: renderingExtensions, parentIsReadOnly: parentIsReadOnly, feedbackFromParent: feedbackFromParent, isTabled: isTabled, onQrItemChange: onQrItemChange }));
+                return (_jsx(ChoiceRadioAnswerValueSetItem, { qItem: qItem, qrItem: qrItem, isRepeated: isRepeated, isTabled: isTabled, renderingExtensions: renderingExtensions, parentIsReadOnly: parentIsReadOnly, feedbackFromParent: feedbackFromParent, calcExpUpdated: calcExpUpdated, onQrItemChange: onQrItemChange }));
             }
         case ChoiceItemControl.Checkbox:
             if (qItem.answerOption) {
-                return (_jsx(ChoiceCheckboxAnswerOptionItem, { qItem: qItem, qrItem: qrItem, itemPath: itemPath, isRepeated: (_a = qItem.repeats) !== null && _a !== void 0 ? _a : false, renderingExtensions: renderingExtensions, parentIsReadOnly: parentIsReadOnly, feedbackFromParent: feedbackFromParent, isTabled: isTabled, onQrItemChange: onQrItemChange }));
+                return (_jsx(ChoiceCheckboxAnswerOptionItem, { qItem: qItem, qrItem: qrItem, isRepeated: qItem.repeats ?? false, isTabled: isTabled, renderingExtensions: renderingExtensions, parentIsReadOnly: parentIsReadOnly, feedbackFromParent: feedbackFromParent, calcExpUpdated: calcExpUpdated, onQrItemChange: onQrItemChange }));
             }
             else {
-                return (_jsx(ChoiceCheckboxAnswerValueSetItem, { qItem: qItem, qrItem: qrItem, itemPath: itemPath, isRepeated: (_b = qItem.repeats) !== null && _b !== void 0 ? _b : false, renderingExtensions: renderingExtensions, parentIsReadOnly: parentIsReadOnly, feedbackFromParent: feedbackFromParent, isTabled: isTabled, onQrItemChange: onQrItemChange }));
+                return (_jsx(ChoiceCheckboxAnswerValueSetItem, { qItem: qItem, qrItem: qrItem, isRepeated: qItem.repeats ?? false, isTabled: isTabled, renderingExtensions: renderingExtensions, parentIsReadOnly: parentIsReadOnly, feedbackFromParent: feedbackFromParent, calcExpUpdated: calcExpUpdated, onQrItemChange: onQrItemChange }));
             }
         case ChoiceItemControl.Autocomplete:
-            return (_jsx(ChoiceAutocompleteItem, { qItem: qItem, qrItem: qrItem, itemPath: itemPath, isRepeated: isRepeated, isTabled: isTabled, renderingExtensions: renderingExtensions, parentIsReadOnly: parentIsReadOnly, feedbackFromParent: feedbackFromParent, onQrItemChange: onQrItemChange }));
+            return (_jsx(ChoiceAutocompleteItem, { qItem: qItem, qrItem: qrItem, isRepeated: isRepeated, isTabled: isTabled, renderingExtensions: renderingExtensions, parentIsReadOnly: parentIsReadOnly, feedbackFromParent: feedbackFromParent, calcExpUpdated: calcExpUpdated, onQrItemChange: onQrItemChange }));
         case ChoiceItemControl.Select:
             if (qItem.answerOption) {
-                return (_jsx(ChoiceSelectAnswerOptionItem, { qItem: qItem, qrItem: qrItem, itemPath: itemPath, isRepeated: isRepeated, isTabled: isTabled, renderingExtensions: renderingExtensions, parentIsReadOnly: parentIsReadOnly, feedbackFromParent: feedbackFromParent, onQrItemChange: onQrItemChange }));
+                return (_jsx(ChoiceSelectAnswerOptionItem, { qItem: qItem, qrItem: qrItem, isRepeated: isRepeated, isTabled: isTabled, renderingExtensions: renderingExtensions, parentIsReadOnly: parentIsReadOnly, feedbackFromParent: feedbackFromParent, calcExpUpdated: calcExpUpdated, onQrItemChange: onQrItemChange }));
             }
             else {
-                return (_jsx(ChoiceSelectAnswerValueSetItem, { qItem: qItem, qrItem: qrItem, itemPath: itemPath, isRepeated: isRepeated, isTabled: isTabled, renderingExtensions: renderingExtensions, parentIsReadOnly: parentIsReadOnly, feedbackFromParent: feedbackFromParent, onQrItemChange: onQrItemChange }));
+                return (_jsx(ChoiceSelectAnswerValueSetItem, { qItem: qItem, qrItem: qrItem, isRepeated: isRepeated, isTabled: isTabled, renderingExtensions: renderingExtensions, parentIsReadOnly: parentIsReadOnly, feedbackFromParent: feedbackFromParent, calcExpUpdated: calcExpUpdated, onQrItemChange: onQrItemChange }));
             }
         default:
             return (_jsxs(Typography, { component: "div", children: ["Something has went wrong when parsing item ", qItem.linkId, " - ", qItem.text] }));

package/lib/components/FormComponents/ChoiceItems/ChoiceItemSwitcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"ChoiceItemSwitcher.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceItemSwitcher.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ChoiceItemSwitcher.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceItemSwitcher.tsx"],"names":[],"mappings":"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"}

package/lib/components/FormComponents/ChoiceItems/ChoiceRadioAnswerOptionFields.js.map

@@ -1 +1 @@
-{"version":3,"file":"ChoiceRadioAnswerOptionFields.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceRadioAnswerOptionFields.tsx"],"names":[],"mappings":";AAmBA,OAAO,cAAc,MAAM,6BAA6B,CAAC;AAezD,SAAS,6BAA6B,CAAC,KAAyC;IAC9E,MAAM,EACJ,KAAK,EACL,OAAO,EACP,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,iBAAiB,EACjB,iCAAiC,EACjC,QAAQ,EACR,eAAe,EACf,OAAO,EACR,GAAG,KAAK,CAAC;IAEV,OAAO,CACL,KAAC,cAAc,IACb,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,iBAAiB,EAAE,iBAAiB,EACpC,iCAAiC,EAAE,iCAAiC,EACpE,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,OAAO,GAChB,CACH,CAAC;AACJ,CAAC;AAED,eAAe,6BAA6B,CAAC"}
+{"version":3,"file":"ChoiceRadioAnswerOptionFields.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceRadioAnswerOptionFields.tsx"],"names":[],"mappings":";AAkBA,OAAO,cAAc,MAAM,6BAA6B,CAAC;AAezD,SAAS,6BAA6B,CAAC,KAAyC;IAC9E,MAAM,EACJ,KAAK,EACL,OAAO,EACP,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,iBAAiB,EACjB,iCAAiC,EACjC,QAAQ,EACR,eAAe,EACf,OAAO,EACR,GAAG,KAAK,CAAC;IAEV,OAAO,CACL,KAAC,cAAc,IACb,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,iBAAiB,EAAE,iBAAiB,EACpC,iCAAiC,EAAE,iCAAiC,EACpE,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,OAAO,GAChB,CACH,CAAC;AACJ,CAAC;AAED,eAAe,6BAA6B,CAAC"}

package/lib/components/FormComponents/ChoiceItems/ChoiceRadioAnswerOptionItem.d.ts

@@ -1,8 +1,3 @@
-import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
-import type { PropsWithFeedbackFromParentAttribute, PropsWithIsRepeatedAttribute, PropsWithIsTabledRequiredAttribute, PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithQrItemChangeHandler, PropsWithRenderingExtensionsAttribute } from '../../../interfaces/renderProps.interface';
-interface ChoiceRadioAnswerOptionItemProps extends PropsWithQrItemChangeHandler, PropsWithItemPathAttribute, PropsWithIsRepeatedAttribute, PropsWithIsTabledRequiredAttribute, PropsWithRenderingExtensionsAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithFeedbackFromParentAttribute {
-    qItem: QuestionnaireItem;
-    qrItem: QuestionnaireResponseItem | null;
-}
-declare function ChoiceRadioAnswerOptionItem(props: ChoiceRadioAnswerOptionItemProps): import("react/jsx-runtime").JSX.Element;
+import type { BaseItemProps } from '../../../interfaces/renderProps.interface';
+declare function ChoiceRadioAnswerOptionItem(props: BaseItemProps): import("react/jsx-runtime").JSX.Element;
 export default ChoiceRadioAnswerOptionItem;

package/lib/components/FormComponents/ChoiceItems/ChoiceRadioAnswerOptionItem.js

@@ -1,59 +1,62 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { findInAnswerOptions, getChoiceControlType, getQrChoiceValue } from '../../../utils/choice';
-import { createEmptyQrItem } from '../../../utils/qrItem';
+/*
+ * Copyright 2025 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 Typography from '@mui/material/Typography';
+import useAnswerOptionsToggleExpressions from '../../../hooks/useAnswerOptionsToggleExpressions';
 import useReadOnly from '../../../hooks/useReadOnly';
-import { useQuestionnaireStore } from '../../../stores';
+import useValidationFeedback from '../../../hooks/useValidationFeedback';
 import { ChoiceItemControl } from '../../../interfaces/choice.enum';
-import Typography from '@mui/material/Typography';
-import useCodingCalculatedExpression from '../../../hooks/useCodingCalculatedExpression';
+import { useQuestionnaireStore } from '../../../stores';
+import { findInAnswerOptions, getChoiceControlType, getQrChoiceValue } from '../../../utils/choice';
+import { createEmptyQrItem } from '../../../utils/qrItem';
 import ChoiceRadioAnswerOptionView from './ChoiceRadioAnswerOptionView';
 import ChoiceSelectAnswerOptionView from './ChoiceSelectAnswerOptionView';
-import useValidationFeedback from '../../../hooks/useValidationFeedback';
-import useAnswerOptionsToggleExpressions from '../../../hooks/useAnswerOptionsToggleExpressions';
 function ChoiceRadioAnswerOptionItem(props) {
-    var _a, _b, _c;
-    const { qItem, qrItem, itemPath, isRepeated, isTabled, renderingExtensions, parentIsReadOnly, feedbackFromParent, onQrItemChange } = props;
+    const { qItem, qrItem, isRepeated, isTabled, renderingExtensions, parentIsReadOnly, feedbackFromParent, calcExpUpdated, onQrItemChange } = props;
     const onFocusLinkId = useQuestionnaireStore.use.onFocusLinkId();
     // Init input value
-    const answerKey = (_b = (_a = qrItem === null || qrItem === void 0 ? void 0 : qrItem.answer) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.id;
-    const qrChoice = qrItem !== null && qrItem !== void 0 ? qrItem : createEmptyQrItem(qItem, answerKey);
+    const answerKey = qrItem?.answer?.[0]?.id;
+    const qrChoice = qrItem ?? createEmptyQrItem(qItem, answerKey);
     const valueChoice = getQrChoiceValue(qrChoice);
     const readOnly = useReadOnly(qItem, parentIsReadOnly);
     // Perform validation checks - there's no string-based input here
     const feedback = useValidationFeedback(qItem, feedbackFromParent);
-    const options = (_c = qItem.answerOption) !== null && _c !== void 0 ? _c : [];
-    // Process calculated expressions
-    const { calcExpUpdated } = useCodingCalculatedExpression({
-        qItem: qItem,
-        valueInString: valueChoice !== null && valueChoice !== void 0 ? valueChoice : '',
-        onChangeByCalcExpressionString: (newValueString) => {
-            handleChange(newValueString, true);
-        },
-        onChangeByCalcExpressionNull: () => {
-            onQrItemChange(createEmptyQrItem(qItem, answerKey), itemPath);
-        }
-    });
+    const options = qItem.answerOption ?? [];
     // Process answerOptionsToggleExpressions
     const { answerOptionsToggleExpressionsMap, answerOptionsToggleExpUpdated } = useAnswerOptionsToggleExpressions(qItem.linkId);
     // Event handlers
-    function handleChange(newValue, includeItemPath = false // only include when this is called from useCalculatedExpression hook
-    ) {
-        const targetItemPath = includeItemPath ? itemPath : undefined;
+    function handleChange(newValue) {
         // No options present or newValue is type null
         if (options.length === 0 || newValue === null) {
-            onQrItemChange(createEmptyQrItem(qItem, answerKey), targetItemPath);
+            onQrItemChange(createEmptyQrItem(qItem, answerKey));
             return;
         }
         // newValue is type string
         if (typeof newValue === 'string') {
             const qrAnswer = findInAnswerOptions(options, newValue);
             onQrItemChange(qrAnswer
-                ? Object.assign(Object.assign({}, createEmptyQrItem(qItem, answerKey)), { answer: [Object.assign(Object.assign({}, qrAnswer), { id: answerKey })] }) : createEmptyQrItem(qItem, answerKey), targetItemPath);
+                ? { ...createEmptyQrItem(qItem, answerKey), answer: [{ ...qrAnswer, id: answerKey }] }
+                : createEmptyQrItem(qItem, answerKey));
             return;
         }
         // newValue is type QuestionnaireItemAnswerOption
         onQrItemChange(newValue
-            ? Object.assign(Object.assign({}, createEmptyQrItem(qItem, answerKey)), { answer: [Object.assign(Object.assign({}, newValue), { id: answerKey })] }) : createEmptyQrItem(qItem, answerKey), targetItemPath);
+            ? { ...createEmptyQrItem(qItem, answerKey), answer: [{ ...newValue, id: answerKey }] }
+            : createEmptyQrItem(qItem, answerKey));
     }
     function handleClear() {
         onQrItemChange(createEmptyQrItem(qItem, answerKey));

package/lib/components/FormComponents/ChoiceItems/ChoiceRadioAnswerOptionItem.js.map

@@ -1 +1 @@
-{"version":3,"file":"ChoiceRadioAnswerOptionItem.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceRadioAnswerOptionItem.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ChoiceRadioAnswerOptionItem.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceRadioAnswerOptionItem.tsx"],"names":[],"mappings":"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"}

package/lib/components/FormComponents/ChoiceItems/ChoiceRadioAnswerOptionView.d.ts

@@ -1,5 +1,5 @@
-import type { PropsWithIsRepeatedAttribute } from '../../../interfaces/renderProps.interface';
 import type { QuestionnaireItem, QuestionnaireItemAnswerOption } from 'fhir/r4';
+import type { PropsWithIsRepeatedAttribute } from '../../../interfaces/renderProps.interface';
 interface ChoiceRadioAnswerOptionViewProps extends PropsWithIsRepeatedAttribute {
     qItem: QuestionnaireItem;
     options: QuestionnaireItemAnswerOption[];

package/lib/components/FormComponents/ChoiceItems/ChoiceRadioAnswerOptionView.js

@@ -1,14 +1,14 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import ChoiceRadioAnswerOptionFields from './ChoiceRadioAnswerOptionFields';
 import { FullWidthFormComponentBox } from '../../Box.styles';
 import ItemFieldGrid from '../ItemParts/ItemFieldGrid';
 import ItemLabel from '../ItemParts/ItemLabel';
+import ChoiceRadioAnswerOptionFields from './ChoiceRadioAnswerOptionFields';
 function ChoiceRadioAnswerOptionView(props) {
     const { qItem, options, valueChoice, feedback, isRepeated, readOnly, expressionUpdated, answerOptionsToggleExpressionsMap, isTabled, onFocusLinkId, onCheckedChange, onClear } = props;
     if (isRepeated) {
         return (_jsx(ChoiceRadioAnswerOptionFields, { qItem: qItem, options: options, valueRadio: valueChoice, feedback: feedback, readOnly: readOnly, expressionUpdated: expressionUpdated, answerOptionsToggleExpressionsMap: answerOptionsToggleExpressionsMap, isTabled: isTabled, onCheckedChange: onCheckedChange, onClear: onClear }));
     }
-    return (_jsx(FullWidthFormComponentBox, { "data-test": "q-item-choice-radio-answer-option-box", "data-linkid": qItem.linkId, onClick: onFocusLinkId, children: _jsx(ItemFieldGrid, { qItem: qItem, readOnly: readOnly, labelChildren: _jsx(ItemLabel, { qItem: qItem, readOnly: readOnly }), fieldChildren: _jsx(ChoiceRadioAnswerOptionFields, { qItem: qItem, options: options, valueRadio: valueChoice, feedback: feedback, readOnly: readOnly, expressionUpdated: expressionUpdated, answerOptionsToggleExpressionsMap: answerOptionsToggleExpressionsMap, isTabled: isTabled, onCheckedChange: onCheckedChange, onClear: onClear }) }) }));
+    return (_jsx(FullWidthFormComponentBox, { "data-test": "q-item-choice-radio-answer-option-box", "data-linkid": qItem.linkId, "data-label": qItem.text, onClick: onFocusLinkId, children: _jsx(ItemFieldGrid, { qItem: qItem, readOnly: readOnly, labelChildren: _jsx(ItemLabel, { qItem: qItem, readOnly: readOnly }), fieldChildren: _jsx(ChoiceRadioAnswerOptionFields, { qItem: qItem, options: options, valueRadio: valueChoice, feedback: feedback, readOnly: readOnly, expressionUpdated: expressionUpdated, answerOptionsToggleExpressionsMap: answerOptionsToggleExpressionsMap, isTabled: isTabled, onCheckedChange: onCheckedChange, onClear: onClear }) }) }));
 }
 export default ChoiceRadioAnswerOptionView;
 //# sourceMappingURL=ChoiceRadioAnswerOptionView.js.map

package/lib/components/FormComponents/ChoiceItems/ChoiceRadioAnswerOptionView.js.map

@@ -1 +1 @@
-{"version":3,"file":"ChoiceRadioAnswerOptionView.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceRadioAnswerOptionView.tsx"],"names":[],"mappings":";AAkBA,OAAO,6BAA6B,MAAM,iCAAiC,CAAC;AAC5E,OAAO,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,aAAa,MAAM,4BAA4B,CAAC;AAGvD,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAgB/C,SAAS,2BAA2B,CAAC,KAAuC;IAC1E,MAAM,EACJ,KAAK,EACL,OAAO,EACP,WAAW,EACX,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,iBAAiB,EACjB,iCAAiC,EACjC,QAAQ,EACR,aAAa,EACb,eAAe,EACf,OAAO,EACR,GAAG,KAAK,CAAC;IAEV,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,CACL,KAAC,6BAA6B,IAC5B,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,WAAW,EACvB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,iBAAiB,EAAE,iBAAiB,EACpC,iCAAiC,EAAE,iCAAiC,EACpE,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,OAAO,GAChB,CACH,CAAC;IACJ,CAAC;IAED,OAAO,CACL,KAAC,yBAAyB,iBACd,uCAAuC,iBACpC,KAAK,CAAC,MAAM,EACzB,OAAO,EAAE,aAAa,YACtB,KAAC,aAAa,IACZ,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,KAAC,SAAS,IAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,GAAI,EAC9D,aAAa,EACX,KAAC,6BAA6B,IAC5B,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,WAAW,EACvB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,iBAAiB,EAAE,iBAAiB,EACpC,iCAAiC,EAAE,iCAAiC,EACpE,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,OAAO,GAChB,GAEJ,GACwB,CAC7B,CAAC;AACJ,CAAC;AAED,eAAe,2BAA2B,CAAC"}
+{"version":3,"file":"ChoiceRadioAnswerOptionView.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceRadioAnswerOptionView.tsx"],"names":[],"mappings":";AAmBA,OAAO,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,aAAa,MAAM,4BAA4B,CAAC;AACvD,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAC/C,OAAO,6BAA6B,MAAM,iCAAiC,CAAC;AAgB5E,SAAS,2BAA2B,CAAC,KAAuC;IAC1E,MAAM,EACJ,KAAK,EACL,OAAO,EACP,WAAW,EACX,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,iBAAiB,EACjB,iCAAiC,EACjC,QAAQ,EACR,aAAa,EACb,eAAe,EACf,OAAO,EACR,GAAG,KAAK,CAAC;IAEV,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,CACL,KAAC,6BAA6B,IAC5B,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,WAAW,EACvB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,iBAAiB,EAAE,iBAAiB,EACpC,iCAAiC,EAAE,iCAAiC,EACpE,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,OAAO,GAChB,CACH,CAAC;IACJ,CAAC;IAED,OAAO,CACL,KAAC,yBAAyB,iBACd,uCAAuC,iBACpC,KAAK,CAAC,MAAM,gBACb,KAAK,CAAC,IAAI,EACtB,OAAO,EAAE,aAAa,YACtB,KAAC,aAAa,IACZ,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,aAAa,EAAE,KAAC,SAAS,IAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,GAAI,EAC9D,aAAa,EACX,KAAC,6BAA6B,IAC5B,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,WAAW,EACvB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,iBAAiB,EAAE,iBAAiB,EACpC,iCAAiC,EAAE,iCAAiC,EACpE,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,OAAO,GAChB,GAEJ,GACwB,CAC7B,CAAC;AACJ,CAAC;AAED,eAAe,2BAA2B,CAAC"}

package/lib/components/FormComponents/ChoiceItems/ChoiceRadioAnswerValueSetFields.js

@@ -1,6 +1,22 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import Typography from '@mui/material/Typography';
+/*
+ * Copyright 2025 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 ErrorOutlineIcon from '@mui/icons-material/ErrorOutline';
+import Typography from '@mui/material/Typography';
 import { StyledAlert } from '../../Alert.styles';
 import RadioFormGroup from '../ItemParts/RadioFormGroup';
 function ChoiceRadioAnswerValueSetFields(props) {

package/lib/components/FormComponents/ChoiceItems/ChoiceRadioAnswerValueSetFields.js.map

@@ -1 +1 @@
-{"version":3,"file":"ChoiceRadioAnswerValueSetFields.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceRadioAnswerValueSetFields.tsx"],"names":[],"mappings":";AAkBA,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAElD,OAAO,gBAAgB,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAEjD,OAAO,cAAc,MAAM,6BAA6B,CAAC;AAgBzD,SAAS,+BAA+B,CAAC,KAA2C;IAClF,MAAM,EACJ,KAAK,EACL,OAAO,EACP,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,iBAAiB,EACjB,iCAAiC,EACjC,gBAAgB,EAChB,QAAQ,EACR,eAAe,EACf,OAAO,EACR,GAAG,KAAK,CAAC;IAEV,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,CACL,KAAC,cAAc,IACb,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,iBAAiB,EAAE,iBAAiB,EACpC,iCAAiC,EAAE,iCAAiC,EACpE,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,OAAO,GAChB,CACH,CAAC;IACJ,CAAC;IAED,IAAI,gBAAgB,CAAC,KAAK,EAAE,CAAC;QAC3B,OAAO,CACL,MAAC,WAAW,IAAC,KAAK,EAAC,OAAO,aACxB,KAAC,gBAAgB,IAAC,KAAK,EAAC,OAAO,EAAC,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,GAAI,EACpD,MAAC,UAAU,IAAC,SAAS,EAAC,KAAK,oFAC2C,GAAG,EACtE,gBAAgB,CAAC,cAAc,IACrB,IACD,CACf,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,CACL,KAAC,UAAU,IAAC,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,sCAE7C,CACd,CAAC;IACJ,CAAC;IAED,OAAO,CACL,MAAC,WAAW,IAAC,KAAK,EAAC,OAAO,aACxB,KAAC,gBAAgB,IAAC,KAAK,EAAC,OAAO,EAAC,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,GAAI,EACpD,KAAC,UAAU,IAAC,SAAS,EAAC,KAAK,iFAEd,IACD,CACf,CAAC;AACJ,CAAC;AAED,eAAe,+BAA+B,CAAC"}
+{"version":3,"file":"ChoiceRadioAnswerValueSetFields.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceRadioAnswerValueSetFields.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,gBAAgB,MAAM,kCAAkC,CAAC;AAChE,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAGlD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,cAAc,MAAM,6BAA6B,CAAC;AAgBzD,SAAS,+BAA+B,CAAC,KAA2C;IAClF,MAAM,EACJ,KAAK,EACL,OAAO,EACP,UAAU,EACV,QAAQ,EACR,QAAQ,EACR,iBAAiB,EACjB,iCAAiC,EACjC,gBAAgB,EAChB,QAAQ,EACR,eAAe,EACf,OAAO,EACR,GAAG,KAAK,CAAC;IAEV,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACvB,OAAO,CACL,KAAC,cAAc,IACb,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,UAAU,EAAE,UAAU,EACtB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,iBAAiB,EAAE,iBAAiB,EACpC,iCAAiC,EAAE,iCAAiC,EACpE,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,eAAe,EAChC,OAAO,EAAE,OAAO,GAChB,CACH,CAAC;IACJ,CAAC;IAED,IAAI,gBAAgB,CAAC,KAAK,EAAE,CAAC;QAC3B,OAAO,CACL,MAAC,WAAW,IAAC,KAAK,EAAC,OAAO,aACxB,KAAC,gBAAgB,IAAC,KAAK,EAAC,OAAO,EAAC,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,GAAI,EACpD,MAAC,UAAU,IAAC,SAAS,EAAC,KAAK,oFAC2C,GAAG,EACtE,gBAAgB,CAAC,cAAc,IACrB,IACD,CACf,CAAC;IACJ,CAAC;IAED,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACzB,OAAO,CACL,KAAC,UAAU,IAAC,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,EAAE,UAAU,EAAE,GAAG,EAAE,QAAQ,EAAE,EAAE,sCAE7C,CACd,CAAC;IACJ,CAAC;IAED,OAAO,CACL,MAAC,WAAW,IAAC,KAAK,EAAC,OAAO,aACxB,KAAC,gBAAgB,IAAC,KAAK,EAAC,OAAO,EAAC,EAAE,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,GAAI,EACpD,KAAC,UAAU,IAAC,SAAS,EAAC,KAAK,iFAEd,IACD,CACf,CAAC;AACJ,CAAC;AAED,eAAe,+BAA+B,CAAC"}

package/lib/components/FormComponents/ChoiceItems/ChoiceRadioAnswerValueSetItem.d.ts

@@ -1,8 +1,3 @@
-import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
-import type { PropsWithFeedbackFromParentAttribute, PropsWithIsRepeatedAttribute, PropsWithIsTabledAttribute, PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithQrItemChangeHandler, PropsWithRenderingExtensionsAttribute } from '../../../interfaces/renderProps.interface';
-interface ChoiceRadioAnswerValueSetItemProps extends PropsWithQrItemChangeHandler, PropsWithItemPathAttribute, PropsWithIsRepeatedAttribute, PropsWithRenderingExtensionsAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithFeedbackFromParentAttribute, PropsWithIsTabledAttribute {
-    qItem: QuestionnaireItem;
-    qrItem: QuestionnaireResponseItem | null;
-}
-declare function ChoiceRadioAnswerValueSetItem(props: ChoiceRadioAnswerValueSetItemProps): import("react/jsx-runtime").JSX.Element;
+import type { BaseItemProps } from '../../../interfaces/renderProps.interface';
+declare function ChoiceRadioAnswerValueSetItem(props: BaseItemProps): import("react/jsx-runtime").JSX.Element;
 export default ChoiceRadioAnswerValueSetItem;

package/lib/components/FormComponents/ChoiceItems/ChoiceRadioAnswerValueSetItem.js

@@ -16,29 +16,29 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * limitations under the License.
  */
 import { useMemo } from 'react';
+import useAnswerOptionsToggleExpressions from '../../../hooks/useAnswerOptionsToggleExpressions';
+import useReadOnly from '../../../hooks/useReadOnly';
+import useValidationFeedback from '../../../hooks/useValidationFeedback';
+import useValueSetCodings from '../../../hooks/useValueSetCodings';
+import { useQuestionnaireStore } from '../../../stores';
 import { convertCodingsToAnswerOptions, findInAnswerOptions } from '../../../utils/choice';
 import { createEmptyQrItem } from '../../../utils/qrItem';
 import { FullWidthFormComponentBox } from '../../Box.styles';
-import useValueSetCodings from '../../../hooks/useValueSetCodings';
-import ChoiceRadioAnswerValueSetFields from './ChoiceRadioAnswerValueSetFields';
-import useReadOnly from '../../../hooks/useReadOnly';
 import ItemFieldGrid from '../ItemParts/ItemFieldGrid';
-import { useQuestionnaireStore } from '../../../stores';
-import useCodingCalculatedExpression from '../../../hooks/useCodingCalculatedExpression';
-import useValidationFeedback from '../../../hooks/useValidationFeedback';
 import ItemLabel from '../ItemParts/ItemLabel';
-import useAnswerOptionsToggleExpressions from '../../../hooks/useAnswerOptionsToggleExpressions';
+import ChoiceRadioAnswerValueSetFields from './ChoiceRadioAnswerValueSetFields';
 function ChoiceRadioAnswerValueSetItem(props) {
-    var _a, _b, _c, _d, _e, _f;
-    const { qItem, qrItem, itemPath, isRepeated, parentIsReadOnly, feedbackFromParent, isTabled, onQrItemChange } = props;
+    const { qItem, qrItem, isRepeated, isTabled, parentIsReadOnly, feedbackFromParent, calcExpUpdated, onQrItemChange } = props;
     const onFocusLinkId = useQuestionnaireStore.use.onFocusLinkId();
     // Init input value
-    const answerKey = (_b = (_a = qrItem === null || qrItem === void 0 ? void 0 : qrItem.answer) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.id;
-    const qrChoiceRadio = qrItem !== null && qrItem !== void 0 ? qrItem : createEmptyQrItem(qItem, answerKey);
+    const answerKey = qrItem?.answer?.[0]?.id;
+    const qrChoiceRadio = qrItem ?? createEmptyQrItem(qItem, answerKey);
     let valueRadio = null;
     if (qrChoiceRadio.answer) {
         valueRadio =
-            (_f = (_d = (_c = qrChoiceRadio.answer[0].valueCoding) === null || _c === void 0 ? void 0 : _c.code) !== null && _d !== void 0 ? _d : (_e = qrChoiceRadio.answer[0].valueCoding) === null || _e === void 0 ? void 0 : _e.display) !== null && _f !== void 0 ? _f : null;
+            qrChoiceRadio.answer[0].valueCoding?.code ??
+                qrChoiceRadio.answer[0].valueCoding?.display ??
+                null;
     }
     // Get codings/options from valueSet
     const { codings, terminologyError, dynamicCodingsUpdated } = useValueSetCodings(qItem);
@@ -46,25 +46,13 @@ function ChoiceRadioAnswerValueSetItem(props) {
     // Perform validation checks - there's no string-based input here
     const feedback = useValidationFeedback(qItem, feedbackFromParent);
     const options = useMemo(() => convertCodingsToAnswerOptions(codings), [codings]);
-    const { calcExpUpdated } = useCodingCalculatedExpression({
-        qItem: qItem,
-        valueInString: valueRadio !== null && valueRadio !== void 0 ? valueRadio : '',
-        onChangeByCalcExpressionString: (newValueString) => {
-            handleChange(newValueString, true);
-        },
-        onChangeByCalcExpressionNull: () => {
-            onQrItemChange(createEmptyQrItem(qItem, answerKey), itemPath);
-        }
-    });
     // Process answerOptionsToggleExpressions
     const { answerOptionsToggleExpressionsMap, answerOptionsToggleExpUpdated } = useAnswerOptionsToggleExpressions(qItem.linkId);
-    function handleChange(newValue, includeItemPath = false // only include when this is called from useCalculatedExpression hook
-    ) {
-        const targetItemPath = includeItemPath ? itemPath : undefined;
+    function handleChange(newValue) {
         if (codings.length > 0) {
             const qrAnswer = findInAnswerOptions(options, newValue);
             const emptyQrItem = createEmptyQrItem(qItem, answerKey);
-            onQrItemChange(qrAnswer ? Object.assign(Object.assign({}, emptyQrItem), { answer: [Object.assign(Object.assign({}, qrAnswer), { id: answerKey })] }) : emptyQrItem, targetItemPath);
+            onQrItemChange(qrAnswer ? { ...emptyQrItem, answer: [{ ...qrAnswer, id: answerKey }] } : emptyQrItem);
         }
     }
     function handleClear() {
@@ -73,7 +61,7 @@ function ChoiceRadioAnswerValueSetItem(props) {
     if (isRepeated) {
         return (_jsx(ChoiceRadioAnswerValueSetFields, { qItem: qItem, options: options, valueRadio: valueRadio, feedback: feedback, readOnly: readOnly, expressionUpdated: calcExpUpdated || dynamicCodingsUpdated || answerOptionsToggleExpUpdated, answerOptionsToggleExpressionsMap: answerOptionsToggleExpressionsMap, terminologyError: terminologyError, isTabled: isTabled, onCheckedChange: handleChange, onClear: handleClear }));
     }
-    return (_jsx(FullWidthFormComponentBox, { "data-test": "q-item-choice-radio-answer-value-set-box", "data-linkid": qItem.linkId, onClick: () => onFocusLinkId(qItem.linkId), children: _jsx(ItemFieldGrid, { qItem: qItem, readOnly: readOnly, labelChildren: _jsx(ItemLabel, { qItem: qItem, readOnly: readOnly }), fieldChildren: _jsx(ChoiceRadioAnswerValueSetFields, { qItem: qItem, options: options, valueRadio: valueRadio, feedback: feedback, readOnly: readOnly, expressionUpdated: calcExpUpdated || dynamicCodingsUpdated || answerOptionsToggleExpUpdated, answerOptionsToggleExpressionsMap: answerOptionsToggleExpressionsMap, terminologyError: terminologyError, isTabled: isTabled, onCheckedChange: handleChange, onClear: handleClear }) }) }));
+    return (_jsx(FullWidthFormComponentBox, { "data-test": "q-item-choice-radio-answer-value-set-box", "data-linkid": qItem.linkId, "data-label": qItem.text, onClick: () => onFocusLinkId(qItem.linkId), children: _jsx(ItemFieldGrid, { qItem: qItem, readOnly: readOnly, labelChildren: _jsx(ItemLabel, { qItem: qItem, readOnly: readOnly }), fieldChildren: _jsx(ChoiceRadioAnswerValueSetFields, { qItem: qItem, options: options, valueRadio: valueRadio, feedback: feedback, readOnly: readOnly, expressionUpdated: calcExpUpdated || dynamicCodingsUpdated || answerOptionsToggleExpUpdated, answerOptionsToggleExpressionsMap: answerOptionsToggleExpressionsMap, terminologyError: terminologyError, isTabled: isTabled, onCheckedChange: handleChange, onClear: handleClear }) }) }));
 }
 export default ChoiceRadioAnswerValueSetItem;
 //# sourceMappingURL=ChoiceRadioAnswerValueSetItem.js.map

package/lib/components/FormComponents/ChoiceItems/ChoiceRadioAnswerValueSetItem.js.map

@@ -1 +1 @@
-{"version":3,"file":"ChoiceRadioAnswerValueSetItem.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceRadioAnswerValueSetItem.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"ChoiceRadioAnswerValueSetItem.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceRadioAnswerValueSetItem.tsx"],"names":[],"mappings":"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"}

package/lib/components/FormComponents/ChoiceItems/ChoiceRadioSingle.js

@@ -1,20 +1,23 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import FormControlLabel from '@mui/material/FormControlLabel';
-import { useRendererStylingStore } from '../../../stores';
+import { useRendererConfigStore } from '../../../stores';
 import { StandardRadio } from '../../Radio.styles';
 function ChoiceRadioSingle(props) {
     const { value, label, readOnly, disabledViaToggleExpression, fullWidth } = props;
-    const readOnlyVisualStyle = useRendererStylingStore.use.readOnlyVisualStyle();
+    const readOnlyVisualStyle = useRendererConfigStore.use.readOnlyVisualStyle();
     // When an option is disabled via answerOptionsToggleExpression, it should truly be "disabled", regardless of readOnlyVisualStyle.
     // Both isHtmlDisabled and isHtmlReadOnly are mutually exclusive.
     const readOnlyWithDisabledStyle = readOnly && readOnlyVisualStyle === 'disabled';
     const readOnlyWithReadOnlyStyle = readOnly && readOnlyVisualStyle === 'readonly';
     const isHtmlDisabled = readOnlyWithDisabledStyle || disabledViaToggleExpression;
     const isHtmlReadOnly = readOnlyWithReadOnlyStyle && !disabledViaToggleExpression;
-    return (_jsx(FormControlLabel, { sx: Object.assign({ width: fullWidth ? '100%' : 'unset' }, (isHtmlReadOnly && {
-            cursor: 'default',
-            color: 'text.secondary'
-        })), disabled: isHtmlDisabled, value: value, control: _jsx(StandardRadio, { "data-test": `radio-single-${label}`, size: "small", readOnly: isHtmlReadOnly }), label: label }));
+    return (_jsx(FormControlLabel, { sx: {
+            width: fullWidth ? '100%' : 'unset',
+            ...(isHtmlReadOnly && {
+                cursor: 'default',
+                color: 'text.secondary'
+            })
+        }, disabled: isHtmlDisabled, value: value, control: _jsx(StandardRadio, { "data-test": `radio-single-${label}`, size: "small", readOnly: isHtmlReadOnly }), label: label }));
 }
 export default ChoiceRadioSingle;
 //# sourceMappingURL=ChoiceRadioSingle.js.map

package/lib/components/FormComponents/ChoiceItems/ChoiceRadioSingle.js.map

@@ -1 +1 @@
-{"version":3,"file":"ChoiceRadioSingle.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceRadioSingle.tsx"],"names":[],"mappings":";AAkBA,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAUnD,SAAS,iBAAiB,CAAC,KAA6B;IACtD,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,2BAA2B,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAEjF,MAAM,mBAAmB,GAAG,uBAAuB,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAE9E,kIAAkI;IAClI,iEAAiE;IACjE,MAAM,yBAAyB,GAAG,QAAQ,IAAI,mBAAmB,KAAK,UAAU,CAAC;IACjF,MAAM,yBAAyB,GAAG,QAAQ,IAAI,mBAAmB,KAAK,UAAU,CAAC;IAEjF,MAAM,cAAc,GAAG,yBAAyB,IAAI,2BAA2B,CAAC;IAChF,MAAM,cAAc,GAAG,yBAAyB,IAAI,CAAC,2BAA2B,CAAC;IAEjF,OAAO,CACL,KAAC,gBAAgB,IACf,EAAE,kBACA,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,IAChC,CAAC,cAAc,IAAI;YACpB,MAAM,EAAE,SAAS;YACjB,KAAK,EAAE,gBAAgB;SACxB,CAAC,GAEJ,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,KAAK,EACZ,OAAO,EACL,KAAC,aAAa,iBAAY,gBAAgB,KAAK,EAAE,EAAE,IAAI,EAAC,OAAO,EAAC,QAAQ,EAAE,cAAc,GAAI,EAE9F,KAAK,EAAE,KAAK,GACZ,CACH,CAAC;AACJ,CAAC;AAED,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"ChoiceRadioSingle.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceRadioSingle.tsx"],"names":[],"mappings":";AAkBA,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAUnD,SAAS,iBAAiB,CAAC,KAA6B;IACtD,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,2BAA2B,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAEjF,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAE7E,kIAAkI;IAClI,iEAAiE;IACjE,MAAM,yBAAyB,GAAG,QAAQ,IAAI,mBAAmB,KAAK,UAAU,CAAC;IACjF,MAAM,yBAAyB,GAAG,QAAQ,IAAI,mBAAmB,KAAK,UAAU,CAAC;IAEjF,MAAM,cAAc,GAAG,yBAAyB,IAAI,2BAA2B,CAAC;IAChF,MAAM,cAAc,GAAG,yBAAyB,IAAI,CAAC,2BAA2B,CAAC;IAEjF,OAAO,CACL,KAAC,gBAAgB,IACf,EAAE,EAAE;YACF,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO;YACnC,GAAG,CAAC,cAAc,IAAI;gBACpB,MAAM,EAAE,SAAS;gBACjB,KAAK,EAAE,gBAAgB;aACxB,CAAC;SACH,EACD,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,KAAK,EACZ,OAAO,EACL,KAAC,aAAa,iBAAY,gBAAgB,KAAK,EAAE,EAAE,IAAI,EAAC,OAAO,EAAC,QAAQ,EAAE,cAAc,GAAI,EAE9F,KAAK,EAAE,KAAK,GACZ,CACH,CAAC;AACJ,CAAC;AAED,eAAe,iBAAiB,CAAC"}

package/lib/components/FormComponents/ChoiceItems/ChoiceSelectAnswerOptionFields.d.ts

@@ -1,6 +1,6 @@
 import type { QuestionnaireItem, QuestionnaireItemAnswerOption } from 'fhir/r4';
-import type { PropsWithIsTabledRequiredAttribute, PropsWithRenderingExtensionsAttribute } from '../../../interfaces/renderProps.interface';
-interface ChoiceSelectAnswerOptionFieldsProps extends PropsWithIsTabledRequiredAttribute, PropsWithRenderingExtensionsAttribute {
+import type { PropsWithIsTabledAttribute, PropsWithRenderingExtensionsAttribute } from '../../../interfaces/renderProps.interface';
+interface ChoiceSelectAnswerOptionFieldsProps extends PropsWithIsTabledAttribute, PropsWithRenderingExtensionsAttribute {
     qItem: QuestionnaireItem;
     options: QuestionnaireItemAnswerOption[];
     valueSelect: QuestionnaireItemAnswerOption | null;

package/lib/components/FormComponents/ChoiceItems/ChoiceSelectAnswerOptionFields.js

@@ -1,20 +1,40 @@
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
-import { StandardTextField } from '../Textfield.styles';
+/*
+ * Copyright 2025 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 Autocomplete from '@mui/material/Autocomplete';
-import { getAnswerOptionLabel } from '../../../utils/openChoice';
+import { useRendererConfigStore } from '../../../stores';
 import { compareAnswerOptionValue, isOptionDisabled } from '../../../utils/choice';
-import { useRendererStylingStore } from '../../../stores';
+import { getAnswerOptionLabel } from '../../../utils/openChoice';
 import { StyledRequiredTypography } from '../Item.styles';
 import DisplayUnitText from '../ItemParts/DisplayUnitText';
 import ExpressionUpdateFadingIcon from '../ItemParts/ExpressionUpdateFadingIcon';
+import { StandardTextField } from '../Textfield.styles';
 function ChoiceSelectAnswerOptionFields(props) {
     const { qItem, options, valueSelect, feedback, readOnly, expressionUpdated, isTabled, renderingExtensions, answerOptionsToggleExpressionsMap, onSelectChange } = props;
-    const readOnlyVisualStyle = useRendererStylingStore.use.readOnlyVisualStyle();
-    const textFieldWidth = useRendererStylingStore.use.textFieldWidth();
+    const readOnlyVisualStyle = useRendererConfigStore.use.readOnlyVisualStyle();
+    const textFieldWidth = useRendererConfigStore.use.textFieldWidth();
     const { displayUnit, displayPrompt, entryFormat } = renderingExtensions;
-    return (_jsxs(_Fragment, { children: [_jsx(Autocomplete, { id: qItem.type + '-' + qItem.linkId, value: valueSelect !== null && valueSelect !== void 0 ? valueSelect : null, options: options, getOptionDisabled: (option) => isOptionDisabled(option, answerOptionsToggleExpressionsMap), getOptionLabel: (option) => getAnswerOptionLabel(option), isOptionEqualToValue: (option, value) => compareAnswerOptionValue(option, value), onChange: (_, newValue) => onSelectChange(newValue), openOnFocus: true, autoHighlight: true, sx: { maxWidth: !isTabled ? textFieldWidth : 3000, minWidth: 160, flexGrow: 1 }, size: "small", disabled: readOnly && readOnlyVisualStyle === 'disabled', readOnly: readOnly && readOnlyVisualStyle === 'readonly', renderInput: (params) => (_jsx(StandardTextField, Object.assign({ multiline: true, textFieldWidth: textFieldWidth, isTabled: isTabled, placeholder: entryFormat || displayPrompt }, params, { slotProps: {
-                        input: Object.assign(Object.assign({}, params.InputProps), { readOnly: readOnly && readOnlyVisualStyle === 'readonly', endAdornment: (_jsxs(_Fragment, { children: [params.InputProps.endAdornment, _jsx(ExpressionUpdateFadingIcon, { fadeIn: expressionUpdated, disabled: readOnly }), _jsx(DisplayUnitText, { readOnly: readOnly, children: displayUnit })] })) })
-                    } }))) }), feedback ? _jsx(StyledRequiredTypography, { children: feedback }) : null] }));
+    return (_jsxs(_Fragment, { children: [_jsx(Autocomplete, { id: qItem.type + '-' + qItem.linkId, value: valueSelect ?? null, options: options, getOptionDisabled: (option) => isOptionDisabled(option, answerOptionsToggleExpressionsMap), getOptionLabel: (option) => getAnswerOptionLabel(option), isOptionEqualToValue: (option, value) => compareAnswerOptionValue(option, value), onChange: (_, newValue) => onSelectChange(newValue), openOnFocus: true, autoHighlight: true, sx: { maxWidth: !isTabled ? textFieldWidth : 3000, minWidth: 160, flexGrow: 1 }, size: "small", disabled: readOnly && readOnlyVisualStyle === 'disabled', readOnly: readOnly && readOnlyVisualStyle === 'readonly', renderInput: (params) => (_jsx(StandardTextField, { multiline: true, textFieldWidth: textFieldWidth, isTabled: isTabled, placeholder: entryFormat || displayPrompt, ...params, slotProps: {
+                        input: {
+                            ...params.InputProps,
+                            readOnly: readOnly && readOnlyVisualStyle === 'readonly',
+                            endAdornment: (_jsxs(_Fragment, { children: [params.InputProps.endAdornment, _jsx(ExpressionUpdateFadingIcon, { fadeIn: expressionUpdated, disabled: readOnly }), _jsx(DisplayUnitText, { readOnly: readOnly, children: displayUnit })] }))
+                        }
+                    } })) }), feedback ? _jsx(StyledRequiredTypography, { children: feedback }) : null] }));
 }
 export default ChoiceSelectAnswerOptionFields;
 //# sourceMappingURL=ChoiceSelectAnswerOptionFields.js.map

package/lib/components/FormComponents/ChoiceItems/ChoiceSelectAnswerOptionFields.js.map

@@ -1 +1 @@
-{"version":3,"file":"ChoiceSelectAnswerOptionFields.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceSelectAnswerOptionFields.tsx"],"names":[],"mappings":";AAsBA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,YAAY,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACnF,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,eAAe,MAAM,8BAA8B,CAAC;AAC3D,OAAO,0BAA0B,MAAM,yCAAyC,CAAC;AAejF,SAAS,8BAA8B,CAAC,KAA0C;IAChF,MAAM,EACJ,KAAK,EACL,OAAO,EACP,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,iBAAiB,EACjB,QAAQ,EACR,mBAAmB,EACnB,iCAAiC,EACjC,cAAc,EACf,GAAG,KAAK,CAAC;IAEV,MAAM,mBAAmB,GAAG,uBAAuB,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAC9E,MAAM,cAAc,GAAG,uBAAuB,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;IAEpE,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,mBAAmB,CAAC;IAExE,OAAO,CACL,8BACE,KAAC,YAAY,IACX,EAAE,EAAE,KAAK,CAAC,IAAI,GAAG,GAAG,GAAG,KAAK,CAAC,MAAM,EACnC,KAAK,EAAE,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,IAAI,EAC1B,OAAO,EAAE,OAAO,EAChB,iBAAiB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,iCAAiC,CAAC,EAC1F,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,oBAAoB,CAAC,MAAM,CAAC,EACxD,oBAAoB,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,wBAAwB,CAAC,MAAM,EAAE,KAAK,CAAC,EAChF,QAAQ,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,EACnD,WAAW,QACX,aAAa,QACb,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,EAC/E,IAAI,EAAC,OAAO,EACZ,QAAQ,EAAE,QAAQ,IAAI,mBAAmB,KAAK,UAAU,EACxD,QAAQ,EAAE,QAAQ,IAAI,mBAAmB,KAAK,UAAU,EACxD,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CACvB,KAAC,iBAAiB,kBAChB,SAAS,QACT,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,WAAW,IAAI,aAAa,IACrC,MAAM,IACV,SAAS,EAAE;wBACT,KAAK,kCACA,MAAM,CAAC,UAAU,KACpB,QAAQ,EAAE,QAAQ,IAAI,mBAAmB,KAAK,UAAU,EACxD,YAAY,EAAE,CACZ,8BACG,MAAM,CAAC,UAAU,CAAC,YAAY,EAC/B,KAAC,0BAA0B,IAAC,MAAM,EAAE,iBAAiB,EAAE,QAAQ,EAAE,QAAQ,GAAI,EAC7E,KAAC,eAAe,IAAC,QAAQ,EAAE,QAAQ,YAAG,WAAW,GAAmB,IACnE,CACJ,GACF;qBACF,IACD,CACH,GACD,EAED,QAAQ,CAAC,CAAC,CAAC,KAAC,wBAAwB,cAAE,QAAQ,GAA4B,CAAC,CAAC,CAAC,IAAI,IACjF,CACJ,CAAC;AACJ,CAAC;AAED,eAAe,8BAA8B,CAAC"}
+{"version":3,"file":"ChoiceSelectAnswerOptionFields.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceSelectAnswerOptionFields.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,YAAY,MAAM,4BAA4B,CAAC;AAMtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,EAAE,wBAAwB,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACnF,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,eAAe,MAAM,8BAA8B,CAAC;AAC3D,OAAO,0BAA0B,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAexD,SAAS,8BAA8B,CAAC,KAA0C;IAChF,MAAM,EACJ,KAAK,EACL,OAAO,EACP,WAAW,EACX,QAAQ,EACR,QAAQ,EACR,iBAAiB,EACjB,QAAQ,EACR,mBAAmB,EACnB,iCAAiC,EACjC,cAAc,EACf,GAAG,KAAK,CAAC;IAEV,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAC7E,MAAM,cAAc,GAAG,sBAAsB,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;IAEnE,MAAM,EAAE,WAAW,EAAE,aAAa,EAAE,WAAW,EAAE,GAAG,mBAAmB,CAAC;IAExE,OAAO,CACL,8BACE,KAAC,YAAY,IACX,EAAE,EAAE,KAAK,CAAC,IAAI,GAAG,GAAG,GAAG,KAAK,CAAC,MAAM,EACnC,KAAK,EAAE,WAAW,IAAI,IAAI,EAC1B,OAAO,EAAE,OAAO,EAChB,iBAAiB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAgB,CAAC,MAAM,EAAE,iCAAiC,CAAC,EAC1F,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,oBAAoB,CAAC,MAAM,CAAC,EACxD,oBAAoB,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,wBAAwB,CAAC,MAAM,EAAE,KAAK,CAAC,EAChF,QAAQ,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,EACnD,WAAW,QACX,aAAa,QACb,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,IAAI,EAAE,QAAQ,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,EAAE,EAC/E,IAAI,EAAC,OAAO,EACZ,QAAQ,EAAE,QAAQ,IAAI,mBAAmB,KAAK,UAAU,EACxD,QAAQ,EAAE,QAAQ,IAAI,mBAAmB,KAAK,UAAU,EACxD,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CACvB,KAAC,iBAAiB,IAChB,SAAS,QACT,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,QAAQ,EAClB,WAAW,EAAE,WAAW,IAAI,aAAa,KACrC,MAAM,EACV,SAAS,EAAE;wBACT,KAAK,EAAE;4BACL,GAAG,MAAM,CAAC,UAAU;4BACpB,QAAQ,EAAE,QAAQ,IAAI,mBAAmB,KAAK,UAAU;4BACxD,YAAY,EAAE,CACZ,8BACG,MAAM,CAAC,UAAU,CAAC,YAAY,EAC/B,KAAC,0BAA0B,IAAC,MAAM,EAAE,iBAAiB,EAAE,QAAQ,EAAE,QAAQ,GAAI,EAC7E,KAAC,eAAe,IAAC,QAAQ,EAAE,QAAQ,YAAG,WAAW,GAAmB,IACnE,CACJ;yBACF;qBACF,GACD,CACH,GACD,EAED,QAAQ,CAAC,CAAC,CAAC,KAAC,wBAAwB,cAAE,QAAQ,GAA4B,CAAC,CAAC,CAAC,IAAI,IACjF,CACJ,CAAC;AACJ,CAAC;AAED,eAAe,8BAA8B,CAAC"}

package/lib/components/FormComponents/ChoiceItems/ChoiceSelectAnswerOptionItem.d.ts

@@ -1,8 +1,3 @@
-import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
-import type { PropsWithFeedbackFromParentAttribute, PropsWithIsRepeatedAttribute, PropsWithIsTabledRequiredAttribute, PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithQrItemChangeHandler, PropsWithRenderingExtensionsAttribute } from '../../../interfaces/renderProps.interface';
-interface ChoiceSelectAnswerOptionItemProps extends PropsWithQrItemChangeHandler, PropsWithItemPathAttribute, PropsWithIsRepeatedAttribute, PropsWithIsTabledRequiredAttribute, PropsWithRenderingExtensionsAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithFeedbackFromParentAttribute {
-    qItem: QuestionnaireItem;
-    qrItem: QuestionnaireResponseItem | null;
-}
-declare function ChoiceSelectAnswerOptionItem(props: ChoiceSelectAnswerOptionItemProps): import("react/jsx-runtime").JSX.Element;
+import type { BaseItemProps } from '../../../interfaces/renderProps.interface';
+declare function ChoiceSelectAnswerOptionItem(props: BaseItemProps): import("react/jsx-runtime").JSX.Element;
 export default ChoiceSelectAnswerOptionItem;