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

package/lib/components/FormComponents/GridGroup/GridGroup.js

@@ -15,7 +15,7 @@ import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-run
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { useMemo } from 'react';
+import { useMemo, useRef, useState } from 'react';
 import { createEmptyQrGroup, updateQrItemsInGroup } from '../../../utils/qrItem';
 import useHidden from '../../../hooks/useHidden';
 import { QGroupContainerBox } from '../../Box.styles';
@@ -25,11 +25,14 @@ import TableContainer from '@mui/material/TableContainer';
 import { mapQItemsIndex } from '../../../utils/mapItem';
 import GridTable from './GridTable';
 import useReadOnly from '../../../hooks/useReadOnly';
-import { useQuestionnaireStore, useRendererStylingStore } from '../../../stores';
+import { useQuestionnaireStore, useRendererConfigStore } from '../../../stores';
 import GroupHeading from '../GroupItem/GroupHeading';
 import { structuredDataCapture } from 'fhir-sdc-helpers';
 import { getItemTextToDisplay } from '../../../utils/itemTextToDisplay';
 import { isItemHidden } from '../../../utils/qItem';
+import { useResizeColumns } from '../../../hooks/useResizeColumns';
+import { getColumnWidth } from '../../../utils/extensions';
+import { calculateColumnWidths } from '../../../utils/columnWidth';
 /**
  * Main component to render a Group Grid (grid) Questionnaire item.
  * @see {@link https://hl7.org/fhir/extensions/CodeSystem-questionnaire-item-control.html}
@@ -37,20 +40,20 @@ import { isItemHidden } from '../../../utils/qItem';
  * @author Sean Fong
  */
 function GridGroup(props) {
-    const { qItem, qrItem, itemPath, groupCardElevation, parentIsReadOnly, parentStyles, onQrItemChange } = props;
+    const { qItem, qrItem, groupCardElevation, parentIsReadOnly, parentStyles, onQrItemChange } = props;
     const enableWhenIsActivated = useQuestionnaireStore.use.enableWhenIsActivated();
     const enableWhenItems = useQuestionnaireStore.use.enableWhenItems();
     const enableWhenExpressions = useQuestionnaireStore.use.enableWhenExpressions();
-    const enableWhenAsReadOnly = useRendererStylingStore.use.enableWhenAsReadOnly();
+    const enableWhenAsReadOnly = useRendererConfigStore.use.enableWhenAsReadOnly();
     const onFocusLinkId = useQuestionnaireStore.use.onFocusLinkId();
     const qRowItems = qItem.item;
     const qrGroup = qrItem && qrItem.item ? qrItem : createEmptyQrGroup(qItem);
     const qrRowItems = qrGroup.item;
     const qItemsIndexMap = useMemo(() => mapQItemsIndex(qItem), [qItem]);
     // Prepare visible first-row items. we use useMemo because we are using it inside useMemo later.
-    const firstRowItems = useMemo(() => { var _a, _b; return (_b = (_a = qRowItems === null || qRowItems === void 0 ? void 0 : qRowItems[0]) === null || _a === void 0 ? void 0 : _a.item) !== null && _b !== void 0 ? _b : []; }, [qRowItems]);
+    const firstRowItems = useMemo(() => qRowItems?.[0]?.item ?? [], [qRowItems]);
     // Get the items and ignore hidden columns as they are automatically added to the columnHeaders as empty space.
-    const visibleColumnItems = useMemo(() => firstRowItems === null || firstRowItems === void 0 ? void 0 : firstRowItems.filter((item) => !isItemHidden(item, enableWhenIsActivated, enableWhenItems, enableWhenExpressions, enableWhenAsReadOnly)), [
+    const visibleColumnItems = useMemo(() => firstRowItems?.filter((item) => !isItemHidden(item, enableWhenIsActivated, enableWhenItems, enableWhenExpressions, enableWhenAsReadOnly)), [
         enableWhenAsReadOnly,
         enableWhenExpressions,
         enableWhenIsActivated,
@@ -58,16 +61,22 @@ function GridGroup(props) {
         firstRowItems
     ]);
     // Get column headers from first row item.text
-    const columnHeaders = useMemo(() => {
-        var _a;
-        return (_a = visibleColumnItems.map((firstItem) => {
-            var _a, _b;
-            return ({
-                label: (_a = getItemTextToDisplay(firstItem)) !== null && _a !== void 0 ? _a : ' ',
-                styleString: (_b = structuredDataCapture.getStyle(firstItem._text)) !== null && _b !== void 0 ? _b : null
-            });
-        })) !== null && _a !== void 0 ? _a : [];
-    }, [visibleColumnItems]);
+    const columnHeaders = useMemo(() => visibleColumnItems.map((firstItem) => ({
+        label: getItemTextToDisplay(firstItem) ?? ' ',
+        styleString: structuredDataCapture.getStyle(firstItem._text) ?? null
+    })) ?? [], [visibleColumnItems]);
+    // Table width ref and state
+    const tableContainerRef = useRef(null);
+    const [tableWidth, setTableWidth] = useState(0);
+    useResizeColumns(tableContainerRef, setTableWidth);
+    // Build and calculate column widths
+    // Add an initial 20% width for the row header column temporarily, will be removed after calculation
+    const columnWidths = useMemo(() => ['20%', ...visibleColumnItems.map((item) => getColumnWidth(item))], [visibleColumnItems]);
+    const calculatedColumnWidths = useMemo(() => {
+        const calculatedColumnWidthsInclLabel = calculateColumnWidths(columnWidths, tableWidth);
+        // Remove the first column width of 20% as it is for the row header
+        return calculatedColumnWidthsInclLabel.slice(1);
+    }, [columnWidths, tableWidth]);
     const readOnly = useReadOnly(qItem, parentIsReadOnly);
     const itemIsHidden = useHidden(qItem);
     if (itemIsHidden) {
@@ -81,14 +90,14 @@ function GridGroup(props) {
         return null;
     }
     // Event Handlers
-    function handleRowChange(newQrItem, targetItemPath) {
-        const updatedQrGroup = Object.assign({}, qrGroup);
+    function handleRowChange(newQrItem) {
+        const updatedQrGroup = { ...qrGroup };
         updateQrItemsInGroup(newQrItem, null, updatedQrGroup, qItemsIndexMap);
-        onQrItemChange(updatedQrGroup, targetItemPath);
+        onQrItemChange(updatedQrGroup);
     }
     // Get item.text as display label
     const itemTextToDisplay = getItemTextToDisplay(qItem);
-    return (_jsxs(QGroupContainerBox, { cardElevation: groupCardElevation, isRepeated: false, py: 3, "data-linkid": qItem.linkId, 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: _jsx(GridTable, { qItems: qRowItems, qrItems: qrRowItems, qItemsIndexMap: qItemsIndexMap, columnHeaders: columnHeaders, itemPath: itemPath, parentIsReadOnly: readOnly, parentStyles: parentStyles, onQrItemChange: handleRowChange }) })] }));
+    return (_jsxs(QGroupContainerBox, { cardElevation: groupCardElevation, isRepeated: false, py: 3, "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 }) }) })] }));
 }
 export default GridGroup;
 //# sourceMappingURL=GridGroup.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"GridGroup.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/GridGroup/GridGroup.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"GridGroup.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/GridGroup/GridGroup.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAc,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAOzD,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AACjF,OAAO,SAAS,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AACtD,OAAO,OAAO,MAAM,uBAAuB,CAAC;AAC5C,OAAO,KAAK,MAAM,qBAAqB,CAAC;AACxC,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,SAAS,MAAM,aAAa,CAAC;AACpC,OAAO,WAAW,MAAM,4BAA4B,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,sBAAsB,EAAE,MAAM,iBAAiB,CAAC;AAChF,OAAO,YAAY,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACpD,OAAO,EAAE,gBAAgB,EAAE,MAAM,iCAAiC,CAAC;AACnE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAWnE;;;;;GAKG;AACH,SAAS,SAAS,CAAC,KAAqB;IACtC,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,kBAAkB,EAAE,gBAAgB,EAAE,YAAY,EAAE,cAAc,EAAE,GACzF,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;IAChF,MAAM,oBAAoB,GAAG,sBAAsB,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC;IAE/E,MAAM,aAAa,GAAG,qBAAqB,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC;IAEhE,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC;IAC7B,MAAM,OAAO,GAAG,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;IAC3E,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAC;IAEhC,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAErE,gGAAgG;IAChG,MAAM,aAAa,GAAwB,OAAO,CAAC,GAAG,EAAE,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,IAAI,IAAI,EAAE,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAElG,+GAA+G;IAC/G,MAAM,kBAAkB,GAAwB,OAAO,CACrD,GAAG,EAAE,CACH,aAAa,EAAE,MAAM,CACnB,CAAC,IAAI,EAAE,EAAE,CACP,CAAC,YAAY,CACX,IAAI,EACJ,qBAAqB,EACrB,eAAe,EACf,qBAAqB,EACrB,oBAAoB,CACrB,CACJ,EACH;QACE,oBAAoB;QACpB,qBAAqB;QACrB,qBAAqB;QACrB,eAAe;QACf,aAAa;KACd,CACF,CAAC;IAEF,8CAA8C;IAC9C,MAAM,aAAa,GAGb,OAAO,CACX,GAAG,EAAE,CACH,kBAAkB,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QACrC,KAAK,EAAE,oBAAoB,CAAC,SAAS,CAAC,IAAI,GAAG;QAC7C,WAAW,EAAE,qBAAqB,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,IAAI;KACrE,CAAC,CAAC,IAAI,EAAE,EACX,CAAC,kBAAkB,CAAC,CACrB,CAAC;IAEF,4BAA4B;IAC5B,MAAM,iBAAiB,GAAG,MAAM,CAAiB,IAAI,CAAC,CAAC;IACvD,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;IAEhD,gBAAgB,CAAC,iBAAiB,EAAE,aAAa,CAAC,CAAC;IAEnD,oCAAoC;IACpC,oGAAoG;IACpG,MAAM,YAAY,GAAG,OAAO,CAC1B,GAAG,EAAE,CAAC,CAAC,KAAK,EAAE,GAAG,kBAAkB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC,CAAC,EACxE,CAAC,kBAAkB,CAAC,CACrB,CAAC;IAEF,MAAM,sBAAsB,GAAG,OAAO,CAAC,GAAG,EAAE;QAC1C,MAAM,+BAA+B,GAAG,qBAAqB,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;QAExF,mEAAmE;QACnE,OAAO,+BAA+B,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IAClD,CAAC,EAAE,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,CAAC;IAE/B,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,EAAE,gBAAgB,CAAC,CAAC;IACtD,MAAM,YAAY,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IACtC,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC,SAAS,IAAI,CAAC,UAAU,EAAE,CAAC;QAC9B,OAAO,yFAA6D,CAAC;IACvE,CAAC;IAED,yCAAyC;IACzC,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC3B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,iBAAiB;IACjB,SAAS,eAAe,CAAC,SAAoC;QAC3D,MAAM,cAAc,GAA8B,EAAE,GAAG,OAAO,EAAE,CAAC;QACjE,oBAAoB,CAAC,SAAS,EAAE,IAAI,EAAE,cAAc,EAAE,cAAc,CAAC,CAAC;QACtE,cAAc,CAAC,cAAc,CAAC,CAAC;IACjC,CAAC;IAED,iCAAiC;IACjC,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAEtD,OAAO,CACL,MAAC,kBAAkB,IACjB,aAAa,EAAE,kBAAkB,EACjC,UAAU,EAAE,KAAK,EACjB,EAAE,EAAE,CAAC,iBACQ,KAAK,CAAC,MAAM,gBACb,KAAK,CAAC,IAAI,EACtB,OAAO,EAAE,GAAG,EAAE,CAAC,aAAa,CAAC,KAAK,CAAC,MAAM,CAAC,EAC1C,KAAK,EAAE,YAAY,IAAI,SAAS,aAC/B,iBAAiB,CAAC,CAAC,CAAC,CACnB,8BACE,KAAC,YAAY,IAAC,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,QAAQ,EAAE,kBAAkB,EAAE,kBAAkB,GAAI,EAC1F,KAAC,OAAO,IAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,GAAI,IACvC,CACJ,CAAC,CAAC,CAAC,IAAI,EAER,cAAK,GAAG,EAAE,iBAAiB,EAAE,KAAK,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,YACnD,KAAC,cAAc,IAAC,SAAS,EAAE,KAAK,EAAE,SAAS,EAAE,kBAAkB,YAC7D,KAAC,SAAS,IACR,MAAM,EAAE,SAAS,EACjB,OAAO,EAAE,UAAU,EACnB,cAAc,EAAE,cAAc,EAC9B,aAAa,EAAE,aAAa,EAC5B,sBAAsB,EAAE,sBAAsB,EAC9C,gBAAgB,EAAE,QAAQ,EAC1B,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,eAAe,GAC/B,GACa,GACb,IACa,CACtB,CAAC;AACJ,CAAC;AAED,eAAe,SAAS,CAAC"}

package/lib/components/FormComponents/GridGroup/GridRow.d.ts

@@ -1,9 +1,13 @@
 import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
-import type { PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithParentStylesAttribute, PropsWithQrItemChangeHandler } from '../../../interfaces/renderProps.interface';
-interface GridRowProps extends PropsWithQrItemChangeHandler, PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithParentStylesAttribute {
+import type { PropsWithParentIsReadOnlyAttribute, PropsWithParentStylesAttribute, PropsWithQrItemChangeHandler } from '../../../interfaces/renderProps.interface';
+interface GridRowProps extends PropsWithQrItemChangeHandler, PropsWithParentIsReadOnlyAttribute, PropsWithParentStylesAttribute {
     qItem: QuestionnaireItem;
     qrItem: QuestionnaireResponseItem | null;
     columnHeaderLabels: string[];
+    calculatedColumnWidths: {
+        width: string;
+        isFixed: boolean;
+    }[];
 }
 declare function GridRow(props: GridRowProps): import("react/jsx-runtime").JSX.Element | null;
 export default GridRow;

package/lib/components/FormComponents/GridGroup/GridRow.js

@@ -23,10 +23,9 @@ import { getQrItemsIndex, mapQItemsIndex } from '../../../utils/mapItem';
 import Typography from '@mui/material/Typography';
 import Box from '@mui/material/Box';
 import useHidden from '../../../hooks/useHidden';
-import { extendItemPath } from '../../../utils/itemPath';
 import { getItemTextToDisplay } from '../../../utils/itemTextToDisplay';
 function GridRow(props) {
-    const { qItem, qrItem, itemPath, columnHeaderLabels, parentIsReadOnly, parentStyles, onQrItemChange } = props;
+    const { qItem, qrItem, columnHeaderLabels, calculatedColumnWidths, parentIsReadOnly, parentStyles, onQrItemChange } = props;
     const rowQItems = qItem.item;
     const row = qrItem && qrItem.item ? qrItem : createEmptyQrGroup(qItem);
     const rowQrItems = row.item;
@@ -39,14 +38,13 @@ function GridRow(props) {
         return null;
     }
     // Add textAlign center style to all grid cells and pass it as parentStyles to the next item
-    const gridCellStyles = Object.assign(Object.assign({}, parentStyles), { textAlign: 'center' });
-    function handleQrRowItemChange(newQrRowItem, targetItemPath) {
-        const qrRow = Object.assign({}, row);
+    const gridCellStyles = { ...parentStyles, textAlign: 'center' };
+    function handleQrRowItemChange(newQrRowItem) {
+        const qrRow = { ...row };
         updateQrItemsInGroup(newQrRowItem, null, qrRow, qItemsIndexMap);
-        onQrItemChange(qrRow, targetItemPath);
+        onQrItemChange(qrRow);
     }
     const qrItemsByIndex = getQrItemsIndex(rowQItems, rowQrItems, qItemsIndexMap);
-    const numOfColumns = columnHeaderLabels.length;
     // Get item.text as display label
     const itemTextToDisplay = getItemTextToDisplay(qItem);
     return (_jsxs(_Fragment, { children: [_jsx(GridTextTableCell, { children: _jsx(Typography, { component: "span", fontWeight: "bold", children: itemTextToDisplay }) }), columnHeaderLabels.map((label, colIndex) => {
@@ -54,14 +52,14 @@ function GridRow(props) {
                 const matchingCellQItemIndex = rowQItems.findIndex((item) => item.text === label);
                 // Render empty cell for sparsity
                 if (matchingCellQItemIndex === -1) {
-                    return _jsx(GridAnswerTableCell, { numOfColumns: numOfColumns }, colIndex);
+                    return (_jsx(GridAnswerTableCell, { calculatedWidth: calculatedColumnWidths[colIndex]?.width }, colIndex));
                 }
                 const cellQItem = rowQItems[matchingCellQItemIndex];
                 const cellQrItem = qrItemsByIndex[matchingCellQItemIndex];
                 if (Array.isArray(cellQrItem)) {
                     return null;
                 }
-                return (_jsx(GridAnswerTableCell, { numOfColumns: numOfColumns, children: _jsx(Box, { display: "flex", alignItems: "center", justifyContent: "center", children: _jsx(SingleItem, { qItem: cellQItem, qrItem: cellQrItem !== null && cellQrItem !== void 0 ? cellQrItem : null, itemPath: extendItemPath(itemPath, cellQItem.linkId), isRepeated: true, isTabled: true, groupCardElevation: 1, parentIsReadOnly: parentIsReadOnly, parentStyles: gridCellStyles, onQrItemChange: handleQrRowItemChange }) }) }, colIndex));
+                return (_jsx(GridAnswerTableCell, { calculatedWidth: calculatedColumnWidths[colIndex]?.width, children: _jsx(Box, { display: "flex", alignItems: "center", justifyContent: "center", children: _jsx(SingleItem, { qItem: cellQItem, qrItem: cellQrItem ?? null, isRepeated: true, isTabled: true, groupCardElevation: 1, parentIsReadOnly: parentIsReadOnly, parentStyles: gridCellStyles, onQrItemChange: handleQrRowItemChange }) }) }, colIndex));
             })] }));
 }
 export default GridRow;

package/lib/components/FormComponents/GridGroup/GridRow.js.map

@@ -1 +1 @@
-{"version":3,"file":"GridRow.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/GridGroup/GridRow.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAc,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAQvC,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,uBAAuB,CAAC;AACjF,OAAO,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAChF,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACzE,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,SAAS,MAAM,0BAA0B,CAAC;AACjD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAEzD,OAAO,EAAE,oBAAoB,EAAE,MAAM,kCAAkC,CAAC;AAYxE,SAAS,OAAO,CAAC,KAAmB;IAClC,MAAM,EACJ,KAAK,EACL,MAAM,EACN,QAAQ,EACR,kBAAkB,EAClB,gBAAgB,EAChB,YAAY,EACZ,cAAc,EACf,GAAG,KAAK,CAAC;IAEV,MAAM,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC;IAC7B,MAAM,GAAG,GAAG,MAAM,IAAI,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC;IACvE,MAAM,UAAU,GAAG,GAAG,CAAC,IAAI,CAAC;IAE5B,MAAM,cAAc,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,cAAc,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC;IAErE,MAAM,YAAY,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IACtC,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,CAAC,SAAS,IAAI,CAAC,UAAU,IAAI,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,4FAA4F;IAC5F,MAAM,cAAc,mCAAQ,YAAY,KAAE,SAAS,EAAE,QAAQ,GAAE,CAAC;IAEhE,SAAS,qBAAqB,CAC5B,YAAuC,EACvC,cAAyB;QAEzB,MAAM,KAAK,qBAAmC,GAAG,CAAE,CAAC;QACpD,oBAAoB,CAAC,YAAY,EAAE,IAAI,EAAE,KAAK,EAAE,cAAc,CAAC,CAAC;QAChE,cAAc,CAAC,KAAK,EAAE,cAAc,CAAC,CAAC;IACxC,CAAC;IAED,MAAM,cAAc,GAAG,eAAe,CAAC,SAAS,EAAE,UAAU,EAAE,cAAc,CAAC,CAAC;IAE9E,MAAM,YAAY,GAAG,kBAAkB,CAAC,MAAM,CAAC;IAE/C,iCAAiC;IACjC,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,KAAK,CAAC,CAAC;IAEtD,OAAO,CACL,8BACE,KAAC,iBAAiB,cAChB,KAAC,UAAU,IAAC,SAAS,EAAC,MAAM,EAAC,UAAU,EAAC,MAAM,YAC3C,iBAAiB,GACP,GACK,EACnB,kBAAkB,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;gBAC1C,+EAA+E;gBAC/E,MAAM,sBAAsB,GAAG,SAAS,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;gBAElF,iCAAiC;gBACjC,IAAI,sBAAsB,KAAK,CAAC,CAAC,EAAE,CAAC;oBAClC,OAAO,KAAC,mBAAmB,IAAgB,YAAY,EAAE,YAAY,IAApC,QAAQ,CAAgC,CAAC;gBAC5E,CAAC;gBAED,MAAM,SAAS,GAAG,SAAS,CAAC,sBAAsB,CAAC,CAAC;gBACpD,MAAM,UAAU,GAAG,cAAc,CAAC,sBAAsB,CAAC,CAAC;gBAE1D,IAAI,KAAK,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,CAAC;oBAC9B,OAAO,IAAI,CAAC;gBACd,CAAC;gBAED,OAAO,CACL,KAAC,mBAAmB,IAAgB,YAAY,EAAE,YAAY,YAC5D,KAAC,GAAG,IAAC,OAAO,EAAC,MAAM,EAAC,UAAU,EAAC,QAAQ,EAAC,cAAc,EAAC,QAAQ,YAC7D,KAAC,UAAU,IACT,KAAK,EAAE,SAAS,EAChB,MAAM,EAAE,UAAU,aAAV,UAAU,cAAV,UAAU,GAAI,IAAI,EAC1B,QAAQ,EAAE,cAAc,CAAC,QAAQ,EAAE,SAAS,CAAC,MAAM,CAAC,EACpD,UAAU,EAAE,IAAI,EAChB,QAAQ,EAAE,IAAI,EACd,kBAAkB,EAAE,CAAC,EACrB,gBAAgB,EAAE,gBAAgB,EAClC,YAAY,EAAE,cAAc,EAC5B,cAAc,EAAE,qBAAqB,GACrC,GACE,IAbkB,QAAQ,CAcZ,CACvB,CAAC;YACJ,CAAC,CAAC,IACD,CACJ,CAAC;AACJ,CAAC;AAED,eAAe,OAAO,CAAC"}
+{"version":3,"file":"GridRow.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/GridGroup/GridRow.tsx"],"names":[],"mappings":"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"}

package/lib/components/FormComponents/GridGroup/GridTable.d.ts

@@ -1,6 +1,6 @@
 import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
-import type { PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithQrItemChangeHandler, PropsWithParentStylesAttribute } from '../../../interfaces/renderProps.interface';
-interface GridTableProps extends PropsWithQrItemChangeHandler, PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithParentStylesAttribute {
+import type { PropsWithParentIsReadOnlyAttribute, PropsWithParentStylesAttribute, PropsWithQrItemChangeHandler } from '../../../interfaces/renderProps.interface';
+interface GridTableProps extends PropsWithQrItemChangeHandler, PropsWithParentIsReadOnlyAttribute, PropsWithParentStylesAttribute {
     qItems: QuestionnaireItem[];
     qrItems: QuestionnaireResponseItem[];
     qItemsIndexMap: Record<string, number>;
@@ -8,6 +8,10 @@ interface GridTableProps extends PropsWithQrItemChangeHandler, PropsWithItemPath
         label: string;
         styleString: string | null;
     }[];
+    calculatedColumnWidths: {
+        width: string;
+        isFixed: boolean;
+    }[];
 }
 declare function GridTable(props: GridTableProps): import("react/jsx-runtime").JSX.Element;
 export default GridTable;

package/lib/components/FormComponents/GridGroup/GridTable.js

@@ -24,10 +24,9 @@ import TableRow from '@mui/material/TableRow';
 import { HeaderTableCell } from '../Tables/Table.styles';
 import GridRow from './GridRow';
 import { getQrItemsIndex } from '../../../utils/mapItem';
-import { extendItemPath } from '../../../utils/itemPath';
 import { default as parseStyleToJs } from 'style-to-js';
 function GridTable(props) {
-    const { qItems, qrItems, qItemsIndexMap, columnHeaders, itemPath, parentIsReadOnly, parentStyles, onQrItemChange } = props;
+    const { qItems, qrItems, qItemsIndexMap, columnHeaders, calculatedColumnWidths, parentIsReadOnly, parentStyles, onQrItemChange } = props;
     const qrItemsByIndex = getQrItemsIndex(qItems, qrItems, qItemsIndexMap);
     const columnHeaderLabels = useMemo(() => columnHeaders.map(({ label }) => label), [columnHeaders]);
     return (_jsxs(Table, { children: [_jsx(TableHead, { children: _jsxs(TableRow, { children: [_jsx(HeaderTableCell, {}), columnHeaders.map(({ label, styleString }) => {
@@ -36,14 +35,18 @@ function GridTable(props) {
                                 textAlign: 'center'
                             };
                             const itemStyles = styleString ? parseStyleToJs(styleString) : {};
-                            const combinedStyle = Object.assign(Object.assign(Object.assign({}, defaultStyle), parentStyles), itemStyles);
+                            const combinedStyle = {
+                                ...defaultStyle,
+                                ...parentStyles,
+                                ...itemStyles
+                            };
                             return (_jsx(HeaderTableCell, { size: "medium", style: combinedStyle, children: label }, label));
                         }), _jsx(TableCell, {})] }) }), _jsx(TableBody, { children: qItems.map((qItem, index) => {
                     const qrItem = qrItemsByIndex[index];
                     if (Array.isArray(qrItem)) {
                         return null;
                     }
-                    return (_jsx(TableRow, { children: _jsx(GridRow, { qItem: qItem, qrItem: qrItem !== null && qrItem !== void 0 ? qrItem : null, columnHeaderLabels: columnHeaderLabels, itemPath: extendItemPath(itemPath, qItem.linkId), parentIsReadOnly: parentIsReadOnly, parentStyles: parentStyles, onQrItemChange: onQrItemChange }) }, qItem.linkId));
+                    return (_jsx(TableRow, { children: _jsx(GridRow, { qItem: qItem, qrItem: qrItem ?? null, columnHeaderLabels: columnHeaderLabels, calculatedColumnWidths: calculatedColumnWidths, parentIsReadOnly: parentIsReadOnly, parentStyles: parentStyles, onQrItemChange: onQrItemChange }) }, qItem.linkId));
                 }) })] }));
 }
 export default GridTable;

package/lib/components/FormComponents/GridGroup/GridTable.js.map

@@ -1 +1 @@
-{"version":3,"file":"GridTable.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/GridGroup/GridTable.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAc,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,MAAM,qBAAqB,CAAC;AACxC,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,OAAO,MAAM,WAAW,CAAC;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAOzD,OAAO,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AACzD,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,aAAa,CAAC;AAgBxD,SAAS,SAAS,CAAC,KAAqB;IACtC,MAAM,EACJ,MAAM,EACN,OAAO,EACP,cAAc,EACd,aAAa,EACb,QAAQ,EACR,gBAAgB,EAChB,YAAY,EACZ,cAAc,EACf,GAAG,KAAK,CAAC;IAEV,MAAM,cAAc,GAAG,eAAe,CAAC,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAExE,MAAM,kBAAkB,GAAG,OAAO,CAChC,GAAG,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,EAC7C,CAAC,aAAa,CAAC,CAChB,CAAC;IAEF,OAAO,CACL,MAAC,KAAK,eACJ,KAAC,SAAS,cACR,MAAC,QAAQ,eACP,KAAC,eAAe,KAAG,EAElB,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE;4BAC5C,yDAAyD;4BACzD,MAAM,YAAY,GAAwB;gCACxC,SAAS,EAAE,QAAQ;6BACpB,CAAC;4BAEF,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;4BAClE,MAAM,aAAa,iDACd,YAAY,GACZ,YAAY,GACZ,UAAU,CACd,CAAC;4BAEF,OAAO,CACL,KAAC,eAAe,IAAa,IAAI,EAAC,QAAQ,EAAC,KAAK,EAAE,aAAa,YAC5D,KAAK,IADc,KAAK,CAET,CACnB,CAAC;wBACJ,CAAC,CAAC,EACF,KAAC,SAAS,KAAG,IACJ,GACD,EACZ,KAAC,SAAS,cACP,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;oBAC3B,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;oBAErC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;wBAC1B,OAAO,IAAI,CAAC;oBACd,CAAC;oBAED,OAAO,CACL,KAAC,QAAQ,cACP,KAAC,OAAO,IACN,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,IAAI,EACtB,kBAAkB,EAAE,kBAAkB,EACtC,QAAQ,EAAE,cAAc,CAAC,QAAQ,EAAE,KAAK,CAAC,MAAM,CAAC,EAChD,gBAAgB,EAAE,gBAAgB,EAClC,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,GAC9B,IATW,KAAK,CAAC,MAAM,CAUhB,CACZ,CAAC;gBACJ,CAAC,CAAC,GACQ,IACN,CACT,CAAC;AACJ,CAAC;AAED,eAAe,SAAS,CAAC"}
+{"version":3,"file":"GridTable.js","sourceRoot":"","sources":["../../../../src/components/FormComponents/GridGroup/GridTable.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAc,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,MAAM,qBAAqB,CAAC;AACxC,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,SAAS,MAAM,yBAAyB,CAAC;AAChD,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,OAAO,MAAM,WAAW,CAAC;AAEhC,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAMzD,OAAO,EAAE,OAAO,IAAI,cAAc,EAAE,MAAM,aAAa,CAAC;AAgBxD,SAAS,SAAS,CAAC,KAAqB;IACtC,MAAM,EACJ,MAAM,EACN,OAAO,EACP,cAAc,EACd,aAAa,EACb,sBAAsB,EAEtB,gBAAgB,EAChB,YAAY,EACZ,cAAc,EACf,GAAG,KAAK,CAAC;IAEV,MAAM,cAAc,GAAG,eAAe,CAAC,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC,CAAC;IAExE,MAAM,kBAAkB,GAAG,OAAO,CAChC,GAAG,EAAE,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC,KAAK,CAAC,EAC7C,CAAC,aAAa,CAAC,CAChB,CAAC;IAEF,OAAO,CACL,MAAC,KAAK,eACJ,KAAC,SAAS,cACR,MAAC,QAAQ,eACP,KAAC,eAAe,KAAG,EAElB,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,EAAE,EAAE;4BAC5C,yDAAyD;4BACzD,MAAM,YAAY,GAAwB;gCACxC,SAAS,EAAE,QAAQ;6BACpB,CAAC;4BAEF,MAAM,UAAU,GAAG,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;4BAClE,MAAM,aAAa,GAAG;gCACpB,GAAG,YAAY;gCACf,GAAG,YAAY;gCACf,GAAG,UAAU;6BACd,CAAC;4BAEF,OAAO,CACL,KAAC,eAAe,IAAa,IAAI,EAAC,QAAQ,EAAC,KAAK,EAAE,aAAa,YAC5D,KAAK,IADc,KAAK,CAET,CACnB,CAAC;wBACJ,CAAC,CAAC,EACF,KAAC,SAAS,KAAG,IACJ,GACD,EACZ,KAAC,SAAS,cACP,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;oBAC3B,MAAM,MAAM,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC;oBAErC,IAAI,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAC;wBAC1B,OAAO,IAAI,CAAC;oBACd,CAAC;oBAED,OAAO,CACL,KAAC,QAAQ,cACP,KAAC,OAAO,IACN,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,IAAI,IAAI,EACtB,kBAAkB,EAAE,kBAAkB,EACtC,sBAAsB,EAAE,sBAAsB,EAC9C,gBAAgB,EAAE,gBAAgB,EAClC,YAAY,EAAE,YAAY,EAC1B,cAAc,EAAE,cAAc,GAC9B,IATW,KAAK,CAAC,MAAM,CAUhB,CACZ,CAAC;gBACJ,CAAC,CAAC,GACQ,IACN,CACT,CAAC;AACJ,CAAC;AAED,eAAe,SAAS,CAAC"}

package/lib/components/FormComponents/GroupItem/GroupHeading.js

@@ -21,22 +21,22 @@ import Typography from '@mui/material/Typography';
 import { getContextDisplays } from '../../../utils/tabs';
 import ContextDisplayItem from '../ItemParts/ContextDisplayItem';
 import useRenderingExtensions from '../../../hooks/useRenderingExtensions';
-import { useRendererStylingStore } from '../../../stores';
+import { useRendererConfigStore } from '../../../stores';
 import RequiredAsterisk from '../ItemParts/RequiredAsterisk';
 import ItemTextSwitcher from '../ItemParts/ItemTextSwitcher';
 import FlyoverItem from '../ItemParts/FlyoverItem';
 import { getHeadingTag } from '../../../utils/headingVariant';
 const GroupHeading = memo(function GroupHeading(props) {
     const { qItem, readOnly, groupCardElevation, tabIsMarkedAsComplete, pageIsMarkedAsComplete, parentStyles } = props;
-    const requiredIndicatorPosition = useRendererStylingStore.use.requiredIndicatorPosition();
+    const requiredIndicatorPosition = useRendererConfigStore.use.requiredIndicatorPosition();
     const { required, displayFlyover } = useRenderingExtensions(qItem);
     const contextDisplayItems = getContextDisplays(qItem);
     const isTabHeading = tabIsMarkedAsComplete !== undefined;
     const isPageHeading = pageIsMarkedAsComplete !== undefined;
     // Get text color from parent styles if available
-    const textColor = (parentStyles === null || parentStyles === void 0 ? void 0 : parentStyles.color) ||
+    const textColor = parentStyles?.color ||
         (readOnly && (!isTabHeading || !isPageHeading) ? 'text.secondary' : 'text.primary');
-    return (_jsx(_Fragment, { children: _jsxs(Box, { display: "flex", alignItems: "center", width: "100%", children: [_jsxs(Box, { position: "relative", display: "flex", flexGrow: 1, alignItems: "center", children: [required && requiredIndicatorPosition === 'start' ? (_jsx(RequiredAsterisk, { sx: { position: 'absolute', top: 0, left: -8 }, children: "*" })) : null, _jsxs(Typography, { component: getHeadingTag(groupCardElevation), variant: "groupHeading", color: textColor, display: "flex", alignItems: "center", sx: Object.assign({ flexGrow: 1 }, (parentStyles || {})), children: [_jsx(ItemTextSwitcher, { qItem: qItem }), required && requiredIndicatorPosition === 'end' ? (_jsx(RequiredAsterisk, { readOnly: readOnly, variant: "groupHeading", children: "*" })) : null, displayFlyover !== '' ? (_jsx(Typography, { component: "span", sx: { ml: 0.75 }, children: _jsx(FlyoverItem, { displayFlyover: displayFlyover, readOnly: readOnly }) })) : null] })] }), _jsx(Box, { display: "flex", columnGap: 0.5, children: contextDisplayItems.map((item) => {
+    return (_jsx(_Fragment, { children: _jsxs(Box, { display: "flex", alignItems: "center", width: "100%", children: [_jsxs(Box, { position: "relative", display: "flex", flexGrow: 1, alignItems: "center", children: [required && requiredIndicatorPosition === 'start' ? (_jsx(RequiredAsterisk, { sx: { position: 'absolute', top: 0, left: -8 }, children: "*" })) : null, _jsxs(Typography, { component: getHeadingTag(groupCardElevation), variant: "groupHeading", color: textColor, display: "flex", alignItems: "center", sx: { flexGrow: 1, ...(parentStyles || {}) }, children: [_jsx(ItemTextSwitcher, { qItem: qItem }), required && requiredIndicatorPosition === 'end' ? (_jsx(RequiredAsterisk, { readOnly: readOnly, variant: "groupHeading", children: "*" })) : null, displayFlyover !== '' ? (_jsx(Typography, { component: "span", sx: { ml: 0.75 }, children: _jsx(FlyoverItem, { displayFlyover: displayFlyover, readOnly: readOnly }) })) : null] })] }), _jsx(Box, { display: "flex", columnGap: 0.5, children: contextDisplayItems.map((item) => {
                         return _jsx(ContextDisplayItem, { displayItem: item }, item.linkId);
                     }) })] }) }));
 });

package/lib/components/FormComponents/GroupItem/GroupHeading.js.map

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

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

@@ -1,8 +1,8 @@
 import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
-import type { PropsWithIsRepeatedAttribute, PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithParentIsRepeatGroupAttribute, PropsWithParentStylesAttribute, PropsWithQrItemChangeHandler } from '../../../interfaces/renderProps.interface';
+import type { PropsWithIsRepeatedAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithParentIsRepeatGroupAttribute, PropsWithParentStylesAttribute, PropsWithQrItemChangeHandler } from '../../../interfaces/renderProps.interface';
 import type { Tabs } from '../../../interfaces/tab.interface';
 import type { Pages } from '../../../interfaces/page.interface';
-interface GroupItemProps extends PropsWithQrItemChangeHandler, PropsWithItemPathAttribute, PropsWithIsRepeatedAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithParentIsRepeatGroupAttribute, PropsWithParentStylesAttribute {
+interface GroupItemProps extends PropsWithQrItemChangeHandler, PropsWithIsRepeatedAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithParentIsRepeatGroupAttribute, PropsWithParentStylesAttribute {
     qItem: QuestionnaireItem;
     qrItem: QuestionnaireResponseItem | null;
     groupCardElevation: number;

package/lib/components/FormComponents/GroupItem/GroupItem.js

@@ -24,7 +24,7 @@ import { QGroupContainerBox } from '../../Box.styles';
 import { GroupCard } from './GroupItem.styles';
 import PageButtonsWrapper from './PageButtonWrapper';
 function GroupItem(props) {
-    const { qItem, qrItem, itemPath, isRepeated, groupCardElevation, disableCardView, tabIsMarkedAsComplete, tabs, currentTabIndex, pageIsMarkedAsComplete, pages, currentPageIndex, parentIsReadOnly, parentIsRepeatGroup, parentRepeatGroupIndex, onQrItemChange, parentStyles } = props;
+    const { qItem, qrItem, isRepeated, groupCardElevation, disableCardView, tabIsMarkedAsComplete, tabs, currentTabIndex, pageIsMarkedAsComplete, pages, currentPageIndex, parentIsReadOnly, parentIsRepeatGroup, parentRepeatGroupIndex, onQrItemChange, parentStyles } = props;
     const qItemsIndexMap = useMemo(() => mapQItemsIndex(qItem), [qItem]);
     const itemIsHidden = useHidden(qItem, parentRepeatGroupIndex);
     if (itemIsHidden) {
@@ -34,15 +34,15 @@ function GroupItem(props) {
     const qrGroup = qrItem && qrItem.item ? qrItem : createEmptyQrGroup(qItem);
     const qrItems = qrGroup.item;
     // Event Handlers
-    function handleQrItemChange(newQrItem, targetItemPath) {
-        const updatedQrGroup = Object.assign({}, qrGroup);
+    function handleQrItemChange(newQrItem) {
+        const updatedQrGroup = { ...qrGroup };
         updateQrItemsInGroup(newQrItem, null, updatedQrGroup, qItemsIndexMap);
-        onQrItemChange(updatedQrGroup, targetItemPath);
+        onQrItemChange(updatedQrGroup);
     }
-    function handleQrRepeatGroupChange(qrRepeatGroup, targetItemPath) {
-        const updatedQrGroup = Object.assign({}, qrGroup);
+    function handleQrRepeatGroupChange(qrRepeatGroup) {
+        const updatedQrGroup = { ...qrGroup };
         updateQrItemsInGroup(null, qrRepeatGroup, updatedQrGroup, qItemsIndexMap);
-        onQrItemChange(updatedQrGroup, targetItemPath);
+        onQrItemChange(updatedQrGroup);
     }
     if (!qItems || !qrItems) {
         // If there are pages passed through, render this invalid group as a card to at least allow the user to see the error
@@ -54,7 +54,7 @@ function GroupItem(props) {
     }
     // If an item has multiple answers, it is a repeat group
     const qrItemsByIndex = getQrItemsIndex(qItems, qrItems, qItemsIndexMap);
-    return (_jsx(GroupItemView, { qItem: qItem, childQItems: qItems, qrItemsByIndex: qrItemsByIndex, itemPath: itemPath, isRepeated: isRepeated, groupCardElevation: groupCardElevation, disableCardView: disableCardView, tabIsMarkedAsComplete: tabIsMarkedAsComplete, tabs: tabs, currentTabIndex: currentTabIndex, pageIsMarkedAsComplete: pageIsMarkedAsComplete, pages: pages, currentPageIndex: currentPageIndex, parentIsReadOnly: parentIsReadOnly, parentIsRepeatGroup: parentIsRepeatGroup, parentRepeatGroupIndex: parentRepeatGroupIndex, parentStyles: parentStyles, onQrItemChange: handleQrItemChange, onQrRepeatGroupChange: handleQrRepeatGroupChange }));
+    return (_jsx(GroupItemView, { qItem: qItem, childQItems: qItems, qrItemsByIndex: qrItemsByIndex, isRepeated: isRepeated, groupCardElevation: groupCardElevation, disableCardView: disableCardView, tabIsMarkedAsComplete: tabIsMarkedAsComplete, tabs: tabs, currentTabIndex: currentTabIndex, pageIsMarkedAsComplete: pageIsMarkedAsComplete, pages: pages, currentPageIndex: currentPageIndex, parentIsReadOnly: parentIsReadOnly, parentIsRepeatGroup: parentIsRepeatGroup, parentRepeatGroupIndex: parentRepeatGroupIndex, parentStyles: parentStyles, onQrItemChange: handleQrItemChange, onQrRepeatGroupChange: handleQrRepeatGroupChange }));
 }
 export default GroupItem;
 //# sourceMappingURL=GroupItem.js.map

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

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

package/lib/components/FormComponents/GroupItem/GroupItemSwitcher.d.ts

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

package/lib/components/FormComponents/GroupItem/GroupItemSwitcher.js

@@ -9,7 +9,7 @@ import GroupItem from './GroupItem';
 import GridGroup from '../GridGroup/GridGroup';
 import { useQuestionnaireStore } from '../../../stores';
 function GroupItemSwitcher(props) {
-    const { qItem, qrItemOrItems, itemPath, groupCardElevation, parentIsReadOnly, parentIsRepeatGroup, parentRepeatGroupIndex, onQrItemChange, onQrRepeatGroupChange, parentStyles } = props;
+    const { qItem, qrItemOrItems, groupCardElevation, parentIsReadOnly, parentIsRepeatGroup, parentRepeatGroupIndex, onQrItemChange, onQrRepeatGroupChange, parentStyles } = props;
     const qItemOverrideComponents = useQuestionnaireStore.use.qItemOverrideComponents();
     const QItemOverrideComponent = qItemOverrideComponents[qItem.linkId];
     const itemIsHidden = useHidden(qItem, parentRepeatGroupIndex);
@@ -21,7 +21,7 @@ function GroupItemSwitcher(props) {
     if (qItem.type === 'group' &&
         QItemOverrideComponent &&
         typeof QItemOverrideComponent === 'function') {
-        return (_jsx(QItemOverrideComponent, { qItem: qItem, qrItem: qrItemOrItems !== null && qrItemOrItems !== void 0 ? qrItemOrItems : null, itemPath: itemPath, isRepeated: !!qItem.repeats, groupCardElevation: groupCardElevation, parentIsReadOnly: parentIsReadOnly, parentIsRepeatGroup: parentIsRepeatGroup, parentRepeatGroupIndex: parentRepeatGroupIndex, onQrItemChange: onQrItemChange, onQrRepeatGroupChange: onQrRepeatGroupChange, parentStyles: parentStyles }));
+        return (_jsx(QItemOverrideComponent, { qItem: qItem, qrItem: qrItemOrItems ?? null, isRepeated: !!qItem.repeats, groupCardElevation: groupCardElevation, parentIsReadOnly: parentIsReadOnly, parentIsRepeatGroup: parentIsRepeatGroup, parentRepeatGroupIndex: parentRepeatGroupIndex, onQrItemChange: onQrItemChange, onQrRepeatGroupChange: onQrRepeatGroupChange, parentStyles: parentStyles }));
     }
     // If there are multiple answers
     const hasMultipleAnswers = Array.isArray(qrItemOrItems);
@@ -33,15 +33,15 @@ function GroupItemSwitcher(props) {
             return _jsx(_Fragment, { children: "Something went wrong here" });
         }
         if (isSpecificItemControl(qItem, 'gtable')) {
-            return (_jsx(GroupTable, { qItem: qItem, qrItems: qrItems, itemPath: itemPath, groupCardElevation: groupCardElevation, isRepeated: true, parentIsReadOnly: parentIsReadOnly, onQrRepeatGroupChange: onQrRepeatGroupChange, parentStyles: parentStyles }));
+            return (_jsx(GroupTable, { qItem: qItem, qrItems: qrItems, groupCardElevation: groupCardElevation, isRepeated: true, parentIsReadOnly: parentIsReadOnly, onQrRepeatGroupChange: onQrRepeatGroupChange, parentStyles: parentStyles }));
         }
-        return (_jsx(RepeatGroup, { qItem: qItem, qrItems: qrItems, itemPath: itemPath, groupCardElevation: groupCardElevation, parentIsReadOnly: parentIsReadOnly, onQrRepeatGroupChange: onQrRepeatGroupChange, parentStyles: parentStyles }));
+        return (_jsx(RepeatGroup, { qItem: qItem, qrItems: qrItems, groupCardElevation: groupCardElevation, parentIsReadOnly: parentIsReadOnly, onQrRepeatGroupChange: onQrRepeatGroupChange, parentStyles: parentStyles }));
     }
     // If there is only one answer
     const qrItem = qrItemOrItems;
     const itemIsGrid = isSpecificItemControl(qItem, 'grid');
     if (itemIsGrid) {
-        return (_jsx(GridGroup, { qItem: qItem, qrItem: qrItem !== null && qrItem !== void 0 ? qrItem : null, itemPath: itemPath, groupCardElevation: groupCardElevation, parentIsReadOnly: parentIsReadOnly, onQrItemChange: onQrItemChange, parentStyles: parentStyles }));
+        return (_jsx(GridGroup, { qItem: qItem, qrItem: qrItem ?? null, groupCardElevation: groupCardElevation, parentIsReadOnly: parentIsReadOnly, onQrItemChange: onQrItemChange, parentStyles: parentStyles }));
     }
     const itemRepeatsAndIsNotCheckbox = isRepeatItemAndNotCheckbox(qItem);
     if (itemRepeatsAndIsNotCheckbox) {
@@ -49,22 +49,22 @@ function GroupItemSwitcher(props) {
             // If qItem is RepeatGroup or a groupTable item in this decision branch,
             // their qrItem array should always be empty
             if (isSpecificItemControl(qItem, 'gtable')) {
-                return (_jsx(GroupTable, { qItem: qItem, qrItems: [], itemPath: itemPath, groupCardElevation: groupCardElevation, isRepeated: true, parentIsReadOnly: parentIsReadOnly, onQrRepeatGroupChange: onQrRepeatGroupChange, parentStyles: parentStyles }));
+                return (_jsx(GroupTable, { qItem: qItem, qrItems: [], groupCardElevation: groupCardElevation, isRepeated: true, parentIsReadOnly: parentIsReadOnly, onQrRepeatGroupChange: onQrRepeatGroupChange, parentStyles: parentStyles }));
             }
-            return (_jsx(RepeatGroup, { qItem: qItem, qrItems: [], itemPath: itemPath, groupCardElevation: groupCardElevation, parentIsReadOnly: parentIsReadOnly, onQrRepeatGroupChange: onQrRepeatGroupChange, parentStyles: parentStyles }));
+            return (_jsx(RepeatGroup, { qItem: qItem, qrItems: [], groupCardElevation: groupCardElevation, parentIsReadOnly: parentIsReadOnly, onQrRepeatGroupChange: onQrRepeatGroupChange, parentStyles: parentStyles }));
         }
-        return (_jsx(RepeatItem, { qItem: qItem, qrItem: qrItem !== null && qrItem !== void 0 ? qrItem : null, itemPath: itemPath, groupCardElevation: groupCardElevation, parentIsReadOnly: parentIsReadOnly, onQrItemChange: onQrItemChange }));
+        return (_jsx(RepeatItem, { qItem: qItem, qrItem: qrItem ?? null, groupCardElevation: groupCardElevation, parentIsReadOnly: parentIsReadOnly, onQrItemChange: onQrItemChange }));
     }
     // if qItem is not a repeating question or is a checkbox
     if (qItem.type === 'group') {
         // GroupTable "gtable" can be rendered with either repeats:true or false
         if (isSpecificItemControl(qItem, 'gtable')) {
-            return (_jsx(GroupTable, { qItem: qItem, qrItems: qrItem ? [qrItem] : [], itemPath: itemPath, groupCardElevation: groupCardElevation, isRepeated: false, parentIsReadOnly: parentIsReadOnly, onQrRepeatGroupChange: onQrRepeatGroupChange, parentStyles: parentStyles }));
+            return (_jsx(GroupTable, { qItem: qItem, qrItems: qrItem ? [qrItem] : [], groupCardElevation: groupCardElevation, isRepeated: false, parentIsReadOnly: parentIsReadOnly, onQrRepeatGroupChange: onQrRepeatGroupChange, parentStyles: parentStyles }));
         }
-        return (_jsx(GroupItem, { qItem: qItem, qrItem: qrItem !== null && qrItem !== void 0 ? qrItem : null, itemPath: itemPath, isRepeated: false, groupCardElevation: groupCardElevation, parentIsReadOnly: parentIsReadOnly, parentIsRepeatGroup: parentIsRepeatGroup, parentRepeatGroupIndex: parentRepeatGroupIndex, onQrItemChange: onQrItemChange, parentStyles: parentStyles }));
+        return (_jsx(GroupItem, { qItem: qItem, qrItem: qrItem ?? null, isRepeated: false, groupCardElevation: groupCardElevation, parentIsReadOnly: parentIsReadOnly, parentIsRepeatGroup: parentIsRepeatGroup, parentRepeatGroupIndex: parentRepeatGroupIndex, onQrItemChange: onQrItemChange, parentStyles: parentStyles }));
     }
     // Defaults to a single, non-group item
-    return (_jsx(SingleItem, { qItem: qItem, qrItem: qrItem !== null && qrItem !== void 0 ? qrItem : null, itemPath: itemPath, isRepeated: false, isTabled: false, groupCardElevation: groupCardElevation, parentIsReadOnly: parentIsReadOnly, parentIsRepeatGroup: parentIsRepeatGroup, parentRepeatGroupIndex: parentRepeatGroupIndex, onQrItemChange: onQrItemChange, parentStyles: parentStyles }));
+    return (_jsx(SingleItem, { qItem: qItem, qrItem: qrItem ?? null, isRepeated: false, isTabled: false, groupCardElevation: groupCardElevation, parentIsReadOnly: parentIsReadOnly, parentIsRepeatGroup: parentIsRepeatGroup, parentRepeatGroupIndex: parentRepeatGroupIndex, onQrItemChange: onQrItemChange, parentStyles: parentStyles }));
 }
 export default GroupItemSwitcher;
 //# sourceMappingURL=GroupItemSwitcher.js.map

package/lib/components/FormComponents/GroupItem/GroupItemSwitcher.js.map

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

package/lib/components/FormComponents/GroupItem/GroupItemView.d.ts

@@ -1,8 +1,8 @@
 import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
-import type { PropsWithIsRepeatedAttribute, PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithParentIsRepeatGroupAttribute, PropsWithParentStylesAttribute, PropsWithQrItemChangeHandler, PropsWithQrRepeatGroupChangeHandler } from '../../../interfaces/renderProps.interface';
+import type { PropsWithIsRepeatedAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithParentIsRepeatGroupAttribute, PropsWithParentStylesAttribute, PropsWithQrItemChangeHandler, PropsWithQrRepeatGroupChangeHandler } from '../../../interfaces/renderProps.interface';
 import type { Tabs } from '../../../interfaces/tab.interface';
 import type { Pages } from '../../../interfaces/page.interface';
-interface GroupItemViewProps extends PropsWithQrItemChangeHandler, PropsWithItemPathAttribute, PropsWithQrRepeatGroupChangeHandler, PropsWithIsRepeatedAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithParentIsRepeatGroupAttribute, PropsWithParentStylesAttribute {
+interface GroupItemViewProps extends PropsWithQrItemChangeHandler, PropsWithQrRepeatGroupChangeHandler, PropsWithIsRepeatedAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithParentIsRepeatGroupAttribute, PropsWithParentStylesAttribute {
     qItem: QuestionnaireItem;
     childQItems: QuestionnaireItem[];
     qrItemsByIndex: (QuestionnaireResponseItem | QuestionnaireResponseItem[] | undefined)[];

package/lib/components/FormComponents/GroupItem/GroupItemView.js

@@ -30,13 +30,11 @@ import useReadOnly from '../../../hooks/useReadOnly';
 import { GroupAccordion } from './GroupAccordion.styles';
 import PageButtonsWrapper from './PageButtonWrapper';
 import { useParseXhtml } from '../../../hooks/useParseXhtml';
-import { extendItemPath } from '../../../utils/itemPath';
 import { getItemTextToDisplay } from '../../../utils/itemTextToDisplay';
 function GroupItemView(props) {
-    var _a, _b, _c;
-    const { qItem, childQItems, qrItemsByIndex, itemPath, isRepeated = false, groupCardElevation, disableCardView, tabIsMarkedAsComplete, tabs, currentTabIndex, pageIsMarkedAsComplete, pages, currentPageIndex, parentIsReadOnly, parentIsRepeatGroup, parentRepeatGroupIndex, parentStyles, onQrItemChange, onQrRepeatGroupChange } = props;
+    const { qItem, childQItems, qrItemsByIndex, isRepeated = false, groupCardElevation, disableCardView, tabIsMarkedAsComplete, tabs, currentTabIndex, pageIsMarkedAsComplete, pages, currentPageIndex, parentIsReadOnly, parentIsRepeatGroup, parentRepeatGroupIndex, parentStyles, onQrItemChange, onQrRepeatGroupChange } = props;
     // If XHTML has styles, pass them to the GroupItemView so it cna be applied down the tree
-    const xhtmlStyles = (_a = useParseXhtml(qItem)) === null || _a === void 0 ? void 0 : _a.styles;
+    const xhtmlStyles = useParseXhtml(qItem)?.styles;
     // Combine parent styles with this group's styles
     const combinedStyles = React.useMemo(() => {
         if (!parentStyles && !xhtmlStyles)
@@ -46,7 +44,7 @@ function GroupItemView(props) {
         if (!parentStyles && xhtmlStyles)
             return xhtmlStyles;
         // Merge parent styles with extracted styles (extracted styles take precedence)
-        return Object.assign(Object.assign({}, parentStyles), xhtmlStyles);
+        return { ...parentStyles, ...xhtmlStyles };
     }, [parentStyles, xhtmlStyles]);
     const readOnly = useReadOnly(qItem, parentIsReadOnly, parentRepeatGroupIndex);
     // Get item.text as display label
@@ -60,19 +58,19 @@ function GroupItemView(props) {
                 transition: { unmountOnExit: true, timeout: 250 }
             }, style: combinedStyles || undefined, children: [_jsx(AccordionSummary, { expandIcon: _jsx(ExpandMoreIcon, {}), sx: { minHeight: '28px' }, children: itemTextToDisplay ? (_jsx(GroupHeading, { qItem: qItem, readOnly: readOnly, groupCardElevation: groupCardElevation, tabIsMarkedAsComplete: tabIsMarkedAsComplete, pageIsMarkedAsComplete: pageIsMarkedAsComplete, parentStyles: combinedStyles })) : null }), _jsxs(AccordionDetails, { sx: { pt: 0 }, children: [itemTextToDisplay ? _jsx(Divider, { sx: { mb: 1.5, opacity: 0.6 } }) : null, _jsxs(_Fragment, { children: [childQItems.map((childQItem, i) => {
                                     const qrItemOrItems = qrItemsByIndex[i];
-                                    return (_jsx(GroupItemSwitcher, { qItem: childQItem, qrItemOrItems: qrItemOrItems, itemPath: extendItemPath(itemPath, childQItem.linkId), groupCardElevation: groupCardElevation + 1, parentIsReadOnly: readOnly, parentIsRepeatGroup: parentIsRepeatGroup, parentRepeatGroupIndex: parentRepeatGroupIndex, parentStyles: combinedStyles, onQrItemChange: onQrItemChange, onQrRepeatGroupChange: onQrRepeatGroupChange }, childQItem.linkId));
+                                    return (_jsx(GroupItemSwitcher, { qItem: childQItem, qrItemOrItems: qrItemOrItems, groupCardElevation: groupCardElevation + 1, parentIsReadOnly: readOnly, parentIsRepeatGroup: parentIsRepeatGroup, parentRepeatGroupIndex: parentRepeatGroupIndex, parentStyles: combinedStyles, onQrItemChange: onQrItemChange, onQrRepeatGroupChange: onQrRepeatGroupChange }, childQItem.linkId));
                                 }), _jsx(TabButtonsWrapper, { currentTabIndex: currentTabIndex, tabs: tabs }), _jsx(PageButtonsWrapper, { currentPageIndex: currentPageIndex, pages: pages })] })] })] }));
     }
     // Disable card view - currently only available via disablePageCardView API
     if (disableCardView) {
-        return (_jsxs(QGroupContainerBox, { cardElevation: groupCardElevation, isRepeated: isRepeated, "data-test": "q-item-group-box", role: "region", "aria-label": (_b = qItem.text) !== null && _b !== void 0 ? _b : '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) => {
+        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) => {
                     const qrItemOrItems = qrItemsByIndex[i];
-                    return (_jsx(GroupItemSwitcher, { qItem: childQItem, qrItemOrItems: qrItemOrItems, itemPath: extendItemPath(itemPath, childQItem.linkId), groupCardElevation: groupCardElevation + 1, parentIsReadOnly: readOnly, parentIsRepeatGroup: parentIsRepeatGroup, parentRepeatGroupIndex: parentRepeatGroupIndex, parentStyles: combinedStyles, onQrItemChange: onQrItemChange, onQrRepeatGroupChange: onQrRepeatGroupChange }, childQItem.linkId));
+                    return (_jsx(GroupItemSwitcher, { qItem: childQItem, qrItemOrItems: qrItemOrItems, groupCardElevation: groupCardElevation + 1, parentIsReadOnly: readOnly, parentIsRepeatGroup: parentIsRepeatGroup, parentRepeatGroupIndex: parentRepeatGroupIndex, parentStyles: combinedStyles, onQrItemChange: onQrItemChange, onQrRepeatGroupChange: onQrRepeatGroupChange }, childQItem.linkId));
                 }), _jsx(TabButtonsWrapper, { currentTabIndex: currentTabIndex, tabs: tabs }), _jsx(PageButtonsWrapper, { currentPageIndex: currentPageIndex, pages: pages })] }));
     }
-    return (_jsx(QGroupContainerBox, { cardElevation: groupCardElevation, isRepeated: isRepeated, "data-test": "q-item-group-box", role: "region", "aria-label": (_c = qItem.text) !== null && _c !== void 0 ? _c : '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) => {
+    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) => {
                     const qrItemOrItems = qrItemsByIndex[i];
-                    return (_jsx(GroupItemSwitcher, { qItem: childQItem, qrItemOrItems: qrItemOrItems, itemPath: extendItemPath(itemPath, childQItem.linkId), groupCardElevation: groupCardElevation + 1, parentIsReadOnly: readOnly, parentIsRepeatGroup: parentIsRepeatGroup, parentRepeatGroupIndex: parentRepeatGroupIndex, parentStyles: combinedStyles, onQrItemChange: onQrItemChange, onQrRepeatGroupChange: onQrRepeatGroupChange }, childQItem.linkId));
+                    return (_jsx(GroupItemSwitcher, { qItem: childQItem, qrItemOrItems: qrItemOrItems, groupCardElevation: groupCardElevation + 1, parentIsReadOnly: readOnly, parentIsRepeatGroup: parentIsRepeatGroup, parentRepeatGroupIndex: parentRepeatGroupIndex, parentStyles: combinedStyles, onQrItemChange: onQrItemChange, onQrRepeatGroupChange: onQrRepeatGroupChange }, childQItem.linkId));
                 }), _jsx(TabButtonsWrapper, { currentTabIndex: currentTabIndex, tabs: tabs }), _jsx(PageButtonsWrapper, { currentPageIndex: currentPageIndex, pages: pages })] }) }));
 }
 export default GroupItemView;