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

package/lib/components/FormComponents/OpenChoiceItems/OpenChoiceSelectAnswerValueSetItem.js

@@ -1,24 +1,24 @@
 import { jsx as _jsx } from "react/jsx-runtime";
+import useReadOnly from '../../../hooks/useReadOnly';
+import useValidationFeedback from '../../../hooks/useValidationFeedback';
+import useValueSetCodings from '../../../hooks/useValueSetCodings';
+import { useQuestionnaireStore } from '../../../stores';
 import { createEmptyQrItem } from '../../../utils/qrItem';
 import { FullWidthFormComponentBox } from '../../Box.styles';
-import useValueSetCodings from '../../../hooks/useValueSetCodings';
-import OpenChoiceSelectAnswerValueSetField from './OpenChoiceSelectAnswerValueSetField';
-import useReadOnly from '../../../hooks/useReadOnly';
 import ItemFieldGrid from '../ItemParts/ItemFieldGrid';
-import { useQuestionnaireStore } from '../../../stores';
-import useValidationFeedback from '../../../hooks/useValidationFeedback';
 import ItemLabel from '../ItemParts/ItemLabel';
 import { sanitizeInput } from '../../../utils/inputSanitization';
+import OpenChoiceSelectAnswerValueSetField from './OpenChoiceSelectAnswerValueSetField';
 function OpenChoiceSelectAnswerValueSetItem(props) {
-    var _a, _b;
     const { qItem, qrItem, isRepeated, isTabled, renderingExtensions, parentIsReadOnly, feedbackFromParent, onQrItemChange } = props;
+    // TODO no calcExpUpdated
     const onFocusLinkId = useQuestionnaireStore.use.onFocusLinkId();
     const readOnly = useReadOnly(qItem, parentIsReadOnly);
     // Perform validation checks
     const feedback = useValidationFeedback(qItem, feedbackFromParent);
     // 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 qrOpenChoice = qrItem !== null && qrItem !== void 0 ? qrItem : createEmptyQrItem(qItem, answerKey);
+    const answerKey = qrItem?.answer?.[0]?.id;
+    const qrOpenChoice = qrItem ?? createEmptyQrItem(qItem, answerKey);
     let valueSelect = null;
     if (qrOpenChoice['answer']) {
         //check if answer has valueCoding or valueString and assign it to valueSelect and null if not present
@@ -32,9 +32,6 @@ function OpenChoiceSelectAnswerValueSetItem(props) {
             valueSelect = null;
         }
     }
-    // TODO Process calculated expressions
-    // This requires its own hook, because in the case of multi-select, we need to check if the value is already checked to prevent an infinite loop
-    // This will be done after the choice/open-choice refactoring
     // Get codings/options from valueSet
     // TODO use dynamicCodingsUpdated to trigger a "refresh" icon when codings are dynamically updated
     const { codings, terminologyError } = useValueSetCodings(qItem);
@@ -57,14 +54,23 @@ function OpenChoiceSelectAnswerValueSetItem(props) {
                 //if the option.display is not present, then compare to code.
                 if (foundOption) {
                     newValue = foundOption;
-                    onQrItemChange(Object.assign(Object.assign({}, qrOpenChoice), { answer: [{ id: answerKey, valueCoding: newValue }] }));
+                    onQrItemChange({
+                        ...qrOpenChoice,
+                        answer: [{ id: answerKey, valueCoding: newValue }]
+                    });
                 } //if newValue is not in the options list, treat it as a string
                 else {
-                    onQrItemChange(Object.assign(Object.assign({}, qrOpenChoice), { answer: [{ id: answerKey, valueString: sanitizeInput(newValue) }] }));
+                    onQrItemChange({
+                        ...qrOpenChoice,
+                        answer: [{ id: answerKey, valueString: sanitizeInput(newValue) }]
+                    });
                 }
             } //if the newValue is not a string, then it is coding
             else {
-                onQrItemChange(Object.assign(Object.assign({}, qrOpenChoice), { answer: [{ id: answerKey, valueCoding: newValue }] }));
+                onQrItemChange({
+                    ...qrOpenChoice,
+                    answer: [{ id: answerKey, valueCoding: newValue }]
+                });
             }
             return;
         }
@@ -73,7 +79,7 @@ function OpenChoiceSelectAnswerValueSetItem(props) {
     if (isRepeated) {
         return (_jsx(OpenChoiceSelectAnswerValueSetField, { qItem: qItem, options: codings, valueSelect: valueSelect, terminologyError: terminologyError, feedback: feedback, isTabled: isTabled, renderingExtensions: renderingExtensions, readOnly: readOnly, onValueChange: handleValueChange }));
     }
-    return (_jsx(FullWidthFormComponentBox, { "data-test": "q-item-open-choice-select-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(OpenChoiceSelectAnswerValueSetField, { qItem: qItem, options: codings, valueSelect: valueSelect, terminologyError: terminologyError, feedback: feedback, isTabled: isTabled, renderingExtensions: renderingExtensions, readOnly: readOnly, onValueChange: handleValueChange }) }) }));
+    return (_jsx(FullWidthFormComponentBox, { "data-test": "q-item-open-choice-select-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(OpenChoiceSelectAnswerValueSetField, { qItem: qItem, options: codings, valueSelect: valueSelect, terminologyError: terminologyError, feedback: feedback, isTabled: isTabled, renderingExtensions: renderingExtensions, readOnly: readOnly, onValueChange: handleValueChange }) }) }));
 }
 export default OpenChoiceSelectAnswerValueSetItem;
 //# sourceMappingURL=OpenChoiceSelectAnswerValueSetItem.js.map

package/lib/components/FormComponents/OpenChoiceItems/OpenChoiceSelectAnswerValueSetItem.js.map

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

package/lib/components/FormComponents/QuantityItem/QuantityComparatorField.d.ts

@@ -1,6 +1,6 @@
-import type { PropsWithIsTabledRequiredAttribute } from '../../../interfaces/renderProps.interface';
 import type { Quantity } from 'fhir/r4';
-interface QuantityComparatorFieldProps extends PropsWithIsTabledRequiredAttribute {
+import type { PropsWithIsTabledAttribute } from '../../../interfaces/renderProps.interface';
+interface QuantityComparatorFieldProps extends PropsWithIsTabledAttribute {
     linkId: string;
     itemType: string;
     options: Quantity['comparator'][];

package/lib/components/FormComponents/QuantityItem/QuantityComparatorField.js

@@ -16,19 +16,19 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * limitations under the License.
  */
 import Autocomplete from '@mui/material/Autocomplete';
-import MuiTextField from '../TextItem/MuiTextField';
 import Box from '@mui/material/Box';
 import Typography from '@mui/material/Typography';
-import { useRendererStylingStore } from '../../../stores';
+import { useRendererConfigStore } from '../../../stores';
+import MuiTextField from '../TextItem/MuiTextField';
 function QuantityComparatorField(props) {
     const { linkId, itemType, options, valueSelect, readOnly, onChange } = props;
     // TODO this component doesn't have a calcExpUpdated update animation
-    const readOnlyVisualStyle = useRendererStylingStore.use.readOnlyVisualStyle();
-    const hideQuantityComparatorField = useRendererStylingStore.use.hideQuantityComparatorField();
+    const readOnlyVisualStyle = useRendererConfigStore.use.readOnlyVisualStyle();
+    const hideQuantityComparatorField = useRendererConfigStore.use.hideQuantityComparatorField();
     if (hideQuantityComparatorField) {
         return null;
     }
-    return (_jsxs(Box, { children: [_jsx(Autocomplete, { "data-test": 'q-item-quantity-comparator', id: itemType + '-' + linkId + '-comparator', value: valueSelect !== null && valueSelect !== void 0 ? valueSelect : null, options: options, onChange: (_, newValue) => onChange(newValue), autoHighlight: true, sx: { width: 88 }, disabled: readOnly && readOnlyVisualStyle === 'disabled', readOnly: readOnly && readOnlyVisualStyle === 'readonly', size: "small", renderInput: (params) => _jsx(MuiTextField, Object.assign({ sx: { width: 88 } }, params)) }), _jsx(Typography, { variant: "caption", color: "text.secondary", children: "(optional)" })] }));
+    return (_jsxs(Box, { children: [_jsx(Autocomplete, { "data-test": 'q-item-quantity-comparator', id: itemType + '-' + linkId + '-comparator', value: valueSelect ?? null, options: options, onChange: (_, newValue) => onChange(newValue), autoHighlight: true, sx: { width: 88 }, disabled: readOnly && readOnlyVisualStyle === 'disabled', readOnly: readOnly && readOnlyVisualStyle === 'readonly', size: "small", renderInput: (params) => _jsx(MuiTextField, { sx: { width: 88 }, ...params }) }), _jsx(Typography, { variant: "caption", color: "text.secondary", children: "(optional)" })] }));
 }
 export default QuantityComparatorField;
 //# sourceMappingURL=QuantityComparatorField.js.map

package/lib/components/FormComponents/QuantityItem/QuantityComparatorField.js.map

@@ -1 +1 @@
-{"version":3,"file":"QuantityComparatorField.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/QuantityItem/QuantityComparatorField.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,YAAY,MAAM,4BAA4B,CAAC;AAEtD,OAAO,YAAY,MAAM,0BAA0B,CAAC;AACpD,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAElD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAY1D,SAAS,uBAAuB,CAAC,KAAmC;IAClE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAC7E,qEAAqE;IAErE,MAAM,mBAAmB,GAAG,uBAAuB,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAC9E,MAAM,2BAA2B,GAAG,uBAAuB,CAAC,GAAG,CAAC,2BAA2B,EAAE,CAAC;IAC9F,IAAI,2BAA2B,EAAE,CAAC;QAChC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CACL,MAAC,GAAG,eACF,KAAC,YAAY,iBACA,4BAA4B,EACvC,EAAE,EAAE,QAAQ,GAAG,GAAG,GAAG,MAAM,GAAG,aAAa,EAC3C,KAAK,EAAE,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,IAAI,EAC1B,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAkC,CAAC,EACvE,aAAa,QACb,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EACjB,QAAQ,EAAE,QAAQ,IAAI,mBAAmB,KAAK,UAAU,EACxD,QAAQ,EAAE,QAAQ,IAAI,mBAAmB,KAAK,UAAU,EACxD,IAAI,EAAC,OAAO,EACZ,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,KAAC,YAAY,kBAAC,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,IAAM,MAAM,EAAI,GACxE,EACF,KAAC,UAAU,IAAC,OAAO,EAAC,SAAS,EAAC,KAAK,EAAC,gBAAgB,2BAEvC,IACT,CACP,CAAC;AACJ,CAAC;AAED,eAAe,uBAAuB,CAAC"}
+{"version":3,"file":"QuantityComparatorField.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/QuantityItem/QuantityComparatorField.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,YAAY,MAAM,4BAA4B,CAAC;AACtD,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAGlD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,YAAY,MAAM,0BAA0B,CAAC;AAYpD,SAAS,uBAAuB,CAAC,KAAmC;IAClE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAC7E,qEAAqE;IAErE,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAC7E,MAAM,2BAA2B,GAAG,sBAAsB,CAAC,GAAG,CAAC,2BAA2B,EAAE,CAAC;IAC7F,IAAI,2BAA2B,EAAE,CAAC;QAChC,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CACL,MAAC,GAAG,eACF,KAAC,YAAY,iBACA,4BAA4B,EACvC,EAAE,EAAE,QAAQ,GAAG,GAAG,GAAG,MAAM,GAAG,aAAa,EAC3C,KAAK,EAAE,WAAW,IAAI,IAAI,EAC1B,OAAO,EAAE,OAAO,EAChB,QAAQ,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAkC,CAAC,EACvE,aAAa,QACb,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,EACjB,QAAQ,EAAE,QAAQ,IAAI,mBAAmB,KAAK,UAAU,EACxD,QAAQ,EAAE,QAAQ,IAAI,mBAAmB,KAAK,UAAU,EACxD,IAAI,EAAC,OAAO,EACZ,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,KAAC,YAAY,IAAC,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,EAAE,KAAM,MAAM,GAAI,GACxE,EACF,KAAC,UAAU,IAAC,OAAO,EAAC,SAAS,EAAC,KAAK,EAAC,gBAAgB,2BAEvC,IACT,CACP,CAAC;AACJ,CAAC;AAED,eAAe,uBAAuB,CAAC"}

package/lib/components/FormComponents/QuantityItem/QuantityField.d.ts

@@ -1,5 +1,5 @@
-import type { PropsWithIsTabledRequiredAttribute } from '../../../interfaces/renderProps.interface';
-interface QuantityFieldProps extends PropsWithIsTabledRequiredAttribute {
+import type { PropsWithIsTabledAttribute } from '../../../interfaces/renderProps.interface';
+interface QuantityFieldProps extends PropsWithIsTabledAttribute {
     linkId: string;
     itemType: string;
     input: string;
@@ -10,7 +10,6 @@ interface QuantityFieldProps extends PropsWithIsTabledRequiredAttribute {
     readOnly: boolean;
     calcExpUpdated: boolean;
     onInputChange: (value: string) => void;
-    onBlur: () => void;
 }
 declare function QuantityField(props: QuantityFieldProps): import("react/jsx-runtime").JSX.Element;
 export default QuantityField;

package/lib/components/FormComponents/QuantityItem/QuantityField.js

@@ -16,15 +16,15 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * limitations under the License.
  */
 import InputAdornment from '@mui/material/InputAdornment';
-import { StandardTextField } from '../Textfield.styles';
-import { useRendererStylingStore } from '../../../stores';
+import { useRendererConfigStore } from '../../../stores';
 import DisplayUnitText from '../ItemParts/DisplayUnitText';
 import { ClearButtonAdornment } from '../ItemParts/ClearButtonAdornment';
 import ExpressionUpdateFadingIcon from '../ItemParts/ExpressionUpdateFadingIcon';
+import { StandardTextField } from '../Textfield.styles';
 function QuantityField(props) {
-    const { linkId, itemType, input, feedback, displayPrompt, displayUnit, entryFormat, readOnly, calcExpUpdated, isTabled, onInputChange, onBlur } = props;
-    const readOnlyVisualStyle = useRendererStylingStore.use.readOnlyVisualStyle();
-    const textFieldWidth = useRendererStylingStore.use.textFieldWidth();
+    const { linkId, itemType, input, feedback, displayPrompt, displayUnit, entryFormat, readOnly, calcExpUpdated, isTabled, onInputChange } = props;
+    const readOnlyVisualStyle = useRendererConfigStore.use.readOnlyVisualStyle();
+    const textFieldWidth = useRendererConfigStore.use.textFieldWidth();
     let placeholderText = '0.0';
     if (displayPrompt) {
         placeholderText = displayPrompt;
@@ -32,7 +32,7 @@ function QuantityField(props) {
     if (entryFormat) {
         placeholderText = entryFormat;
     }
-    return (_jsx(StandardTextField, { id: itemType + '-' + linkId + '-input', value: input, error: !!feedback, onChange: (event) => onInputChange(event.target.value), onBlur: onBlur, disabled: readOnly && readOnlyVisualStyle === 'disabled', placeholder: placeholderText, fullWidth: true, textFieldWidth: textFieldWidth, isTabled: isTabled, size: "small", slotProps: {
+    return (_jsx(StandardTextField, { id: itemType + '-' + linkId + '-input', value: input, error: !!feedback, onChange: (event) => onInputChange(event.target.value), disabled: readOnly && readOnlyVisualStyle === 'disabled', placeholder: placeholderText, fullWidth: true, textFieldWidth: textFieldWidth, isTabled: isTabled, size: "small", slotProps: {
             htmlInput: { inputMode: 'numeric', pattern: '[0-9]*' },
             input: {
                 readOnly: readOnly && readOnlyVisualStyle === 'readonly',

package/lib/components/FormComponents/QuantityItem/QuantityField.js.map

@@ -1 +1 @@
-{"version":3,"file":"QuantityField.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/QuantityItem/QuantityField.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,eAAe,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,0BAA0B,MAAM,yCAAyC,CAAC;AAgBjF,SAAS,aAAa,CAAC,KAAyB;IAC9C,MAAM,EACJ,MAAM,EACN,QAAQ,EACR,KAAK,EACL,QAAQ,EACR,aAAa,EACb,WAAW,EACX,WAAW,EACX,QAAQ,EACR,cAAc,EACd,QAAQ,EACR,aAAa,EACb,MAAM,EACP,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,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,IAAI,aAAa,EAAE,CAAC;QAClB,eAAe,GAAG,aAAa,CAAC;IAClC,CAAC;IAED,IAAI,WAAW,EAAE,CAAC;QAChB,eAAe,GAAG,WAAW,CAAC;IAChC,CAAC;IAED,OAAO,CACL,KAAC,iBAAiB,IAChB,EAAE,EAAE,QAAQ,GAAG,GAAG,GAAG,MAAM,GAAG,QAAQ,EACtC,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,CAAC,CAAC,QAAQ,EACjB,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EACtD,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,IAAI,mBAAmB,KAAK,UAAU,EACxD,WAAW,EAAE,eAAe,EAC5B,SAAS,QACT,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAC,OAAO,EACZ,SAAS,EAAE;YACT,SAAS,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE;YACtD,KAAK,EAAE;gBACL,QAAQ,EAAE,QAAQ,IAAI,mBAAmB,KAAK,UAAU;gBACxD,YAAY,EAAE,CACZ,MAAC,cAAc,IAAC,QAAQ,EAAE,KAAK,aAC7B,KAAC,0BAA0B,IAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,GAAI,EAC1E,KAAC,oBAAoB,IACnB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,GAAG,EAAE;gCACZ,aAAa,CAAC,EAAE,CAAC,CAAC;4BACpB,CAAC,GACD,EACF,KAAC,eAAe,IAAC,QAAQ,EAAE,QAAQ,YAAG,WAAW,GAAmB,IACrD,CAClB;aACF;SACF,EACD,UAAU,EAAE,QAAQ,eACV,uBAAuB,GACjC,CACH,CAAC;AACJ,CAAC;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"QuantityField.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/QuantityItem/QuantityField.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAE1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,eAAe,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACzE,OAAO,0BAA0B,MAAM,yCAAyC,CAAC;AACjF,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAexD,SAAS,aAAa,CAAC,KAAyB;IAC9C,MAAM,EACJ,MAAM,EACN,QAAQ,EACR,KAAK,EACL,QAAQ,EACR,aAAa,EACb,WAAW,EACX,WAAW,EACX,QAAQ,EACR,cAAc,EACd,QAAQ,EACR,aAAa,EACd,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,IAAI,eAAe,GAAG,KAAK,CAAC;IAC5B,IAAI,aAAa,EAAE,CAAC;QAClB,eAAe,GAAG,aAAa,CAAC;IAClC,CAAC;IAED,IAAI,WAAW,EAAE,CAAC;QAChB,eAAe,GAAG,WAAW,CAAC;IAChC,CAAC;IAED,OAAO,CACL,KAAC,iBAAiB,IAChB,EAAE,EAAE,QAAQ,GAAG,GAAG,GAAG,MAAM,GAAG,QAAQ,EACtC,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,CAAC,CAAC,QAAQ,EACjB,QAAQ,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,EACtD,QAAQ,EAAE,QAAQ,IAAI,mBAAmB,KAAK,UAAU,EACxD,WAAW,EAAE,eAAe,EAC5B,SAAS,QACT,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,QAAQ,EAClB,IAAI,EAAC,OAAO,EACZ,SAAS,EAAE;YACT,SAAS,EAAE,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,QAAQ,EAAE;YACtD,KAAK,EAAE;gBACL,QAAQ,EAAE,QAAQ,IAAI,mBAAmB,KAAK,UAAU;gBACxD,YAAY,EAAE,CACZ,MAAC,cAAc,IAAC,QAAQ,EAAE,KAAK,aAC7B,KAAC,0BAA0B,IAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,GAAI,EAC1E,KAAC,oBAAoB,IACnB,QAAQ,EAAE,QAAQ,EAClB,OAAO,EAAE,GAAG,EAAE;gCACZ,aAAa,CAAC,EAAE,CAAC,CAAC;4BACpB,CAAC,GACD,EACF,KAAC,eAAe,IAAC,QAAQ,EAAE,QAAQ,YAAG,WAAW,GAAmB,IACrD,CAClB;aACF;SACF,EACD,UAAU,EAAE,QAAQ,eACV,uBAAuB,GACjC,CACH,CAAC;AACJ,CAAC;AAED,eAAe,aAAa,CAAC"}

package/lib/components/FormComponents/QuantityItem/QuantityItem.js

@@ -16,51 +16,45 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  * limitations under the License.
  */
 import { useCallback, useMemo, useState } from 'react';
-import { FullWidthFormComponentBox } from '../../Box.styles';
-import useValidationFeedback from '../../../hooks/useValidationFeedback';
 import debounce from 'lodash.debounce';
-import { DEBOUNCE_DURATION } from '../../../utils/debounce';
-import { createEmptyQrItem } from '../../../utils/qrItem';
-import ItemFieldGrid from '../ItemParts/ItemFieldGrid';
-import { parseDecimalStringWithPrecision } from '../../../utils/parseInputs';
-import { getDecimalPrecision } from '../../../utils/extensions';
 import useReadOnly from '../../../hooks/useReadOnly';
+import useValidationFeedback from '../../../hooks/useValidationFeedback';
 import { useQuestionnaireStore } from '../../../stores';
+import { DEBOUNCE_DURATION } from '../../../utils/debounce';
+import { getDecimalPrecision } from '../../../utils/extensions';
+import { parseDecimalStringWithPrecision } from '../../../utils/parseInputs';
+import { createEmptyQrItem } from '../../../utils/qrItem';
 import Box from '@mui/material/Box';
 import QuantityField from './QuantityField';
-import QuantityUnitField from './QuantityUnitField';
 import { createQuantityItemAnswer, quantityComparators, stringIsComparator } from '../../../utils/quantity';
-import QuantityComparatorField from './QuantityComparatorField';
-import useQuantityCalculatedExpression from '../../../hooks/useQuantityCalculatedExpression';
+import { FullWidthFormComponentBox } from '../../Box.styles';
+import ItemFieldGrid from '../ItemParts/ItemFieldGrid';
 import ItemLabel from '../ItemParts/ItemLabel';
-import useShowFeedback from '../../../hooks/useShowFeedback';
+import QuantityUnitField from './QuantityUnitField';
+import QuantityComparatorField from './QuantityComparatorField';
 function QuantityItem(props) {
-    var _a, _b, _c, _d, _e, _f, _g;
-    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();
     const precision = getDecimalPrecision(qItem);
     const { displayPrompt, entryFormat, quantityUnit } = renderingExtensions;
     let { displayUnit } = renderingExtensions;
     // Get units options if present
-    const unitOptions = useMemo(() => {
-        var _a, _b;
-        return (_b = (_a = qItem.extension) === null || _a === void 0 ? void 0 : _a.filter((f) => f.url === 'http://hl7.org/fhir/StructureDefinition/questionnaire-unitOption')) !== null && _b !== void 0 ? _b : [];
-    }, [qItem]);
+    const unitOptions = useMemo(() => qItem.extension?.filter((f) => f.url === 'http://hl7.org/fhir/StructureDefinition/questionnaire-unitOption') ?? [], [qItem]);
     if (displayUnit === '' && unitOptions.length === 1) {
-        displayUnit = (_b = (_a = unitOptions[0].valueCoding) === null || _a === void 0 ? void 0 : _a.display) !== null && _b !== void 0 ? _b : '';
+        displayUnit = unitOptions[0].valueCoding?.display ?? '';
     }
     // Init inputs
-    const answerKey = (_d = (_c = qrItem === null || qrItem === void 0 ? void 0 : qrItem.answer) === null || _c === void 0 ? void 0 : _c[0]) === null || _d === void 0 ? void 0 : _d.id;
+    const answerKey = qrItem?.answer?.[0]?.id;
     let valueQuantity = {};
     let initialValueInput = '';
     let initialComparatorInput = null;
-    let initialUnitInput = (_e = quantityUnit !== null && quantityUnit !== void 0 ? quantityUnit : unitOptions === null || unitOptions === void 0 ? void 0 : unitOptions.at(0)) !== null && _e !== void 0 ? _e : null;
-    if (qrItem === null || qrItem === void 0 ? void 0 : qrItem.answer) {
-        if (qrItem === null || qrItem === void 0 ? void 0 : qrItem.answer[0].valueQuantity) {
+    let initialUnitInput = quantityUnit ?? unitOptions?.at(0) ?? null;
+    if (qrItem?.answer) {
+        if (qrItem?.answer[0].valueQuantity) {
             valueQuantity = qrItem.answer[0].valueQuantity;
         }
         initialValueInput =
-            (precision ? (_f = valueQuantity.value) === null || _f === void 0 ? void 0 : _f.toFixed(precision) : (_g = valueQuantity.value) === null || _g === void 0 ? void 0 : _g.toString()) || '';
+            (precision ? valueQuantity.value?.toFixed(precision) : valueQuantity.value?.toString()) || '';
         if (valueQuantity.comparator && stringIsComparator(valueQuantity.comparator)) {
             initialComparatorInput = valueQuantity.comparator;
         }
@@ -81,99 +75,47 @@ function QuantityItem(props) {
     const readOnly = useReadOnly(qItem, parentIsReadOnly);
     // Perform validation checks
     const feedback = useValidationFeedback(qItem, feedbackFromParent);
-    // Provides a way to hide the feedback when the user is typing
-    const { showFeedback, setShowFeedback, hasBlurred, setHasBlurred } = useShowFeedback();
-    // Process calculated expressions
-    const { calcExpUpdated } = useQuantityCalculatedExpression({
-        qItem: qItem,
-        inputValue: valueInput,
-        precision: precision,
-        onChangeByCalcExpressionDecimal: (newValueDecimal) => {
-            var _a, _b, _c;
-            setValueInput(typeof precision === 'number'
-                ? newValueDecimal.toFixed(precision)
-                : newValueDecimal.toString());
-            onQrItemChange(Object.assign(Object.assign({}, createEmptyQrItem(qItem, answerKey)), { answer: [
-                    {
-                        id: answerKey,
-                        valueQuantity: {
-                            value: newValueDecimal,
-                            unit: (_a = unitInput === null || unitInput === void 0 ? void 0 : unitInput.valueCoding) === null || _a === void 0 ? void 0 : _a.display,
-                            system: (_b = unitInput === null || unitInput === void 0 ? void 0 : unitInput.valueCoding) === null || _b === void 0 ? void 0 : _b.system,
-                            code: (_c = unitInput === null || unitInput === void 0 ? void 0 : unitInput.valueCoding) === null || _c === void 0 ? void 0 : _c.code
-                        }
-                    }
-                ] }), itemPath);
-        },
-        onChangeByCalcExpressionQuantity: (newValueDecimal, newUnitSystem, newUnitCode, newUnitDisplay) => {
-            setValueInput(typeof precision === 'number'
-                ? newValueDecimal.toFixed(precision)
-                : newValueDecimal.toString());
-            onQrItemChange(Object.assign(Object.assign({}, createEmptyQrItem(qItem, answerKey)), { answer: [
-                    {
-                        id: answerKey,
-                        valueQuantity: {
-                            value: newValueDecimal,
-                            unit: newUnitDisplay,
-                            system: newUnitSystem,
-                            code: newUnitCode
-                        }
-                    }
-                ] }), itemPath);
-        },
-        onChangeByCalcExpressionNull: () => {
-            setValueInput('');
-            onQrItemChange(createEmptyQrItem(qItem, answerKey), itemPath);
-        }
-    });
     // Event handlers
     function handleComparatorInputChange(newComparatorInput) {
         setComparatorInput(newComparatorInput);
-        // Only suppress feedback once (before first blur)
-        if (!hasBlurred) {
-            setShowFeedback(false);
-        }
         if (!valueInput)
             return;
-        onQrItemChange(Object.assign(Object.assign({}, createEmptyQrItem(qItem, answerKey)), { answer: createQuantityItemAnswer(precision, valueInput, newComparatorInput, unitInput, answerKey) }));
+        onQrItemChange({
+            ...createEmptyQrItem(qItem, answerKey),
+            answer: createQuantityItemAnswer(precision, valueInput, newComparatorInput, unitInput, answerKey)
+        });
     }
     function handleUnitInputChange(newUnitInput) {
         setUnitInput(newUnitInput);
-        // Only suppress feedback once (before first blur)
-        if (!hasBlurred) {
-            setShowFeedback(false);
-        }
         if (!valueInput)
             return;
-        onQrItemChange(Object.assign(Object.assign({}, createEmptyQrItem(qItem, answerKey)), { answer: createQuantityItemAnswer(precision, valueInput, comparatorInput, newUnitInput, answerKey) }));
+        onQrItemChange({
+            ...createEmptyQrItem(qItem, answerKey),
+            answer: createQuantityItemAnswer(precision, valueInput, comparatorInput, newUnitInput, answerKey)
+        });
     }
     function handleValueInputChange(newInput) {
         const parsedNewInput = parseDecimalStringWithPrecision(newInput, precision);
         setValueInput(parsedNewInput);
-        // Only suppress feedback once (before first blur)
-        if (!hasBlurred) {
-            setShowFeedback(false);
-        }
         updateQrItemWithDebounce(parsedNewInput);
     }
-    function handleBlur() {
-        setShowFeedback(true);
-        setHasBlurred(true); // From now on, feedback should stay visible
-    }
     // eslint-disable-next-line react-hooks/exhaustive-deps
     const updateQrItemWithDebounce = useCallback(debounce((parsedNewInput) => {
         if (parsedNewInput === '') {
             onQrItemChange(createEmptyQrItem(qItem, answerKey));
         }
         else {
-            onQrItemChange(Object.assign(Object.assign({}, createEmptyQrItem(qItem, answerKey)), { answer: createQuantityItemAnswer(precision, parsedNewInput, comparatorInput, unitInput, answerKey) }));
+            onQrItemChange({
+                ...createEmptyQrItem(qItem, answerKey),
+                answer: createQuantityItemAnswer(precision, parsedNewInput, comparatorInput, unitInput, answerKey)
+            });
         }
     }, DEBOUNCE_DURATION), [onQrItemChange, qItem, displayUnit, precision, comparatorInput, unitInput]); // Dependencies are tested, debounce is causing eslint to not recognise dependencies
     const showUnitOptions = unitOptions.length > 0 && displayUnit === '';
     if (isRepeated) {
-        return (_jsxs(Box, { id: qItem.type + '-' + qItem.linkId, "data-test": "q-item-quantity-box", display: "flex", width: "100%", gap: 1, children: [_jsx(QuantityComparatorField, { linkId: qItem.linkId, itemType: qItem.type, options: quantityComparators, valueSelect: comparatorInput, readOnly: readOnly, calcExpUpdated: calcExpUpdated, isTabled: isTabled, onChange: handleComparatorInputChange }), _jsx(QuantityField, { linkId: qItem.linkId, itemType: qItem.type, input: valueInput, feedback: showFeedback ? feedback : '', displayPrompt: displayPrompt, displayUnit: displayUnit, entryFormat: entryFormat, readOnly: readOnly, calcExpUpdated: calcExpUpdated, isTabled: isTabled, onInputChange: handleValueInputChange, onBlur: handleBlur }), showUnitOptions ? (_jsx(QuantityUnitField, { linkId: qItem.linkId, itemType: qItem.type, options: unitOptions, valueSelect: unitInput, readOnly: readOnly, calcExpUpdated: calcExpUpdated, isTabled: isTabled, onChange: handleUnitInputChange })) : null] }));
+        return (_jsxs(Box, { id: qItem.type + '-' + qItem.linkId, "data-test": "q-item-quantity-box", display: "flex", width: "100%", gap: 1, children: [_jsx(QuantityComparatorField, { linkId: qItem.linkId, itemType: qItem.type, options: quantityComparators, valueSelect: comparatorInput, readOnly: readOnly, calcExpUpdated: calcExpUpdated, isTabled: isTabled, onChange: handleComparatorInputChange }), _jsx(QuantityField, { linkId: qItem.linkId, itemType: qItem.type, input: valueInput, feedback: feedback ?? '', displayPrompt: displayPrompt, displayUnit: displayUnit, entryFormat: entryFormat, readOnly: readOnly, calcExpUpdated: calcExpUpdated, isTabled: isTabled, onInputChange: handleValueInputChange }), showUnitOptions ? (_jsx(QuantityUnitField, { linkId: qItem.linkId, itemType: qItem.type, options: unitOptions, valueSelect: unitInput, readOnly: readOnly, calcExpUpdated: calcExpUpdated, isTabled: isTabled, onChange: handleUnitInputChange })) : null] }));
     }
-    return (_jsx(FullWidthFormComponentBox, { "data-test": "q-item-quantity-box", "data-linkid": qItem.linkId, onClick: () => onFocusLinkId(qItem.linkId), children: _jsx(ItemFieldGrid, { qItem: qItem, readOnly: readOnly, labelChildren: _jsx(ItemLabel, { qItem: qItem, readOnly: readOnly }), fieldChildren: _jsxs(Box, { display: "flex", gap: 1, children: [_jsx(QuantityComparatorField, { linkId: qItem.linkId, itemType: qItem.type, options: quantityComparators, valueSelect: comparatorInput, readOnly: readOnly, calcExpUpdated: calcExpUpdated, isTabled: isTabled, onChange: handleComparatorInputChange }), _jsx(QuantityField, { linkId: qItem.linkId, itemType: qItem.type, input: valueInput, feedback: showFeedback ? feedback : '', displayPrompt: displayPrompt, displayUnit: displayUnit, entryFormat: entryFormat, readOnly: readOnly, calcExpUpdated: calcExpUpdated, isTabled: isTabled, onInputChange: handleValueInputChange, onBlur: handleBlur }), showUnitOptions ? (_jsx(QuantityUnitField, { linkId: qItem.linkId, itemType: qItem.type, options: unitOptions, valueSelect: unitInput, readOnly: readOnly, calcExpUpdated: calcExpUpdated, isTabled: isTabled, onChange: handleUnitInputChange })) : null] }), feedback: showFeedback ? feedback : undefined }) }));
+    return (_jsx(FullWidthFormComponentBox, { "data-test": "q-item-quantity-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: _jsxs(Box, { display: "flex", gap: 1, children: [_jsx(QuantityComparatorField, { linkId: qItem.linkId, itemType: qItem.type, options: quantityComparators, valueSelect: comparatorInput, readOnly: readOnly, calcExpUpdated: calcExpUpdated, isTabled: isTabled, onChange: handleComparatorInputChange }), _jsx(QuantityField, { linkId: qItem.linkId, itemType: qItem.type, input: valueInput, feedback: feedback ?? '', displayPrompt: displayPrompt, displayUnit: displayUnit, entryFormat: entryFormat, readOnly: readOnly, calcExpUpdated: calcExpUpdated, isTabled: isTabled, onInputChange: handleValueInputChange }), showUnitOptions ? (_jsx(QuantityUnitField, { linkId: qItem.linkId, itemType: qItem.type, options: unitOptions, valueSelect: unitInput, readOnly: readOnly, calcExpUpdated: calcExpUpdated, isTabled: isTabled, onChange: handleUnitInputChange })) : null] }), feedback: feedback ?? undefined }) }));
 }
 export default QuantityItem;
 //# sourceMappingURL=QuantityItem.js.map

package/lib/components/FormComponents/QuantityItem/QuantityItem.js.map

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

package/lib/components/FormComponents/QuantityItem/QuantityUnitField.d.ts

@@ -1,6 +1,6 @@
 import type { QuestionnaireItemAnswerOption } from 'fhir/r4';
-import type { PropsWithIsTabledRequiredAttribute } from '../../../interfaces/renderProps.interface';
-interface QuantityUnitFieldProps extends PropsWithIsTabledRequiredAttribute {
+import type { PropsWithIsTabledAttribute } from '../../../interfaces/renderProps.interface';
+interface QuantityUnitFieldProps extends PropsWithIsTabledAttribute {
     linkId: string;
     itemType: string;
     options: QuestionnaireItemAnswerOption[];

package/lib/components/FormComponents/QuantityItem/QuantityUnitField.js

@@ -18,13 +18,13 @@ import { jsx as _jsx } from "react/jsx-runtime";
 import { getAnswerOptionLabel } from '../../../utils/openChoice';
 import { StandardTextField } from '../Textfield.styles';
 import Autocomplete from '@mui/material/Autocomplete';
-import { useRendererStylingStore } from '../../../stores';
+import { useRendererConfigStore } from '../../../stores';
 function QuantityUnitField(props) {
     const { linkId, itemType, options, valueSelect, readOnly, isTabled, onChange } = props;
     // TODO this component doesn't have a calcExpUpdated update animation
-    const readOnlyVisualStyle = useRendererStylingStore.use.readOnlyVisualStyle();
-    const textFieldWidth = useRendererStylingStore.use.textFieldWidth();
-    return (_jsx(Autocomplete, { id: itemType + '-' + linkId + '-unit', value: valueSelect !== null && valueSelect !== void 0 ? valueSelect : null, isOptionEqualToValue: (option, value) => { var _a, _b; return ((_a = option.valueCoding) === null || _a === void 0 ? void 0 : _a.code) === ((_b = value === null || value === void 0 ? void 0 : value.valueCoding) === null || _b === void 0 ? void 0 : _b.code); }, options: options, getOptionLabel: (option) => getAnswerOptionLabel(option), onChange: (_, newValue) => onChange(newValue), autoHighlight: true, sx: { maxWidth: !isTabled ? textFieldWidth : 3000, minWidth: 160, flexGrow: 1 }, disabled: readOnly && readOnlyVisualStyle === 'disabled', readOnly: readOnly && readOnlyVisualStyle === 'readonly', size: "small", renderInput: (params) => (_jsx(StandardTextField, Object.assign({ textFieldWidth: textFieldWidth, isTabled: isTabled }, params))) }));
+    const readOnlyVisualStyle = useRendererConfigStore.use.readOnlyVisualStyle();
+    const textFieldWidth = useRendererConfigStore.use.textFieldWidth();
+    return (_jsx(Autocomplete, { id: itemType + '-' + linkId + '-unit', value: valueSelect ?? null, isOptionEqualToValue: (option, value) => option.valueCoding?.code === value?.valueCoding?.code, options: options, getOptionLabel: (option) => getAnswerOptionLabel(option), onChange: (_, newValue) => onChange(newValue), autoHighlight: true, sx: { maxWidth: !isTabled ? textFieldWidth : 3000, minWidth: 160, flexGrow: 1 }, disabled: readOnly && readOnlyVisualStyle === 'disabled', readOnly: readOnly && readOnlyVisualStyle === 'readonly', size: "small", renderInput: (params) => (_jsx(StandardTextField, { "data-test": "q-item-unit-field", textFieldWidth: textFieldWidth, isTabled: isTabled, ...params })) }));
 }
 export default QuantityUnitField;
 //# sourceMappingURL=QuantityUnitField.js.map

package/lib/components/FormComponents/QuantityItem/QuantityUnitField.js.map

@@ -1 +1 @@
-{"version":3,"file":"QuantityUnitField.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/QuantityItem/QuantityUnitField.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,YAAY,MAAM,4BAA4B,CAAC;AAGtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAY1D,SAAS,iBAAiB,CAAC,KAA6B;IACtD,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IACvF,qEAAqE;IAErE,MAAM,mBAAmB,GAAG,uBAAuB,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAC9E,MAAM,cAAc,GAAG,uBAAuB,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;IAEpE,OAAO,CACL,KAAC,YAAY,IACX,EAAE,EAAE,QAAQ,GAAG,GAAG,GAAG,MAAM,GAAG,OAAO,EACrC,KAAK,EAAE,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,IAAI,EAC1B,oBAAoB,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,eACtC,OAAA,CAAA,MAAA,MAAM,CAAC,WAAW,0CAAE,IAAI,OAAK,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,0CAAE,IAAI,CAAA,CAAA,EAAA,EAEvD,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,oBAAoB,CAAC,MAAM,CAAC,EACxD,QAAQ,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAgD,CAAC,EACrF,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,QAAQ,EAAE,QAAQ,IAAI,mBAAmB,KAAK,UAAU,EACxD,QAAQ,EAAE,QAAQ,IAAI,mBAAmB,KAAK,UAAU,EACxD,IAAI,EAAC,OAAO,EACZ,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CACvB,KAAC,iBAAiB,kBAAC,cAAc,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,IAAM,MAAM,EAAI,CACtF,GACD,CACH,CAAC;AACJ,CAAC;AAED,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"QuantityUnitField.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/QuantityItem/QuantityUnitField.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAC;AACjE,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,YAAY,MAAM,4BAA4B,CAAC;AAGtD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAYzD,SAAS,iBAAiB,CAAC,KAA6B;IACtD,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IACvF,qEAAqE;IAErE,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAC7E,MAAM,cAAc,GAAG,sBAAsB,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;IAEnE,OAAO,CACL,KAAC,YAAY,IACX,EAAE,EAAE,QAAQ,GAAG,GAAG,GAAG,MAAM,GAAG,OAAO,EACrC,KAAK,EAAE,WAAW,IAAI,IAAI,EAC1B,oBAAoB,EAAE,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CACtC,MAAM,CAAC,WAAW,EAAE,IAAI,KAAK,KAAK,EAAE,WAAW,EAAE,IAAI,EAEvD,OAAO,EAAE,OAAO,EAChB,cAAc,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,oBAAoB,CAAC,MAAM,CAAC,EACxD,QAAQ,EAAE,CAAC,CAAC,EAAE,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,QAAgD,CAAC,EACrF,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,QAAQ,EAAE,QAAQ,IAAI,mBAAmB,KAAK,UAAU,EACxD,QAAQ,EAAE,QAAQ,IAAI,mBAAmB,KAAK,UAAU,EACxD,IAAI,EAAC,OAAO,EACZ,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,CACvB,KAAC,iBAAiB,iBACN,mBAAmB,EAC7B,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,QAAQ,KACd,MAAM,GACV,CACH,GACD,CACH,CAAC;AACJ,CAAC;AAED,eAAe,iBAAiB,CAAC"}

package/lib/components/FormComponents/RepeatGroup/AddItemButton.js

@@ -3,9 +3,8 @@ import Box from '@mui/material/Box';
 import Button from '@mui/material/Button';
 import AddIcon from '@mui/icons-material/Add';
 function AddItemButton(props) {
-    var _a;
     const { repeatGroups, readOnly, onAddItem } = props;
-    const isDisabled = ((_a = repeatGroups[repeatGroups.length - 1]) === null || _a === void 0 ? void 0 : _a.qrItem) === null || readOnly;
+    const isDisabled = repeatGroups[repeatGroups.length - 1]?.qrItem === null || readOnly;
     return (_jsx(Box, { display: "flex", flexDirection: "row-reverse", children: _jsx(Button, { variant: "contained", size: "small", startIcon: _jsx(AddIcon, {}), disabled: isDisabled, onClick: onAddItem, "data-test": "button-add-repeat-item", children: "Add Item" }) }));
 }
 export default AddItemButton;

package/lib/components/FormComponents/RepeatGroup/AddItemButton.js.map

@@ -1 +1 @@
-{"version":3,"file":"AddItemButton.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/RepeatGroup/AddItemButton.tsx"],"names":[],"mappings":";AAkBA,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,OAAO,MAAM,yBAAyB,CAAC;AAS9C,SAAS,aAAa,CAAC,KAAyB;;IAC9C,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAEpD,MAAM,UAAU,GAAG,CAAA,MAAA,YAAY,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,0CAAE,MAAM,MAAK,IAAI,IAAI,QAAQ,CAAC;IAEtF,OAAO,CACL,KAAC,GAAG,IAAC,OAAO,EAAC,MAAM,EAAC,aAAa,EAAC,aAAa,YAC7C,KAAC,MAAM,IACL,OAAO,EAAC,WAAW,EACnB,IAAI,EAAC,OAAO,EACZ,SAAS,EAAE,KAAC,OAAO,KAAG,EACtB,QAAQ,EAAE,UAAU,EACpB,OAAO,EAAE,SAAS,eACR,wBAAwB,yBAE3B,GACL,CACP,CAAC;AACJ,CAAC;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"AddItemButton.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/RepeatGroup/AddItemButton.tsx"],"names":[],"mappings":";AAkBA,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,OAAO,MAAM,yBAAyB,CAAC;AAS9C,SAAS,aAAa,CAAC,KAAyB;IAC9C,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAEpD,MAAM,UAAU,GAAG,YAAY,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,IAAI,QAAQ,CAAC;IAEtF,OAAO,CACL,KAAC,GAAG,IAAC,OAAO,EAAC,MAAM,EAAC,aAAa,EAAC,aAAa,YAC7C,KAAC,MAAM,IACL,OAAO,EAAC,WAAW,EACnB,IAAI,EAAC,OAAO,EACZ,SAAS,EAAE,KAAC,OAAO,KAAG,EACtB,QAAQ,EAAE,UAAU,EACpB,OAAO,EAAE,SAAS,eACR,wBAAwB,yBAE3B,GACL,CACP,CAAC;AACJ,CAAC;AAED,eAAe,aAAa,CAAC"}

package/lib/components/FormComponents/RepeatGroup/RepeatGroup.d.ts

@@ -1,6 +1,6 @@
-import type { PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithParentIsRepeatGroupAttribute, PropsWithParentStylesAttribute, PropsWithQrRepeatGroupChangeHandler } from '../../../interfaces/renderProps.interface';
+import type { PropsWithParentIsReadOnlyAttribute, PropsWithParentIsRepeatGroupAttribute, PropsWithParentStylesAttribute, PropsWithQrRepeatGroupChangeHandler } from '../../../interfaces/renderProps.interface';
 import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
-interface RepeatGroupProps extends PropsWithQrRepeatGroupChangeHandler, PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithParentIsRepeatGroupAttribute, PropsWithParentStylesAttribute {
+interface RepeatGroupProps extends PropsWithQrRepeatGroupChangeHandler, PropsWithParentIsReadOnlyAttribute, PropsWithParentIsRepeatGroupAttribute, PropsWithParentStylesAttribute {
     qItem: QuestionnaireItem;
     qrItems: QuestionnaireResponseItem[];
     groupCardElevation: number;

package/lib/components/FormComponents/RepeatGroup/RepeatGroup.js

@@ -27,11 +27,11 @@ import { generateNewRepeatId } from '../../../utils/repeatId';
  * @author Sean Fong
  */
 function RepeatGroup(props) {
-    const { qItem, qrItems, itemPath, groupCardElevation, parentIsReadOnly, onQrRepeatGroupChange, parentStyles } = props;
+    const { qItem, qrItems, groupCardElevation, parentIsReadOnly, onQrRepeatGroupChange, parentStyles } = props;
     const mutateRepeatEnableWhenItems = useQuestionnaireStore.use.mutateRepeatEnableWhenItems();
     const initialRepeatGroups = useInitialiseRepeatGroups(qItem.linkId, qrItems);
     const [repeatGroups, setRepeatGroups] = useState(initialRepeatGroups);
-    function handleAnswerChange(newQrItem, index, targetItemPath) {
+    function handleAnswerChange(newQrItem, index) {
         const updatedRepeatGroups = [...repeatGroups];
         if (newQrItem.item) {
             updatedRepeatGroups[index].qrItem = {
@@ -41,11 +41,10 @@ function RepeatGroup(props) {
             };
         }
         setRepeatGroups(updatedRepeatGroups);
-        // Include targetItemPath because an answer is changed
         onQrRepeatGroupChange({
             linkId: qItem.linkId,
             qrItems: updatedRepeatGroups.flatMap((singleGroup) => singleGroup.qrItem ? [structuredClone(singleGroup.qrItem)] : [])
-        }, targetItemPath);
+        });
     }
     function handleRemoveItem(index) {
         const updatedRepeatGroups = [...repeatGroups];
@@ -53,7 +52,6 @@ function RepeatGroup(props) {
         const newLastItemIndex = repeatGroups.length;
         mutateRepeatEnableWhenItems(qItem.linkId, newLastItemIndex, 'remove');
         setRepeatGroups(updatedRepeatGroups);
-        // Don't need to include targetItemPath because we are deleting the whole QRItem, only include targetItemPath if an answer is changed
         onQrRepeatGroupChange({
             linkId: qItem.linkId,
             qrItems: updatedRepeatGroups.flatMap((singleGroup) => singleGroup.qrItem ? [structuredClone(singleGroup.qrItem)] : [])
@@ -70,7 +68,7 @@ function RepeatGroup(props) {
             }
         ]);
     }
-    return (_jsx(RepeatGroupView, { qItem: qItem, repeatGroups: repeatGroups, itemPath: itemPath, groupCardElevation: groupCardElevation, parentIsReadOnly: parentIsReadOnly, onAnswerChange: handleAnswerChange, onAddItem: handleAddItem, onRemoveItem: handleRemoveItem, parentStyles: parentStyles }));
+    return (_jsx(RepeatGroupView, { qItem: qItem, repeatGroups: repeatGroups, groupCardElevation: groupCardElevation, parentIsReadOnly: parentIsReadOnly, onAnswerChange: handleAnswerChange, onAddItem: handleAddItem, onRemoveItem: handleRemoveItem, parentStyles: parentStyles }));
 }
 export default RepeatGroup;
 //# sourceMappingURL=RepeatGroup.js.map

package/lib/components/FormComponents/RepeatGroup/RepeatGroup.js.map

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

package/lib/components/FormComponents/RepeatGroup/RepeatGroupItem.d.ts

@@ -1,6 +1,6 @@
-import type { PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithQrItemChangeHandler } from '../../../interfaces/renderProps.interface';
+import type { PropsWithParentIsReadOnlyAttribute, PropsWithQrItemChangeHandler } from '../../../interfaces/renderProps.interface';
 import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
-interface RepeatGroupItemProps extends PropsWithQrItemChangeHandler, PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute {
+interface RepeatGroupItemProps extends PropsWithQrItemChangeHandler, PropsWithParentIsReadOnlyAttribute {
     qItem: QuestionnaireItem;
     repeatGroupIndex: number;
     answeredQrItem: QuestionnaireResponseItem;

package/lib/components/FormComponents/RepeatGroup/RepeatGroupItem.js

@@ -5,9 +5,9 @@ import GroupItem from '../GroupItem/GroupItem';
 import RemoveItemButton from './RemoveItemButton';
 import useReadOnly from '../../../hooks/useReadOnly';
 function RepeatGroupItem(props) {
-    const { qItem, repeatGroupIndex, answeredQrItem, nullableQrItem, numOfRepeatGroups, itemPath, groupCardElevation, parentIsReadOnly, onRemoveItem, onQrItemChange } = props;
+    const { qItem, repeatGroupIndex, answeredQrItem, nullableQrItem, numOfRepeatGroups, groupCardElevation, parentIsReadOnly, onRemoveItem, onQrItemChange } = props;
     const readOnly = useReadOnly(qItem, parentIsReadOnly, repeatGroupIndex);
-    return (_jsxs(RepeatGroupContainerStack, { direction: "row", justifyContent: "end", children: [_jsx(Box, { sx: { flexGrow: 1 }, children: _jsx(GroupItem, { qItem: qItem, qrItem: answeredQrItem, itemPath: itemPath, isRepeated: true, parentIsRepeatGroup: true, parentRepeatGroupIndex: repeatGroupIndex, parentIsReadOnly: parentIsReadOnly, groupCardElevation: groupCardElevation, onQrItemChange: onQrItemChange }) }), _jsx(RemoveItemButton, { nullableQrItem: nullableQrItem, numOfRepeatGroups: numOfRepeatGroups, readOnly: readOnly, onRemoveItem: onRemoveItem })] }));
+    return (_jsxs(RepeatGroupContainerStack, { direction: "row", justifyContent: "end", children: [_jsx(Box, { sx: { flexGrow: 1 }, children: _jsx(GroupItem, { qItem: qItem, qrItem: answeredQrItem, isRepeated: true, parentIsRepeatGroup: true, parentRepeatGroupIndex: repeatGroupIndex, parentIsReadOnly: parentIsReadOnly, groupCardElevation: groupCardElevation, onQrItemChange: onQrItemChange }) }), _jsx(RemoveItemButton, { nullableQrItem: nullableQrItem, numOfRepeatGroups: numOfRepeatGroups, readOnly: readOnly, onRemoveItem: onRemoveItem })] }));
 }
 export default RepeatGroupItem;
 //# sourceMappingURL=RepeatGroupItem.js.map