@aehrc/smart-forms-renderer 1.0.0-alpha.98 → 1.0.0

package/lib/components/FormComponents/ItemParts/ItemFieldGrid.js.map

@@ -1 +1 @@
-{"version":3,"file":"ItemFieldGrid.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ItemParts/ItemFieldGrid.tsx"],"names":[],"mappings":";AAoBA,OAAO,sBAAsB,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,mBAAmB,MAAM,oCAAoC,CAAC;AACrE,OAAO,IAAI,MAAM,oBAAoB,CAAC;AAYtC,SAAS,aAAa,CAAC,KAAyB;IAC9C,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;IAEhE,MAAM,cAAc,GAAG,uBAAuB,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;IACpE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,eAAe,EAAE,YAAY,EAAE,GAAG,cAAc,CAAC;IAE7F,MAAM,EAAE,mBAAmB,EAAE,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAE9D,OAAO,CACL,MAAC,IAAI,IAAC,SAAS,QAAC,aAAa,EAAE,eAAe,GAAG,IAAI,EAAE,MAAM,EAAE,YAAY,GAAG,IAAI,aAEhF,KAAC,IAAI,IAAC,IAAI,oBAAO,gBAAgB,aAC/B,4BAAG,aAAa,GAAI,GACf,EACP,MAAC,IAAI,IAAC,IAAI,oBAAO,gBAAgB,cAC/B,4BAAG,aAAa,GAAI,EAEnB,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,KAAK,CAAC,YAAY,IAAI,CAChE,KAAC,mBAAmB,IAAC,QAAQ,EAAE,QAAQ,YAAG,mBAAmB,GAAuB,CACrF,IACI,IACF,CACR,CAAC;AACJ,CAAC;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"ItemFieldGrid.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ItemParts/ItemFieldGrid.tsx"],"names":[],"mappings":";AAoBA,OAAO,sBAAsB,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,mBAAmB,MAAM,oCAAoC,CAAC;AACrE,OAAO,IAAI,MAAM,oBAAoB,CAAC;AAYtC,SAAS,aAAa,CAAC,KAAyB;IAC9C,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,aAAa,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;IAEhE,MAAM,cAAc,GAAG,sBAAsB,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;IACnE,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,eAAe,EAAE,YAAY,EAAE,GAAG,cAAc,CAAC;IAE7F,MAAM,EAAE,mBAAmB,EAAE,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAE9D,OAAO,CACL,MAAC,IAAI,IAAC,SAAS,QAAC,aAAa,EAAE,eAAe,GAAG,IAAI,EAAE,MAAM,EAAE,YAAY,GAAG,IAAI,aAEhF,KAAC,IAAI,IAAC,IAAI,EAAE,EAAE,GAAG,gBAAgB,EAAE,YACjC,4BAAG,aAAa,GAAI,GACf,EACP,MAAC,IAAI,IAAC,IAAI,EAAE,EAAE,GAAG,gBAAgB,EAAE,aACjC,4BAAG,aAAa,GAAI,EAEnB,CAAC,KAAK,CAAC,QAAQ,IAAI,CAAC,KAAK,CAAC,YAAY,IAAI,CAAC,KAAK,CAAC,YAAY,IAAI,CAChE,KAAC,mBAAmB,IAAC,QAAQ,EAAE,QAAQ,YAAG,mBAAmB,GAAuB,CACrF,IACI,IACF,CACR,CAAC;AACJ,CAAC;AAED,eAAe,aAAa,CAAC"}

package/lib/components/FormComponents/ItemParts/ItemLabel.js

@@ -17,7 +17,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
  */
 import { memo } from 'react';
 import Box from '@mui/material/Box';
-import { useRendererStylingStore } from '../../../stores/rendererStylingStore';
+import { useRendererConfigStore } from '../../../stores/rendererConfigStore';
 import useRenderingExtensions from '../../../hooks/useRenderingExtensions';
 import RequiredAsterisk from './RequiredAsterisk';
 import { getContextDisplays } from '../../../utils/tabs';
@@ -29,8 +29,8 @@ import { structuredDataCapture } from 'fhir-sdc-helpers';
 import { default as parseStyleToJs } from 'style-to-js';
 const ItemLabel = memo(function ItemLabel(props) {
     const { qItem, readOnly, isDisplayItem, parentStyles } = props;
-    const readOnlyVisualStyle = useRendererStylingStore.use.readOnlyVisualStyle();
-    const requiredIndicatorPosition = useRendererStylingStore.use.requiredIndicatorPosition();
+    const readOnlyVisualStyle = useRendererConfigStore.use.readOnlyVisualStyle();
+    const requiredIndicatorPosition = useRendererConfigStore.use.requiredIndicatorPosition();
     const { required, displayFlyover } = useRenderingExtensions(qItem);
     const contextDisplayItems = getContextDisplays(qItem);
     // is item is a display item, it should not use the "label" variant
@@ -38,15 +38,16 @@ const ItemLabel = memo(function ItemLabel(props) {
     const variant = isDisplayItem ? undefined : 'label';
     // Get text color from parent styles if available
     const readOnlyTextColor = readOnlyVisualStyle === 'disabled' ? 'text.disabled' : 'text.secondary';
-    const textColor = (parentStyles === null || parentStyles === void 0 ? void 0 : parentStyles.color) || (readOnly ? readOnlyTextColor : 'text.primary');
+    const textColor = parentStyles?.color || (readOnly ? readOnlyTextColor : 'text.primary');
     // Get styles from qItem._text
     const stylesString = structuredDataCapture.getStyle(qItem._text);
     const itemStyles = stylesString ? parseStyleToJs(stylesString) : {};
-    return (_jsxs(Box, { display: "flex", alignItems: "center", justifyContent: "space-between", children: [_jsxs(Box, { position: "relative", display: "flex", flexGrow: 1, alignItems: "center", children: [required && requiredIndicatorPosition === 'start' ? (_jsx(RequiredAsterisk, { readOnly: readOnly, variant: variant, sx: { position: 'absolute', top: 0, left: -8 }, children: "*" })) : null, _jsxs(Typography, { id: 'label-' + qItem.linkId, component: component, variant: variant, 
-                        // TODO: Delete this section later after testing.
-                        // based on the qItem type if it is choice, or open-choice, boolean  then don't display the htmlFor
-                        // htmlFor={qItem.type === 'choice' || qItem.type === 'open-choice' || qItem.type === 'boolean' ? undefined : qItem.type + '-' + qItem.linkId}
-                        htmlFor: qItem.type + '-' + qItem.linkId, color: textColor, sx: Object.assign(Object.assign({ mt: 0.5, flexGrow: 1 }, (parentStyles || {})), itemStyles), children: [_jsx(ItemTextSwitcher, { qItem: qItem }), required && requiredIndicatorPosition === 'end' ? (_jsx(RequiredAsterisk, { readOnly: readOnly, variant: variant, children: "*" })) : null, displayFlyover !== '' ? (_jsx(Typography, { component: "span", sx: { ml: 0.75 }, children: _jsx(FlyoverItem, { displayFlyover: displayFlyover, readOnly: readOnly }) })) : null] })] }), _jsx(Box, { display: "flex", columnGap: 0.5, children: contextDisplayItems.map((item) => {
+    return (_jsxs(Box, { display: "flex", alignItems: "center", justifyContent: "space-between", children: [_jsxs(Box, { position: "relative", display: "flex", flexGrow: 1, alignItems: "center", children: [required && requiredIndicatorPosition === 'start' ? (_jsx(RequiredAsterisk, { readOnly: readOnly, variant: variant, sx: { position: 'absolute', top: 0, left: -8 }, children: "*" })) : null, _jsxs(Typography, { id: 'label-' + qItem.linkId, component: component, variant: variant, htmlFor: qItem.type + '-' + qItem.linkId, color: textColor, sx: {
+                            mt: 0.5,
+                            flexGrow: 1,
+                            ...(parentStyles || {}),
+                            ...itemStyles
+                        }, children: [_jsx(ItemTextSwitcher, { qItem: qItem }), required && requiredIndicatorPosition === 'end' ? (_jsx(RequiredAsterisk, { readOnly: readOnly, variant: variant, children: "*" })) : null, displayFlyover !== '' ? (_jsx(Typography, { component: "span", sx: { ml: 0.75 }, children: _jsx(FlyoverItem, { displayFlyover: displayFlyover, readOnly: readOnly }) })) : null] })] }), _jsx(Box, { display: "flex", columnGap: 0.5, children: contextDisplayItems.map((item) => {
                     return _jsx(ContextDisplayItem, { displayItem: item }, item.linkId);
                 }) })] }));
 });

package/lib/components/FormComponents/ItemParts/ItemLabel.js.map

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

package/lib/components/FormComponents/ItemParts/ItemRepopulateButton.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { jsx as _jsx } from "react/jsx-runtime";
 /*
  * Copyright 2025 Commonwealth Scientific and Industrial Research
@@ -36,7 +27,6 @@ import TaskAltIcon from '@mui/icons-material/TaskAlt';
 import WarningIcon from '@mui/icons-material/Warning';
 import { fetchResourceCallback, fetchTerminologyCallback } from '../../../api/callback';
 function ItemRepopulateButton(props) {
-    var _a;
     const { qItem, repopulatable, onRepopulate } = props;
     const client = useSmartConfigStore.use.client();
     const patient = useSmartConfigStore.use.patient();
@@ -45,7 +35,6 @@ function ItemRepopulateButton(props) {
     const fhirContext = useSmartConfigStore.use.fhirContext();
     const defaultTerminologyServerUrl = useTerminologyServerStore.use.url();
     const sourceQuestionnaire = useQuestionnaireStore.use.sourceQuestionnaire();
-    const setPopulatedContext = useQuestionnaireStore.use.setPopulatedContext();
     const [repopulationState, setRepopulationState] = useState('idle');
     // On success, set state to successful and set back to idle after 5 seconds
     useEffect(() => {
@@ -56,44 +45,37 @@ function ItemRepopulateButton(props) {
             return () => clearTimeout(timer);
         }
     }, [repopulationState]);
-    function handleClick() {
-        return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            if (!client || !patient || !user) {
-                setRepopulationState('error');
-                console.warn('ItemRepopulateButton: fhirClient, patient or user is not available. Load it via useSmartConfigStore first.');
-                return;
-            }
-            setRepopulationState('loading');
-            const { populateSuccess, populateResult } = yield populateQuestionnaire({
-                questionnaire: sourceQuestionnaire,
-                fetchResourceCallback: fetchResourceCallback,
-                fetchResourceRequestConfig: {
-                    sourceServerUrl: client.state.serverUrl,
-                    authToken: (_b = (_a = client.state.tokenResponse) === null || _a === void 0 ? void 0 : _a.access_token) !== null && _b !== void 0 ? _b : ''
-                },
-                patient: patient,
-                user: user,
-                encounter: encounter !== null && encounter !== void 0 ? encounter : undefined,
-                fhirContext: fhirContext !== null && fhirContext !== void 0 ? fhirContext : undefined,
-                fetchTerminologyCallback: fetchTerminologyCallback,
-                fetchTerminologyRequestConfig: {
-                    terminologyServerUrl: defaultTerminologyServerUrl
-                }
-            });
-            if (!populateSuccess || !populateResult) {
-                setRepopulationState('error');
-                return;
-            }
-            setRepopulationState('success');
-            const { populatedResponse, populatedContext } = populateResult;
-            // TODO eventually we want to deprecate this in 1.0.0, populatedContext is now passed to buildFormWrapper and is automatically added to the FhirPathContext
-            if (populatedContext) {
-                setPopulatedContext(populatedContext, true);
+    async function handleClick() {
+        if (!client || !patient || !user) {
+            setRepopulationState('error');
+            console.warn('ItemRepopulateButton: fhirClient, patient or user is not available. Load it via useSmartConfigStore first.');
+            return;
+        }
+        setRepopulationState('loading');
+        const { populateSuccess, populateResult } = await populateQuestionnaire({
+            questionnaire: sourceQuestionnaire,
+            fetchResourceCallback: fetchResourceCallback,
+            fetchResourceRequestConfig: {
+                sourceServerUrl: client.state.serverUrl,
+                authToken: client.state.tokenResponse?.access_token ?? ''
+            },
+            patient: patient,
+            user: user,
+            encounter: encounter ?? undefined,
+            fhirContext: fhirContext ?? undefined,
+            fetchTerminologyCallback: fetchTerminologyCallback,
+            fetchTerminologyRequestConfig: {
+                terminologyServerUrl: defaultTerminologyServerUrl
             }
-            const newQuestionnaireResponseItem = getQuestionnaireResponseItem(populatedResponse, qItem.linkId);
-            onRepopulate(newQuestionnaireResponseItem !== null && newQuestionnaireResponseItem !== void 0 ? newQuestionnaireResponseItem : null);
         });
+        if (!populateSuccess || !populateResult) {
+            setRepopulationState('error');
+            return;
+        }
+        setRepopulationState('success');
+        const { populatedResponse } = populateResult;
+        const newQuestionnaireResponseItem = getQuestionnaireResponseItem(populatedResponse, qItem.linkId);
+        onRepopulate(newQuestionnaireResponseItem ?? null);
     }
     if (!repopulatable) {
         return null;
@@ -108,7 +90,7 @@ function ItemRepopulateButton(props) {
             }, children: _jsx(TaskAltIcon, { fontSize: "small", color: "success" }) }));
     }
     if (repopulationState === 'error') {
-        return (_jsx(Box, { title: `Unable to sync item "${(_a = qItem.text) !== null && _a !== void 0 ? _a : qItem.linkId}".`, sx: {
+        return (_jsx(Box, { title: `Unable to sync item "${qItem.text ?? qItem.linkId}".`, sx: {
                 width: 30,
                 height: 30,
                 display: 'flex',

package/lib/components/FormComponents/ItemParts/ItemRepopulateButton.js.map

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

package/lib/components/FormComponents/ItemParts/ItemTextSwitcher.js

@@ -6,29 +6,30 @@ import { useParseXhtml } from '../../../hooks/useParseXhtml';
 import useDisplayCqfAndCalculatedExpression from '../../../hooks/useDisplayCqfAndCalculatedExpression';
 import { getItemTextToDisplay } from '../../../utils/itemTextToDisplay';
 const ItemTextSwitcher = memo(function ItemTextSwitcher({ qItem }) {
-    var _a;
     let itemTextToDisplay = getItemTextToDisplay(qItem);
     // Use calculatedExpressionString if available
-    const calculatedExpressionString = (_a = useDisplayCqfAndCalculatedExpression(qItem)) !== null && _a !== void 0 ? _a : '';
+    const calculatedExpressionString = useDisplayCqfAndCalculatedExpression(qItem, 'item._text') ?? '';
     if (calculatedExpressionString) {
         itemTextToDisplay = calculatedExpressionString;
     }
+    // Get aria-label text if available
+    const itemTextAriaLabel = useDisplayCqfAndCalculatedExpression(qItem, 'item._text.aria-label') ?? undefined;
     // parse XHTML if found
     const parsedXhtml = useParseXhtml(qItem);
     if (parsedXhtml) {
-        return _jsx("span", { children: parsedXhtml.content });
+        return _jsx("span", { "aria-label": itemTextAriaLabel, children: parsedXhtml.content });
     }
     // parse markdown if found
     const markdownString = getMarkdownString(qItem);
     if (markdownString) {
-        return (_jsx("span", { children: _jsx(ReactMarkdown, { children: markdownString }) }));
+        return (_jsx("span", { "aria-label": itemTextAriaLabel, children: _jsx(ReactMarkdown, { children: markdownString }) }));
     }
     // labelText is empty, return null
     if (!itemTextToDisplay) {
         return null;
     }
     // parse regular text
-    return _jsx("span", { children: itemTextToDisplay });
+    return _jsx("span", { "aria-label": itemTextAriaLabel, children: itemTextToDisplay });
 });
 export default ItemTextSwitcher;
 //# sourceMappingURL=ItemTextSwitcher.js.map

package/lib/components/FormComponents/ItemParts/ItemTextSwitcher.js.map

@@ -1 +1 @@
-{"version":3,"file":"ItemTextSwitcher.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ItemParts/ItemTextSwitcher.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,aAAa,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,oCAAoC,MAAM,qDAAqD,CAAC;AAEvG,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAMxE,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,gBAAgB,CAAC,EAAE,KAAK,EAAyB;;IACtF,IAAI,iBAAiB,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAEpD,8CAA8C;IAC9C,MAAM,0BAA0B,GAAG,MAAA,oCAAoC,CAAC,KAAK,CAAC,mCAAI,EAAE,CAAC;IACrF,IAAI,0BAA0B,EAAE,CAAC;QAC/B,iBAAiB,GAAG,0BAA0B,CAAC;IACjD,CAAC;IAED,uBAAuB;IACvB,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACzC,IAAI,WAAW,EAAE,CAAC;QAChB,OAAO,yBAAO,WAAW,CAAC,OAAO,GAAQ,CAAC;IAC5C,CAAC;IAED,0BAA0B;IAC1B,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;IAChD,IAAI,cAAc,EAAE,CAAC;QACnB,OAAO,CACL,yBACE,KAAC,aAAa,cAAE,cAAc,GAAiB,GAC1C,CACR,CAAC;IACJ,CAAC;IAED,kCAAkC;IAClC,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,qBAAqB;IACrB,OAAO,yBAAO,iBAAiB,GAAQ,CAAC;AAC1C,CAAC,CAAC,CAAC;AAEH,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"ItemTextSwitcher.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ItemParts/ItemTextSwitcher.tsx"],"names":[],"mappings":";AAAA,OAAc,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,aAAa,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,iBAAiB,EAAE,MAAM,2BAA2B,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAC7D,OAAO,oCAAoC,MAAM,qDAAqD,CAAC;AAEvG,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAMxE,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,gBAAgB,CAAC,EAAE,KAAK,EAAyB;IACtF,IAAI,iBAAiB,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAEpD,8CAA8C;IAC9C,MAAM,0BAA0B,GAC9B,oCAAoC,CAAC,KAAK,EAAE,YAAY,CAAC,IAAI,EAAE,CAAC;IAClE,IAAI,0BAA0B,EAAE,CAAC;QAC/B,iBAAiB,GAAG,0BAA0B,CAAC;IACjD,CAAC;IAED,mCAAmC;IACnC,MAAM,iBAAiB,GACrB,oCAAoC,CAAC,KAAK,EAAE,uBAAuB,CAAC,IAAI,SAAS,CAAC;IAEpF,uBAAuB;IACvB,MAAM,WAAW,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC;IACzC,IAAI,WAAW,EAAE,CAAC;QAChB,OAAO,6BAAkB,iBAAiB,YAAG,WAAW,CAAC,OAAO,GAAQ,CAAC;IAC3E,CAAC;IAED,0BAA0B;IAC1B,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC;IAChD,IAAI,cAAc,EAAE,CAAC;QACnB,OAAO,CACL,6BAAkB,iBAAiB,YACjC,KAAC,aAAa,cAAE,cAAc,GAAiB,GAC1C,CACR,CAAC;IACJ,CAAC;IAED,kCAAkC;IAClC,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACvB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,qBAAqB;IACrB,OAAO,6BAAkB,iBAAiB,YAAG,iBAAiB,GAAQ,CAAC;AACzE,CAAC,CAAC,CAAC;AAEH,eAAe,gBAAgB,CAAC"}

package/lib/components/FormComponents/ItemParts/OpenLabelField.js

@@ -1,12 +1,12 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { StandardTextField } from '../Textfield.styles';
-import { useRendererStylingStore } from '../../../stores';
+import { useRendererConfigStore } from '../../../stores';
 import InputAdornment from '@mui/material/InputAdornment';
 import { ClearButtonAdornment } from './ClearButtonAdornment';
 function OpenLabelField(props) {
     const { value, readOnly, openLabelOptionSelected, label, onInputChange } = props;
-    const readOnlyVisualStyle = useRendererStylingStore.use.readOnlyVisualStyle();
-    const textFieldWidth = useRendererStylingStore.use.textFieldWidth();
+    const readOnlyVisualStyle = useRendererConfigStore.use.readOnlyVisualStyle();
+    const textFieldWidth = useRendererConfigStore.use.textFieldWidth();
     const fieldReadOnly = !openLabelOptionSelected || readOnly;
     function handleInputChange(event) {
         onInputChange(event.target.value);
@@ -19,7 +19,7 @@ function OpenLabelField(props) {
                         } }) }))
             },
             htmlInput: {
-                'aria-label': label !== null && label !== void 0 ? label : 'Unnamed open label field'
+                'aria-label': label ?? 'Unnamed open label field'
             }
         } }));
 }

package/lib/components/FormComponents/ItemParts/OpenLabelField.js.map

@@ -1 +1 @@
-{"version":3,"file":"OpenLabelField.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ItemParts/OpenLabelField.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAU9D,SAAS,cAAc,CAAC,KAA0B;IAChD,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,uBAAuB,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;IAEjF,MAAM,mBAAmB,GAAG,uBAAuB,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAC9E,MAAM,cAAc,GAAG,uBAAuB,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;IAEpE,MAAM,aAAa,GAAG,CAAC,uBAAuB,IAAI,QAAQ,CAAC;IAE3D,SAAS,iBAAiB,CAAC,KAAoC;QAC7D,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAED,OAAO,CACL,KAAC,iBAAiB,iBACL,cAAc,KAAK,EAAE,EAChC,SAAS,QACT,QAAQ,EAAE,aAAa,IAAI,mBAAmB,KAAK,UAAU,EAC7D,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,iBAAiB,EAC3B,SAAS,QACT,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,KAAK,EACf,IAAI,EAAC,OAAO,EACZ,SAAS,EAAE;YACT,KAAK,EAAE;gBACL,QAAQ,EAAE,aAAa,IAAI,mBAAmB,KAAK,UAAU;gBAC7D,YAAY,EAAE,CACZ,KAAC,cAAc,IAAC,QAAQ,EAAC,KAAK,YAC5B,KAAC,oBAAoB,IACnB,QAAQ,EAAE,aAAa,EACvB,OAAO,EAAE,GAAG,EAAE;4BACZ,aAAa,CAAC,EAAE,CAAC,CAAC;wBACpB,CAAC,GACD,GACa,CAClB;aACF;YACD,SAAS,EAAE;gBACT,YAAY,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,0BAA0B;aAClD;SACF,GACD,CACH,CAAC;AACJ,CAAC;AAED,eAAe,cAAc,CAAC"}
+{"version":3,"file":"OpenLabelField.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ItemParts/OpenLabelField.tsx"],"names":[],"mappings":";AACA,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AACzD,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAU9D,SAAS,cAAc,CAAC,KAA0B;IAChD,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,uBAAuB,EAAE,KAAK,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;IAEjF,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAC7E,MAAM,cAAc,GAAG,sBAAsB,CAAC,GAAG,CAAC,cAAc,EAAE,CAAC;IAEnE,MAAM,aAAa,GAAG,CAAC,uBAAuB,IAAI,QAAQ,CAAC;IAE3D,SAAS,iBAAiB,CAAC,KAAoC;QAC7D,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAED,OAAO,CACL,KAAC,iBAAiB,iBACL,cAAc,KAAK,EAAE,EAChC,SAAS,QACT,QAAQ,EAAE,aAAa,IAAI,mBAAmB,KAAK,UAAU,EAC7D,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,iBAAiB,EAC3B,SAAS,QACT,cAAc,EAAE,cAAc,EAC9B,QAAQ,EAAE,KAAK,EACf,IAAI,EAAC,OAAO,EACZ,SAAS,EAAE;YACT,KAAK,EAAE;gBACL,QAAQ,EAAE,aAAa,IAAI,mBAAmB,KAAK,UAAU;gBAC7D,YAAY,EAAE,CACZ,KAAC,cAAc,IAAC,QAAQ,EAAC,KAAK,YAC5B,KAAC,oBAAoB,IACnB,QAAQ,EAAE,aAAa,EACvB,OAAO,EAAE,GAAG,EAAE;4BACZ,aAAa,CAAC,EAAE,CAAC,CAAC;wBACpB,CAAC,GACD,GACa,CAClB;aACF;YACD,SAAS,EAAE;gBACT,YAAY,EAAE,KAAK,IAAI,0BAA0B;aAClD;SACF,GACD,CACH,CAAC;AACJ,CAAC;AAED,eAAe,cAAc,CAAC"}

package/lib/components/FormComponents/ItemParts/RadioButtonWithOpenLabel.js

@@ -4,7 +4,7 @@ import ChoiceRadioSingle from '../ChoiceItems/ChoiceRadioSingle';
 import OpenLabelField from './OpenLabelField';
 function RadioButtonWithOpenLabel(props) {
     const { value, label, readOnly, isSelected, onInputChange } = props;
-    return (_jsxs(Box, { "data-test": "q-item-radio-open-label-box", children: [_jsx(ChoiceRadioSingle, { value: value !== null && value !== void 0 ? value : '', label: label + ':', readOnly: readOnly, disabledViaToggleExpression: false, fullWidth: false }), _jsx(OpenLabelField, { value: value, readOnly: readOnly, openLabelOptionSelected: isSelected, label: label, onInputChange: onInputChange })] }));
+    return (_jsxs(Box, { "data-test": "q-item-radio-open-label-box", children: [_jsx(ChoiceRadioSingle, { value: value ?? '', label: label + ':', readOnly: readOnly, disabledViaToggleExpression: false, fullWidth: false }), _jsx(OpenLabelField, { value: value, readOnly: readOnly, openLabelOptionSelected: isSelected, label: label, onInputChange: onInputChange })] }));
 }
 export default RadioButtonWithOpenLabel;
 //# sourceMappingURL=RadioButtonWithOpenLabel.js.map

package/lib/components/FormComponents/ItemParts/RadioButtonWithOpenLabel.js.map

@@ -1 +1 @@
-{"version":3,"file":"RadioButtonWithOpenLabel.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ItemParts/RadioButtonWithOpenLabel.tsx"],"names":[],"mappings":";AAkBA,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAU9C,SAAS,wBAAwB,CAAC,KAAoC;IACpE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;IAEpE,OAAO,CACL,MAAC,GAAG,iBAAW,6BAA6B,aAC1C,KAAC,iBAAiB,IAChB,KAAK,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,EAAE,EAClB,KAAK,EAAE,KAAK,GAAG,GAAG,EAClB,QAAQ,EAAE,QAAQ,EAClB,2BAA2B,EAAE,KAAK,EAClC,SAAS,EAAE,KAAK,GAChB,EACF,KAAC,cAAc,IACb,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,uBAAuB,EAAE,UAAU,EACnC,KAAK,EAAE,KAAK,EACZ,aAAa,EAAE,aAAa,GAC5B,IACE,CACP,CAAC;AACJ,CAAC;AAED,eAAe,wBAAwB,CAAC"}
+{"version":3,"file":"RadioButtonWithOpenLabel.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ItemParts/RadioButtonWithOpenLabel.tsx"],"names":[],"mappings":";AAkBA,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AACjE,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAU9C,SAAS,wBAAwB,CAAC,KAAoC;IACpE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;IAEpE,OAAO,CACL,MAAC,GAAG,iBAAW,6BAA6B,aAC1C,KAAC,iBAAiB,IAChB,KAAK,EAAE,KAAK,IAAI,EAAE,EAClB,KAAK,EAAE,KAAK,GAAG,GAAG,EAClB,QAAQ,EAAE,QAAQ,EAClB,2BAA2B,EAAE,KAAK,EAClC,SAAS,EAAE,KAAK,GAChB,EACF,KAAC,cAAc,IACb,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,uBAAuB,EAAE,UAAU,EACnC,KAAK,EAAE,KAAK,EACZ,aAAa,EAAE,aAAa,GAC5B,IACE,CACP,CAAC;AACJ,CAAC;AAED,eAAe,wBAAwB,CAAC"}

package/lib/components/FormComponents/ItemParts/RadioFormGroup.d.ts

@@ -1,5 +1,5 @@
-import type { ReactNode } from 'react';
 import type { QuestionnaireItem, QuestionnaireItemAnswerOption } from 'fhir/r4';
+import type { ReactNode } from 'react';
 interface ChoiceRadioGroupProps {
     qItem: QuestionnaireItem;
     options: QuestionnaireItemAnswerOption[];

package/lib/components/FormComponents/ItemParts/RadioFormGroup.js

@@ -1,32 +1,31 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import Box from '@mui/material/Box';
 import RadioGroup from '@mui/material/RadioGroup';
-import { StyledRequiredTypography } from '../Item.styles';
 import { ChoiceItemOrientation } from '../../../interfaces/choice.enum';
-import RadioOptionList from './RadioOptionList';
-import ExpressionUpdateFadingIcon from './ExpressionUpdateFadingIcon';
-import ClearInputButton from './ClearInputButton';
-import { useRendererStylingStore } from '../../../stores';
+import { useRendererConfigStore } from '../../../stores';
 import { getChoiceOrientation } from '../../../utils/choice';
+import { StyledRequiredTypography } from '../Item.styles';
+import ClearInputButton from './ClearInputButton';
+import ExpressionUpdateFadingIcon from './ExpressionUpdateFadingIcon';
+import RadioOptionList from './RadioOptionList';
 function RadioFormGroup(props) {
-    var _a, _b;
     const { qItem, options, valueRadio, feedback, readOnly, expressionUpdated, answerOptionsToggleExpressionsMap, isTabled, onCheckedChange, onClear, children } = props;
-    const readOnlyVisualStyle = useRendererStylingStore.use.readOnlyVisualStyle();
-    const inputsFlexGrow = useRendererStylingStore.use.inputsFlexGrow();
-    const orientation = (_a = getChoiceOrientation(qItem)) !== null && _a !== void 0 ? _a : ChoiceItemOrientation.Vertical;
+    const readOnlyVisualStyle = useRendererConfigStore.use.readOnlyVisualStyle();
+    const inputsFlexGrow = useRendererConfigStore.use.inputsFlexGrow();
+    const orientation = getChoiceOrientation(qItem) ?? ChoiceItemOrientation.Vertical;
     return (_jsxs(_Fragment, { children: [_jsxs(Box, { display: "flex", width: "100%", sx: {
                     justifyContent: 'space-between',
                     alignItems: { xs: 'start', sm: 'center' },
                     flexDirection: { xs: 'column', sm: 'row' }
-                }, children: [_jsxs(Box, { display: "flex", alignItems: "center", sx: inputsFlexGrow ? { width: '100%', flexWrap: 'nowrap' } : {}, children: [_jsxs(RadioGroup, Object.assign({ id: qItem.type + '-' + qItem.linkId }, (!isTabled
-                                ? { 'aria-labelledby': 'label-' + qItem.linkId }
-                                : { 'aria-label': (_b = qItem.text) !== null && _b !== void 0 ? _b : 'Unnamed radio group' }), { "aria-readonly": readOnly && readOnlyVisualStyle === 'readonly', row: orientation === ChoiceItemOrientation.Horizontal, sx: inputsFlexGrow ? { width: '100%', flexWrap: 'nowrap' } : {}, onChange: (e) => {
+                }, children: [_jsxs(Box, { display: "flex", alignItems: "center", sx: inputsFlexGrow ? { width: '100%', flexWrap: 'nowrap' } : {}, children: [_jsxs(RadioGroup, { id: qItem.type + '-' + qItem.linkId, ...(!isTabled
+                                    ? { 'aria-labelledby': 'label-' + qItem.linkId }
+                                    : { 'aria-label': qItem.text ?? 'Unnamed radio group' }), "aria-readonly": readOnly && readOnlyVisualStyle === 'readonly', row: orientation === ChoiceItemOrientation.Horizontal, sx: inputsFlexGrow ? { width: '100%', flexWrap: 'nowrap' } : {}, onChange: (e) => {
                                     // If item.readOnly=true, do not allow any changes
                                     if (readOnly) {
                                         return;
                                     }
                                     onCheckedChange(e.target.value);
-                                }, value: valueRadio, "data-test": "q-item-radio-group", children: [_jsx(RadioOptionList, { options: options, readOnly: readOnly, fullWidth: inputsFlexGrow, answerOptionsToggleExpressionsMap: answerOptionsToggleExpressionsMap }), children] })), _jsx(Box, { flexGrow: 1 }), _jsx(ExpressionUpdateFadingIcon, { fadeIn: expressionUpdated, disabled: readOnly })] }), _jsx(ClearInputButton, { buttonShown: !!valueRadio, readOnly: readOnly, onClear: onClear })] }), feedback ? _jsx(StyledRequiredTypography, { children: feedback }) : null] }));
+                                }, value: valueRadio, "data-test": "q-item-radio-group", children: [_jsx(RadioOptionList, { options: options, readOnly: readOnly, fullWidth: inputsFlexGrow, answerOptionsToggleExpressionsMap: answerOptionsToggleExpressionsMap }), children] }), _jsx(Box, { flexGrow: 1 }), _jsx(ExpressionUpdateFadingIcon, { fadeIn: expressionUpdated, disabled: readOnly })] }), _jsx(ClearInputButton, { buttonShown: !!valueRadio, readOnly: readOnly, onClear: onClear })] }), feedback ? _jsx(StyledRequiredTypography, { children: feedback }) : null] }));
 }
 export default RadioFormGroup;
 //# sourceMappingURL=RadioFormGroup.js.map

package/lib/components/FormComponents/ItemParts/RadioFormGroup.js.map

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

package/lib/components/FormComponents/ItemParts/RadioOptionList.js

@@ -4,10 +4,9 @@ import { isOptionDisabled } from '../../../utils/choice';
 function RadioOptionList(props) {
     const { options, readOnly, fullWidth, answerOptionsToggleExpressionsMap } = props;
     return (_jsx(_Fragment, { children: options.map((option) => {
-            var _a, _b, _c;
             const optionDisabledViaToggleExpression = isOptionDisabled(option, answerOptionsToggleExpressionsMap);
             if (option['valueCoding']) {
-                return (_jsx(ChoiceRadioSingle, { value: (_a = option.valueCoding.code) !== null && _a !== void 0 ? _a : '', label: (_b = option.valueCoding.display) !== null && _b !== void 0 ? _b : `${option.valueCoding.code}`, readOnly: readOnly, disabledViaToggleExpression: optionDisabledViaToggleExpression, fullWidth: fullWidth }, (_c = option.valueCoding.code) !== null && _c !== void 0 ? _c : ''));
+                return (_jsx(ChoiceRadioSingle, { value: option.valueCoding.code ?? '', label: option.valueCoding.display ?? `${option.valueCoding.code}`, readOnly: readOnly, disabledViaToggleExpression: optionDisabledViaToggleExpression, fullWidth: fullWidth }, option.valueCoding.code ?? ''));
             }
             if (option['valueString']) {
                 return (_jsx(ChoiceRadioSingle, { value: option.valueString, label: option.valueString, readOnly: readOnly, disabledViaToggleExpression: optionDisabledViaToggleExpression, fullWidth: fullWidth }, option.valueString));

package/lib/components/FormComponents/ItemParts/RadioOptionList.js.map

@@ -1 +1 @@
-{"version":3,"file":"RadioOptionList.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ItemParts/RadioOptionList.tsx"],"names":[],"mappings":";AAkBA,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAEjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AASzD,SAAS,eAAe,CAAC,KAA2B;IAClD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,iCAAiC,EAAE,GAAG,KAAK,CAAC;IAElF,OAAO,CACL,4BACG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;;YACtB,MAAM,iCAAiC,GAAG,gBAAgB,CACxD,MAAM,EACN,iCAAiC,CAClC,CAAC;YAEF,IAAI,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC1B,OAAO,CACL,KAAC,iBAAiB,IAEhB,KAAK,EAAE,MAAA,MAAM,CAAC,WAAW,CAAC,IAAI,mCAAI,EAAE,EACpC,KAAK,EAAE,MAAA,MAAM,CAAC,WAAW,CAAC,OAAO,mCAAI,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,EACjE,QAAQ,EAAE,QAAQ,EAClB,2BAA2B,EAAE,iCAAiC,EAC9D,SAAS,EAAE,SAAS,IALf,MAAA,MAAM,CAAC,WAAW,CAAC,IAAI,mCAAI,EAAE,CAMlC,CACH,CAAC;YACJ,CAAC;YAED,IAAI,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC1B,OAAO,CACL,KAAC,iBAAiB,IAEhB,KAAK,EAAE,MAAM,CAAC,WAAW,EACzB,KAAK,EAAE,MAAM,CAAC,WAAW,EACzB,QAAQ,EAAE,QAAQ,EAClB,2BAA2B,EAAE,iCAAiC,EAC9D,SAAS,EAAE,SAAS,IALf,MAAM,CAAC,WAAW,CAMvB,CACH,CAAC;YACJ,CAAC;YAED,IAAI,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;gBAC3B,OAAO,CACL,KAAC,iBAAiB,IAEhB,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,EACrC,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,EACrC,QAAQ,EAAE,QAAQ,EAClB,2BAA2B,EAAE,iCAAiC,EAC9D,SAAS,EAAE,SAAS,IALf,MAAM,CAAC,YAAY,CAMxB,CACH,CAAC;YACJ,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,GACD,CACJ,CAAC;AACJ,CAAC;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"RadioOptionList.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ItemParts/RadioOptionList.tsx"],"names":[],"mappings":";AAkBA,OAAO,iBAAiB,MAAM,kCAAkC,CAAC;AAEjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AASzD,SAAS,eAAe,CAAC,KAA2B;IAClD,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,iCAAiC,EAAE,GAAG,KAAK,CAAC;IAElF,OAAO,CACL,4BACG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;YACtB,MAAM,iCAAiC,GAAG,gBAAgB,CACxD,MAAM,EACN,iCAAiC,CAClC,CAAC;YAEF,IAAI,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC1B,OAAO,CACL,KAAC,iBAAiB,IAEhB,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC,IAAI,IAAI,EAAE,EACpC,KAAK,EAAE,MAAM,CAAC,WAAW,CAAC,OAAO,IAAI,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,EACjE,QAAQ,EAAE,QAAQ,EAClB,2BAA2B,EAAE,iCAAiC,EAC9D,SAAS,EAAE,SAAS,IALf,MAAM,CAAC,WAAW,CAAC,IAAI,IAAI,EAAE,CAMlC,CACH,CAAC;YACJ,CAAC;YAED,IAAI,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC1B,OAAO,CACL,KAAC,iBAAiB,IAEhB,KAAK,EAAE,MAAM,CAAC,WAAW,EACzB,KAAK,EAAE,MAAM,CAAC,WAAW,EACzB,QAAQ,EAAE,QAAQ,EAClB,2BAA2B,EAAE,iCAAiC,EAC9D,SAAS,EAAE,SAAS,IALf,MAAM,CAAC,WAAW,CAMvB,CACH,CAAC;YACJ,CAAC;YAED,IAAI,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;gBAC3B,OAAO,CACL,KAAC,iBAAiB,IAEhB,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,EACrC,KAAK,EAAE,MAAM,CAAC,YAAY,CAAC,QAAQ,EAAE,EACrC,QAAQ,EAAE,QAAQ,EAClB,2BAA2B,EAAE,iCAAiC,EAC9D,SAAS,EAAE,SAAS,IALf,MAAM,CAAC,YAAY,CAMxB,CACH,CAAC;YACJ,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,GACD,CACJ,CAAC;AACJ,CAAC;AAED,eAAe,eAAe,CAAC"}

package/lib/components/FormComponents/ItemParts/RequiredAsterisk.js

@@ -1,22 +1,11 @@
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 import { jsx as _jsx } from "react/jsx-runtime";
 import Typography from '@mui/material/Typography';
-import { useRendererStylingStore } from '../../../stores';
+import { useRendererConfigStore } from '../../../stores';
 function RequiredAsterisk(props) {
-    const { readOnly, children = '*' } = props, rest = __rest(props, ["readOnly", "children"]);
-    const readOnlyVisualStyle = useRendererStylingStore.use.readOnlyVisualStyle();
+    const { readOnly, children = '*', ...rest } = props;
+    const readOnlyVisualStyle = useRendererConfigStore.use.readOnlyVisualStyle();
     const readOnlyTextColor = readOnlyVisualStyle === 'disabled' ? 'text.disabled' : 'text.secondary';
-    return (_jsx(Typography, Object.assign({ component: "span", color: readOnly ? readOnlyTextColor : 'red' }, rest, { children: children })));
+    return (_jsx(Typography, { component: "span", color: readOnly ? readOnlyTextColor : 'error', ...rest, children: children }));
 }
 export default RequiredAsterisk;
 //# sourceMappingURL=RequiredAsterisk.js.map

package/lib/components/FormComponents/ItemParts/RequiredAsterisk.js.map

@@ -1 +1 @@
-{"version":3,"file":"RequiredAsterisk.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ItemParts/RequiredAsterisk.tsx"],"names":[],"mappings":";;;;;;;;;;;;AAmBA,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAM1D,SAAS,gBAAgB,CAAC,KAA4B;IACpD,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,GAAG,KAAc,KAAK,EAAd,IAAI,UAAK,KAAK,EAA7C,wBAAqC,CAAQ,CAAC;IAEpD,MAAM,mBAAmB,GAAG,uBAAuB,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAE9E,MAAM,iBAAiB,GAAG,mBAAmB,KAAK,UAAU,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,gBAAgB,CAAC;IAElG,OAAO,CACL,KAAC,UAAU,kBAAC,SAAS,EAAC,MAAM,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,KAAK,IAAM,IAAI,cAC/E,QAAQ,IACE,CACd,CAAC;AACJ,CAAC;AAED,eAAe,gBAAgB,CAAC"}
+{"version":3,"file":"RequiredAsterisk.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ItemParts/RequiredAsterisk.tsx"],"names":[],"mappings":";AAmBA,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAMzD,SAAS,gBAAgB,CAAC,KAA4B;IACpD,MAAM,EAAE,QAAQ,EAAE,QAAQ,GAAG,GAAG,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC;IAEpD,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAE7E,MAAM,iBAAiB,GAAG,mBAAmB,KAAK,UAAU,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,gBAAgB,CAAC;IAElG,OAAO,CACL,KAAC,UAAU,IAAC,SAAS,EAAC,MAAM,EAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,OAAO,KAAM,IAAI,YACjF,QAAQ,GACE,CACd,CAAC;AACJ,CAAC;AAED,eAAe,gBAAgB,CAAC"}

package/lib/components/FormComponents/OpenChoiceItems/OpenChoiceAutocompleteField.d.ts

@@ -1,8 +1,8 @@
 import type { AutocompleteChangeReason } from '@mui/material/Autocomplete';
 import type { Coding, QuestionnaireItem } from 'fhir/r4';
-import type { PropsWithIsTabledRequiredAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithRenderingExtensionsAttribute } from '../../../interfaces/renderProps.interface';
+import type { PropsWithIsTabledAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithRenderingExtensionsAttribute } from '../../../interfaces/renderProps.interface';
 import type { AlertColor } from '@mui/material/Alert';
-interface OpenChoiceAutocompleteFieldProps extends PropsWithIsTabledRequiredAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithRenderingExtensionsAttribute {
+interface OpenChoiceAutocompleteFieldProps extends PropsWithIsTabledAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithRenderingExtensionsAttribute {
     qItem: QuestionnaireItem;
     options: Coding[];
     valueAutocomplete: string | Coding;

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

@@ -10,26 +10,31 @@ import InfoIcon from '@mui/icons-material/Info';
 import WarningAmberIcon from '@mui/icons-material/WarningAmber';
 import DoneIcon from '@mui/icons-material/Done';
 import ErrorIcon from '@mui/icons-material/Error';
-import { useRendererStylingStore } from '../../../stores';
+import { useRendererConfigStore } from '../../../stores';
 import DisplayUnitText from '../ItemParts/DisplayUnitText';
 function OpenChoiceAutocompleteField(props) {
     const { qItem, options, valueAutocomplete, input, loading, feedback, readOnly, isTabled, renderingExtensions, onValueChange } = props;
-    const readOnlyVisualStyle = useRendererStylingStore.use.readOnlyVisualStyle();
-    const textFieldWidth = useRendererStylingStore.use.textFieldWidth();
+    const readOnlyVisualStyle = useRendererConfigStore.use.readOnlyVisualStyle();
+    const textFieldWidth = useRendererConfigStore.use.textFieldWidth();
     const { displayUnit, displayPrompt, entryFormat } = renderingExtensions;
-    return (_jsx(Autocomplete, Object.assign({}, (!isTabled && { id: `${qItem.type}-${qItem.linkId}` }), { value: valueAutocomplete, options: options, getOptionLabel: (option) => { var _a; return typeof option === 'string' ? option : ((_a = option.display) !== null && _a !== void 0 ? _a : `${option.code}`); }, disabled: readOnly && readOnlyVisualStyle === 'disabled', readOnly: readOnly && readOnlyVisualStyle === 'readonly', loading: loading, loadingText: 'Fetching results...', clearOnEscape: true, freeSolo: true, sx: { maxWidth: !isTabled ? textFieldWidth : 3000, minWidth: 220, flexGrow: 1 }, onChange: (_, newValue, reason) => onValueChange(newValue, reason), onInputChange: (_, newValue, reason) => onValueChange(newValue, reason), filterOptions: (x) => x, renderInput: (params) => {
-            var _a;
-            return (_jsx(StandardTextField, Object.assign({}, params, { multiline: true, value: input, textFieldWidth: textFieldWidth, isTabled: isTabled, size: "small", placeholder: entryFormat || displayPrompt, slotProps: {
-                    input: Object.assign(Object.assign({}, params.InputProps), { readOnly: readOnly && readOnlyVisualStyle === 'readonly', startAdornment: (_jsxs(_Fragment, { children: [!valueAutocomplete || valueAutocomplete === '' ? (_jsx(SearchIcon, { fontSize: "small", sx: { ml: 0.5 } })) : null, params.InputProps.startAdornment] })), 
-                        // Warning indicator should not show up in open-choice autocomplete
-                        endAdornment: (_jsxs(_Fragment, { children: [loading ? (_jsx(CircularProgress, { color: "inherit", size: 16 })) : feedback && feedback.color !== 'warning' ? (_jsx(Fade, { in: !!feedback, timeout: 300, children: _jsx(Tooltip, { title: feedback.message, arrow: true, sx: { ml: 1 }, children: {
-                                            info: _jsx(InfoIcon, { fontSize: "small", color: "info" }),
-                                            warning: _jsx(WarningAmberIcon, { fontSize: "small", color: "warning" }),
-                                            success: _jsx(DoneIcon, { fontSize: "small", color: "success" }),
-                                            error: _jsx(ErrorIcon, { fontSize: "small", color: "error" })
-                                        }[feedback.color] }) })) : null, params.InputProps.endAdornment, _jsx(DisplayUnitText, { readOnly: readOnly, children: displayUnit })] })), inputProps: Object.assign(Object.assign({}, params.inputProps), (isTabled ? {} : { 'aria-label': (_a = qItem.text) !== null && _a !== void 0 ? _a : `Unnamed ${qItem.type} item` })) })
-                }, "data-test": "q-item-open-choice-autocomplete-field" })));
-        } })));
+    return (_jsx(Autocomplete, { ...(!isTabled && { id: `${qItem.type}-${qItem.linkId}` }), value: valueAutocomplete, options: options, getOptionLabel: (option) => typeof option === 'string' ? option : (option.display ?? `${option.code}`), disabled: readOnly && readOnlyVisualStyle === 'disabled', readOnly: readOnly && readOnlyVisualStyle === 'readonly', loading: loading, loadingText: 'Fetching results...', clearOnEscape: true, freeSolo: true, sx: { maxWidth: !isTabled ? textFieldWidth : 3000, minWidth: 220, flexGrow: 1 }, onChange: (_, newValue, reason) => onValueChange(newValue, reason), onInputChange: (_, newValue, reason) => onValueChange(newValue, reason), filterOptions: (x) => x, renderInput: (params) => (_jsx(StandardTextField, { ...params, multiline: true, value: input, textFieldWidth: textFieldWidth, isTabled: isTabled, size: "small", placeholder: entryFormat || displayPrompt, slotProps: {
+                input: {
+                    ...params.InputProps,
+                    readOnly: readOnly && readOnlyVisualStyle === 'readonly',
+                    startAdornment: (_jsxs(_Fragment, { children: [!valueAutocomplete || valueAutocomplete === '' ? (_jsx(SearchIcon, { fontSize: "small", sx: { ml: 0.5 } })) : null, params.InputProps.startAdornment] })),
+                    // Warning indicator should not show up in open-choice autocomplete
+                    endAdornment: (_jsxs(_Fragment, { children: [loading ? (_jsx(CircularProgress, { color: "inherit", size: 16 })) : feedback && feedback.color !== 'warning' ? (_jsx(Fade, { in: !!feedback, timeout: 300, children: _jsx(Tooltip, { title: feedback.message, arrow: true, sx: { ml: 1 }, children: {
+                                        info: _jsx(InfoIcon, { fontSize: "small", color: "info" }),
+                                        warning: _jsx(WarningAmberIcon, { fontSize: "small", color: "warning" }),
+                                        success: _jsx(DoneIcon, { fontSize: "small", color: "success" }),
+                                        error: _jsx(ErrorIcon, { fontSize: "small", color: "error" })
+                                    }[feedback.color] }) })) : null, params.InputProps.endAdornment, _jsx(DisplayUnitText, { readOnly: readOnly, children: displayUnit })] })),
+                    inputProps: {
+                        ...params.inputProps,
+                        ...(isTabled ? {} : { 'aria-label': qItem.text ?? `Unnamed ${qItem.type} item` })
+                    }
+                }
+            }, "data-test": "q-item-open-choice-autocomplete-field" })) }));
 }
 export default OpenChoiceAutocompleteField;
 //# sourceMappingURL=OpenChoiceAutocompleteField.js.map

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

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

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