@aehrc/smart-forms-renderer 1.2.13 → 1.2.14
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/ChoiceItems/ChoiceSelectAnswerValueSetFields.js +1 -1
- package/lib/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetFields.js.map +1 -1
- package/lib/components/FormComponents/GridGroup/GridGroup.js +1 -1
- package/lib/components/FormComponents/GroupItem/GroupItem.styles.js +1 -1
- package/lib/components/FormComponents/GroupItem/GroupItem.styles.js.map +1 -1
- package/lib/components/FormComponents/GroupItem/GroupItemView.js +2 -2
- package/lib/components/FormComponents/GroupItem/GroupItemView.js.map +1 -1
- package/lib/components/FormComponents/GroupItem/TabButtonsWrapper.js +1 -1
- package/lib/components/FormComponents/GroupItem/TabButtonsWrapper.js.map +1 -1
- package/lib/components/FormComponents/ItemParts/CheckboxSingle.js +2 -1
- package/lib/components/FormComponents/ItemParts/CheckboxSingle.js.map +1 -1
- package/lib/components/FormComponents/RepeatGroup/AddItemButton.js +1 -1
- package/lib/components/FormComponents/RepeatGroup/AddItemButton.js.map +1 -1
- package/lib/components/FormComponents/RepeatGroup/RepeatGroupView.js +1 -1
- package/lib/components/FormComponents/RepeatItem/AddItemButton.js +1 -1
- package/lib/components/FormComponents/RepeatItem/AddItemButton.js.map +1 -1
- package/lib/components/FormComponents/RepeatItem/RepeatItem.styles.js +2 -4
- package/lib/components/FormComponents/RepeatItem/RepeatItem.styles.js.map +1 -1
- package/lib/components/FormComponents/Tables/GroupTableView.js +1 -1
- package/lib/components/Renderer/FormBodySingleCollapsible.js +1 -1
- package/lib/components/Renderer/FormBodySingleCollapsible.js.map +1 -1
- package/lib/components/Tabs/FormBodyTabList.js +1 -1
- package/lib/components/Tabs/FormBodyTabList.js.map +1 -1
- package/lib/utils/calculatedExpression.js +11 -3
- package/lib/utils/calculatedExpression.js.map +1 -1
- package/package.json +1 -1
- package/src/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetFields.tsx +1 -0
- package/src/components/FormComponents/GridGroup/GridGroup.tsx +1 -1
- package/src/components/FormComponents/GroupItem/GroupItem.styles.ts +1 -1
- package/src/components/FormComponents/GroupItem/GroupItemView.tsx +4 -0
- package/src/components/FormComponents/GroupItem/TabButtonsWrapper.tsx +1 -1
- package/src/components/FormComponents/ItemParts/CheckboxSingle.tsx +3 -0
- package/src/components/FormComponents/RepeatGroup/AddItemButton.tsx +1 -1
- package/src/components/FormComponents/RepeatGroup/RepeatGroupView.tsx +1 -1
- package/src/components/FormComponents/RepeatItem/AddItemButton.tsx +1 -1
- package/src/components/FormComponents/RepeatItem/RepeatItem.styles.tsx +2 -4
- package/src/components/FormComponents/Tables/GroupTableView.tsx +1 -1
- package/src/components/Renderer/FormBodySingleCollapsible.tsx +2 -0
- package/src/components/Tabs/FormBodyTabList.tsx +5 -1
- package/src/utils/calculatedExpression.ts +11 -8
|
@@ -31,7 +31,7 @@ function ChoiceSelectAnswerValueSetFields(props) {
|
|
|
31
31
|
const textFieldWidth = useRendererConfigStore.use.textFieldWidth();
|
|
32
32
|
const { displayUnit, displayPrompt, entryFormat } = renderingExtensions;
|
|
33
33
|
if (codings.length > 0) {
|
|
34
|
-
return (_jsxs(_Fragment, { children: [_jsx(Autocomplete, { ...(!isTabled && { id: `${qItem.type}-${qItem.linkId}` }), options: codings, getOptionDisabled: (coding) => isCodingDisabled(coding, answerOptionsToggleExpressionsMap), getOptionLabel: (option) => option.display ?? `${option.code}`, value: valueCoding ?? null, onChange: (_, newValue) => onSelectChange(newValue), autoHighlight: true, sx: { maxWidth: !isTabled ? textFieldWidth : 3000, minWidth: 160, flexGrow: 1 }, size: "small", disabled: readOnly && readOnlyVisualStyle === 'disabled', readOnly: readOnly && readOnlyVisualStyle === 'readonly', renderInput: (params) => (_jsx(StandardTextField, { textFieldWidth: textFieldWidth, isTabled: isTabled, placeholder: entryFormat || displayPrompt, ...params, slotProps: {
|
|
34
|
+
return (_jsxs(_Fragment, { children: [_jsx(Autocomplete, { ...(!isTabled && { id: `${qItem.type}-${qItem.linkId}` }), options: codings, getOptionDisabled: (coding) => isCodingDisabled(coding, answerOptionsToggleExpressionsMap), getOptionLabel: (option) => option.display ?? `${option.code}`, value: valueCoding ?? null, onChange: (_, newValue) => onSelectChange(newValue), autoHighlight: true, sx: { maxWidth: !isTabled ? textFieldWidth : 3000, minWidth: 160, flexGrow: 1 }, size: "small", disabled: readOnly && readOnlyVisualStyle === 'disabled', readOnly: readOnly && readOnlyVisualStyle === 'readonly', renderInput: (params) => (_jsx(StandardTextField, { multiline: true, textFieldWidth: textFieldWidth, isTabled: isTabled, placeholder: entryFormat || displayPrompt, ...params, slotProps: {
|
|
35
35
|
input: {
|
|
36
36
|
...params.InputProps,
|
|
37
37
|
readOnly: readOnly && readOnlyVisualStyle === 'readonly',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ChoiceSelectAnswerValueSetFields.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetFields.tsx"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"ChoiceSelectAnswerValueSetFields.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetFields.tsx"],"names":[],"mappings":"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"}
|
|
@@ -97,7 +97,7 @@ function GridGroup(props) {
|
|
|
97
97
|
}
|
|
98
98
|
// Get item.text as display label
|
|
99
99
|
const itemTextToDisplay = getItemTextToDisplay(qItem);
|
|
100
|
-
return (_jsxs(QGroupContainerBox, { cardElevation: groupCardElevation, isRepeated: false, py:
|
|
100
|
+
return (_jsxs(QGroupContainerBox, { cardElevation: groupCardElevation, isRepeated: false, py: 0, "data-linkid": qItem.linkId, "data-label": qItem.text, onClick: () => onFocusLinkId(qItem.linkId), style: parentStyles || undefined, children: [itemTextToDisplay ? (_jsxs(_Fragment, { children: [_jsx(GroupHeading, { qItem: qItem, readOnly: readOnly, groupCardElevation: groupCardElevation }), _jsx(Divider, { sx: { my: 1, opacity: 0.6 } })] })) : null, _jsx("div", { ref: tableContainerRef, style: { width: '100%' }, children: _jsx(TableContainer, { component: Paper, elevation: groupCardElevation, children: _jsx(GridTable, { qItems: qRowItems, qrItems: qrRowItems, qItemsIndexMap: qItemsIndexMap, columnHeaders: columnHeaders, calculatedColumnWidths: calculatedColumnWidths, parentIsReadOnly: readOnly, parentStyles: parentStyles, onQrItemChange: handleRowChange }) }) })] }));
|
|
101
101
|
}
|
|
102
102
|
export default GridGroup;
|
|
103
103
|
//# sourceMappingURL=GridGroup.js.map
|
|
@@ -20,7 +20,7 @@ export const GroupCard = styled(Card, {
|
|
|
20
20
|
shouldForwardProp: (prop) => prop !== 'elevation' && prop !== 'isRepeated'
|
|
21
21
|
})(({ elevation, isRepeated }) => ({
|
|
22
22
|
paddingTop: '20px',
|
|
23
|
-
paddingBottom: '
|
|
23
|
+
paddingBottom: '0px',
|
|
24
24
|
paddingLeft: elevation === 1 ? '26px' : '24px',
|
|
25
25
|
paddingRight: elevation === 1 ? '26px' : '24px',
|
|
26
26
|
marginBottom: isRepeated ? 0 : '28px'
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GroupItem.styles.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/GroupItem/GroupItem.styles.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,IAAI,MAAM,oBAAoB,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,EAAE;IACpC,iBAAiB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,WAAW,IAAI,IAAI,KAAK,YAAY;CAC3E,CAAC,CAA6C,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;IAC7E,UAAU,EAAE,MAAM;IAClB,aAAa,EAAE,
|
|
1
|
+
{"version":3,"file":"GroupItem.styles.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/GroupItem/GroupItem.styles.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,IAAI,MAAM,oBAAoB,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,IAAI,EAAE;IACpC,iBAAiB,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,WAAW,IAAI,IAAI,KAAK,YAAY;CAC3E,CAAC,CAA6C,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;IAC7E,UAAU,EAAE,MAAM;IAClB,aAAa,EAAE,KAAK;IACpB,WAAW,EAAE,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;IAC9C,YAAY,EAAE,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;IAC/C,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM;CACtC,CAAC,CAAC,CAAC"}
|
|
@@ -63,12 +63,12 @@ function GroupItemView(props) {
|
|
|
63
63
|
}
|
|
64
64
|
// Disable card view - currently only available via disablePageCardView API
|
|
65
65
|
if (disableCardView) {
|
|
66
|
-
return (_jsxs(QGroupContainerBox, { cardElevation: groupCardElevation, isRepeated: isRepeated, "data-test": "q-item-group-box", role: "region", "aria-label": qItem.text ?? 'Unnamed group', style: combinedStyles || undefined, children: [!isRepeated && itemTextToDisplay ? (_jsxs(_Fragment, { children: [_jsx(GroupHeading, { qItem: qItem, readOnly: readOnly, groupCardElevation: groupCardElevation, tabIsMarkedAsComplete: tabIsMarkedAsComplete, pageIsMarkedAsComplete: pageIsMarkedAsComplete, parentStyles: combinedStyles }), _jsx(Divider, { sx: { mt: 1, mb: 1.5, opacity: 0.6 } })] })) : null, childQItems.map((childQItem, i) => {
|
|
66
|
+
return (_jsxs(QGroupContainerBox, { cardElevation: groupCardElevation, isRepeated: isRepeated, "data-test": "q-item-group-box", role: "region", "aria-label": qItem.text ?? 'Unnamed group', "data-linkid": qItem.linkId, "data-label": qItem.text, style: combinedStyles || undefined, children: [!isRepeated && itemTextToDisplay ? (_jsxs(_Fragment, { children: [_jsx(GroupHeading, { qItem: qItem, readOnly: readOnly, groupCardElevation: groupCardElevation, tabIsMarkedAsComplete: tabIsMarkedAsComplete, pageIsMarkedAsComplete: pageIsMarkedAsComplete, parentStyles: combinedStyles }), _jsx(Divider, { sx: { mt: 1, mb: 1.5, opacity: 0.6 } })] })) : null, childQItems.map((childQItem, i) => {
|
|
67
67
|
const qrItemOrItems = qrItemsByIndex[i];
|
|
68
68
|
return (_jsx(GroupItemSwitcher, { qItem: childQItem, qrItemOrItems: qrItemOrItems, groupCardElevation: groupCardElevation + 1, parentIsReadOnly: readOnly, parentIsRepeatGroup: parentIsRepeatGroup, parentRepeatGroupIndex: parentRepeatGroupIndex, parentStyles: combinedStyles, onQrItemChange: onQrItemChange, onQrRepeatGroupChange: onQrRepeatGroupChange }, childQItem.linkId));
|
|
69
69
|
}), _jsx(TabButtonsWrapper, { currentTabIndex: currentTabIndex, tabs: tabs }), _jsx(PageButtonsWrapper, { currentPageIndex: currentPageIndex, pages: pages })] }));
|
|
70
70
|
}
|
|
71
|
-
return (_jsx(QGroupContainerBox, { cardElevation: groupCardElevation, isRepeated: isRepeated, "data-test": "q-item-group-box", role: "region", "aria-label": qItem.text ?? 'Unnamed group', children: _jsxs(GroupCard, { elevation: groupCardElevation, isRepeated: isRepeated, style: combinedStyles || undefined, children: [!isRepeated && itemTextToDisplay ? (_jsxs(_Fragment, { children: [_jsx(GroupHeading, { qItem: qItem, readOnly: readOnly, groupCardElevation: groupCardElevation, tabIsMarkedAsComplete: tabIsMarkedAsComplete, pageIsMarkedAsComplete: pageIsMarkedAsComplete, parentStyles: combinedStyles }), _jsx(Divider, { sx: { mt: 1, mb: 1.5, opacity: 0.6 } })] })) : null, childQItems.map((childQItem, i) => {
|
|
71
|
+
return (_jsx(QGroupContainerBox, { cardElevation: groupCardElevation, isRepeated: isRepeated, "data-test": "q-item-group-box", "data-linkid": qItem.linkId, "data-label": qItem.text, role: "region", "aria-label": qItem.text ?? 'Unnamed group', children: _jsxs(GroupCard, { elevation: groupCardElevation, isRepeated: isRepeated, style: combinedStyles || undefined, children: [!isRepeated && itemTextToDisplay ? (_jsxs(_Fragment, { children: [_jsx(GroupHeading, { qItem: qItem, readOnly: readOnly, groupCardElevation: groupCardElevation, tabIsMarkedAsComplete: tabIsMarkedAsComplete, pageIsMarkedAsComplete: pageIsMarkedAsComplete, parentStyles: combinedStyles }), _jsx(Divider, { sx: { mt: 1, mb: 1.5, opacity: 0.6 } })] })) : null, childQItems.map((childQItem, i) => {
|
|
72
72
|
const qrItemOrItems = qrItemsByIndex[i];
|
|
73
73
|
return (_jsx(GroupItemSwitcher, { qItem: childQItem, qrItemOrItems: qrItemOrItems, groupCardElevation: groupCardElevation + 1, parentIsReadOnly: readOnly, parentIsRepeatGroup: parentIsRepeatGroup, parentRepeatGroupIndex: parentRepeatGroupIndex, parentStyles: combinedStyles, onQrItemChange: onQrItemChange, onQrRepeatGroupChange: onQrRepeatGroupChange }, childQItem.linkId));
|
|
74
74
|
}), _jsx(TabButtonsWrapper, { currentTabIndex: currentTabIndex, tabs: tabs }), _jsx(PageButtonsWrapper, { currentPageIndex: currentPageIndex, pages: pages })] }) }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GroupItemView.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/GroupItem/GroupItemView.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"GroupItemView.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/GroupItem/GroupItemView.tsx"],"names":[],"mappings":"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"}
|
|
@@ -68,7 +68,7 @@ const TabButtonsWrapper = memo(function TabButtonsWrapper(props) {
|
|
|
68
68
|
const nextTabButtonHidden = nextTabIndex === null;
|
|
69
69
|
// This is more of a fallback check to prevent the user from navigating to an invisble tab if buttons are visble for some reason
|
|
70
70
|
const tabButtonsDisabled = numOfVisibleTabs <= 1;
|
|
71
|
-
return (_jsxs(Box, { display: "flex", mt: 3, children: [previousTabButtonHidden ? null : (_jsx(PreviousTabButton, { isDisabled: tabButtonsDisabled, onPreviousTabClick: handlePreviousTabButtonClick })), _jsx(Box, { flexGrow: 1 }), nextTabButtonHidden ? null : (_jsx(NextTabButton, { isDisabled: tabButtonsDisabled, onNextTabClick: handleNextTabButtonClick }))] }));
|
|
71
|
+
return (_jsxs(Box, { display: "flex", mt: 3, mb: 3, children: [previousTabButtonHidden ? null : (_jsx(PreviousTabButton, { isDisabled: tabButtonsDisabled, onPreviousTabClick: handlePreviousTabButtonClick })), _jsx(Box, { flexGrow: 1 }), nextTabButtonHidden ? null : (_jsx(NextTabButton, { isDisabled: tabButtonsDisabled, onNextTabClick: handleNextTabButtonClick }))] }));
|
|
72
72
|
});
|
|
73
73
|
export default TabButtonsWrapper;
|
|
74
74
|
//# sourceMappingURL=TabButtonsWrapper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TabButtonsWrapper.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/GroupItem/TabButtonsWrapper.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAc,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,GAAG,MAAM,mBAAmB,CAAC;AAEpC,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAChF,OAAO,aAAa,MAAM,iBAAiB,CAAC;AAC5C,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AACpD,OAAO,6BAA6B,MAAM,8CAA8C,CAAC;AACzF,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AAOvE,MAAM,iBAAiB,GAAG,IAAI,CAAC,SAAS,iBAAiB,CAAC,KAA6B;IACrF,MAAM,EAAE,eAAe,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC;IAExC,MAAM,SAAS,GAAG,qBAAqB,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;IACxD,MAAM,iBAAiB,GAAG,sBAAsB,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC;IACzE,MAAM,8BAA8B,GAClC,sBAAsB,CAAC,GAAG,CAAC,8BAA8B,EAAE,CAAC;IAE9D,MAAM,EAAE,gBAAgB,EAAE,YAAY,EAAE,gBAAgB,EAAE,GAAG,6BAA6B,CACxF,eAAe,EACf,IAAI,CACL,CAAC;IAEF,MAAM,YAAY,GAAG,kBAAkB,EAAE,CAAC;IAE1C,MAAM,cAAc,GAAG,eAAe,KAAK,SAAS,IAAI,IAAI,KAAK,SAAS,CAAC;IAE3E,iBAAiB;IACjB,SAAS,4BAA4B;QACnC,IAAI,gBAAgB,KAAK,IAAI,EAAE,CAAC;YAC9B,OAAO;QACT,CAAC;QAED,SAAS,CAAC,gBAAgB,CAAC,CAAC;QAE5B,wBAAwB;QACxB,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEtB,+DAA+D;QAC/D,IAAI,CAAC,8BAA8B,EAAE,CAAC;YACpC,UAAU,CAAC,GAAG,EAAE;gBACd,YAAY,CAAC,YAAY,gBAAgB,EAAE,CAAC,CAAC;YAC/C,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,0CAA0C;QACrD,CAAC;IACH,CAAC;IAED,SAAS,wBAAwB;QAC/B,IAAI,YAAY,KAAK,IAAI,EAAE,CAAC;YAC1B,OAAO;QACT,CAAC;QAED,SAAS,CAAC,YAAY,CAAC,CAAC;QAExB,wBAAwB;QACxB,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEtB,+CAA+C;QAC/C,UAAU,CAAC,GAAG,EAAE;YACd,YAAY,CAAC,YAAY,YAAY,EAAE,CAAC,CAAC;QAC3C,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,0CAA0C;IACrD,CAAC;IAED,IAAI,cAAc,EAAE,CAAC;QACnB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,2EAA2E;IAC3E,IAAI,iBAAiB,EAAE,CAAC;QACtB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,uBAAuB,GAAG,gBAAgB,KAAK,IAAI,CAAC;IAC1D,MAAM,mBAAmB,GAAG,YAAY,KAAK,IAAI,CAAC;IAElD,gIAAgI;IAChI,MAAM,kBAAkB,GAAG,gBAAgB,IAAI,CAAC,CAAC;IAEjD,OAAO,CACL,MAAC,GAAG,IAAC,OAAO,EAAC,MAAM,EAAC,EAAE,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"TabButtonsWrapper.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/GroupItem/TabButtonsWrapper.tsx"],"names":[],"mappings":"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"}
|
|
@@ -11,13 +11,14 @@ function CheckboxSingle(props) {
|
|
|
11
11
|
const readOnlyWithReadOnlyStyle = readOnly && readOnlyVisualStyle === 'readonly';
|
|
12
12
|
const isHtmlDisabled = readOnlyWithDisabledStyle || disabledViaToggleExpression;
|
|
13
13
|
const isHtmlReadOnly = readOnlyWithReadOnlyStyle && !disabledViaToggleExpression;
|
|
14
|
+
const textForDataTest = labelText ?? (typeof label === 'string' ? label : value);
|
|
14
15
|
return (_jsx(FormControlLabel, { sx: {
|
|
15
16
|
width: fullWidth ? '100%' : 'unset',
|
|
16
17
|
...(isHtmlReadOnly && {
|
|
17
18
|
cursor: 'default',
|
|
18
19
|
color: 'text.secondary'
|
|
19
20
|
})
|
|
20
|
-
}, disabled: isHtmlDisabled, value: value, control: _jsx(StandardCheckbox, { size: "small", checked: isChecked, readOnly: isHtmlReadOnly, "aria-readonly": isHtmlReadOnly, role: "checkbox", "aria-checked": isChecked, onChange: () => {
|
|
21
|
+
}, disabled: isHtmlDisabled, value: value, control: _jsx(StandardCheckbox, { "data-test": `checkbox-single-${textForDataTest}`, size: "small", checked: isChecked, readOnly: isHtmlReadOnly, "aria-readonly": isHtmlReadOnly, role: "checkbox", "aria-checked": isChecked, onChange: () => {
|
|
21
22
|
// If item.readOnly=true, do not allow any changes
|
|
22
23
|
if (readOnly) {
|
|
23
24
|
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,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAazD,SAAS,cAAc,CAAC,KAA0B;IAChD,MAAM,EACJ,KAAK,EACL,KAAK,EACL,SAAS,EACT,QAAQ,EACR,2BAA2B,EAC3B,SAAS,EACT,SAAS,EACT,eAAe,EAChB,GAAG,KAAK,CAAC;IAEV,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAE7E,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,EAAE;YACF,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO;YACnC,GAAG,CAAC,cAAc,IAAI;gBACpB,MAAM,EAAE,SAAS;gBACjB,KAAK,EAAE,gBAAgB;aACxB,CAAC;SACH,EACD,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,KAAK,EACZ,OAAO,EACL,KAAC,gBAAgB,
|
|
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,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAazD,SAAS,cAAc,CAAC,KAA0B;IAChD,MAAM,EACJ,KAAK,EACL,KAAK,EACL,SAAS,EACT,QAAQ,EACR,2BAA2B,EAC3B,SAAS,EACT,SAAS,EACT,eAAe,EAChB,GAAG,KAAK,CAAC;IAEV,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,GAAG,CAAC,mBAAmB,EAAE,CAAC;IAE7E,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,MAAM,eAAe,GAAG,SAAS,IAAI,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAEjF,OAAO,CACL,KAAC,gBAAgB,IACf,EAAE,EAAE;YACF,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO;YACnC,GAAG,CAAC,cAAc,IAAI;gBACpB,MAAM,EAAE,SAAS;gBACjB,KAAK,EAAE,gBAAgB;aACxB,CAAC;SACH,EACD,QAAQ,EAAE,cAAc,EACxB,KAAK,EAAE,KAAK,EACZ,OAAO,EACL,KAAC,gBAAgB,iBACJ,mBAAmB,eAAe,EAAE,EAC/C,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,CAAC,OAAO,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,kBAAkB;iBACpF;aACF,GACD,EAEJ,KAAK,EAAE,KAAK,GACZ,CACH,CAAC;AACJ,CAAC;AAED,eAAe,cAAc,CAAC"}
|
|
@@ -5,7 +5,7 @@ import AddIcon from '@mui/icons-material/Add';
|
|
|
5
5
|
function AddItemButton(props) {
|
|
6
6
|
const { repeatGroups, readOnly, onAddItem } = props;
|
|
7
7
|
const isDisabled = repeatGroups[repeatGroups.length - 1]?.qrItem === null || readOnly;
|
|
8
|
-
return (_jsx(Box, { display: "flex", flexDirection: "row-reverse", children: _jsx(Button, { variant: "contained", size: "small", startIcon: _jsx(AddIcon, {}), disabled: isDisabled, onClick: onAddItem, "data-test": "button-add-repeat-item", children: "Add Item" }) }));
|
|
8
|
+
return (_jsx(Box, { display: "flex", flexDirection: "row-reverse", sx: { mt: 1 }, children: _jsx(Button, { variant: "contained", size: "small", startIcon: _jsx(AddIcon, {}), disabled: isDisabled, onClick: onAddItem, "data-test": "button-add-repeat-item", children: "Add Item" }) }));
|
|
9
9
|
}
|
|
10
10
|
export default AddItemButton;
|
|
11
11
|
//# sourceMappingURL=AddItemButton.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddItemButton.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/RepeatGroup/AddItemButton.tsx"],"names":[],"mappings":";AAkBA,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,OAAO,MAAM,yBAAyB,CAAC;AAS9C,SAAS,aAAa,CAAC,KAAyB;IAC9C,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAEpD,MAAM,UAAU,GAAG,YAAY,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,IAAI,QAAQ,CAAC;IAEtF,OAAO,CACL,KAAC,GAAG,IAAC,OAAO,EAAC,MAAM,EAAC,aAAa,EAAC,aAAa,
|
|
1
|
+
{"version":3,"file":"AddItemButton.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/RepeatGroup/AddItemButton.tsx"],"names":[],"mappings":";AAkBA,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,OAAO,MAAM,yBAAyB,CAAC;AAS9C,SAAS,aAAa,CAAC,KAAyB;IAC9C,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAEpD,MAAM,UAAU,GAAG,YAAY,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE,MAAM,KAAK,IAAI,IAAI,QAAQ,CAAC;IAEtF,OAAO,CACL,KAAC,GAAG,IAAC,OAAO,EAAC,MAAM,EAAC,aAAa,EAAC,aAAa,EAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,YAC3D,KAAC,MAAM,IACL,OAAO,EAAC,WAAW,EACnB,IAAI,EAAC,OAAO,EACZ,SAAS,EAAE,KAAC,OAAO,KAAG,EACtB,QAAQ,EAAE,UAAU,EACpB,OAAO,EAAE,SAAS,eACR,wBAAwB,yBAE3B,GACL,CACP,CAAC;AACJ,CAAC;AAED,eAAe,aAAa,CAAC"}
|
|
@@ -40,7 +40,7 @@ function RepeatGroupView(props) {
|
|
|
40
40
|
return (_jsx(Collapse, { timeout: 200, children: _jsx(RepeatGroupItem, { qItem: qItem, repeatGroupIndex: index, answeredQrItem: answeredQrItem, nullableQrItem: nullableQrItem, numOfRepeatGroups: repeatGroups.length, groupCardElevation: groupCardElevation, parentIsReadOnly: parentIsReadOnly, onRemoveItem: () => onRemoveItem(index), onQrItemChange: (newQrItem) => onAnswerChange(newQrItem, index) }) }, id));
|
|
41
41
|
}) }), !isGroupAddItemButtonHidden(qItem) && (_jsx(AddItemButton, { repeatGroups: repeatGroups, readOnly: readOnly, onAddItem: onAddItem }))] })] }));
|
|
42
42
|
}
|
|
43
|
-
return (_jsx(QGroupContainerBox, { cardElevation: groupCardElevation, isRepeated: true, style: parentStyles || undefined, children: _jsxs(Card, { elevation: groupCardElevation, sx: { p: 3, py:
|
|
43
|
+
return (_jsx(QGroupContainerBox, { cardElevation: groupCardElevation, isRepeated: true, style: parentStyles || undefined, children: _jsxs(Card, { elevation: groupCardElevation, sx: { p: 3, py: 1.5, mb: 2.5 }, children: [itemTextToDisplay ? (_jsxs(_Fragment, { children: [_jsx(GroupHeading, { qItem: qItem, readOnly: readOnly, groupCardElevation: groupCardElevation }), _jsx(Divider, { sx: { mt: 1, mb: 1.5, opacity: 0.6 } })] })) : null, _jsx(TransitionGroup, { children: repeatGroups.map(({ id, qrItem: nullableQrItem }, index) => {
|
|
44
44
|
const answeredQrItem = createEmptyQrItem(qItem, undefined);
|
|
45
45
|
if (nullableQrItem) {
|
|
46
46
|
answeredQrItem.item = nullableQrItem.item;
|
|
@@ -8,7 +8,7 @@ function AddItemButton(props) {
|
|
|
8
8
|
// Also disables button if item is readOnly
|
|
9
9
|
const lastAnswer = repeatAnswers[repeatAnswers.length - 1];
|
|
10
10
|
const isDisabled = lastAnswer === null || Object.keys(lastAnswer ?? {}).join() === 'id' || readOnly;
|
|
11
|
-
return (_jsx(Box, { display: "flex", flexDirection: "row-reverse", children: _jsx(Button, { variant: "contained", size: "small", startIcon: _jsx(AddIcon, {}), disabled: isDisabled, onClick: onAddItem, "data-test": "button-add-repeat-item", children: "Add Item" }) }));
|
|
11
|
+
return (_jsx(Box, { display: "flex", flexDirection: "row-reverse", sx: { mt: 1 }, children: _jsx(Button, { variant: "contained", size: "small", startIcon: _jsx(AddIcon, {}), disabled: isDisabled, onClick: onAddItem, "data-test": "button-add-repeat-item", children: "Add Item" }) }));
|
|
12
12
|
}
|
|
13
13
|
export default AddItemButton;
|
|
14
14
|
//# sourceMappingURL=AddItemButton.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AddItemButton.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/RepeatItem/AddItemButton.tsx"],"names":[],"mappings":";AAkBA,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,OAAO,MAAM,yBAAyB,CAAC;AAS9C,SAAS,aAAa,CAAC,KAAyB;IAC9C,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAErD,+DAA+D;IAC/D,2CAA2C;IAC3C,MAAM,UAAU,GAAG,aAAa,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC3D,MAAM,UAAU,GACd,UAAU,KAAK,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,IAAI,IAAI,QAAQ,CAAC;IAEnF,OAAO,CACL,KAAC,GAAG,IAAC,OAAO,EAAC,MAAM,EAAC,aAAa,EAAC,aAAa,
|
|
1
|
+
{"version":3,"file":"AddItemButton.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/RepeatItem/AddItemButton.tsx"],"names":[],"mappings":";AAkBA,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,MAAM,MAAM,sBAAsB,CAAC;AAC1C,OAAO,OAAO,MAAM,yBAAyB,CAAC;AAS9C,SAAS,aAAa,CAAC,KAAyB;IAC9C,MAAM,EAAE,aAAa,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAErD,+DAA+D;IAC/D,2CAA2C;IAC3C,MAAM,UAAU,GAAG,aAAa,CAAC,aAAa,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC3D,MAAM,UAAU,GACd,UAAU,KAAK,IAAI,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,KAAK,IAAI,IAAI,QAAQ,CAAC;IAEnF,OAAO,CACL,KAAC,GAAG,IAAC,OAAO,EAAC,MAAM,EAAC,aAAa,EAAC,aAAa,EAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,YAC3D,KAAC,MAAM,IACL,OAAO,EAAC,WAAW,EACnB,IAAI,EAAC,OAAO,EACZ,SAAS,EAAE,KAAC,OAAO,KAAG,EACtB,QAAQ,EAAE,UAAU,EACpB,OAAO,EAAE,SAAS,eACR,wBAAwB,yBAE3B,GACL,CACP,CAAC;AACJ,CAAC;AAED,eAAe,aAAa,CAAC"}
|
|
@@ -21,11 +21,9 @@ export const RepeatRemoveTooltip = styled(Tooltip)(() => ({
|
|
|
21
21
|
marginLeft: 8
|
|
22
22
|
}));
|
|
23
23
|
export const RepeatItemContainerStack = styled(Stack)(() => ({
|
|
24
|
-
alignItems: 'center'
|
|
25
|
-
paddingBottom: 8
|
|
24
|
+
alignItems: 'center'
|
|
26
25
|
}));
|
|
27
26
|
export const RepeatGroupContainerStack = styled(Stack)(() => ({
|
|
28
|
-
alignItems: 'center'
|
|
29
|
-
paddingBottom: 16
|
|
27
|
+
alignItems: 'center'
|
|
30
28
|
}));
|
|
31
29
|
//# sourceMappingURL=RepeatItem.styles.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RepeatItem.styles.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/RepeatItem/RepeatItem.styles.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,MAAM,qBAAqB,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,OAAO,MAAM,uBAAuB,CAAC;AAE5C,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IACxD,UAAU,EAAE,CAAC;CACd,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC3D,UAAU,EAAE,QAAQ;
|
|
1
|
+
{"version":3,"file":"RepeatItem.styles.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/RepeatItem/RepeatItem.styles.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,MAAM,qBAAqB,CAAC;AACxC,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAC9C,OAAO,OAAO,MAAM,uBAAuB,CAAC;AAE5C,MAAM,CAAC,MAAM,mBAAmB,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IACxD,UAAU,EAAE,CAAC;CACd,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,wBAAwB,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC3D,UAAU,EAAE,QAAQ;CACrB,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,yBAAyB,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC;IAC5D,UAAU,EAAE,QAAQ;CACrB,CAAC,CAAC,CAAC"}
|
|
@@ -43,7 +43,7 @@ function GroupTableView(props) {
|
|
|
43
43
|
} }) })) : null, visibleItemLabels.map((visibleItemLabel) => (_jsx(HeaderTableCell, { children: _jsx(Box, { display: "flex", alignItems: "center", justifyContent: "center", children: visibleItemLabel }) }, visibleItemLabel))), _jsx(TableCell, { padding: "checkbox" })] }) }), _jsx(GroupTableBody, { tableQItem: qItem, readOnly: readOnly, tableRows: tableRows, selectedIds: selectedIds, qItemsIndexMap: qItemsIndexMap, visibleItemLabels: visibleItemLabels, calculatedColumnWidths: calculatedColumnWidths, showExtraGTableInteractions: showExtraGTableInteractions, parentIsReadOnly: parentIsReadOnly, onRowChange: onRowChange, onRemoveRow: onRemoveRow, onSelectRow: onSelectRow, onReorderRows: onReorderRows })] }) })] })] }));
|
|
44
44
|
}
|
|
45
45
|
// Regular GTable
|
|
46
|
-
return (_jsxs(QGroupContainerBox, { cardElevation: groupCardElevation, isRepeated: false, py:
|
|
46
|
+
return (_jsxs(QGroupContainerBox, { cardElevation: groupCardElevation, isRepeated: false, py: 0, "data-linkid": qItem.linkId, "data-label": qItem.text, onClick: () => onFocusLinkId(qItem.linkId), style: parentStyles || undefined, children: [itemTextToDisplay ? (_jsxs(_Fragment, { children: [_jsx(GroupHeading, { qItem: qItem, readOnly: readOnly, groupCardElevation: groupCardElevation }), _jsx(Divider, { sx: { my: 1, opacity: 0.6 } })] })) : null, _jsx(TableContainer, { component: Paper, elevation: groupCardElevation, children: _jsxs(Table, { children: [showExtraGTableInteractions && !isGroupAddItemButtonHidden(qItem) ? (_jsx("caption", { children: _jsx(AddRowButton, { repeatGroups: tableRows, readOnly: readOnly, onAddItem: onAddRow }) })) : null, _jsx(TableHead, { children: _jsxs(TableRow, { children: [_jsx(HeaderTableCell, { padding: "none" }), showExtraGTableInteractions ? (_jsx(HeaderTableCell, { padding: "none", children: _jsx(StandardCheckbox, { color: "primary", size: "small", indeterminate: indeterminateValue, checked: checkedValue, disabled: readOnly && readOnlyVisualStyle === 'disabled', readOnly: readOnly && readOnlyVisualStyle === 'readonly', "aria-readonly": readOnly && readOnlyVisualStyle === 'readonly', role: "checkbox", "aria-checked": ariaCheckedValue, onChange: onSelectAll, slotProps: {
|
|
47
47
|
input: {
|
|
48
48
|
'aria-label': 'Select all rows in ' + (qItem.text ?? `Unnamed ${qItem.type} item`)
|
|
49
49
|
}
|
|
@@ -17,7 +17,7 @@ const FormBodySingleCollapsible = memo(function FormBodySingleCollapsible(props)
|
|
|
17
17
|
const isExpanded = selectedIndex === index;
|
|
18
18
|
return (_jsxs(Accordion, { expanded: isExpanded, slotProps: {
|
|
19
19
|
transition: { unmountOnExit: true, timeout: 250 }
|
|
20
|
-
}, onChange: () => onToggleExpand(index), children: [_jsx(AccordionSummary, { expandIcon: _jsx(ExpandMoreIcon, {}), children: _jsxs(Box, { display: "flex", alignItems: "center", justifyContent: "space-between", width: "100%", mr: 3, children: [_jsx(Typography, { children: collapsibleLabel }), _jsx(Box, { display: "flex", columnGap: 0.5, children: contextDisplayItems.map((item) => {
|
|
20
|
+
}, "data-linkid": qItem.linkId, "data-label": qItem.text, onChange: () => onToggleExpand(index), children: [_jsx(AccordionSummary, { expandIcon: _jsx(ExpandMoreIcon, {}), children: _jsxs(Box, { display: "flex", alignItems: "center", justifyContent: "space-between", width: "100%", mr: 3, children: [_jsx(Typography, { children: collapsibleLabel }), _jsx(Box, { display: "flex", columnGap: 0.5, children: contextDisplayItems.map((item) => {
|
|
21
21
|
return _jsx(ContextDisplayItem, { displayItem: item }, item.linkId);
|
|
22
22
|
}) })] }) }), _jsx(AccordionDetails, { children: _jsx(_Fragment, { children: children }) })] }));
|
|
23
23
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FormBodySingleCollapsible.js","sourceRoot":"","sources":["../../../src/components/Renderer/FormBodySingleCollapsible.tsx"],"names":[],"mappings":";AAkBA,OAAc,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;AAC9D,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;AAC9D,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,cAAc,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,kBAAkB,MAAM,gDAAgD,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAUrE,MAAM,yBAAyB,GAAG,IAAI,CAAC,SAAS,yBAAyB,CACvE,KAAqC;IAErC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAExE,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAEtD,MAAM,gBAAgB,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,oBAAoB,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAElF,MAAM,UAAU,GAAG,aAAa,KAAK,KAAK,CAAC;IAE3C,OAAO,CACL,MAAC,SAAS,IACR,QAAQ,EAAE,UAAU,EACpB,SAAS,EAAE;YACT,UAAU,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE;SAClD,
|
|
1
|
+
{"version":3,"file":"FormBodySingleCollapsible.js","sourceRoot":"","sources":["../../../src/components/Renderer/FormBodySingleCollapsible.tsx"],"names":[],"mappings":";AAkBA,OAAc,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;AAC9D,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;AAC9D,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,cAAc,MAAM,gCAAgC,CAAC;AAC5D,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AACtD,OAAO,kBAAkB,MAAM,gDAAgD,CAAC;AAChF,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAUrE,MAAM,yBAAyB,GAAG,IAAI,CAAC,SAAS,yBAAyB,CACvE,KAAqC;IAErC,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,aAAa,EAAE,cAAc,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;IAExE,MAAM,mBAAmB,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAEtD,MAAM,gBAAgB,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,oBAAoB,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;IAElF,MAAM,UAAU,GAAG,aAAa,KAAK,KAAK,CAAC;IAE3C,OAAO,CACL,MAAC,SAAS,IACR,QAAQ,EAAE,UAAU,EACpB,SAAS,EAAE;YACT,UAAU,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,EAAE;SAClD,iBACY,KAAK,CAAC,MAAM,gBACb,KAAK,CAAC,IAAI,EACtB,QAAQ,EAAE,GAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,aACrC,KAAC,gBAAgB,IAAC,UAAU,EAAE,KAAC,cAAc,KAAG,YAC9C,MAAC,GAAG,IAAC,OAAO,EAAC,MAAM,EAAC,UAAU,EAAC,QAAQ,EAAC,cAAc,EAAC,eAAe,EAAC,KAAK,EAAC,MAAM,EAAC,EAAE,EAAE,CAAC,aACvF,KAAC,UAAU,cAAE,gBAAgB,GAAc,EAC3C,KAAC,GAAG,IAAC,OAAO,EAAC,MAAM,EAAC,SAAS,EAAE,GAAG,YAC/B,mBAAmB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gCAChC,OAAO,KAAC,kBAAkB,IAAmB,WAAW,EAAE,IAAI,IAA9B,IAAI,CAAC,MAAM,CAAuB,CAAC;4BACrE,CAAC,CAAC,GACE,IACF,GACW,EACnB,KAAC,gBAAgB,cACf,4BAAG,QAAQ,GAAI,GACE,IACT,CACb,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,eAAe,yBAAyB,CAAC"}
|
|
@@ -44,7 +44,7 @@ const FormBodyTabList = memo(function FormBodyTabList(props) {
|
|
|
44
44
|
}
|
|
45
45
|
const tabIsSelected = currentTabIndex.toString() === i.toString();
|
|
46
46
|
const tabLabel = getShortText(qItem) ?? getItemTextToDisplay(qItem) ?? '';
|
|
47
|
-
return (_jsx(Collapse, { timeout: 100, children: _jsx(FormBodySingleTab, { qItem: qItem, contextDisplayItems: contextDisplayItems, selected: tabIsSelected, tabLabel: tabLabel, listIndex: i }) }, qItem.linkId));
|
|
47
|
+
return (_jsx(Collapse, { timeout: 100, "data-linkid": qItem.linkId, "data-label": qItem.text, children: _jsx(FormBodySingleTab, { qItem: qItem, contextDisplayItems: contextDisplayItems, selected: tabIsSelected, tabLabel: tabLabel, listIndex: i }) }, qItem.linkId));
|
|
48
48
|
}) }));
|
|
49
49
|
});
|
|
50
50
|
export default FormBodyTabList;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FormBodyTabList.js","sourceRoot":"","sources":["../../../src/components/Tabs/FormBodyTabList.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAc,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAUrE,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,eAAe,CAAC,KAA2B;IAC/E,MAAM,EAAE,aAAa,EAAE,eAAe,EAAE,IAAI,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,GAC5F,KAAK,CAAC;IAER,MAAM,qBAAqB,GAAG,qBAAqB,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC;IAChF,MAAM,eAAe,GAAG,qBAAqB,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC;IACpE,MAAM,qBAAqB,GAAG,qBAAqB,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC;IAEhF,OAAO,CACL,KAAC,eAAe,cACb,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;YAC9B,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC;YACtD,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAEnC,IACE,WAAW,CAAC;gBACV,KAAK;gBACL,mBAAmB;gBACnB,KAAK;gBACL,qBAAqB;gBACrB,eAAe;gBACf,qBAAqB;gBACrB,sBAAsB;aACvB,CAAC,EACF,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,aAAa,GAAG,eAAe,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;YAClE,MAAM,QAAQ,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,oBAAoB,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAE1E,OAAO,CACL,KAAC,QAAQ,
|
|
1
|
+
{"version":3,"file":"FormBodyTabList.js","sourceRoot":"","sources":["../../../src/components/Tabs/FormBodyTabList.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAc,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAUrE,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,eAAe,CAAC,KAA2B;IAC/E,MAAM,EAAE,aAAa,EAAE,eAAe,EAAE,IAAI,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,GAC5F,KAAK,CAAC;IAER,MAAM,qBAAqB,GAAG,qBAAqB,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC;IAChF,MAAM,eAAe,GAAG,qBAAqB,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC;IACpE,MAAM,qBAAqB,GAAG,qBAAqB,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC;IAEhF,OAAO,CACL,KAAC,eAAe,cACb,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;YAC9B,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC;YACtD,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAEnC,IACE,WAAW,CAAC;gBACV,KAAK;gBACL,mBAAmB;gBACnB,KAAK;gBACL,qBAAqB;gBACrB,eAAe;gBACf,qBAAqB;gBACrB,sBAAsB;aACvB,CAAC,EACF,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,aAAa,GAAG,eAAe,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;YAClE,MAAM,QAAQ,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,oBAAoB,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAE1E,OAAO,CACL,KAAC,QAAQ,IAEP,OAAO,EAAE,GAAG,iBACC,KAAK,CAAC,MAAM,gBACb,KAAK,CAAC,IAAI,YACtB,KAAC,iBAAiB,IAChB,KAAK,EAAE,KAAK,EACZ,mBAAmB,EAAE,mBAAmB,EACxC,QAAQ,EAAE,aAAa,EACvB,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,CAAC,GACZ,IAVG,KAAK,CAAC,MAAM,CAWR,CACZ,CAAC;QACJ,CAAC,CAAC,GACc,CACnB,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,eAAe,eAAe,CAAC"}
|
|
@@ -222,7 +222,7 @@ function applyCalculatedExpressionValuesRecursive(qItem, qrItemOrItems, calculat
|
|
|
222
222
|
}
|
|
223
223
|
: null, calculatedExpressions);
|
|
224
224
|
}
|
|
225
|
-
|
|
225
|
+
let qrItem = qrItemOrItems;
|
|
226
226
|
const childQItems = qItem.item;
|
|
227
227
|
if (childQItems && childQItems.length > 0) {
|
|
228
228
|
const childQrItems = qrItem?.item ?? [];
|
|
@@ -235,17 +235,25 @@ function applyCalculatedExpressionValuesRecursive(qItem, qrItemOrItems, calculat
|
|
|
235
235
|
// Update QR items in repeating group
|
|
236
236
|
if (Array.isArray(updatedChildQRItemOrItems)) {
|
|
237
237
|
if (updatedChildQRItemOrItems.length > 0) {
|
|
238
|
+
// Lazily initialise qrItem so all children are added to the same group object
|
|
239
|
+
if (!qrItem) {
|
|
240
|
+
qrItem = structuredClone(createEmptyQrGroup(qItem));
|
|
241
|
+
}
|
|
238
242
|
updateQrItemsInGroup(null, {
|
|
239
243
|
linkId: childQItem.linkId,
|
|
240
244
|
qrItems: updatedChildQRItemOrItems
|
|
241
|
-
}, qrItem
|
|
245
|
+
}, qrItem, indexMap);
|
|
242
246
|
}
|
|
243
247
|
continue;
|
|
244
248
|
}
|
|
245
249
|
// Update QR items in non-repeating group
|
|
246
250
|
const updatedChildQRItem = updatedChildQRItemOrItems;
|
|
247
251
|
if (updatedChildQRItem) {
|
|
248
|
-
|
|
252
|
+
// Lazily initialise qrItem so all children are added to the same group object
|
|
253
|
+
if (!qrItem) {
|
|
254
|
+
qrItem = structuredClone(createEmptyQrGroup(qItem));
|
|
255
|
+
}
|
|
256
|
+
updateQrItemsInGroup(updatedChildQRItem, null, qrItem, indexMap);
|
|
249
257
|
}
|
|
250
258
|
}
|
|
251
259
|
return applyCalculatedExpressionValuesInNonLeafItem(qItem, qrItem, calculatedExpressions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculatedExpression.js","sourceRoot":"","sources":["../../src/utils/calculatedExpression.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"calculatedExpression.js","sourceRoot":"","sources":["../../src/utils/calculatedExpression.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -85,6 +85,7 @@ function ChoiceSelectAnswerValueSetFields(props: ChoiceSelectAnswerValueSetField
|
|
|
85
85
|
readOnly={readOnly && readOnlyVisualStyle === 'readonly'}
|
|
86
86
|
renderInput={(params) => (
|
|
87
87
|
<StandardTextField
|
|
88
|
+
multiline
|
|
88
89
|
textFieldWidth={textFieldWidth}
|
|
89
90
|
isTabled={isTabled}
|
|
90
91
|
placeholder={entryFormat || displayPrompt}
|
|
@@ -159,7 +159,7 @@ function GridGroup(props: GridGroupProps) {
|
|
|
159
159
|
<QGroupContainerBox
|
|
160
160
|
cardElevation={groupCardElevation}
|
|
161
161
|
isRepeated={false}
|
|
162
|
-
py={
|
|
162
|
+
py={0}
|
|
163
163
|
data-linkid={qItem.linkId}
|
|
164
164
|
data-label={qItem.text}
|
|
165
165
|
onClick={() => onFocusLinkId(qItem.linkId)}
|
|
@@ -22,7 +22,7 @@ export const GroupCard = styled(Card, {
|
|
|
22
22
|
shouldForwardProp: (prop) => prop !== 'elevation' && prop !== 'isRepeated'
|
|
23
23
|
})<{ elevation: number; isRepeated: boolean }>(({ elevation, isRepeated }) => ({
|
|
24
24
|
paddingTop: '20px',
|
|
25
|
-
paddingBottom: '
|
|
25
|
+
paddingBottom: '0px',
|
|
26
26
|
paddingLeft: elevation === 1 ? '26px' : '24px',
|
|
27
27
|
paddingRight: elevation === 1 ? '26px' : '24px',
|
|
28
28
|
marginBottom: isRepeated ? 0 : '28px'
|
|
@@ -171,6 +171,8 @@ function GroupItemView(props: GroupItemViewProps) {
|
|
|
171
171
|
data-test="q-item-group-box"
|
|
172
172
|
role="region"
|
|
173
173
|
aria-label={qItem.text ?? 'Unnamed group'}
|
|
174
|
+
data-linkid={qItem.linkId}
|
|
175
|
+
data-label={qItem.text}
|
|
174
176
|
style={combinedStyles || undefined}>
|
|
175
177
|
{/* Show group heading when item.repeats=false AND itemTextToDisplay is valid */}
|
|
176
178
|
{!isRepeated && itemTextToDisplay ? (
|
|
@@ -216,6 +218,8 @@ function GroupItemView(props: GroupItemViewProps) {
|
|
|
216
218
|
cardElevation={groupCardElevation}
|
|
217
219
|
isRepeated={isRepeated}
|
|
218
220
|
data-test="q-item-group-box"
|
|
221
|
+
data-linkid={qItem.linkId}
|
|
222
|
+
data-label={qItem.text}
|
|
219
223
|
role="region"
|
|
220
224
|
aria-label={qItem.text ?? 'Unnamed group'}>
|
|
221
225
|
<GroupCard
|
|
@@ -97,7 +97,7 @@ const TabButtonsWrapper = memo(function TabButtonsWrapper(props: TabButtonsWrapp
|
|
|
97
97
|
const tabButtonsDisabled = numOfVisibleTabs <= 1;
|
|
98
98
|
|
|
99
99
|
return (
|
|
100
|
-
<Box display="flex" mt={3}>
|
|
100
|
+
<Box display="flex" mt={3} mb={3}>
|
|
101
101
|
{previousTabButtonHidden ? null : (
|
|
102
102
|
<PreviousTabButton
|
|
103
103
|
isDisabled={tabButtonsDisabled}
|
|
@@ -53,6 +53,8 @@ function CheckboxSingle(props: CheckboxSingleProps) {
|
|
|
53
53
|
const isHtmlDisabled = readOnlyWithDisabledStyle || disabledViaToggleExpression;
|
|
54
54
|
const isHtmlReadOnly = readOnlyWithReadOnlyStyle && !disabledViaToggleExpression;
|
|
55
55
|
|
|
56
|
+
const textForDataTest = labelText ?? (typeof label === 'string' ? label : value);
|
|
57
|
+
|
|
56
58
|
return (
|
|
57
59
|
<FormControlLabel
|
|
58
60
|
sx={{
|
|
@@ -66,6 +68,7 @@ function CheckboxSingle(props: CheckboxSingleProps) {
|
|
|
66
68
|
value={value}
|
|
67
69
|
control={
|
|
68
70
|
<StandardCheckbox
|
|
71
|
+
data-test={`checkbox-single-${textForDataTest}`}
|
|
69
72
|
size="small"
|
|
70
73
|
checked={isChecked}
|
|
71
74
|
readOnly={isHtmlReadOnly}
|
|
@@ -33,7 +33,7 @@ function AddItemButton(props: AddItemButtonProps) {
|
|
|
33
33
|
const isDisabled = repeatGroups[repeatGroups.length - 1]?.qrItem === null || readOnly;
|
|
34
34
|
|
|
35
35
|
return (
|
|
36
|
-
<Box display="flex" flexDirection="row-reverse">
|
|
36
|
+
<Box display="flex" flexDirection="row-reverse" sx={{ mt: 1 }}>
|
|
37
37
|
<Button
|
|
38
38
|
variant="contained"
|
|
39
39
|
size="small"
|
|
@@ -139,7 +139,7 @@ function RepeatGroupView(props: RepeatGroupViewProps) {
|
|
|
139
139
|
cardElevation={groupCardElevation}
|
|
140
140
|
isRepeated={true}
|
|
141
141
|
style={parentStyles || undefined}>
|
|
142
|
-
<Card elevation={groupCardElevation} sx={{ p: 3, py:
|
|
142
|
+
<Card elevation={groupCardElevation} sx={{ p: 3, py: 1.5, mb: 2.5 }}>
|
|
143
143
|
{itemTextToDisplay ? (
|
|
144
144
|
<>
|
|
145
145
|
<GroupHeading
|
|
@@ -37,7 +37,7 @@ function AddItemButton(props: AddItemButtonProps) {
|
|
|
37
37
|
lastAnswer === null || Object.keys(lastAnswer ?? {}).join() === 'id' || readOnly;
|
|
38
38
|
|
|
39
39
|
return (
|
|
40
|
-
<Box display="flex" flexDirection="row-reverse">
|
|
40
|
+
<Box display="flex" flexDirection="row-reverse" sx={{ mt: 1 }}>
|
|
41
41
|
<Button
|
|
42
42
|
variant="contained"
|
|
43
43
|
size="small"
|
|
@@ -24,11 +24,9 @@ export const RepeatRemoveTooltip = styled(Tooltip)(() => ({
|
|
|
24
24
|
}));
|
|
25
25
|
|
|
26
26
|
export const RepeatItemContainerStack = styled(Stack)(() => ({
|
|
27
|
-
alignItems: 'center'
|
|
28
|
-
paddingBottom: 8
|
|
27
|
+
alignItems: 'center'
|
|
29
28
|
}));
|
|
30
29
|
|
|
31
30
|
export const RepeatGroupContainerStack = styled(Stack)(() => ({
|
|
32
|
-
alignItems: 'center'
|
|
33
|
-
paddingBottom: 16
|
|
31
|
+
alignItems: 'center'
|
|
34
32
|
}));
|
|
@@ -193,7 +193,7 @@ function GroupTableView(props: GroupTableViewProps) {
|
|
|
193
193
|
<QGroupContainerBox
|
|
194
194
|
cardElevation={groupCardElevation}
|
|
195
195
|
isRepeated={false}
|
|
196
|
-
py={
|
|
196
|
+
py={0}
|
|
197
197
|
data-linkid={qItem.linkId}
|
|
198
198
|
data-label={qItem.text}
|
|
199
199
|
onClick={() => onFocusLinkId(qItem.linkId)}
|
|
@@ -54,6 +54,8 @@ const FormBodySingleCollapsible = memo(function FormBodySingleCollapsible(
|
|
|
54
54
|
slotProps={{
|
|
55
55
|
transition: { unmountOnExit: true, timeout: 250 }
|
|
56
56
|
}}
|
|
57
|
+
data-linkid={qItem.linkId}
|
|
58
|
+
data-label={qItem.text}
|
|
57
59
|
onChange={() => onToggleExpand(index)}>
|
|
58
60
|
<AccordionSummary expandIcon={<ExpandMoreIcon />}>
|
|
59
61
|
<Box display="flex" alignItems="center" justifyContent="space-between" width="100%" mr={3}>
|
|
@@ -66,7 +66,11 @@ const FormBodyTabList = memo(function FormBodyTabList(props: FormBodyTabListProp
|
|
|
66
66
|
const tabLabel = getShortText(qItem) ?? getItemTextToDisplay(qItem) ?? '';
|
|
67
67
|
|
|
68
68
|
return (
|
|
69
|
-
<Collapse
|
|
69
|
+
<Collapse
|
|
70
|
+
key={qItem.linkId}
|
|
71
|
+
timeout={100}
|
|
72
|
+
data-linkid={qItem.linkId}
|
|
73
|
+
data-label={qItem.text}>
|
|
70
74
|
<FormBodySingleTab
|
|
71
75
|
qItem={qItem}
|
|
72
76
|
contextDisplayItems={contextDisplayItems}
|
|
@@ -370,7 +370,7 @@ function applyCalculatedExpressionValuesRecursive(
|
|
|
370
370
|
);
|
|
371
371
|
}
|
|
372
372
|
|
|
373
|
-
|
|
373
|
+
let qrItem = qrItemOrItems;
|
|
374
374
|
const childQItems = qItem.item;
|
|
375
375
|
if (childQItems && childQItems.length > 0) {
|
|
376
376
|
const childQrItems = qrItem?.item ?? [];
|
|
@@ -391,13 +391,17 @@ function applyCalculatedExpressionValuesRecursive(
|
|
|
391
391
|
// Update QR items in repeating group
|
|
392
392
|
if (Array.isArray(updatedChildQRItemOrItems)) {
|
|
393
393
|
if (updatedChildQRItemOrItems.length > 0) {
|
|
394
|
+
// Lazily initialise qrItem so all children are added to the same group object
|
|
395
|
+
if (!qrItem) {
|
|
396
|
+
qrItem = structuredClone(createEmptyQrGroup(qItem));
|
|
397
|
+
}
|
|
394
398
|
updateQrItemsInGroup(
|
|
395
399
|
null,
|
|
396
400
|
{
|
|
397
401
|
linkId: childQItem.linkId,
|
|
398
402
|
qrItems: updatedChildQRItemOrItems
|
|
399
403
|
},
|
|
400
|
-
qrItem
|
|
404
|
+
qrItem,
|
|
401
405
|
indexMap
|
|
402
406
|
);
|
|
403
407
|
}
|
|
@@ -407,12 +411,11 @@ function applyCalculatedExpressionValuesRecursive(
|
|
|
407
411
|
// Update QR items in non-repeating group
|
|
408
412
|
const updatedChildQRItem = updatedChildQRItemOrItems;
|
|
409
413
|
if (updatedChildQRItem) {
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
413
|
-
|
|
414
|
-
|
|
415
|
-
);
|
|
414
|
+
// Lazily initialise qrItem so all children are added to the same group object
|
|
415
|
+
if (!qrItem) {
|
|
416
|
+
qrItem = structuredClone(createEmptyQrGroup(qItem));
|
|
417
|
+
}
|
|
418
|
+
updateQrItemsInGroup(updatedChildQRItem, null, qrItem, indexMap);
|
|
416
419
|
}
|
|
417
420
|
}
|
|
418
421
|
|