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

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

@@ -1,56 +1,42 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import { findInAnswerOptions, getQrChoiceValue } from '../../../utils/choice';
-import { createEmptyQrItem } from '../../../utils/qrItem';
+import useAnswerOptionsToggleExpressions from '../../../hooks/useAnswerOptionsToggleExpressions';
 import useReadOnly from '../../../hooks/useReadOnly';
+import useValidationFeedback from '../../../hooks/useValidationFeedback';
 import { useQuestionnaireStore } from '../../../stores';
-import useCodingCalculatedExpression from '../../../hooks/useCodingCalculatedExpression';
+import { findInAnswerOptions, getQrChoiceValue } from '../../../utils/choice';
+import { createEmptyQrItem } from '../../../utils/qrItem';
 import ChoiceSelectAnswerOptionView from './ChoiceSelectAnswerOptionView';
-import useValidationFeedback from '../../../hooks/useValidationFeedback';
-import useAnswerOptionsToggleExpressions from '../../../hooks/useAnswerOptionsToggleExpressions';
-// TODO eventually merge this item with ChoiceRadioAnswerOptionItem
 function ChoiceSelectAnswerOptionItem(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();
     const readOnly = useReadOnly(qItem, parentIsReadOnly);
     // Perform validation checks - there's no string-based input here
     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 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 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);
-    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));
     }
     return (_jsx(ChoiceSelectAnswerOptionView, { qItem: qItem, options: options, valueChoice: valueChoice, feedback: feedback, readOnly: readOnly, expressionUpdated: calcExpUpdated || answerOptionsToggleExpUpdated, isRepeated: isRepeated, isTabled: isTabled, renderingExtensions: renderingExtensions, answerOptionsToggleExpressionsMap: answerOptionsToggleExpressionsMap, onFocusLinkId: () => onFocusLinkId(qItem.linkId), onSelectChange: handleChange }));
 }

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

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

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

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

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

@@ -1,33 +1,17 @@
 import { jsx as _jsx } 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 { useMemo } from 'react';
+import { findInAnswerOptions } from '../../../utils/choice';
 import { FullWidthFormComponentBox } from '../../Box.styles';
 import ItemFieldGrid from '../ItemParts/ItemFieldGrid';
-import { findInAnswerOptions } from '../../../utils/choice';
-import ChoiceSelectAnswerOptionFields from './ChoiceSelectAnswerOptionFields';
 import ItemLabel from '../ItemParts/ItemLabel';
+import ChoiceSelectAnswerOptionFields from './ChoiceSelectAnswerOptionFields';
 function ChoiceSelectAnswerOptionView(props) {
     const { qItem, options, valueChoice, feedback, isRepeated, isTabled, renderingExtensions, readOnly, expressionUpdated, answerOptionsToggleExpressionsMap, onFocusLinkId, onSelectChange } = props;
-    const valueSelect = useMemo(() => { var _a; return (_a = findInAnswerOptions(options, valueChoice !== null && valueChoice !== void 0 ? valueChoice : '')) !== null && _a !== void 0 ? _a : null; }, [options, valueChoice]);
+    const valueSelect = useMemo(() => findInAnswerOptions(options, valueChoice ?? '') ?? null, [options, valueChoice]);
     if (isRepeated) {
         return (_jsx(ChoiceSelectAnswerOptionFields, { qItem: qItem, options: options, valueSelect: valueSelect, feedback: feedback, readOnly: readOnly, expressionUpdated: expressionUpdated, isTabled: isTabled, renderingExtensions: renderingExtensions, answerOptionsToggleExpressionsMap: answerOptionsToggleExpressionsMap, onSelectChange: onSelectChange }));
     }
-    return (_jsx(FullWidthFormComponentBox, { "data-test": "q-item-choice-select-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(ChoiceSelectAnswerOptionFields, { qItem: qItem, options: options, valueSelect: valueSelect, feedback: feedback, readOnly: readOnly, expressionUpdated: expressionUpdated, isTabled: isTabled, renderingExtensions: renderingExtensions, answerOptionsToggleExpressionsMap: answerOptionsToggleExpressionsMap, onSelectChange: onSelectChange }) }) }));
+    return (_jsx(FullWidthFormComponentBox, { "data-test": "q-item-choice-select-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(ChoiceSelectAnswerOptionFields, { qItem: qItem, options: options, valueSelect: valueSelect, feedback: feedback, readOnly: readOnly, expressionUpdated: expressionUpdated, isTabled: isTabled, renderingExtensions: renderingExtensions, answerOptionsToggleExpressionsMap: answerOptionsToggleExpressionsMap, onSelectChange: onSelectChange }) }) }));
 }
 export default ChoiceSelectAnswerOptionView;
 //# sourceMappingURL=ChoiceSelectAnswerOptionView.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"ChoiceSelectAnswerOptionView.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceSelectAnswerOptionView.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAc,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,aAAa,MAAM,4BAA4B,CAAC;AAOvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,8BAA8B,MAAM,kCAAkC,CAAC;AAC9E,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAiB/C,SAAS,4BAA4B,CAAC,KAAwC;IAC5E,MAAM,EACJ,KAAK,EACL,OAAO,EACP,WAAW,EACX,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,mBAAmB,EACnB,QAAQ,EACR,iBAAiB,EACjB,iCAAiC,EACjC,aAAa,EACb,cAAc,EACf,GAAG,KAAK,CAAC;IAEV,MAAM,WAAW,GAAyC,OAAO,CAC/D,GAAG,EAAE,WAAC,OAAA,MAAA,mBAAmB,CAAC,OAAO,EAAE,WAAW,aAAX,WAAW,cAAX,WAAW,GAAI,EAAE,CAAC,mCAAI,IAAI,CAAA,EAAA,EAC7D,CAAC,OAAO,EAAE,WAAW,CAAC,CACvB,CAAC;IAEF,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,CACL,KAAC,8BAA8B,IAC7B,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,iBAAiB,EAAE,iBAAiB,EACpC,QAAQ,EAAE,QAAQ,EAClB,mBAAmB,EAAE,mBAAmB,EACxC,iCAAiC,EAAE,iCAAiC,EACpE,cAAc,EAAE,cAAc,GAC9B,CACH,CAAC;IACJ,CAAC;IAED,OAAO,CACL,KAAC,yBAAyB,iBACd,wCAAwC,iBACrC,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,8BAA8B,IAC7B,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,iBAAiB,EAAE,iBAAiB,EACpC,QAAQ,EAAE,QAAQ,EAClB,mBAAmB,EAAE,mBAAmB,EACxC,iCAAiC,EAAE,iCAAiC,EACpE,cAAc,EAAE,cAAc,GAC9B,GAEJ,GACwB,CAC7B,CAAC;AACJ,CAAC;AAED,eAAe,4BAA4B,CAAC"}
+{"version":3,"file":"ChoiceSelectAnswerOptionView.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceSelectAnswerOptionView.tsx"],"names":[],"mappings":";AAkBA,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAMhC,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,aAAa,MAAM,4BAA4B,CAAC;AACvD,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAC/C,OAAO,8BAA8B,MAAM,kCAAkC,CAAC;AAiB9E,SAAS,4BAA4B,CAAC,KAAwC;IAC5E,MAAM,EACJ,KAAK,EACL,OAAO,EACP,WAAW,EACX,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,mBAAmB,EACnB,QAAQ,EACR,iBAAiB,EACjB,iCAAiC,EACjC,aAAa,EACb,cAAc,EACf,GAAG,KAAK,CAAC;IAEV,MAAM,WAAW,GAAyC,OAAO,CAC/D,GAAG,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,WAAW,IAAI,EAAE,CAAC,IAAI,IAAI,EAC7D,CAAC,OAAO,EAAE,WAAW,CAAC,CACvB,CAAC;IAEF,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,CACL,KAAC,8BAA8B,IAC7B,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,iBAAiB,EAAE,iBAAiB,EACpC,QAAQ,EAAE,QAAQ,EAClB,mBAAmB,EAAE,mBAAmB,EACxC,iCAAiC,EAAE,iCAAiC,EACpE,cAAc,EAAE,cAAc,GAC9B,CACH,CAAC;IACJ,CAAC;IAED,OAAO,CACL,KAAC,yBAAyB,iBACd,wCAAwC,iBACrC,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,8BAA8B,IAC7B,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,iBAAiB,EAAE,iBAAiB,EACpC,QAAQ,EAAE,QAAQ,EAClB,mBAAmB,EAAE,mBAAmB,EACxC,iCAAiC,EAAE,iCAAiC,EACpE,cAAc,EAAE,cAAc,GAC9B,GAEJ,GACwB,CAC7B,CAAC;AACJ,CAAC;AAED,eAAe,4BAA4B,CAAC"}

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

@@ -1,7 +1,7 @@
 import type { Coding, QuestionnaireItem } from 'fhir/r4';
-import type { PropsWithIsTabledRequiredAttribute, PropsWithRenderingExtensionsAttribute } from '../../../interfaces/renderProps.interface';
 import type { TerminologyError } from '../../../hooks/useValueSetCodings';
-interface ChoiceSelectAnswerValueSetFieldsProps extends PropsWithIsTabledRequiredAttribute, PropsWithRenderingExtensionsAttribute {
+import type { PropsWithIsTabledAttribute, PropsWithRenderingExtensionsAttribute } from '../../../interfaces/renderProps.interface';
+interface ChoiceSelectAnswerValueSetFieldsProps extends PropsWithIsTabledAttribute, PropsWithRenderingExtensionsAttribute {
     qItem: QuestionnaireItem;
     codings: Coding[];
     valueCoding: Coding | null;

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

@@ -15,28 +15,33 @@ import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-run
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import Autocomplete from '@mui/material/Autocomplete';
-import { StandardTextField } from '../Textfield.styles';
-import { StyledAlert } from '../../Alert.styles';
 import ErrorOutlineIcon from '@mui/icons-material/ErrorOutline';
+import Autocomplete from '@mui/material/Autocomplete';
 import Typography from '@mui/material/Typography';
-import { useRendererStylingStore } from '../../../stores';
-import { StyledRequiredTypography } from '../Item.styles';
-import DisplayUnitText from '../ItemParts/DisplayUnitText';
+import { useRendererConfigStore } from '../../../stores';
 import { isCodingDisabled } from '../../../utils/choice';
 import ExpressionUpdateFadingIcon from '../ItemParts/ExpressionUpdateFadingIcon';
+import { StyledAlert } from '../../Alert.styles';
+import { StyledRequiredTypography } from '../Item.styles';
+import DisplayUnitText from '../ItemParts/DisplayUnitText';
+import { StandardTextField } from '../Textfield.styles';
 function ChoiceSelectAnswerValueSetFields(props) {
     const { qItem, codings, valueCoding, terminologyError, 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;
     if (codings.length > 0) {
-        return (_jsxs(_Fragment, { children: [_jsx(Autocomplete, Object.assign({}, (!isTabled && { id: `${qItem.type}-${qItem.linkId}` }), { options: codings, getOptionDisabled: (coding) => isCodingDisabled(coding, answerOptionsToggleExpressionsMap), getOptionLabel: (option) => { var _a; return (_a = option.display) !== null && _a !== void 0 ? _a : `${option.code}`; }, value: valueCoding !== null && valueCoding !== void 0 ? valueCoding : null, 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) => {
-                        var _a;
-                        return (_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 })] })), inputProps: Object.assign(Object.assign({}, params.inputProps), { 'aria-label': (_a = qItem.text) !== null && _a !== void 0 ? _a : 'Unnamed choice dropdown' }) })
-                            }, "data-test": "q-item-choice-select-answer-value-set-field", "data-linkid": qItem.linkId })));
-                    } })), feedback ? _jsx(StyledRequiredTypography, { children: feedback }) : null] }));
+        return (_jsxs(_Fragment, { children: [_jsx(Autocomplete, { ...(!isTabled && { id: `${qItem.type}-${qItem.linkId}` }), options: codings, getOptionDisabled: (coding) => isCodingDisabled(coding, answerOptionsToggleExpressionsMap), getOptionLabel: (option) => option.display ?? `${option.code}`, value: valueCoding ?? null, 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 })] })),
+                                inputProps: {
+                                    ...params.inputProps,
+                                    'aria-label': qItem.text ?? 'Unnamed choice dropdown'
+                                }
+                            }
+                        }, "data-test": "q-item-choice-select-answer-value-set-field", "data-linkid": qItem.linkId, "data-label": qItem.text })) }), feedback ? _jsx(StyledRequiredTypography, { children: feedback }) : null] }));
     }
     if (terminologyError.error) {
         return (_jsxs(StyledAlert, { color: "error", children: [_jsx(ErrorOutlineIcon, { color: "error", sx: { pr: 0.75 } }), _jsxs(Typography, { component: "div", children: ["There was an error fetching options from the terminology server for", ' ', terminologyError.answerValueSet] })] }));

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

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

package/lib/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetItem.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 ChoiceSelectAnswerValueSetItemProps extends PropsWithQrItemChangeHandler, PropsWithItemPathAttribute, PropsWithIsRepeatedAttribute, PropsWithIsTabledRequiredAttribute, PropsWithRenderingExtensionsAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithFeedbackFromParentAttribute {
-    qItem: QuestionnaireItem;
-    qrItem: QuestionnaireResponseItem | null;
-}
-declare function ChoiceSelectAnswerValueSetItem(props: ChoiceSelectAnswerValueSetItemProps): import("react/jsx-runtime").JSX.Element;
+import type { BaseItemProps } from '../../../interfaces/renderProps.interface';
+declare function ChoiceSelectAnswerValueSetItem(props: BaseItemProps): import("react/jsx-runtime").JSX.Element;
 export default ChoiceSelectAnswerValueSetItem;

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

@@ -16,28 +16,25 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * limitations under the License.
  */
 import { useEffect, 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 { createEmptyQrItem } from '../../../utils/qrItem';
 import { FullWidthFormComponentBox } from '../../Box.styles';
-import useValueSetCodings from '../../../hooks/useValueSetCodings';
-import ChoiceSelectAnswerValueSetFields from './ChoiceSelectAnswerValueSetFields';
-import useReadOnly from '../../../hooks/useReadOnly';
 import ItemFieldGrid from '../ItemParts/ItemFieldGrid';
-import { useQuestionnaireStore } from '../../../stores';
-import useCodingCalculatedExpression from '../../../hooks/useCodingCalculatedExpression';
-import { convertCodingsToAnswerOptions, findInAnswerOptions } from '../../../utils/choice';
-import useValidationFeedback from '../../../hooks/useValidationFeedback';
 import ItemLabel from '../ItemParts/ItemLabel';
-import useAnswerOptionsToggleExpressions from '../../../hooks/useAnswerOptionsToggleExpressions';
+import ChoiceSelectAnswerValueSetFields from './ChoiceSelectAnswerValueSetFields';
 function ChoiceSelectAnswerValueSetItem(props) {
-    var _a, _b, _c, _d, _e;
-    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 qrChoiceSelect = qrItem !== null && qrItem !== void 0 ? qrItem : createEmptyQrItem(qItem, answerKey);
+    const answerKey = qrItem?.answer?.[0]?.id;
+    const qrChoiceSelect = qrItem ?? createEmptyQrItem(qItem, answerKey);
     let valueCoding = null;
     if (qrChoiceSelect.answer) {
-        valueCoding = (_c = qrChoiceSelect.answer[0].valueCoding) !== null && _c !== void 0 ? _c : null;
+        valueCoding = qrChoiceSelect.answer[0].valueCoding ?? null;
     }
     const readOnly = useReadOnly(qItem, parentIsReadOnly);
     // Perform validation checks
@@ -45,8 +42,8 @@ function ChoiceSelectAnswerValueSetItem(props) {
     // Get codings/options from valueSet
     const { codings, terminologyError, dynamicCodingsUpdated } = useValueSetCodings(qItem);
     valueCoding = useMemo(() => {
-        const updatedValueCoding = codings.find((queriedCoding) => queriedCoding.code === (valueCoding === null || valueCoding === void 0 ? void 0 : valueCoding.code));
-        return updatedValueCoding !== null && updatedValueCoding !== void 0 ? updatedValueCoding : valueCoding;
+        const updatedValueCoding = codings.find((queriedCoding) => queriedCoding.code === valueCoding?.code);
+        return updatedValueCoding ?? valueCoding;
     }, [codings, valueCoding]);
     // Check and remove populated answer if it is a string
     // NOTE: $populate will try to populate answer as valueCoding,
@@ -59,28 +56,15 @@ function ChoiceSelectAnswerValueSetItem(props) {
     // Only run effect once - on populate
     // eslint-disable-next-line react-hooks/exhaustive-deps
     []);
-    const answerOptions = useMemo(() => convertCodingsToAnswerOptions(codings), [codings]);
-    // Process calculated expressions
-    const { calcExpUpdated } = useCodingCalculatedExpression({
-        qItem: qItem,
-        valueInString: (_e = (_d = valueCoding === null || valueCoding === void 0 ? void 0 : valueCoding.code) !== null && _d !== void 0 ? _d : valueCoding === null || valueCoding === void 0 ? void 0 : valueCoding.display) !== null && _e !== void 0 ? _e : '',
-        onChangeByCalcExpressionString: (newValueString) => {
-            if (codings.length > 0) {
-                const qrAnswer = findInAnswerOptions(answerOptions, newValueString);
-                onQrItemChange(qrAnswer
-                    ? Object.assign(Object.assign({}, createEmptyQrItem(qItem, answerKey)), { answer: [Object.assign(Object.assign({}, qrAnswer), { id: answerKey })] }) : createEmptyQrItem(qItem, answerKey), itemPath);
-            }
-        },
-        onChangeByCalcExpressionNull: () => {
-            onQrItemChange(createEmptyQrItem(qItem, answerKey), itemPath);
-        }
-    });
     // Process answerOptionsToggleExpressions
     const { answerOptionsToggleExpressionsMap, answerOptionsToggleExpUpdated } = useAnswerOptionsToggleExpressions(qItem.linkId);
     // Event handlers
     function handleChange(newValue) {
         if (newValue) {
-            onQrItemChange(Object.assign(Object.assign({}, createEmptyQrItem(qItem, answerKey)), { answer: [{ id: answerKey, valueCoding: newValue }] }));
+            onQrItemChange({
+                ...createEmptyQrItem(qItem, answerKey),
+                answer: [{ id: answerKey, valueCoding: newValue }]
+            });
             return;
         }
         onQrItemChange(createEmptyQrItem(qItem, answerKey));

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

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

package/lib/components/FormComponents/DateTimeItems/CustomDateItem/CustomDateField.d.ts

@@ -1,6 +1,6 @@
 import type { Dispatch, SetStateAction } from 'react';
-import type { PropsWithIsTabledRequiredAttribute } from '../../../../interfaces/renderProps.interface';
-interface CustomDateFieldProps extends PropsWithIsTabledRequiredAttribute {
+import type { PropsWithIsTabledAttribute } from '../../../../interfaces/renderProps.interface';
+interface CustomDateFieldProps extends PropsWithIsTabledAttribute {
     linkId: string;
     itemType: string;
     itemText: string | undefined;
@@ -15,7 +15,6 @@ interface CustomDateFieldProps extends PropsWithIsTabledRequiredAttribute {
     isPartOfDateTime: boolean;
     setFocused: Dispatch<SetStateAction<boolean>>;
     onInputChange: (newInput: string) => void;
-    onDateBlur: () => void;
     onSelectDate: (newDateValue: string) => void;
 }
 declare function CustomDateField(props: CustomDateFieldProps): import("react/jsx-runtime").JSX.Element;

package/lib/components/FormComponents/DateTimeItems/CustomDateItem/CustomDateField.js

@@ -3,12 +3,12 @@ import { useRef } from 'react';
 import InputAdornment from '@mui/material/InputAdornment';
 import { StandardTextField } from '../../Textfield.styles';
 import DatePicker from './DatePicker';
-import { useRendererStylingStore } from '../../../../stores';
+import { useRendererConfigStore } from '../../../../stores';
 import ExpressionUpdateFadingIcon from '../../ItemParts/ExpressionUpdateFadingIcon';
 function CustomDateField(props) {
-    const { linkId, itemType, itemText, valueDate, input, feedback, isFocused, displayPrompt, entryFormat, readOnly, calcExpUpdated, isPartOfDateTime, isTabled, setFocused, onInputChange, onDateBlur, onSelectDate } = props;
-    const readOnlyVisualStyle = useRendererStylingStore.use.readOnlyVisualStyle();
-    const textFieldWidth = useRendererStylingStore.use.textFieldWidth();
+    const { linkId, itemType, itemText, valueDate, input, feedback, isFocused, displayPrompt, entryFormat, readOnly, calcExpUpdated, isPartOfDateTime, isTabled, setFocused, onInputChange, onSelectDate } = props;
+    const readOnlyVisualStyle = useRendererConfigStore.use.readOnlyVisualStyle();
+    const textFieldWidth = useRendererConfigStore.use.textFieldWidth();
     const anchorRef = useRef(null);
     // If this reusable date field is part of a DateTime component, the id should be appended with '-date'
     const id = isPartOfDateTime ? itemType + '-' + linkId + '-date' : itemType + '-' + linkId;
@@ -19,18 +19,17 @@ function CustomDateField(props) {
     if (entryFormat !== '') {
         placeholderText = entryFormat;
     }
-    return (_jsx(StandardTextField, Object.assign({}, (!isTabled && { id: id }), { "data-test": 'date', ref: anchorRef, fullWidth: true, textFieldWidth: textFieldWidth, isTabled: isTabled, value: input, error: !!feedback, onChange: (e) => onInputChange(e.target.value), placeholder: placeholderText, disabled: readOnly && readOnlyVisualStyle === 'disabled', size: "small", focused: isFocused, onFocus: () => setFocused(true), onBlur: () => {
-            onDateBlur();
-            setFocused(false);
-        }, slotProps: {
+    return (_jsx(StandardTextField, { ...(!isTabled && { id: id }), "data-test": 'date', ref: anchorRef, fullWidth: true, textFieldWidth: textFieldWidth, isTabled: isTabled, value: input, error: !!feedback, onChange: (e) => onInputChange(e.target.value), placeholder: placeholderText, disabled: readOnly && readOnlyVisualStyle === 'disabled', size: "small", focused: isFocused, onFocus: () => setFocused(true), onBlur: () => setFocused(false), slotProps: {
             input: {
                 readOnly: readOnly && readOnlyVisualStyle === 'readonly',
                 endAdornment: (_jsxs(InputAdornment, { position: "end", children: [_jsx(ExpressionUpdateFadingIcon, { fadeIn: calcExpUpdated, disabled: readOnly }), _jsx(DatePicker, { valueString: valueDate, readOnly: readOnly, anchorEl: anchorRef.current, onSelectDate: (valueDayjs) => {
                                 onSelectDate(valueDayjs.format('DD/MM/YYYY'));
                             }, onFocus: (focus) => setFocused(focus) })] })),
-                inputProps: Object.assign({}, (isTabled ? {} : { 'aria-label': itemText !== null && itemText !== void 0 ? itemText : `Unnamed ${itemType} item` }))
+                inputProps: {
+                    ...(isTabled ? {} : { 'aria-label': itemText ?? `Unnamed ${itemType} item` })
+                }
             }
-        }, helperText: feedback })));
+        }, helperText: feedback }));
 }
 export default CustomDateField;
 //# sourceMappingURL=CustomDateField.js.map

package/lib/components/FormComponents/DateTimeItems/CustomDateItem/CustomDateField.js.map

@@ -1 +1 @@
-{"version":3,"file":"CustomDateField.js","sourceRoot":"","sources":["../../../../../src/components/FormComponents/DateTimeItems/CustomDateItem/CustomDateField.tsx"],"names":[],"mappings":";AAkBA,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAE/B,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAE1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,UAAU,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAC7D,OAAO,0BAA0B,MAAM,4CAA4C,CAAC;AAqBpF,SAAS,eAAe,CAAC,KAA2B;IAClD,MAAM,EACJ,MAAM,EACN,QAAQ,EACR,QAAQ,EACR,SAAS,EACT,KAAK,EACL,QAAQ,EACR,SAAS,EACT,aAAa,EACb,WAAW,EACX,QAAQ,EACR,cAAc,EACd,gBAAgB,EAChB,QAAQ,EACR,UAAU,EACV,aAAa,EACb,UAAU,EACV,YAAY,EACb,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,SAAS,GAAG,MAAM,CAAwB,IAAI,CAAC,CAAC;IAEtD,sGAAsG;IACtG,MAAM,EAAE,GAAG,gBAAgB,CAAC,CAAC,CAAC,QAAQ,GAAG,GAAG,GAAG,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,QAAQ,GAAG,GAAG,GAAG,MAAM,CAAC;IAE1F,IAAI,eAAe,GAAG,YAAY,CAAC;IACnC,IAAI,aAAa,KAAK,EAAE,EAAE,CAAC;QACzB,eAAe,GAAG,aAAa,CAAC;IAClC,CAAC;IAED,IAAI,WAAW,KAAK,EAAE,EAAE,CAAC;QACvB,eAAe,GAAG,WAAW,CAAC;IAChC,CAAC;IAED,OAAO,CACL,KAAC,iBAAiB,oBACZ,CAAC,CAAC,QAAQ,IAAI,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,iBAClB,MAAM,EACjB,GAAG,EAAE,SAAS,EACd,SAAS,QACT,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,CAAC,CAAC,QAAQ,EACjB,QAAQ,EAAE,CAAC,CAAgC,EAAE,EAAE,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAC7E,WAAW,EAAE,eAAe,EAC5B,QAAQ,EAAE,QAAQ,IAAI,mBAAmB,KAAK,UAAU,EACxD,IAAI,EAAC,OAAO,EACZ,OAAO,EAAE,SAAS,EAClB,OAAO,EAAE,GAAG,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAC/B,MAAM,EAAE,GAAG,EAAE;YACX,UAAU,EAAE,CAAC;YACb,UAAU,CAAC,KAAK,CAAC,CAAC;QACpB,CAAC,EACD,SAAS,EAAE;YACT,KAAK,EAAE;gBACL,QAAQ,EAAE,QAAQ,IAAI,mBAAmB,KAAK,UAAU;gBACxD,YAAY,EAAE,CACZ,MAAC,cAAc,IAAC,QAAQ,EAAC,KAAK,aAC5B,KAAC,0BAA0B,IAAC,MAAM,EAAE,cAAc,EAAE,QAAQ,EAAE,QAAQ,GAAI,EAC1E,KAAC,UAAU,IACT,WAAW,EAAE,SAAS,EACtB,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,SAAS,CAAC,OAAO,EAC3B,YAAY,EAAE,CAAC,UAAiB,EAAE,EAAE;gCAClC,YAAY,CAAC,UAAU,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;4BAChD,CAAC,EACD,OAAO,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC,GACrC,IACa,CAClB;gBACD,UAAU,oBACL,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,YAAY,EAAE,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,WAAW,QAAQ,OAAO,EAAE,CAAC,CAC9E;aACF;SACF,EACD,UAAU,EAAE,QAAQ,IACpB,CACH,CAAC;AACJ,CAAC;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"CustomDateField.js","sourceRoot":"","sources":["../../../../../src/components/FormComponents/DateTimeItems/CustomDateItem/CustomDateField.tsx"],"names":[],"mappings":"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"}

package/lib/components/FormComponents/DateTimeItems/CustomDateItem/CustomDateItem.js

@@ -16,26 +16,23 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * limitations under the License.
  */
 import { useState } from 'react';
+import useDateValidation from '../../../../hooks/useDateValidation';
 import useReadOnly from '../../../../hooks/useReadOnly';
+import { useQuestionnaireStore } from '../../../../stores';
+import { createEmptyQrItem } from '../../../../utils/qrItem';
 import { FullWidthFormComponentBox } from '../../../Box.styles';
 import ItemFieldGrid from '../../ItemParts/ItemFieldGrid';
+import ItemLabel from '../../ItemParts/ItemLabel';
 import { parseFhirDateToDisplayDate, parseInputDateToFhirDate, validateDateInput } from '../utils/parseDate';
-import { createEmptyQrItem } from '../../../../utils/qrItem';
-import useDateValidation from '../../../../hooks/useDateValidation';
 import CustomDateField from './CustomDateField';
-import { useQuestionnaireStore } from '../../../../stores';
-import ItemLabel from '../../ItemParts/ItemLabel';
-import useShowFeedback from '../../../../hooks/useShowFeedback';
-import useDateCalculatedExpression from '../../../../hooks/useDateCalculatedExpression';
 function CustomDateItem(props) {
-    var _a, _b;
-    const { qItem, qrItem, isRepeated, isTabled, renderingExtensions, parentIsReadOnly, onQrItemChange } = props;
+    const { qItem, qrItem, isRepeated, isTabled, renderingExtensions, parentIsReadOnly, calcExpUpdated, onQrItemChange } = props;
     const onFocusLinkId = useQuestionnaireStore.use.onFocusLinkId();
     const readOnly = useReadOnly(qItem, parentIsReadOnly);
     const { displayPrompt, entryFormat } = renderingExtensions;
     // 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 qrDate = qrItem !== null && qrItem !== void 0 ? qrItem : createEmptyQrItem(qItem, answerKey);
+    const answerKey = qrItem?.answer?.[0]?.id;
+    const qrDate = qrItem ?? createEmptyQrItem(qItem, answerKey);
     let valueDate = '';
     if (qrDate.answer) {
         if (qrDate.answer[0].valueDate) {
@@ -50,48 +47,30 @@ function CustomDateItem(props) {
     const [focused, setFocused] = useState(false);
     // Perform validation checks
     const feedback = useDateValidation(input, dateParseFail);
-    // Provides a way to hide the feedback when the user is typing
-    const { showFeedback, setShowFeedback, hasBlurred, setHasBlurred } = useShowFeedback();
-    // Process calculated expressions
-    const { calcExpUpdated } = useDateCalculatedExpression({
-        qItem: qItem,
-        valueDateFhir: valueDate,
-        onChangeByCalcExpressionString: (newValueDateFhir) => {
-            const { displayDate } = parseFhirDateToDisplayDate(newValueDateFhir);
-            setInput(displayDate);
-            onQrItemChange(Object.assign(Object.assign({}, createEmptyQrItem(qItem, answerKey)), { answer: [{ id: answerKey, valueDate: parseInputDateToFhirDate(newValueDateFhir) }] }));
-        },
-        onChangeByCalcExpressionNull: () => {
-            setInput('');
-            onQrItemChange(createEmptyQrItem(qItem, answerKey));
-        }
-    });
     function handleSelectDate(selectedDate) {
         setInput(selectedDate);
-        onQrItemChange(Object.assign(Object.assign({}, createEmptyQrItem(qItem, answerKey)), { answer: [{ id: answerKey, valueDate: parseInputDateToFhirDate(selectedDate) }] }));
+        onQrItemChange({
+            ...createEmptyQrItem(qItem, answerKey),
+            answer: [{ id: answerKey, valueDate: parseInputDateToFhirDate(selectedDate) }]
+        });
     }
     function handleInputChange(newInput) {
         setInput(newInput);
-        // Only suppress feedback once (before first blur)
-        if (!hasBlurred) {
-            setShowFeedback(false);
-        }
         if (newInput === '') {
             onQrItemChange(createEmptyQrItem(qItem, answerKey));
         }
         if (!validateDateInput(newInput)) {
             return;
         }
-        onQrItemChange(Object.assign(Object.assign({}, createEmptyQrItem(qItem, answerKey)), { answer: [{ id: answerKey, valueDate: parseInputDateToFhirDate(newInput) }] }));
-    }
-    function handleDateBlur() {
-        setShowFeedback(true);
-        setHasBlurred(true); // From now on, feedback should stay visible
+        onQrItemChange({
+            ...createEmptyQrItem(qItem, answerKey),
+            answer: [{ id: answerKey, valueDate: parseInputDateToFhirDate(newInput) }]
+        });
     }
     if (isRepeated) {
-        return (_jsx(CustomDateField, { linkId: qItem.linkId, itemType: qItem.type, itemText: qItem.text, valueDate: displayDate, input: input, feedback: showFeedback ? feedback : '', isFocused: focused, displayPrompt: displayPrompt, entryFormat: entryFormat, readOnly: readOnly, calcExpUpdated: calcExpUpdated, isPartOfDateTime: false, isTabled: isTabled, setFocused: setFocused, onInputChange: handleInputChange, onDateBlur: handleDateBlur, onSelectDate: handleSelectDate }));
+        return (_jsx(CustomDateField, { linkId: qItem.linkId, itemType: qItem.type, itemText: qItem.text, valueDate: displayDate, input: input, feedback: feedback ?? '', isFocused: focused, displayPrompt: displayPrompt, entryFormat: entryFormat, readOnly: readOnly, calcExpUpdated: calcExpUpdated, isPartOfDateTime: false, isTabled: isTabled, setFocused: setFocused, onInputChange: handleInputChange, onSelectDate: handleSelectDate }));
     }
-    return (_jsx(FullWidthFormComponentBox, { "data-test": "q-item-date-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(CustomDateField, { linkId: qItem.linkId, itemType: qItem.type, itemText: qItem.text, valueDate: displayDate, input: input, feedback: showFeedback ? feedback : '', isFocused: focused, displayPrompt: displayPrompt, entryFormat: entryFormat, readOnly: readOnly, calcExpUpdated: calcExpUpdated, isPartOfDateTime: false, isTabled: isTabled, setFocused: setFocused, onInputChange: handleInputChange, onDateBlur: handleDateBlur, onSelectDate: handleSelectDate }), feedback: showFeedback ? feedback : undefined }) }));
+    return (_jsx(FullWidthFormComponentBox, { "data-test": "q-item-date-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(CustomDateField, { linkId: qItem.linkId, itemType: qItem.type, itemText: qItem.text, valueDate: displayDate, input: input, feedback: feedback ?? '', isFocused: focused, displayPrompt: displayPrompt, entryFormat: entryFormat, readOnly: readOnly, calcExpUpdated: calcExpUpdated, isPartOfDateTime: false, isTabled: isTabled, setFocused: setFocused, onInputChange: handleInputChange, onSelectDate: handleSelectDate }), feedback: feedback ?? undefined }) }));
 }
 export default CustomDateItem;
 //# sourceMappingURL=CustomDateItem.js.map

package/lib/components/FormComponents/DateTimeItems/CustomDateItem/CustomDateItem.js.map

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

package/lib/components/FormComponents/DateTimeItems/CustomDateItem/DatePicker.js

@@ -25,7 +25,7 @@ function DatePicker(props) {
     const { valueString, readOnly, anchorEl, onSelectDate, onFocus } = props;
     const [open, setOpen] = useState(false);
     const valueDayJs = valueString ? dayjs(valueString, 'DD/MM/YYYY') : null;
-    return (_jsx(LocalizationProvider, { dateAdapter: AdapterDayjs, children: _jsx(MuiDatePicker, { value: valueDayJs !== null && valueDayJs !== void 0 ? valueDayJs : null, slots: { field: DatePickerButton }, slotProps: {
+    return (_jsx(LocalizationProvider, { dateAdapter: AdapterDayjs, children: _jsx(MuiDatePicker, { value: valueDayJs ?? null, slots: { field: DatePickerButton }, slotProps: {
                 field: {
                     onOpen: () => {
                         if (readOnly) {

package/lib/components/FormComponents/DateTimeItems/CustomDateItem/DatePicker.js.map

@@ -1 +1 @@
-{"version":3,"file":"DatePicker.js","sourceRoot":"","sources":["../../../../../src/components/FormComponents/DateTimeItems/CustomDateItem/DatePicker.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAc,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAExC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAUlD,SAAS,UAAU,CAAC,KAAsB;IACxC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAEzE,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExC,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAEzE,OAAO,CACL,KAAC,oBAAoB,IAAC,WAAW,EAAE,YAAY,YAC7C,KAAC,aAAa,IACZ,KAAK,EAAE,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAI,EACzB,KAAK,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAE,EAClC,SAAS,EAAE;gBACT,KAAK,EAAE;oBACL,MAAM,EAAE,GAAG,EAAE;wBACX,IAAI,QAAQ,EAAE,CAAC;4BACb,OAAO;wBACT,CAAC;wBAED,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;wBACf,OAAO,CAAC,IAAI,CAAC,CAAC;oBAChB,CAAC;oBACD,QAAQ,EAAE,QAAQ;iBACZ;gBACR,SAAS,EAAE;oBACT,IAAI,EAAE,OAAO;iBACd;gBACD,MAAM,EAAE;oBACN,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAuB;iBACxC;aACF,EACD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,GAAG,EAAE;gBACZ,OAAO,CAAC,KAAK,CAAC,CAAC;gBACf,OAAO,CAAC,KAAK,CAAC,CAAC;YACjB,CAAC,EACD,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE;gBACrB,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACd,OAAO;gBACT,CAAC;gBAED,YAAY,CAAC,QAAQ,CAAC,CAAC;gBACvB,OAAO,CAAC,KAAK,CAAC,CAAC;YACjB,CAAC,GACD,GACmB,CACxB,CAAC;AACJ,CAAC;AAED,eAAe,UAAU,CAAC"}
+{"version":3,"file":"DatePicker.js","sourceRoot":"","sources":["../../../../../src/components/FormComponents/DateTimeItems/CustomDateItem/DatePicker.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAc,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAExC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,kCAAkC,CAAC;AAChE,OAAO,EAAE,oBAAoB,EAAE,MAAM,0CAA0C,CAAC;AAChF,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,gBAAgB,MAAM,oBAAoB,CAAC;AAUlD,SAAS,UAAU,CAAC,KAAsB;IACxC,MAAM,EAAE,WAAW,EAAE,QAAQ,EAAE,QAAQ,EAAE,YAAY,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;IAEzE,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAExC,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,KAAK,CAAC,WAAW,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;IAEzE,OAAO,CACL,KAAC,oBAAoB,IAAC,WAAW,EAAE,YAAY,YAC7C,KAAC,aAAa,IACZ,KAAK,EAAE,UAAU,IAAI,IAAI,EACzB,KAAK,EAAE,EAAE,KAAK,EAAE,gBAAgB,EAAE,EAClC,SAAS,EAAE;gBACT,KAAK,EAAE;oBACL,MAAM,EAAE,GAAG,EAAE;wBACX,IAAI,QAAQ,EAAE,CAAC;4BACb,OAAO;wBACT,CAAC;wBAED,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC;wBACf,OAAO,CAAC,IAAI,CAAC,CAAC;oBAChB,CAAC;oBACD,QAAQ,EAAE,QAAQ;iBACZ;gBACR,SAAS,EAAE;oBACT,IAAI,EAAE,OAAO;iBACd;gBACD,MAAM,EAAE;oBACN,QAAQ,EAAE,GAAG,EAAE,CAAC,QAAuB;iBACxC;aACF,EACD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,GAAG,EAAE;gBACZ,OAAO,CAAC,KAAK,CAAC,CAAC;gBACf,OAAO,CAAC,KAAK,CAAC,CAAC;YACjB,CAAC,EACD,QAAQ,EAAE,CAAC,QAAQ,EAAE,EAAE;gBACrB,IAAI,CAAC,QAAQ,EAAE,CAAC;oBACd,OAAO;gBACT,CAAC;gBAED,YAAY,CAAC,QAAQ,CAAC,CAAC;gBACvB,OAAO,CAAC,KAAK,CAAC,CAAC;YACjB,CAAC,GACD,GACmB,CACxB,CAAC;AACJ,CAAC;AAED,eAAe,UAAU,CAAC"}

package/lib/components/FormComponents/DateTimeItems/CustomDateItem/DatePickerButton.js

@@ -1,13 +1,13 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import IconButton from '@mui/material/IconButton';
 import EventIcon from '@mui/icons-material/Event';
-import { useRendererStylingStore } from '../../../../stores';
+import { useRendererConfigStore } from '../../../../stores';
 function DatePickerButton(props) {
     const { onOpen, readOnly } = props;
-    const readOnlyVisualStyle = useRendererStylingStore.use.readOnlyVisualStyle();
+    const readOnlyVisualStyle = useRendererConfigStore.use.readOnlyVisualStyle();
     return (_jsx(IconButton, { sx: { height: 30, width: 30, color: 'text.secondary' }, disabled: readOnly && readOnlyVisualStyle === 'disabled', "aria-label": "Pick a date", tabIndex: readOnly ? -1 : 0, onClick: (e) => {
             e.stopPropagation();
-            onOpen === null || onOpen === void 0 ? void 0 : onOpen();
+            onOpen?.();
         }, children: _jsx(EventIcon, { fontSize: "small" }) }));
 }
 export default DatePickerButton;