@aehrc/smart-forms-renderer 1.0.0-alpha.69 → 1.0.0-alpha.70
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/components/FormComponents/BooleanItem/BooleanField.js +1 -1
- package/lib/components/FormComponents/BooleanItem/BooleanField.js.map +1 -1
- package/lib/components/FormComponents/ChoiceItems/CheckboxOptionList.js +3 -3
- package/lib/components/FormComponents/ChoiceItems/CheckboxOptionList.js.map +1 -1
- package/lib/components/FormComponents/ChoiceItems/ChoiceRadioSingle.d.ts +1 -0
- package/lib/components/FormComponents/ChoiceItems/ChoiceRadioSingle.js +11 -5
- package/lib/components/FormComponents/ChoiceItems/ChoiceRadioSingle.js.map +1 -1
- package/lib/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetFields.d.ts +1 -0
- package/lib/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetFields.js +3 -2
- package/lib/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetFields.js.map +1 -1
- package/lib/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetItem.js +5 -2
- package/lib/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetItem.js.map +1 -1
- package/lib/components/FormComponents/ItemParts/CheckboxSingle.d.ts +3 -2
- package/lib/components/FormComponents/ItemParts/CheckboxSingle.js +11 -4
- package/lib/components/FormComponents/ItemParts/CheckboxSingle.js.map +1 -1
- package/lib/components/FormComponents/ItemParts/CheckboxSingleWithOpenLabel.js +8 -1
- package/lib/components/FormComponents/ItemParts/CheckboxSingleWithOpenLabel.js.map +1 -1
- package/lib/components/FormComponents/ItemParts/RadioButtonWithOpenLabel.js +1 -1
- package/lib/components/FormComponents/ItemParts/RadioButtonWithOpenLabel.js.map +1 -1
- package/lib/components/FormComponents/ItemParts/RadioOptionList.js +3 -3
- package/lib/components/FormComponents/ItemParts/RadioOptionList.js.map +1 -1
- package/lib/hooks/useAnswerOptionsToggleExpressions.d.ts +2 -1
- package/lib/hooks/useAnswerOptionsToggleExpressions.js +9 -0
- package/lib/hooks/useAnswerOptionsToggleExpressions.js.map +1 -1
- package/lib/utils/choice.d.ts +1 -0
- package/lib/utils/choice.js +12 -1
- package/lib/utils/choice.js.map +1 -1
- package/package.json +1 -1
- package/src/components/FormComponents/BooleanItem/BooleanField.tsx +4 -0
- package/src/components/FormComponents/ChoiceItems/CheckboxOptionList.tsx +6 -3
- package/src/components/FormComponents/ChoiceItems/ChoiceRadioSingle.tsx +15 -8
- package/src/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetFields.tsx +6 -0
- package/src/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetItem.tsx +8 -1
- package/src/components/FormComponents/ItemParts/CheckboxSingle.tsx +26 -8
- package/src/components/FormComponents/ItemParts/CheckboxSingleWithOpenLabel.tsx +14 -3
- package/src/components/FormComponents/ItemParts/RadioButtonWithOpenLabel.tsx +1 -0
- package/src/components/FormComponents/ItemParts/RadioOptionList.tsx +6 -3
- package/src/hooks/useAnswerOptionsToggleExpressions.ts +11 -1
- package/src/utils/choice.ts +19 -1
|
@@ -61,7 +61,7 @@ const BooleanField = memo(function BooleanField(props) {
|
|
|
61
61
|
return;
|
|
62
62
|
}
|
|
63
63
|
onCheckedChange(e.target.value);
|
|
64
|
-
}, value: selection, children: reverseBooleanYesNo ? (_jsxs(_Fragment, { children: [_jsx(ChoiceRadioSingle, { value: "false", label: "No", readOnly: readOnly, fullWidth: inputsFlexGrow }), _jsx(ChoiceRadioSingle, { value: "true", label: "Yes", readOnly: readOnly, fullWidth: inputsFlexGrow })] })) : (_jsxs(_Fragment, { children: [_jsx(ChoiceRadioSingle, { value: "true", label: "Yes", readOnly: readOnly, fullWidth: inputsFlexGrow }), _jsx(ChoiceRadioSingle, { value: "false", label: "No", readOnly: readOnly, fullWidth: inputsFlexGrow })] })) }), _jsx(Box, { flexGrow: 1 }), _jsx(FadingCheckIcon, { fadeIn: calcExpUpdated, disabled: readOnly })] })), _jsx(ClearInputButton, { buttonShown: valueBoolean !== undefined, readOnly: readOnly, onClear: onClear })] }), feedback ? _jsx(StyledRequiredTypography, { children: feedback }) : null] }));
|
|
64
|
+
}, value: selection, children: reverseBooleanYesNo ? (_jsxs(_Fragment, { children: [_jsx(ChoiceRadioSingle, { value: "false", label: "No", readOnly: readOnly, disabledViaToggleExpression: false, fullWidth: inputsFlexGrow }), _jsx(ChoiceRadioSingle, { value: "true", label: "Yes", readOnly: readOnly, disabledViaToggleExpression: false, fullWidth: inputsFlexGrow })] })) : (_jsxs(_Fragment, { children: [_jsx(ChoiceRadioSingle, { value: "true", label: "Yes", readOnly: readOnly, disabledViaToggleExpression: false, fullWidth: inputsFlexGrow }), _jsx(ChoiceRadioSingle, { value: "false", label: "No", readOnly: readOnly, disabledViaToggleExpression: false, fullWidth: inputsFlexGrow })] })) }), _jsx(Box, { flexGrow: 1 }), _jsx(FadingCheckIcon, { fadeIn: calcExpUpdated, disabled: readOnly })] })), _jsx(ClearInputButton, { buttonShown: valueBoolean !== undefined, readOnly: readOnly, onClear: onClear })] }), feedback ? _jsx(StyledRequiredTypography, { children: feedback }) : null] }));
|
|
65
65
|
});
|
|
66
66
|
export default BooleanField;
|
|
67
67
|
//# sourceMappingURL=BooleanField.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"BooleanField.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/BooleanItem/BooleanField.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"BooleanField.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/BooleanItem/BooleanField.tsx"],"names":[],"mappings":"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"}
|
|
@@ -7,13 +7,13 @@ function CheckboxOptionList(props) {
|
|
|
7
7
|
var _a, _b, _c, _d, _e;
|
|
8
8
|
const optionDisabledViaToggleExpression = isOptionDisabled(option, answerOptionsToggleExpressionsMap);
|
|
9
9
|
if (option['valueCoding']) {
|
|
10
|
-
return (_jsx(CheckboxSingle, { value: (_b = (_a = option.valueCoding.code) !== null && _a !== void 0 ? _a : option.valueCoding.display) !== null && _b !== void 0 ? _b : '', label: (_c = option.valueCoding.display) !== null && _c !== void 0 ? _c : `${option.valueCoding.code}`, readOnly: readOnly
|
|
10
|
+
return (_jsx(CheckboxSingle, { value: (_b = (_a = option.valueCoding.code) !== null && _a !== void 0 ? _a : option.valueCoding.display) !== null && _b !== void 0 ? _b : '', label: (_c = option.valueCoding.display) !== null && _c !== void 0 ? _c : `${option.valueCoding.code}`, readOnly: readOnly, disabledViaToggleExpression: optionDisabledViaToggleExpression, fullWidth: fullWidth, isChecked: answers.some((answer) => JSON.stringify(answer) === JSON.stringify(option)), onCheckedChange: onCheckedChange }, (_e = (_d = option.valueCoding.code) !== null && _d !== void 0 ? _d : option.valueCoding.display) !== null && _e !== void 0 ? _e : ''));
|
|
11
11
|
}
|
|
12
12
|
if (option['valueString']) {
|
|
13
|
-
return (_jsx(CheckboxSingle, { value: option.valueString, label: option.valueString, readOnly: readOnly
|
|
13
|
+
return (_jsx(CheckboxSingle, { value: option.valueString, label: option.valueString, readOnly: readOnly, disabledViaToggleExpression: optionDisabledViaToggleExpression, fullWidth: fullWidth, isChecked: answers.some((answer) => answer.valueString === option.valueString), onCheckedChange: onCheckedChange }, option.valueString));
|
|
14
14
|
}
|
|
15
15
|
if (option['valueInteger']) {
|
|
16
|
-
return (_jsx(CheckboxSingle, { value: option.valueInteger.toString(), label: option.valueInteger.toString(), readOnly: readOnly
|
|
16
|
+
return (_jsx(CheckboxSingle, { value: option.valueInteger.toString(), label: option.valueInteger.toString(), readOnly: readOnly, disabledViaToggleExpression: optionDisabledViaToggleExpression, fullWidth: fullWidth, isChecked: answers.some((answer) => answer.valueInteger === option.valueInteger), onCheckedChange: onCheckedChange }, option.valueInteger));
|
|
17
17
|
}
|
|
18
18
|
return null;
|
|
19
19
|
}) }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheckboxOptionList.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/CheckboxOptionList.tsx"],"names":[],"mappings":";AAmBA,OAAO,cAAc,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAWzD,SAAS,kBAAkB,CAAC,KAA8B;IACxD,MAAM,EACJ,OAAO,EACP,OAAO,EACP,QAAQ,EACR,SAAS,EACT,iCAAiC,EACjC,eAAe,EAChB,GAAG,KAAK,CAAC;IAEV,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,cAAc,IAEb,KAAK,EAAE,MAAA,MAAA,MAAM,CAAC,WAAW,CAAC,IAAI,mCAAI,MAAM,CAAC,WAAW,CAAC,OAAO,mCAAI,EAAE,EAClE,KAAK,EAAE,MAAA,MAAM,CAAC,WAAW,CAAC,OAAO,mCAAI,GAAG,MAAM,CAAC,WAAW,CAAC,IAAI,EAAE,EACjE,QAAQ,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"CheckboxOptionList.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/CheckboxOptionList.tsx"],"names":[],"mappings":";AAmBA,OAAO,cAAc,MAAM,6BAA6B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAWzD,SAAS,kBAAkB,CAAC,KAA8B;IACxD,MAAM,EACJ,OAAO,EACP,OAAO,EACP,QAAQ,EACR,SAAS,EACT,iCAAiC,EACjC,eAAe,EAChB,GAAG,KAAK,CAAC;IAEV,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,cAAc,IAEb,KAAK,EAAE,MAAA,MAAA,MAAM,CAAC,WAAW,CAAC,IAAI,mCAAI,MAAM,CAAC,WAAW,CAAC,OAAO,mCAAI,EAAE,EAClE,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,EACpB,SAAS,EAAE,OAAO,CAAC,IAAI,CACrB,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAC9D,EACD,eAAe,EAAE,eAAe,IAT3B,MAAA,MAAA,MAAM,CAAC,WAAW,CAAC,IAAI,mCAAI,MAAM,CAAC,WAAW,CAAC,OAAO,mCAAI,EAAE,CAUhE,CACH,CAAC;YACJ,CAAC;YAED,IAAI,MAAM,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC1B,OAAO,CACL,KAAC,cAAc,IAEb,KAAK,EAAE,MAAM,CAAC,WAAW,EACzB,KAAK,EAAE,MAAM,CAAC,WAAW,EACzB,QAAQ,EAAE,QAAQ,EAClB,2BAA2B,EAAE,iCAAiC,EAC9D,SAAS,EAAE,SAAS,EACpB,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,WAAW,KAAK,MAAM,CAAC,WAAW,CAAC,EAC9E,eAAe,EAAE,eAAe,IAP3B,MAAM,CAAC,WAAW,CAQvB,CACH,CAAC;YACJ,CAAC;YAED,IAAI,MAAM,CAAC,cAAc,CAAC,EAAE,CAAC;gBAC3B,OAAO,CACL,KAAC,cAAc,IAEb,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,EACpB,SAAS,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,YAAY,KAAK,MAAM,CAAC,YAAY,CAAC,EAChF,eAAe,EAAE,eAAe,IAP3B,MAAM,CAAC,YAAY,CAQxB,CACH,CAAC;YACJ,CAAC;YAED,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,GACD,CACJ,CAAC;AACJ,CAAC;AAED,eAAe,kBAAkB,CAAC"}
|
|
@@ -3,12 +3,18 @@ import FormControlLabel from '@mui/material/FormControlLabel';
|
|
|
3
3
|
import { useRendererStylingStore } from '../../../stores';
|
|
4
4
|
import { StandardRadio } from '../../Radio.styles';
|
|
5
5
|
function ChoiceRadioSingle(props) {
|
|
6
|
-
const { value, label, readOnly, fullWidth } = props;
|
|
6
|
+
const { value, label, readOnly, disabledViaToggleExpression, fullWidth } = props;
|
|
7
7
|
const readOnlyVisualStyle = useRendererStylingStore.use.readOnlyVisualStyle();
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
8
|
+
// When an option is disabled via answerOptionsToggleExpression, it should truly be "disabled", regardless of readOnlyVisualStyle.
|
|
9
|
+
// Both isHtmlDisabled and isHtmlReadOnly are mutually exclusive.
|
|
10
|
+
const readOnlyWithDisabledStyle = readOnly && readOnlyVisualStyle === 'disabled';
|
|
11
|
+
const readOnlyWithReadOnlyStyle = readOnly && readOnlyVisualStyle === 'readonly';
|
|
12
|
+
const isHtmlDisabled = readOnlyWithDisabledStyle || disabledViaToggleExpression;
|
|
13
|
+
const isHtmlReadOnly = readOnlyWithReadOnlyStyle && !disabledViaToggleExpression;
|
|
14
|
+
return (_jsx(FormControlLabel, { sx: Object.assign({ width: fullWidth ? '100%' : 'unset' }, (isHtmlReadOnly && {
|
|
15
|
+
cursor: 'default',
|
|
16
|
+
color: 'text.secondary'
|
|
17
|
+
})), disabled: isHtmlDisabled, value: value, control: _jsx(StandardRadio, { size: "small", readOnly: isHtmlReadOnly }), label: label }));
|
|
12
18
|
}
|
|
13
19
|
export default ChoiceRadioSingle;
|
|
14
20
|
//# sourceMappingURL=ChoiceRadioSingle.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChoiceRadioSingle.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceRadioSingle.tsx"],"names":[],"mappings":";AAkBA,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"ChoiceRadioSingle.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceRadioSingle.tsx"],"names":[],"mappings":";AAkBA,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAUnD,SAAS,iBAAiB,CAAC,KAA6B;IACtD,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,2BAA2B,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAEjF,MAAM,mBAAmB,GAAG,uBAAuB,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAE9E,kIAAkI;IAClI,iEAAiE;IACjE,MAAM,yBAAyB,GAAG,QAAQ,IAAI,mBAAmB,KAAK,UAAU,CAAC;IACjF,MAAM,yBAAyB,GAAG,QAAQ,IAAI,mBAAmB,KAAK,UAAU,CAAC;IAEjF,MAAM,cAAc,GAAG,yBAAyB,IAAI,2BAA2B,CAAC;IAChF,MAAM,cAAc,GAAG,yBAAyB,IAAI,CAAC,2BAA2B,CAAC;IAEjF,OAAO,CACL,KAAC,gBAAgB,IACf,EAAE,kBACA,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,IAChC,CAAC,cAAc,IAAI;YACpB,MAAM,EAAE,SAAS;YACjB,KAAK,EAAE,gBAAgB;SACxB,CAAC,GAEJ,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,KAAC,aAAa,IAAC,IAAI,EAAC,OAAO,EAAC,QAAQ,EAAE,cAAc,GAAI,EACjE,KAAK,EAAE,KAAK,GACZ,CACH,CAAC;AACJ,CAAC;AAED,eAAe,iBAAiB,CAAC"}
|
|
@@ -9,6 +9,7 @@ interface ChoiceSelectAnswerValueSetFieldsProps extends PropsWithIsTabledRequire
|
|
|
9
9
|
feedback: string;
|
|
10
10
|
readOnly: boolean;
|
|
11
11
|
expressionUpdated: boolean;
|
|
12
|
+
answerOptionsToggleExpressionsMap: Map<string, boolean>;
|
|
12
13
|
onSelectChange: (newValue: Coding | null) => void;
|
|
13
14
|
}
|
|
14
15
|
declare function ChoiceSelectAnswerValueSetFields(props: ChoiceSelectAnswerValueSetFieldsProps): import("react/jsx-runtime").JSX.Element;
|
|
@@ -8,13 +8,14 @@ import FadingCheckIcon from '../ItemParts/FadingCheckIcon';
|
|
|
8
8
|
import { useRendererStylingStore } from '../../../stores';
|
|
9
9
|
import { StyledRequiredTypography } from '../Item.styles';
|
|
10
10
|
import DisplayUnitText from '../ItemParts/DisplayUnitText';
|
|
11
|
+
import { isCodingDisabled } from '../../../utils/choice';
|
|
11
12
|
function ChoiceSelectAnswerValueSetFields(props) {
|
|
12
|
-
const { qItem, codings, valueCoding, terminologyError, feedback, readOnly, expressionUpdated, isTabled, renderingExtensions, onSelectChange } = props;
|
|
13
|
+
const { qItem, codings, valueCoding, terminologyError, feedback, readOnly, expressionUpdated, isTabled, renderingExtensions, answerOptionsToggleExpressionsMap, onSelectChange } = props;
|
|
13
14
|
const readOnlyVisualStyle = useRendererStylingStore.use.readOnlyVisualStyle();
|
|
14
15
|
const textFieldWidth = useRendererStylingStore.use.textFieldWidth();
|
|
15
16
|
const { displayUnit, displayPrompt, entryFormat } = renderingExtensions;
|
|
16
17
|
if (codings.length > 0) {
|
|
17
|
-
return (_jsxs(_Fragment, { children: [_jsx(Autocomplete, Object.assign({}, (!isTabled && { id: `${qItem.type}-${qItem.linkId}` }), { options: codings, 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) => {
|
|
18
|
+
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) => {
|
|
18
19
|
var _a;
|
|
19
20
|
return (_jsx(StandardTextField, Object.assign({ textFieldWidth: textFieldWidth, isTabled: isTabled, placeholder: entryFormat || displayPrompt }, params, { slotProps: {
|
|
20
21
|
input: Object.assign(Object.assign({}, params.InputProps), { readOnly: readOnly && readOnlyVisualStyle === 'readonly', endAdornment: (_jsxs(_Fragment, { children: [params.InputProps.endAdornment, _jsx(FadingCheckIcon, { 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' }) })
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChoiceSelectAnswerValueSetFields.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetFields.tsx"],"names":[],"mappings":";AAkBA,OAAO,YAAY,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,gBAAgB,MAAM,kCAAkC,CAAC;AAChE,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAOlD,OAAO,eAAe,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,wBAAwB,EAAE,MAAM,gBAAgB,CAAC;AAC1D,OAAO,eAAe,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"ChoiceSelectAnswerValueSetFields.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetFields.tsx"],"names":[],"mappings":"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"}
|
|
@@ -27,6 +27,7 @@ import useCodingCalculatedExpression from '../../../hooks/useCodingCalculatedExp
|
|
|
27
27
|
import { convertCodingsToAnswerOptions, findInAnswerOptions } from '../../../utils/choice';
|
|
28
28
|
import useValidationFeedback from '../../../hooks/useValidationFeedback';
|
|
29
29
|
import ItemLabel from '../ItemParts/ItemLabel';
|
|
30
|
+
import useAnswerOptionsToggleExpressions from '../../../hooks/useAnswerOptionsToggleExpressions';
|
|
30
31
|
function ChoiceSelectAnswerValueSetItem(props) {
|
|
31
32
|
var _a, _b, _c, _d, _e;
|
|
32
33
|
const { qItem, qrItem, itemPath, isRepeated, isTabled, renderingExtensions, parentIsReadOnly, feedbackFromParent, onQrItemChange } = props;
|
|
@@ -74,6 +75,8 @@ function ChoiceSelectAnswerValueSetItem(props) {
|
|
|
74
75
|
onQrItemChange(createEmptyQrItem(qItem, answerKey), itemPath);
|
|
75
76
|
}
|
|
76
77
|
});
|
|
78
|
+
// Process answerOptionsToggleExpressions
|
|
79
|
+
const { answerOptionsToggleExpressionsMap, answerOptionsToggleExpUpdated } = useAnswerOptionsToggleExpressions(qItem.linkId);
|
|
77
80
|
// Event handlers
|
|
78
81
|
function handleChange(newValue) {
|
|
79
82
|
if (newValue) {
|
|
@@ -83,9 +86,9 @@ function ChoiceSelectAnswerValueSetItem(props) {
|
|
|
83
86
|
onQrItemChange(createEmptyQrItem(qItem, answerKey));
|
|
84
87
|
}
|
|
85
88
|
if (isRepeated) {
|
|
86
|
-
return (_jsx(ChoiceSelectAnswerValueSetFields, { qItem: qItem, codings: codings, valueCoding: valueCoding, terminologyError: terminologyError, feedback: feedback, readOnly: readOnly, expressionUpdated: calcExpUpdated || dynamicCodingsUpdated, isTabled: isTabled, renderingExtensions: renderingExtensions, onSelectChange: handleChange }));
|
|
89
|
+
return (_jsx(ChoiceSelectAnswerValueSetFields, { qItem: qItem, codings: codings, valueCoding: valueCoding, terminologyError: terminologyError, feedback: feedback, readOnly: readOnly, expressionUpdated: calcExpUpdated || dynamicCodingsUpdated || answerOptionsToggleExpUpdated, isTabled: isTabled, renderingExtensions: renderingExtensions, answerOptionsToggleExpressionsMap: answerOptionsToggleExpressionsMap, onSelectChange: handleChange }));
|
|
87
90
|
}
|
|
88
|
-
return (_jsx(FullWidthFormComponentBox, { "data-test": "q-item-choice-select-answer-value-set-box", onClick: () => onFocusLinkId(qItem.linkId), children: _jsx(ItemFieldGrid, { qItem: qItem, readOnly: readOnly, labelChildren: _jsx(ItemLabel, { qItem: qItem, readOnly: readOnly }), fieldChildren: _jsx(ChoiceSelectAnswerValueSetFields, { qItem: qItem, codings: codings, valueCoding: valueCoding, terminologyError: terminologyError, feedback: feedback, readOnly: readOnly, expressionUpdated: calcExpUpdated || dynamicCodingsUpdated, isTabled: isTabled, renderingExtensions: renderingExtensions, onSelectChange: handleChange }) }) }));
|
|
91
|
+
return (_jsx(FullWidthFormComponentBox, { "data-test": "q-item-choice-select-answer-value-set-box", onClick: () => onFocusLinkId(qItem.linkId), children: _jsx(ItemFieldGrid, { qItem: qItem, readOnly: readOnly, labelChildren: _jsx(ItemLabel, { qItem: qItem, readOnly: readOnly }), fieldChildren: _jsx(ChoiceSelectAnswerValueSetFields, { qItem: qItem, codings: codings, valueCoding: valueCoding, terminologyError: terminologyError, feedback: feedback, readOnly: readOnly, expressionUpdated: calcExpUpdated || dynamicCodingsUpdated, isTabled: isTabled, renderingExtensions: renderingExtensions, answerOptionsToggleExpressionsMap: answerOptionsToggleExpressionsMap, onSelectChange: handleChange }) }) }));
|
|
89
92
|
}
|
|
90
93
|
export default ChoiceSelectAnswerValueSetItem;
|
|
91
94
|
//# sourceMappingURL=ChoiceSelectAnswerValueSetItem.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChoiceSelectAnswerValueSetItem.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetItem.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAc,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAGlD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,kBAAkB,MAAM,mCAAmC,CAAC;AAUnE,OAAO,gCAAgC,MAAM,oCAAoC,CAAC;AAClF,OAAO,WAAW,MAAM,4BAA4B,CAAC;AACrD,OAAO,aAAa,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,6BAA6B,MAAM,8CAA8C,CAAC;AACzF,OAAO,EAAE,6BAA6B,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC3F,OAAO,qBAAqB,MAAM,sCAAsC,CAAC;AACzE,OAAO,SAAS,MAAM,wBAAwB,CAAC;
|
|
1
|
+
{"version":3,"file":"ChoiceSelectAnswerValueSetItem.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetItem.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAc,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAGlD,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,yBAAyB,EAAE,MAAM,kBAAkB,CAAC;AAC7D,OAAO,kBAAkB,MAAM,mCAAmC,CAAC;AAUnE,OAAO,gCAAgC,MAAM,oCAAoC,CAAC;AAClF,OAAO,WAAW,MAAM,4BAA4B,CAAC;AACrD,OAAO,aAAa,MAAM,4BAA4B,CAAC;AACvD,OAAO,EAAE,qBAAqB,EAAE,MAAM,iBAAiB,CAAC;AACxD,OAAO,6BAA6B,MAAM,8CAA8C,CAAC;AACzF,OAAO,EAAE,6BAA6B,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC3F,OAAO,qBAAqB,MAAM,sCAAsC,CAAC;AACzE,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAC/C,OAAO,iCAAiC,MAAM,kDAAkD,CAAC;AAcjG,SAAS,8BAA8B,CAAC,KAA0C;;IAChF,MAAM,EACJ,KAAK,EACL,MAAM,EACN,QAAQ,EACR,UAAU,EACV,QAAQ,EACR,mBAAmB,EACnB,gBAAgB,EAChB,kBAAkB,EAClB,cAAc,EACf,GAAG,KAAK,CAAC;IAEV,MAAM,aAAa,GAAG,qBAAqB,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;IAEhE,mBAAmB;IACnB,MAAM,SAAS,GAAG,MAAA,MAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,0CAAG,CAAC,CAAC,0CAAE,EAAE,CAAC;IAC1C,MAAM,cAAc,GAAG,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;IAErE,IAAI,WAAW,GAAkB,IAAI,CAAC;IACtC,IAAI,cAAc,CAAC,MAAM,EAAE,CAAC;QAC1B,WAAW,GAAG,MAAA,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,mCAAI,IAAI,CAAC;IAC7D,CAAC;IAED,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;IAEtD,4BAA4B;IAC5B,MAAM,QAAQ,GAAG,qBAAqB,CAAC,KAAK,EAAE,kBAAkB,EAAE,EAAE,CAAC,CAAC;IAEtE,oCAAoC;IACpC,MAAM,EAAE,OAAO,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAEvF,WAAW,GAAG,OAAO,CAAC,GAAG,EAAE;QACzB,MAAM,kBAAkB,GAAG,OAAO,CAAC,IAAI,CACrC,CAAC,aAAa,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,MAAK,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,CAAA,CAC5D,CAAC;QACF,OAAO,kBAAkB,aAAlB,kBAAkB,cAAlB,kBAAkB,GAAI,WAAW,CAAC;IAC3C,CAAC,EAAE,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC;IAE3B,sDAAsD;IACtD,8DAA8D;IAC9D,+DAA+D;IAC/D,SAAS,CACP,GAAG,EAAE;QACH,IAAI,cAAc,CAAC,MAAM,IAAI,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;YAClE,cAAc,CAAC,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;IACD,qCAAqC;IACrC,uDAAuD;IACvD,EAAE,CACH,CAAC;IAEF,MAAM,aAAa,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,6BAA6B,CAAC,OAAO,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEvF,iCAAiC;IACjC,MAAM,EAAE,cAAc,EAAE,GAAG,6BAA6B,CAAC;QACvD,KAAK,EAAE,KAAK;QACZ,aAAa,EAAE,MAAA,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,IAAI,mCAAI,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,mCAAI,EAAE;QAC9D,8BAA8B,EAAE,CAAC,cAAc,EAAE,EAAE;YACjD,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;gBACvB,MAAM,QAAQ,GAAG,mBAAmB,CAAC,aAAa,EAAE,cAAc,CAAC,CAAC;gBACpE,cAAc,CACZ,QAAQ;oBACN,CAAC,iCAAM,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC,KAAE,MAAM,EAAE,iCAAM,QAAQ,KAAE,EAAE,EAAE,SAAS,IAAG,IACpF,CAAC,CAAC,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC,EACvC,QAAQ,CACT,CAAC;YACJ,CAAC;QACH,CAAC;QACD,4BAA4B,EAAE,GAAG,EAAE;YACjC,cAAc,CAAC,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC;QAChE,CAAC;KACF,CAAC,CAAC;IAEH,yCAAyC;IACzC,MAAM,EAAE,iCAAiC,EAAE,6BAA6B,EAAE,GACxE,iCAAiC,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAElD,iBAAiB;IACjB,SAAS,YAAY,CAAC,QAAuB;QAC3C,IAAI,QAAQ,EAAE,CAAC;YACb,cAAc,iCACT,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC,KACtC,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,QAAQ,EAAE,CAAC,IAClD,CAAC;YACH,OAAO;QACT,CAAC;QACD,cAAc,CAAC,iBAAiB,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,UAAU,EAAE,CAAC;QACf,OAAO,CACL,KAAC,gCAAgC,IAC/B,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,iBAAiB,EAAE,cAAc,IAAI,qBAAqB,IAAI,6BAA6B,EAC3F,QAAQ,EAAE,QAAQ,EAClB,mBAAmB,EAAE,mBAAmB,EACxC,iCAAiC,EAAE,iCAAiC,EACpE,cAAc,EAAE,YAAY,GAC5B,CACH,CAAC;IACJ,CAAC;IAED,OAAO,CACL,KAAC,yBAAyB,iBACd,2CAA2C,EACrD,OAAO,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,YAC1C,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,gCAAgC,IAC/B,KAAK,EAAE,KAAK,EACZ,OAAO,EAAE,OAAO,EAChB,WAAW,EAAE,WAAW,EACxB,gBAAgB,EAAE,gBAAgB,EAClC,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,QAAQ,EAClB,iBAAiB,EAAE,cAAc,IAAI,qBAAqB,EAC1D,QAAQ,EAAE,QAAQ,EAClB,mBAAmB,EAAE,mBAAmB,EACxC,iCAAiC,EAAE,iCAAiC,EACpE,cAAc,EAAE,YAAY,GAC5B,GAEJ,GACwB,CAC7B,CAAC;AACJ,CAAC;AAED,eAAe,8BAA8B,CAAC"}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
interface
|
|
1
|
+
interface CheckboxSingleProps {
|
|
2
2
|
value: string;
|
|
3
3
|
label: string;
|
|
4
4
|
readOnly: boolean;
|
|
5
|
+
disabledViaToggleExpression: boolean;
|
|
5
6
|
fullWidth: boolean;
|
|
6
7
|
isChecked: boolean;
|
|
7
8
|
onCheckedChange: (value: string) => unknown;
|
|
8
9
|
}
|
|
9
|
-
declare function CheckboxSingle(props:
|
|
10
|
+
declare function CheckboxSingle(props: CheckboxSingleProps): import("react/jsx-runtime").JSX.Element;
|
|
10
11
|
export default CheckboxSingle;
|
|
@@ -3,11 +3,18 @@ import FormControlLabel from '@mui/material/FormControlLabel';
|
|
|
3
3
|
import { StandardCheckbox } from '../../Checkbox.styles';
|
|
4
4
|
import { useRendererStylingStore } from '../../../stores';
|
|
5
5
|
function CheckboxSingle(props) {
|
|
6
|
-
const { value, label, readOnly, fullWidth, isChecked, onCheckedChange } = props;
|
|
6
|
+
const { value, label, readOnly, disabledViaToggleExpression, fullWidth, isChecked, onCheckedChange } = props;
|
|
7
7
|
const readOnlyVisualStyle = useRendererStylingStore.use.readOnlyVisualStyle();
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
8
|
+
// When an option is disabled via toggle expression, it should truly be "disabled", regardless of readOnlyVisualStyle.
|
|
9
|
+
// Both isDisabled and isReadOnly are mutually exclusive.
|
|
10
|
+
const readOnlyWithDisabledStyle = readOnly && readOnlyVisualStyle === 'disabled';
|
|
11
|
+
const readOnlyWithReadOnlyStyle = readOnly && readOnlyVisualStyle === 'readonly';
|
|
12
|
+
const isHtmlDisabled = readOnlyWithDisabledStyle || disabledViaToggleExpression;
|
|
13
|
+
const isHtmlReadOnly = readOnlyWithReadOnlyStyle && !disabledViaToggleExpression;
|
|
14
|
+
return (_jsx(FormControlLabel, { sx: Object.assign({ width: fullWidth ? '100%' : 'unset' }, (isHtmlReadOnly && {
|
|
15
|
+
cursor: 'default',
|
|
16
|
+
color: 'text.secondary'
|
|
17
|
+
})), disabled: isHtmlDisabled, value: value, control: _jsx(StandardCheckbox, { size: "small", checked: isChecked, readOnly: isHtmlReadOnly, "aria-readonly": isHtmlReadOnly, role: "checkbox", "aria-checked": isChecked, onChange: () => {
|
|
11
18
|
// If item.readOnly=true, do not allow any changes
|
|
12
19
|
if (readOnly) {
|
|
13
20
|
return;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheckboxSingle.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ItemParts/CheckboxSingle.tsx"],"names":[],"mappings":";AAkBA,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"CheckboxSingle.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ItemParts/CheckboxSingle.tsx"],"names":[],"mappings":";AAkBA,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAY1D,SAAS,cAAc,CAAC,KAA0B;IAChD,MAAM,EACJ,KAAK,EACL,KAAK,EACL,QAAQ,EACR,2BAA2B,EAC3B,SAAS,EACT,SAAS,EACT,eAAe,EAChB,GAAG,KAAK,CAAC;IAEV,MAAM,mBAAmB,GAAG,uBAAuB,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAE9E,sHAAsH;IACtH,yDAAyD;IACzD,MAAM,yBAAyB,GAAG,QAAQ,IAAI,mBAAmB,KAAK,UAAU,CAAC;IACjF,MAAM,yBAAyB,GAAG,QAAQ,IAAI,mBAAmB,KAAK,UAAU,CAAC;IAEjF,MAAM,cAAc,GAAG,yBAAyB,IAAI,2BAA2B,CAAC;IAChF,MAAM,cAAc,GAAG,yBAAyB,IAAI,CAAC,2BAA2B,CAAC;IAEjF,OAAO,CACL,KAAC,gBAAgB,IACf,EAAE,kBACA,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,IAChC,CAAC,cAAc,IAAI;YACpB,MAAM,EAAE,SAAS;YACjB,KAAK,EAAE,gBAAgB;SACxB,CAAC,GAEJ,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,KAAK,EACZ,OAAO,EACL,KAAC,gBAAgB,IACf,IAAI,EAAC,OAAO,EACZ,OAAO,EAAE,SAAS,EAClB,QAAQ,EAAE,cAAc,mBACT,cAAc,EAC7B,IAAI,EAAC,UAAU,kBACD,SAAS,EACvB,QAAQ,EAAE,GAAG,EAAE;gBACb,kDAAkD;gBAClD,IAAI,QAAQ,EAAE,CAAC;oBACb,OAAO;gBACT,CAAC;gBAED,eAAe,CAAC,KAAK,CAAC,CAAC;YACzB,CAAC,EACD,SAAS,EAAE;gBACT,KAAK,EAAE;oBACL,YAAY,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,kBAAkB;iBAC1C;aACF,GACD,EAEJ,KAAK,EAAE,KAAK,GACZ,CACH,CAAC;AACJ,CAAC;AAED,eAAe,cAAc,CAAC"}
|
|
@@ -7,10 +7,17 @@ import OpenLabelField from './OpenLabelField';
|
|
|
7
7
|
function CheckboxSingleWithOpenLabel(props) {
|
|
8
8
|
const { value, label, isChecked, readOnly, onCheckedChange, onInputChange } = props;
|
|
9
9
|
const readOnlyVisualStyle = useRendererStylingStore.use.readOnlyVisualStyle();
|
|
10
|
+
// When an option is disabled via toggle expression, it should truly be "disabled", regardless of readOnlyVisualStyle.
|
|
11
|
+
// Both isDisabled and isReadOnly are mutually exclusive.
|
|
12
|
+
const isHtmlDisabled = readOnly && readOnlyVisualStyle === 'disabled';
|
|
13
|
+
const isHtmlReadOnly = readOnly && readOnlyVisualStyle === 'readonly';
|
|
10
14
|
function handleCheckedChange(event) {
|
|
11
15
|
onCheckedChange(event.target.checked);
|
|
12
16
|
}
|
|
13
|
-
return (_jsxs(Box, { "data-test": "q-item-checkbox-open-label-box", children: [_jsx(FormControlLabel, {
|
|
17
|
+
return (_jsxs(Box, { "data-test": "q-item-checkbox-open-label-box", children: [_jsx(FormControlLabel, { sx: Object.assign({}, (isHtmlReadOnly && {
|
|
18
|
+
cursor: 'default',
|
|
19
|
+
color: 'text.secondary'
|
|
20
|
+
})), disabled: isHtmlDisabled, control: _jsx(StandardCheckbox, { size: "small", checked: isChecked, readOnly: isHtmlReadOnly, "aria-readonly": isHtmlReadOnly, role: "checkbox", "aria-checked": isChecked, onChange: handleCheckedChange, slotProps: {
|
|
14
21
|
input: {
|
|
15
22
|
'aria-label': label !== null && label !== void 0 ? label : 'Unnamed checkbox'
|
|
16
23
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"CheckboxSingleWithOpenLabel.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ItemParts/CheckboxSingleWithOpenLabel.tsx"],"names":[],"mappings":";AAmBA,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAW9C,SAAS,2BAA2B,CAAC,KAAY;IAC/C,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,eAAe,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;IAEpF,MAAM,mBAAmB,GAAG,uBAAuB,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAE9E,SAAS,mBAAmB,CAAC,KAAoC;QAC/D,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,OAAO,CACL,MAAC,GAAG,iBAAW,gCAAgC,aAC7C,KAAC,gBAAgB,IACf,
|
|
1
|
+
{"version":3,"file":"CheckboxSingleWithOpenLabel.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ItemParts/CheckboxSingleWithOpenLabel.tsx"],"names":[],"mappings":";AAmBA,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,iBAAiB,CAAC;AAC1D,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,cAAc,MAAM,kBAAkB,CAAC;AAW9C,SAAS,2BAA2B,CAAC,KAAY;IAC/C,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,QAAQ,EAAE,eAAe,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;IAEpF,MAAM,mBAAmB,GAAG,uBAAuB,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAE9E,sHAAsH;IACtH,yDAAyD;IACzD,MAAM,cAAc,GAAG,QAAQ,IAAI,mBAAmB,KAAK,UAAU,CAAC;IACtE,MAAM,cAAc,GAAG,QAAQ,IAAI,mBAAmB,KAAK,UAAU,CAAC;IAEtE,SAAS,mBAAmB,CAAC,KAAoC;QAC/D,eAAe,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;IACxC,CAAC;IAED,OAAO,CACL,MAAC,GAAG,iBAAW,gCAAgC,aAC7C,KAAC,gBAAgB,IACf,EAAE,oBACG,CAAC,cAAc,IAAI;oBACpB,MAAM,EAAE,SAAS;oBACjB,KAAK,EAAE,gBAAgB;iBACxB,CAAC,GAEJ,QAAQ,EAAE,cAAc,EACxB,OAAO,EACL,KAAC,gBAAgB,IACf,IAAI,EAAC,OAAO,EACZ,OAAO,EAAE,SAAS,EAClB,QAAQ,EAAE,cAAc,mBACT,cAAc,EAC7B,IAAI,EAAC,UAAU,kBACD,SAAS,EACvB,QAAQ,EAAE,mBAAmB,EAC7B,SAAS,EAAE;wBACT,KAAK,EAAE;4BACL,YAAY,EAAE,KAAK,aAAL,KAAK,cAAL,KAAK,GAAI,kBAAkB;yBAC1C;qBACF,GACD,EAEJ,KAAK,EAAE,KAAK,GAAG,GAAG,GAClB,EACF,KAAC,cAAc,IACb,KAAK,EAAE,KAAK,EACZ,QAAQ,EAAE,QAAQ,EAClB,uBAAuB,EAAE,SAAS,EAClC,KAAK,EAAE,KAAK,EACZ,aAAa,EAAE,aAAa,GAC5B,IACE,CACP,CAAC;AACJ,CAAC;AAED,eAAe,2BAA2B,CAAC"}
|
|
@@ -4,7 +4,7 @@ import ChoiceRadioSingle from '../ChoiceItems/ChoiceRadioSingle';
|
|
|
4
4
|
import OpenLabelField from './OpenLabelField';
|
|
5
5
|
function RadioButtonWithOpenLabel(props) {
|
|
6
6
|
const { value, label, readOnly, isSelected, onInputChange } = props;
|
|
7
|
-
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, fullWidth: false }), _jsx(OpenLabelField, { value: value, readOnly: readOnly, openLabelOptionSelected: isSelected, label: label, onInputChange: onInputChange })] }));
|
|
7
|
+
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 })] }));
|
|
8
8
|
}
|
|
9
9
|
export default RadioButtonWithOpenLabel;
|
|
10
10
|
//# sourceMappingURL=RadioButtonWithOpenLabel.js.map
|
|
@@ -1 +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,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"}
|
|
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"}
|
|
@@ -7,13 +7,13 @@ function RadioOptionList(props) {
|
|
|
7
7
|
var _a, _b, _c;
|
|
8
8
|
const optionDisabledViaToggleExpression = isOptionDisabled(option, answerOptionsToggleExpressionsMap);
|
|
9
9
|
if (option['valueCoding']) {
|
|
10
|
-
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
|
|
10
|
+
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 : ''));
|
|
11
11
|
}
|
|
12
12
|
if (option['valueString']) {
|
|
13
|
-
return (_jsx(ChoiceRadioSingle, { value: option.valueString, label: option.valueString, readOnly: readOnly
|
|
13
|
+
return (_jsx(ChoiceRadioSingle, { value: option.valueString, label: option.valueString, readOnly: readOnly, disabledViaToggleExpression: optionDisabledViaToggleExpression, fullWidth: fullWidth }, option.valueString));
|
|
14
14
|
}
|
|
15
15
|
if (option['valueInteger']) {
|
|
16
|
-
return (_jsx(ChoiceRadioSingle, { value: option.valueInteger.toString(), label: option.valueInteger.toString(), readOnly: readOnly
|
|
16
|
+
return (_jsx(ChoiceRadioSingle, { value: option.valueInteger.toString(), label: option.valueInteger.toString(), readOnly: readOnly, disabledViaToggleExpression: optionDisabledViaToggleExpression, fullWidth: fullWidth }, option.valueInteger));
|
|
17
17
|
}
|
|
18
18
|
return null;
|
|
19
19
|
}) }));
|
|
@@ -1 +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,
|
|
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"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
|
-
import type { QuestionnaireItemAnswerOption } from 'fhir/r4';
|
|
1
|
+
import type { Coding, QuestionnaireItemAnswerOption } from 'fhir/r4';
|
|
2
2
|
declare function useAnswerOptionsToggleExpressions(linkId: string): {
|
|
3
3
|
answerOptionsToggleExpressionsMap: Map<string, boolean>;
|
|
4
4
|
answerOptionsToggleExpUpdated: boolean;
|
|
5
5
|
};
|
|
6
6
|
export declare function generateOptionKey(option: QuestionnaireItemAnswerOption): string;
|
|
7
|
+
export declare function generateCodingKey(coding: Coding): string;
|
|
7
8
|
export default useAnswerOptionsToggleExpressions;
|
|
@@ -63,5 +63,14 @@ export function generateOptionKey(option) {
|
|
|
63
63
|
}
|
|
64
64
|
return ''; // In case no valid value is found
|
|
65
65
|
}
|
|
66
|
+
// An exact copy of isOptionDisabled, except instead of using QuestionnaireItemAnswerOption it usings codings.
|
|
67
|
+
// It makes sense to align these two functions when we refactor choice/open-choice items https://github.com/aehrc/smart-forms/issues/1205
|
|
68
|
+
export function generateCodingKey(coding) {
|
|
69
|
+
var _a, _b, _c;
|
|
70
|
+
const systemKey = (_a = coding.system) !== null && _a !== void 0 ? _a : ' ';
|
|
71
|
+
const codeKey = (_b = coding.code) !== null && _b !== void 0 ? _b : ' ';
|
|
72
|
+
const displayKey = (_c = coding.display) !== null && _c !== void 0 ? _c : ' ';
|
|
73
|
+
return `coding:${systemKey}-${codeKey}-${displayKey}`;
|
|
74
|
+
}
|
|
66
75
|
export default useAnswerOptionsToggleExpressions;
|
|
67
76
|
//# sourceMappingURL=useAnswerOptionsToggleExpressions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useAnswerOptionsToggleExpressions.js","sourceRoot":"","sources":["../../src/hooks/useAnswerOptionsToggleExpressions.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"useAnswerOptionsToggleExpressions.js","sourceRoot":"","sources":["../../src/hooks/useAnswerOptionsToggleExpressions.ts"],"names":[],"mappings":"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"}
|
package/lib/utils/choice.d.ts
CHANGED
|
@@ -43,3 +43,4 @@ export declare function updateChoiceCheckboxAnswers(changedValue: string, answer
|
|
|
43
43
|
*/
|
|
44
44
|
export declare function getChoiceOrientation(qItem: QuestionnaireItem): ChoiceItemOrientation | null;
|
|
45
45
|
export declare function isOptionDisabled(option: QuestionnaireItemAnswerOption, answerOptionsToggleExpressionsMap: Map<string, boolean>): boolean;
|
|
46
|
+
export declare function isCodingDisabled(coding: Coding, answerOptionsToggleExpressionsMap: Map<string, boolean>): boolean;
|
package/lib/utils/choice.js
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { ChoiceItemControl, ChoiceItemOrientation } from '../interfaces/choice.enum';
|
|
2
2
|
import { isSpecificItemControl } from './itemControl';
|
|
3
3
|
import { getRelevantCodingProperties } from './valueSet';
|
|
4
|
-
import { generateOptionKey } from '../hooks/useAnswerOptionsToggleExpressions';
|
|
4
|
+
import { generateCodingKey, generateOptionKey } from '../hooks/useAnswerOptionsToggleExpressions';
|
|
5
5
|
/**
|
|
6
6
|
* Convert codings to Questionnaire answer options
|
|
7
7
|
*
|
|
@@ -173,4 +173,15 @@ export function isOptionDisabled(option, answerOptionsToggleExpressionsMap) {
|
|
|
173
173
|
return (answerOptionsToggleExpressionsMap.has(optionKey) &&
|
|
174
174
|
!answerOptionsToggleExpressionsMap.get(optionKey));
|
|
175
175
|
}
|
|
176
|
+
// An exact copy of isOptionDisabled, except instead of using QuestionnaireItemAnswerOption it usings codings.
|
|
177
|
+
// It makes sense to align these two functions when we refactor choice/open-choice items https://github.com/aehrc/smart-forms/issues/1205
|
|
178
|
+
export function isCodingDisabled(coding, answerOptionsToggleExpressionsMap) {
|
|
179
|
+
// all options are enabled by default if answerOptionsToggleExpressions are present
|
|
180
|
+
if (answerOptionsToggleExpressionsMap.size === 0) {
|
|
181
|
+
return false;
|
|
182
|
+
}
|
|
183
|
+
const optionKey = generateCodingKey(coding);
|
|
184
|
+
return (answerOptionsToggleExpressionsMap.has(optionKey) &&
|
|
185
|
+
!answerOptionsToggleExpressionsMap.get(optionKey));
|
|
186
|
+
}
|
|
176
187
|
//# sourceMappingURL=choice.js.map
|
package/lib/utils/choice.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"choice.js","sourceRoot":"","sources":["../../src/utils/choice.ts"],"names":[],"mappings":"AAwBA,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACrF,OAAO,EAAE,qBAAqB,EAAE,MAAM,eAAe,CAAC;AACtD,OAAO,EAAE,2BAA2B,EAAE,MAAM,YAAY,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,4CAA4C,CAAC;
|
|
1
|
+
{"version":3,"file":"choice.js","sourceRoot":"","sources":["../../src/utils/choice.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -123,12 +123,14 @@ const BooleanField = memo(function BooleanField(props: BooleanFieldProps) {
|
|
|
123
123
|
value="false"
|
|
124
124
|
label="No"
|
|
125
125
|
readOnly={readOnly}
|
|
126
|
+
disabledViaToggleExpression={false}
|
|
126
127
|
fullWidth={inputsFlexGrow}
|
|
127
128
|
/>
|
|
128
129
|
<ChoiceRadioSingle
|
|
129
130
|
value="true"
|
|
130
131
|
label="Yes"
|
|
131
132
|
readOnly={readOnly}
|
|
133
|
+
disabledViaToggleExpression={false}
|
|
132
134
|
fullWidth={inputsFlexGrow}
|
|
133
135
|
/>
|
|
134
136
|
</>
|
|
@@ -138,12 +140,14 @@ const BooleanField = memo(function BooleanField(props: BooleanFieldProps) {
|
|
|
138
140
|
value="true"
|
|
139
141
|
label="Yes"
|
|
140
142
|
readOnly={readOnly}
|
|
143
|
+
disabledViaToggleExpression={false}
|
|
141
144
|
fullWidth={inputsFlexGrow}
|
|
142
145
|
/>
|
|
143
146
|
<ChoiceRadioSingle
|
|
144
147
|
value="false"
|
|
145
148
|
label="No"
|
|
146
149
|
readOnly={readOnly}
|
|
150
|
+
disabledViaToggleExpression={false}
|
|
147
151
|
fullWidth={inputsFlexGrow}
|
|
148
152
|
/>
|
|
149
153
|
</>
|
|
@@ -53,7 +53,8 @@ function CheckboxOptionList(props: CheckboxOptionListProps) {
|
|
|
53
53
|
key={option.valueCoding.code ?? option.valueCoding.display ?? ''}
|
|
54
54
|
value={option.valueCoding.code ?? option.valueCoding.display ?? ''}
|
|
55
55
|
label={option.valueCoding.display ?? `${option.valueCoding.code}`}
|
|
56
|
-
readOnly={readOnly
|
|
56
|
+
readOnly={readOnly}
|
|
57
|
+
disabledViaToggleExpression={optionDisabledViaToggleExpression}
|
|
57
58
|
fullWidth={fullWidth}
|
|
58
59
|
isChecked={answers.some(
|
|
59
60
|
(answer) => JSON.stringify(answer) === JSON.stringify(option)
|
|
@@ -69,7 +70,8 @@ function CheckboxOptionList(props: CheckboxOptionListProps) {
|
|
|
69
70
|
key={option.valueString}
|
|
70
71
|
value={option.valueString}
|
|
71
72
|
label={option.valueString}
|
|
72
|
-
readOnly={readOnly
|
|
73
|
+
readOnly={readOnly}
|
|
74
|
+
disabledViaToggleExpression={optionDisabledViaToggleExpression}
|
|
73
75
|
fullWidth={fullWidth}
|
|
74
76
|
isChecked={answers.some((answer) => answer.valueString === option.valueString)}
|
|
75
77
|
onCheckedChange={onCheckedChange}
|
|
@@ -83,7 +85,8 @@ function CheckboxOptionList(props: CheckboxOptionListProps) {
|
|
|
83
85
|
key={option.valueInteger}
|
|
84
86
|
value={option.valueInteger.toString()}
|
|
85
87
|
label={option.valueInteger.toString()}
|
|
86
|
-
readOnly={readOnly
|
|
88
|
+
readOnly={readOnly}
|
|
89
|
+
disabledViaToggleExpression={optionDisabledViaToggleExpression}
|
|
87
90
|
fullWidth={fullWidth}
|
|
88
91
|
isChecked={answers.some((answer) => answer.valueInteger === option.valueInteger)}
|
|
89
92
|
onCheckedChange={onCheckedChange}
|
|
@@ -24,28 +24,35 @@ interface ChoiceRadioSingleProps {
|
|
|
24
24
|
value: string;
|
|
25
25
|
label: string;
|
|
26
26
|
readOnly: boolean;
|
|
27
|
+
disabledViaToggleExpression: boolean;
|
|
27
28
|
fullWidth: boolean;
|
|
28
29
|
}
|
|
29
30
|
|
|
30
31
|
function ChoiceRadioSingle(props: ChoiceRadioSingleProps) {
|
|
31
|
-
const { value, label, readOnly, fullWidth } = props;
|
|
32
|
+
const { value, label, readOnly, disabledViaToggleExpression, fullWidth } = props;
|
|
32
33
|
|
|
33
34
|
const readOnlyVisualStyle = useRendererStylingStore.use.readOnlyVisualStyle();
|
|
34
35
|
|
|
36
|
+
// When an option is disabled via answerOptionsToggleExpression, it should truly be "disabled", regardless of readOnlyVisualStyle.
|
|
37
|
+
// Both isHtmlDisabled and isHtmlReadOnly are mutually exclusive.
|
|
38
|
+
const readOnlyWithDisabledStyle = readOnly && readOnlyVisualStyle === 'disabled';
|
|
39
|
+
const readOnlyWithReadOnlyStyle = readOnly && readOnlyVisualStyle === 'readonly';
|
|
40
|
+
|
|
41
|
+
const isHtmlDisabled = readOnlyWithDisabledStyle || disabledViaToggleExpression;
|
|
42
|
+
const isHtmlReadOnly = readOnlyWithReadOnlyStyle && !disabledViaToggleExpression;
|
|
43
|
+
|
|
35
44
|
return (
|
|
36
45
|
<FormControlLabel
|
|
37
46
|
sx={{
|
|
38
47
|
width: fullWidth ? '100%' : 'unset',
|
|
39
|
-
...(
|
|
40
|
-
|
|
41
|
-
|
|
48
|
+
...(isHtmlReadOnly && {
|
|
49
|
+
cursor: 'default',
|
|
50
|
+
color: 'text.secondary'
|
|
42
51
|
})
|
|
43
52
|
}}
|
|
44
|
-
disabled={
|
|
53
|
+
disabled={isHtmlDisabled}
|
|
45
54
|
value={value}
|
|
46
|
-
control={
|
|
47
|
-
<StandardRadio size="small" readOnly={readOnly && readOnlyVisualStyle === 'readonly'} />
|
|
48
|
-
}
|
|
55
|
+
control={<StandardRadio size="small" readOnly={isHtmlReadOnly} />}
|
|
49
56
|
label={label}
|
|
50
57
|
/>
|
|
51
58
|
);
|
|
@@ -31,6 +31,7 @@ import FadingCheckIcon from '../ItemParts/FadingCheckIcon';
|
|
|
31
31
|
import { useRendererStylingStore } from '../../../stores';
|
|
32
32
|
import { StyledRequiredTypography } from '../Item.styles';
|
|
33
33
|
import DisplayUnitText from '../ItemParts/DisplayUnitText';
|
|
34
|
+
import { isCodingDisabled } from '../../../utils/choice';
|
|
34
35
|
|
|
35
36
|
interface ChoiceSelectAnswerValueSetFieldsProps
|
|
36
37
|
extends PropsWithIsTabledRequiredAttribute,
|
|
@@ -42,6 +43,7 @@ interface ChoiceSelectAnswerValueSetFieldsProps
|
|
|
42
43
|
feedback: string;
|
|
43
44
|
readOnly: boolean;
|
|
44
45
|
expressionUpdated: boolean;
|
|
46
|
+
answerOptionsToggleExpressionsMap: Map<string, boolean>;
|
|
45
47
|
onSelectChange: (newValue: Coding | null) => void;
|
|
46
48
|
}
|
|
47
49
|
|
|
@@ -56,6 +58,7 @@ function ChoiceSelectAnswerValueSetFields(props: ChoiceSelectAnswerValueSetField
|
|
|
56
58
|
expressionUpdated,
|
|
57
59
|
isTabled,
|
|
58
60
|
renderingExtensions,
|
|
61
|
+
answerOptionsToggleExpressionsMap,
|
|
59
62
|
onSelectChange
|
|
60
63
|
} = props;
|
|
61
64
|
|
|
@@ -70,6 +73,9 @@ function ChoiceSelectAnswerValueSetFields(props: ChoiceSelectAnswerValueSetField
|
|
|
70
73
|
<Autocomplete
|
|
71
74
|
{...(!isTabled && { id: `${qItem.type}-${qItem.linkId}` })}
|
|
72
75
|
options={codings}
|
|
76
|
+
getOptionDisabled={(coding) =>
|
|
77
|
+
isCodingDisabled(coding, answerOptionsToggleExpressionsMap)
|
|
78
|
+
}
|
|
73
79
|
getOptionLabel={(option) => option.display ?? `${option.code}`}
|
|
74
80
|
value={valueCoding ?? null}
|
|
75
81
|
onChange={(_, newValue) => onSelectChange(newValue)}
|
|
@@ -38,6 +38,7 @@ import useCodingCalculatedExpression from '../../../hooks/useCodingCalculatedExp
|
|
|
38
38
|
import { convertCodingsToAnswerOptions, findInAnswerOptions } from '../../../utils/choice';
|
|
39
39
|
import useValidationFeedback from '../../../hooks/useValidationFeedback';
|
|
40
40
|
import ItemLabel from '../ItemParts/ItemLabel';
|
|
41
|
+
import useAnswerOptionsToggleExpressions from '../../../hooks/useAnswerOptionsToggleExpressions';
|
|
41
42
|
|
|
42
43
|
interface ChoiceSelectAnswerValueSetItemProps
|
|
43
44
|
extends PropsWithQrItemChangeHandler,
|
|
@@ -126,6 +127,10 @@ function ChoiceSelectAnswerValueSetItem(props: ChoiceSelectAnswerValueSetItemPro
|
|
|
126
127
|
}
|
|
127
128
|
});
|
|
128
129
|
|
|
130
|
+
// Process answerOptionsToggleExpressions
|
|
131
|
+
const { answerOptionsToggleExpressionsMap, answerOptionsToggleExpUpdated } =
|
|
132
|
+
useAnswerOptionsToggleExpressions(qItem.linkId);
|
|
133
|
+
|
|
129
134
|
// Event handlers
|
|
130
135
|
function handleChange(newValue: Coding | null) {
|
|
131
136
|
if (newValue) {
|
|
@@ -147,9 +152,10 @@ function ChoiceSelectAnswerValueSetItem(props: ChoiceSelectAnswerValueSetItemPro
|
|
|
147
152
|
terminologyError={terminologyError}
|
|
148
153
|
feedback={feedback}
|
|
149
154
|
readOnly={readOnly}
|
|
150
|
-
expressionUpdated={calcExpUpdated || dynamicCodingsUpdated}
|
|
155
|
+
expressionUpdated={calcExpUpdated || dynamicCodingsUpdated || answerOptionsToggleExpUpdated}
|
|
151
156
|
isTabled={isTabled}
|
|
152
157
|
renderingExtensions={renderingExtensions}
|
|
158
|
+
answerOptionsToggleExpressionsMap={answerOptionsToggleExpressionsMap}
|
|
153
159
|
onSelectChange={handleChange}
|
|
154
160
|
/>
|
|
155
161
|
);
|
|
@@ -174,6 +180,7 @@ function ChoiceSelectAnswerValueSetItem(props: ChoiceSelectAnswerValueSetItemPro
|
|
|
174
180
|
expressionUpdated={calcExpUpdated || dynamicCodingsUpdated}
|
|
175
181
|
isTabled={isTabled}
|
|
176
182
|
renderingExtensions={renderingExtensions}
|
|
183
|
+
answerOptionsToggleExpressionsMap={answerOptionsToggleExpressionsMap}
|
|
177
184
|
onSelectChange={handleChange}
|
|
178
185
|
/>
|
|
179
186
|
}
|
|
@@ -20,36 +20,54 @@ import FormControlLabel from '@mui/material/FormControlLabel';
|
|
|
20
20
|
import { StandardCheckbox } from '../../Checkbox.styles';
|
|
21
21
|
import { useRendererStylingStore } from '../../../stores';
|
|
22
22
|
|
|
23
|
-
interface
|
|
23
|
+
interface CheckboxSingleProps {
|
|
24
24
|
value: string;
|
|
25
25
|
label: string;
|
|
26
26
|
readOnly: boolean;
|
|
27
|
+
disabledViaToggleExpression: boolean;
|
|
27
28
|
fullWidth: boolean;
|
|
28
29
|
isChecked: boolean;
|
|
29
30
|
onCheckedChange: (value: string) => unknown;
|
|
30
31
|
}
|
|
31
32
|
|
|
32
|
-
function CheckboxSingle(props:
|
|
33
|
-
const {
|
|
33
|
+
function CheckboxSingle(props: CheckboxSingleProps) {
|
|
34
|
+
const {
|
|
35
|
+
value,
|
|
36
|
+
label,
|
|
37
|
+
readOnly,
|
|
38
|
+
disabledViaToggleExpression,
|
|
39
|
+
fullWidth,
|
|
40
|
+
isChecked,
|
|
41
|
+
onCheckedChange
|
|
42
|
+
} = props;
|
|
34
43
|
|
|
35
44
|
const readOnlyVisualStyle = useRendererStylingStore.use.readOnlyVisualStyle();
|
|
36
45
|
|
|
46
|
+
// When an option is disabled via toggle expression, it should truly be "disabled", regardless of readOnlyVisualStyle.
|
|
47
|
+
// Both isDisabled and isReadOnly are mutually exclusive.
|
|
48
|
+
const readOnlyWithDisabledStyle = readOnly && readOnlyVisualStyle === 'disabled';
|
|
49
|
+
const readOnlyWithReadOnlyStyle = readOnly && readOnlyVisualStyle === 'readonly';
|
|
50
|
+
|
|
51
|
+
const isHtmlDisabled = readOnlyWithDisabledStyle || disabledViaToggleExpression;
|
|
52
|
+
const isHtmlReadOnly = readOnlyWithReadOnlyStyle && !disabledViaToggleExpression;
|
|
53
|
+
|
|
37
54
|
return (
|
|
38
55
|
<FormControlLabel
|
|
39
56
|
sx={{
|
|
40
57
|
width: fullWidth ? '100%' : 'unset',
|
|
41
|
-
...(
|
|
42
|
-
|
|
58
|
+
...(isHtmlReadOnly && {
|
|
59
|
+
cursor: 'default',
|
|
60
|
+
color: 'text.secondary'
|
|
43
61
|
})
|
|
44
62
|
}}
|
|
45
|
-
disabled={
|
|
63
|
+
disabled={isHtmlDisabled}
|
|
46
64
|
value={value}
|
|
47
65
|
control={
|
|
48
66
|
<StandardCheckbox
|
|
49
67
|
size="small"
|
|
50
68
|
checked={isChecked}
|
|
51
|
-
readOnly={
|
|
52
|
-
aria-readonly={
|
|
69
|
+
readOnly={isHtmlReadOnly}
|
|
70
|
+
aria-readonly={isHtmlReadOnly}
|
|
53
71
|
role="checkbox"
|
|
54
72
|
aria-checked={isChecked}
|
|
55
73
|
onChange={() => {
|
|
@@ -37,6 +37,11 @@ function CheckboxSingleWithOpenLabel(props: Props) {
|
|
|
37
37
|
|
|
38
38
|
const readOnlyVisualStyle = useRendererStylingStore.use.readOnlyVisualStyle();
|
|
39
39
|
|
|
40
|
+
// When an option is disabled via toggle expression, it should truly be "disabled", regardless of readOnlyVisualStyle.
|
|
41
|
+
// Both isDisabled and isReadOnly are mutually exclusive.
|
|
42
|
+
const isHtmlDisabled = readOnly && readOnlyVisualStyle === 'disabled';
|
|
43
|
+
const isHtmlReadOnly = readOnly && readOnlyVisualStyle === 'readonly';
|
|
44
|
+
|
|
40
45
|
function handleCheckedChange(event: ChangeEvent<HTMLInputElement>) {
|
|
41
46
|
onCheckedChange(event.target.checked);
|
|
42
47
|
}
|
|
@@ -44,13 +49,19 @@ function CheckboxSingleWithOpenLabel(props: Props) {
|
|
|
44
49
|
return (
|
|
45
50
|
<Box data-test="q-item-checkbox-open-label-box">
|
|
46
51
|
<FormControlLabel
|
|
47
|
-
|
|
52
|
+
sx={{
|
|
53
|
+
...(isHtmlReadOnly && {
|
|
54
|
+
cursor: 'default',
|
|
55
|
+
color: 'text.secondary'
|
|
56
|
+
})
|
|
57
|
+
}}
|
|
58
|
+
disabled={isHtmlDisabled}
|
|
48
59
|
control={
|
|
49
60
|
<StandardCheckbox
|
|
50
61
|
size="small"
|
|
51
62
|
checked={isChecked}
|
|
52
|
-
readOnly={
|
|
53
|
-
aria-readonly={
|
|
63
|
+
readOnly={isHtmlReadOnly}
|
|
64
|
+
aria-readonly={isHtmlReadOnly}
|
|
54
65
|
role="checkbox"
|
|
55
66
|
aria-checked={isChecked}
|
|
56
67
|
onChange={handleCheckedChange}
|
|
@@ -44,7 +44,8 @@ function RadioOptionList(props: RadioOptionListProps) {
|
|
|
44
44
|
key={option.valueCoding.code ?? ''}
|
|
45
45
|
value={option.valueCoding.code ?? ''}
|
|
46
46
|
label={option.valueCoding.display ?? `${option.valueCoding.code}`}
|
|
47
|
-
readOnly={readOnly
|
|
47
|
+
readOnly={readOnly}
|
|
48
|
+
disabledViaToggleExpression={optionDisabledViaToggleExpression}
|
|
48
49
|
fullWidth={fullWidth}
|
|
49
50
|
/>
|
|
50
51
|
);
|
|
@@ -56,7 +57,8 @@ function RadioOptionList(props: RadioOptionListProps) {
|
|
|
56
57
|
key={option.valueString}
|
|
57
58
|
value={option.valueString}
|
|
58
59
|
label={option.valueString}
|
|
59
|
-
readOnly={readOnly
|
|
60
|
+
readOnly={readOnly}
|
|
61
|
+
disabledViaToggleExpression={optionDisabledViaToggleExpression}
|
|
60
62
|
fullWidth={fullWidth}
|
|
61
63
|
/>
|
|
62
64
|
);
|
|
@@ -68,7 +70,8 @@ function RadioOptionList(props: RadioOptionListProps) {
|
|
|
68
70
|
key={option.valueInteger}
|
|
69
71
|
value={option.valueInteger.toString()}
|
|
70
72
|
label={option.valueInteger.toString()}
|
|
71
|
-
readOnly={readOnly
|
|
73
|
+
readOnly={readOnly}
|
|
74
|
+
disabledViaToggleExpression={optionDisabledViaToggleExpression}
|
|
72
75
|
fullWidth={fullWidth}
|
|
73
76
|
/>
|
|
74
77
|
);
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { useQuestionnaireStore } from '../stores';
|
|
2
|
-
import type { QuestionnaireItemAnswerOption } from 'fhir/r4';
|
|
2
|
+
import type { Coding, QuestionnaireItemAnswerOption } from 'fhir/r4';
|
|
3
3
|
import { useEffect, useRef, useState } from 'react';
|
|
4
4
|
|
|
5
5
|
function useAnswerOptionsToggleExpressions(linkId: string): {
|
|
@@ -85,4 +85,14 @@ export function generateOptionKey(option: QuestionnaireItemAnswerOption): string
|
|
|
85
85
|
return ''; // In case no valid value is found
|
|
86
86
|
}
|
|
87
87
|
|
|
88
|
+
// An exact copy of isOptionDisabled, except instead of using QuestionnaireItemAnswerOption it usings codings.
|
|
89
|
+
// It makes sense to align these two functions when we refactor choice/open-choice items https://github.com/aehrc/smart-forms/issues/1205
|
|
90
|
+
export function generateCodingKey(coding: Coding): string {
|
|
91
|
+
const systemKey = coding.system ?? ' ';
|
|
92
|
+
const codeKey = coding.code ?? ' ';
|
|
93
|
+
const displayKey = coding.display ?? ' ';
|
|
94
|
+
|
|
95
|
+
return `coding:${systemKey}-${codeKey}-${displayKey}`;
|
|
96
|
+
}
|
|
97
|
+
|
|
88
98
|
export default useAnswerOptionsToggleExpressions;
|
package/src/utils/choice.ts
CHANGED
|
@@ -25,7 +25,7 @@ import type {
|
|
|
25
25
|
import { ChoiceItemControl, ChoiceItemOrientation } from '../interfaces/choice.enum';
|
|
26
26
|
import { isSpecificItemControl } from './itemControl';
|
|
27
27
|
import { getRelevantCodingProperties } from './valueSet';
|
|
28
|
-
import { generateOptionKey } from '../hooks/useAnswerOptionsToggleExpressions';
|
|
28
|
+
import { generateCodingKey, generateOptionKey } from '../hooks/useAnswerOptionsToggleExpressions';
|
|
29
29
|
|
|
30
30
|
/**
|
|
31
31
|
* Convert codings to Questionnaire answer options
|
|
@@ -252,3 +252,21 @@ export function isOptionDisabled(
|
|
|
252
252
|
!answerOptionsToggleExpressionsMap.get(optionKey)
|
|
253
253
|
);
|
|
254
254
|
}
|
|
255
|
+
|
|
256
|
+
// An exact copy of isOptionDisabled, except instead of using QuestionnaireItemAnswerOption it usings codings.
|
|
257
|
+
// It makes sense to align these two functions when we refactor choice/open-choice items https://github.com/aehrc/smart-forms/issues/1205
|
|
258
|
+
export function isCodingDisabled(
|
|
259
|
+
coding: Coding,
|
|
260
|
+
answerOptionsToggleExpressionsMap: Map<string, boolean>
|
|
261
|
+
): boolean {
|
|
262
|
+
// all options are enabled by default if answerOptionsToggleExpressions are present
|
|
263
|
+
if (answerOptionsToggleExpressionsMap.size === 0) {
|
|
264
|
+
return false;
|
|
265
|
+
}
|
|
266
|
+
|
|
267
|
+
const optionKey = generateCodingKey(coding);
|
|
268
|
+
return (
|
|
269
|
+
answerOptionsToggleExpressionsMap.has(optionKey) &&
|
|
270
|
+
!answerOptionsToggleExpressionsMap.get(optionKey)
|
|
271
|
+
);
|
|
272
|
+
}
|