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

package/lib/components/Renderer/BaseRenderer.js

@@ -25,7 +25,6 @@ import { isPaginatedForm } from '../../utils/page';
 import FormBodyPaginated from './FormBodyPaginated';
 import { Container } from '@mui/material';
 import { useFormUpdateQueueStore } from '../../stores/formUpdateQueueStore';
-import { createSingleItemPath } from '../../utils/itemPath';
 import dayjs from 'dayjs';
 import localizedFormat from 'dayjs/plugin/localizedFormat';
 import customParseFormat from 'dayjs/plugin/customParseFormat';
@@ -44,43 +43,40 @@ silenceReactBeautifulDndError();
  * @author Sean Fong
  */
 function BaseRenderer() {
-    var _a;
     const sourceQuestionnaire = useQuestionnaireStore.use.sourceQuestionnaire();
     const readOnly = useQuestionnaireStore.use.readOnly();
     const responseKey = useQuestionnaireResponseStore.use.key();
     const updatableResponse = useQuestionnaireResponseStore.use.updatableResponse();
-    const replaceLatestFormUpdate = useFormUpdateQueueStore.use.replaceLatestFormUpdate();
+    const enqueueFormUpdate = useFormUpdateQueueStore.use.enqueueFormUpdate();
     const qItemsIndexMap = useMemo(() => mapQItemsIndex(sourceQuestionnaire), [sourceQuestionnaire]);
-    function handleTopLevelQRItemSingleChange(newTopLevelQRItem, targetItemPath) {
+    function handleTopLevelQRItemSingleChange(newTopLevelQRItem) {
         const updatedResponse = structuredClone(updatableResponse);
         updateQrItemsInGroup(newTopLevelQRItem, null, updatedResponse, qItemsIndexMap);
-        replaceLatestFormUpdate({
-            questionnaireResponse: updatedResponse,
-            targetItemPath: targetItemPath
+        enqueueFormUpdate({
+            questionnaireResponse: updatedResponse
         });
     }
-    function handleTopLevelQRItemMultipleChange(newTopLevelQRItems, targetItemPath) {
+    function handleTopLevelQRItemMultipleChange(newTopLevelQRItems) {
         const updatedResponse = structuredClone(updatableResponse);
         updateQrItemsInGroup(null, newTopLevelQRItems, updatedResponse, qItemsIndexMap);
-        replaceLatestFormUpdate({
-            questionnaireResponse: updatedResponse,
-            targetItemPath: targetItemPath
+        enqueueFormUpdate({
+            questionnaireResponse: updatedResponse
         });
     }
     const topLevelQItems = sourceQuestionnaire.item;
-    const topLevelQRItems = (_a = structuredClone(updatableResponse.item)) !== null && _a !== void 0 ? _a : [];
+    const topLevelQRItems = structuredClone(updatableResponse.item) ?? [];
     if (!topLevelQItems) {
-        return _jsx(_Fragment, { children: "Questionnaire does not have any items" });
+        return (_jsx(_Fragment, { children: "Questionnaire does not have any items or something has gone wrong. Try rebuilding the form." }));
     }
     // If an item has multiple answers, it is a repeat group
     const topLevelQRItemsByIndex = getQrItemsIndex(topLevelQItems, topLevelQRItems, qItemsIndexMap);
     const wholeFormIsPaginated = isPaginatedForm(topLevelQItems);
     if (wholeFormIsPaginated) {
-        return (_jsx(Fade, { in: true, timeout: 500, children: _jsx(Container, { disableGutters: true, maxWidth: "xl", children: _jsx(FormBodyPaginated, { topLevelQItems: topLevelQItems, topLevelQRItems: topLevelQRItemsByIndex, itemPath: [], parentIsReadOnly: readOnly, onQrItemChange: (newTopLevelQRItem, targetItemPath) => handleTopLevelQRItemSingleChange(newTopLevelQRItem, targetItemPath) }) }, responseKey) }));
+        return (_jsx(Fade, { in: true, timeout: 500, children: _jsx(Container, { disableGutters: true, maxWidth: "xl", children: _jsx(FormBodyPaginated, { topLevelQItems: topLevelQItems, topLevelQRItems: topLevelQRItemsByIndex, parentIsReadOnly: readOnly, onQrItemChange: (newTopLevelQRItem) => handleTopLevelQRItemSingleChange(newTopLevelQRItem) }) }, responseKey) }));
     }
     return (_jsx(Fade, { in: true, timeout: 500, children: _jsx(Container, { disableGutters: true, maxWidth: "xl", children: topLevelQItems.map((qItem, index) => {
                 const qrItemOrItems = topLevelQRItemsByIndex[index];
-                return (_jsx(FormTopLevelItem, { topLevelQItem: qItem, topLevelQRItemOrItems: qrItemOrItems !== null && qrItemOrItems !== void 0 ? qrItemOrItems : null, parentIsReadOnly: readOnly, wholeFormIsPaginated: wholeFormIsPaginated, itemPath: createSingleItemPath(qItem.linkId), onQrItemChange: (newTopLevelQRItem, targetItemPath) => handleTopLevelQRItemSingleChange(newTopLevelQRItem, targetItemPath), onQrRepeatGroupChange: (newTopLevelQRItems, targetItemPath) => handleTopLevelQRItemMultipleChange(newTopLevelQRItems, targetItemPath) }, qItem.linkId));
+                return (_jsx(FormTopLevelItem, { topLevelQItem: qItem, topLevelQRItemOrItems: qrItemOrItems ?? null, parentIsReadOnly: readOnly, wholeFormIsPaginated: wholeFormIsPaginated, onQrItemChange: (newTopLevelQRItem) => handleTopLevelQRItemSingleChange(newTopLevelQRItem), onQrRepeatGroupChange: (newTopLevelQRItems) => handleTopLevelQRItemMultipleChange(newTopLevelQRItems) }, qItem.linkId));
             }) }, responseKey) }));
 }
 export default BaseRenderer;

package/lib/components/Renderer/BaseRenderer.js.map

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

package/lib/components/Renderer/FormBodyCollapsible.d.ts

@@ -1,6 +1,6 @@
 import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
-import type { PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithQrItemChangeHandler } from '../../interfaces/renderProps.interface';
-interface FormBodyCollapsibleProps extends PropsWithQrItemChangeHandler, PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute {
+import type { PropsWithParentIsReadOnlyAttribute, PropsWithQrItemChangeHandler } from '../../interfaces/renderProps.interface';
+interface FormBodyCollapsibleProps extends PropsWithQrItemChangeHandler, PropsWithParentIsReadOnlyAttribute {
     topLevelQItem: QuestionnaireItem;
     topLevelQRItem: QuestionnaireResponseItem | null;
 }

package/lib/components/Renderer/FormBodyCollapsible.js

@@ -21,19 +21,18 @@ import { getQrItemsIndex, mapQItemsIndex } from '../../utils/mapItem';
 import { createEmptyQrGroup, updateQrItemsInGroup } from '../../utils/qrItem';
 import { useQuestionnaireStore } from '../../stores';
 import FormBodySingleCollapsibleWrapper from './FormBodySingleCollapsibleWrapper';
-import { extendItemPath } from '../../utils/itemPath';
 function FormBodyCollapsibleWrapper(props) {
-    const { topLevelQItem, topLevelQRItem, itemPath, parentIsReadOnly, onQrItemChange } = props;
+    const { topLevelQItem, topLevelQRItem, parentIsReadOnly, onQrItemChange } = props;
     const tabs = useQuestionnaireStore.use.tabs();
     const currentTab = useQuestionnaireStore.use.currentTabIndex();
     const switchTab = useQuestionnaireStore.use.switchTab();
     const indexMap = useMemo(() => mapQItemsIndex(topLevelQItem), [topLevelQItem]);
-    const nonNullTopLevelQRItem = topLevelQRItem !== null && topLevelQRItem !== void 0 ? topLevelQRItem : createEmptyQrGroup(topLevelQItem);
+    const nonNullTopLevelQRItem = topLevelQRItem ?? createEmptyQrGroup(topLevelQItem);
     const qItems = topLevelQItem.item;
     const qrItems = nonNullTopLevelQRItem.item;
-    function handleQrGroupChange(qrItem, targetItemPath) {
+    function handleQrGroupChange(qrItem) {
         updateQrItemsInGroup(qrItem, null, nonNullTopLevelQRItem, indexMap);
-        onQrItemChange(nonNullTopLevelQRItem, targetItemPath);
+        onQrItemChange(nonNullTopLevelQRItem);
     }
     if (!qItems || !qrItems) {
         return _jsx(_Fragment, { children: "Unable to load form" });
@@ -53,7 +52,7 @@ function FormBodyCollapsibleWrapper(props) {
                 // Something has gone horribly wrong
                 return null;
             }
-            return (_jsx(FormBodySingleCollapsibleWrapper, { qItem: qItem, qrItem: qrItem !== null && qrItem !== void 0 ? qrItem : null, index: i, selectedIndex: currentTab, itemPath: extendItemPath(itemPath, qItem.linkId), parentIsReadOnly: parentIsReadOnly, onToggleExpand: handleToggleExpand, onQrItemChange: handleQrGroupChange }, qItem.linkId));
+            return (_jsx(FormBodySingleCollapsibleWrapper, { qItem: qItem, qrItem: qrItem ?? null, index: i, selectedIndex: currentTab, parentIsReadOnly: parentIsReadOnly, onToggleExpand: handleToggleExpand, onQrItemChange: handleQrGroupChange }, qItem.linkId));
         }) }));
 }
 export default FormBodyCollapsibleWrapper;

package/lib/components/Renderer/FormBodyCollapsible.js.map

@@ -1 +1 @@
-{"version":3,"file":"FormBodyCollapsible.js","sourceRoot":"","sources":["../../../src/components/Renderer/FormBodyCollapsible.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"FormBodyCollapsible.js","sourceRoot":"","sources":["../../../src/components/Renderer/FormBodyCollapsible.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAc,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACvC,OAAO,KAAK,MAAM,qBAAqB,CAAC;AAExC,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACtE,OAAO,EAAE,kBAAkB,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAK9E,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,gCAAgC,MAAM,oCAAoC,CAAC;AASlF,SAAS,0BAA0B,CAAC,KAA+B;IACjE,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,gBAAgB,EAAE,cAAc,EAAE,GAAG,KAAK,CAAC;IAElF,MAAM,IAAI,GAAG,qBAAqB,CAAC,GAAG,CAAC,IAAI,EAAE,CAAC;IAC9C,MAAM,UAAU,GAAG,qBAAqB,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC;IAC/D,MAAM,SAAS,GAAG,qBAAqB,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;IAExD,MAAM,QAAQ,GAA2B,OAAO,CAC9C,GAAG,EAAE,CAAC,cAAc,CAAC,aAAa,CAAC,EACnC,CAAC,aAAa,CAAC,CAChB,CAAC;IAEF,MAAM,qBAAqB,GAAG,cAAc,IAAI,kBAAkB,CAAC,aAAa,CAAC,CAAC;IAElF,MAAM,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC;IAClC,MAAM,OAAO,GAAG,qBAAqB,CAAC,IAAI,CAAC;IAE3C,SAAS,mBAAmB,CAAC,MAAiC;QAC5D,oBAAoB,CAAC,MAAM,EAAE,IAAI,EAAE,qBAAqB,EAAE,QAAQ,CAAC,CAAC;QACpE,cAAc,CAAC,qBAAqB,CAAC,CAAC;IACxC,CAAC;IAED,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACxB,OAAO,oDAAwB,CAAC;IAClC,CAAC;IAED,SAAS,kBAAkB,CAAC,KAAa;QACvC,SAAS,CAAC,UAAU,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;IAC/C,CAAC;IAED,IAAI,CAAC,MAAM,IAAI,CAAC,OAAO,EAAE,CAAC;QACxB,OAAO,oDAAwB,CAAC;IAClC,CAAC;IAED,MAAM,cAAc,GAAG,eAAe,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAElE,OAAO,CACL,KAAC,KAAK,IAAC,MAAM,EAAE,CAAC,YACb,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;YACvB,MAAM,MAAM,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;YAEjC,MAAM,gBAAgB,GAAG,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;YAChD,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAEnC,IAAI,CAAC,KAAK,IAAI,CAAC,gBAAgB,EAAE,CAAC;gBAChC,oCAAoC;gBACpC,OAAO,IAAI,CAAC;YACd,CAAC;YAED,OAAO,CACL,KAAC,gCAAgC,IAE/B,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,IAAI,IAAI,EACtB,KAAK,EAAE,CAAC,EACR,aAAa,EAAE,UAAU,EACzB,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,kBAAkB,EAClC,cAAc,EAAE,mBAAmB,IAP9B,KAAK,CAAC,MAAM,CAQjB,CACH,CAAC;QACJ,CAAC,CAAC,GACI,CACT,CAAC;AACJ,CAAC;AAED,eAAe,0BAA0B,CAAC"}

package/lib/components/Renderer/FormBodyPageContainer.d.ts

@@ -1,6 +1,6 @@
 import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
-import type { PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithQrItemChangeHandler } from '../../interfaces/renderProps.interface';
-interface FormBodyPageContainerProps extends PropsWithQrItemChangeHandler, PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute {
+import type { PropsWithParentIsReadOnlyAttribute, PropsWithQrItemChangeHandler } from '../../interfaces/renderProps.interface';
+interface FormBodyPageContainerProps extends PropsWithQrItemChangeHandler, PropsWithParentIsReadOnlyAttribute {
     topLevelQItem: QuestionnaireItem;
     topLevelQRItem: QuestionnaireResponseItem | null;
 }

package/lib/components/Renderer/FormBodyPageContainer.js

@@ -7,7 +7,6 @@ import GroupItem from '../FormComponents/GroupItem/GroupItem';
 import { useQuestionnaireStore } from '../../stores';
 import { getQrItemsIndex, mapQItemsIndex } from '../../utils/mapItem';
 import { createEmptyQrGroup, updateQrItemsInGroup } from '../../utils/qrItem';
-import { extendItemPath } from '../../utils/itemPath';
 /* Using "page" item as a page-container - only preserved for backwards compatibility (not compliant with https://hl7.org/fhir/extensions/CodeSystem-questionnaire-item-control.html#questionnaire-item-control-page)
  * - The first "page" item in the questionnaire will be considered as a page-container, and all its children will be considered as pages
  * - All other pages will be ignored by the renderer
@@ -16,23 +15,22 @@ import { extendItemPath } from '../../utils/itemPath';
  * Note: This will only be used if wholeFormIsPaginated=false
  */
 function FormBodyPageContainer(props) {
-    const { topLevelQItem, topLevelQRItem, itemPath, parentIsReadOnly, onQrItemChange } = props;
+    const { topLevelQItem, topLevelQRItem, parentIsReadOnly, onQrItemChange } = props;
     const pages = useQuestionnaireStore.use.pages();
     const currentPage = useQuestionnaireStore.use.currentPageIndex();
     const indexMap = useMemo(() => mapQItemsIndex(topLevelQItem), [topLevelQItem]);
-    const nonNullTopLevelQRItem = topLevelQRItem !== null && topLevelQRItem !== void 0 ? topLevelQRItem : createEmptyQrGroup(topLevelQItem);
+    const nonNullTopLevelQRItem = topLevelQRItem ?? createEmptyQrGroup(topLevelQItem);
     const qItems = topLevelQItem.item;
     const qrItems = nonNullTopLevelQRItem.item;
-    function handleQrGroupChange(qrItem, targetItemPath) {
+    function handleQrGroupChange(qrItem) {
         updateQrItemsInGroup(qrItem, null, nonNullTopLevelQRItem, indexMap);
-        onQrItemChange(nonNullTopLevelQRItem, targetItemPath);
+        onQrItemChange(nonNullTopLevelQRItem);
     }
     if (!qItems || !qrItems) {
         return _jsx(_Fragment, { children: "Unable to load form" });
     }
     const qrItemsByIndex = getQrItemsIndex(qItems, qrItems, indexMap);
     return (_jsx(Grid, { container: true, spacing: 1.5, children: _jsx(TabContext, { value: currentPage.toString(), children: _jsx(Grid, { size: { xs: 12, md: 12, lg: 12 }, children: qItems.map((qItem, i) => {
-                    var _a, _b, _c;
                     const qrItem = qrItemsByIndex[i];
                     const isNotRepeatGroup = !Array.isArray(qrItem);
                     const isPage = !!pages[qItem.linkId];
@@ -40,9 +38,9 @@ function FormBodyPageContainer(props) {
                         // This should never happen
                         return null;
                     }
-                    const isRepeated = (_a = qItem.repeats) !== null && _a !== void 0 ? _a : false;
-                    const pageIsMarkedAsComplete = (_b = pages[qItem.linkId].isComplete) !== null && _b !== void 0 ? _b : false;
-                    return (_jsx(TabPanel, { "aria-label": `${(_c = qItem.text) !== null && _c !== void 0 ? _c : 'Unnamed'} page`, sx: { p: 0 }, value: i.toString(), "data-test": "renderer-page-panel", children: _jsx(GroupItem, { qItem: qItem, qrItem: qrItem !== null && qrItem !== void 0 ? qrItem : null, itemPath: extendItemPath(itemPath, qItem.linkId), isRepeated: isRepeated, groupCardElevation: 1, pageIsMarkedAsComplete: pageIsMarkedAsComplete, pages: pages, currentPageIndex: currentPage, parentIsReadOnly: parentIsReadOnly, onQrItemChange: handleQrGroupChange }) }, qItem.linkId));
+                    const isRepeated = qItem.repeats ?? false;
+                    const pageIsMarkedAsComplete = pages[qItem.linkId].isComplete ?? false;
+                    return (_jsx(TabPanel, { "aria-label": `${qItem.text ?? 'Unnamed'} page`, sx: { p: 0 }, value: i.toString(), "data-test": "renderer-page-panel", children: _jsx(GroupItem, { qItem: qItem, qrItem: qrItem ?? null, isRepeated: isRepeated, groupCardElevation: 1, pageIsMarkedAsComplete: pageIsMarkedAsComplete, pages: pages, currentPageIndex: currentPage, parentIsReadOnly: parentIsReadOnly, onQrItemChange: handleQrGroupChange }) }, qItem.linkId));
                 }) }) }) }));
 }
 export default FormBodyPageContainer;

package/lib/components/Renderer/FormBodyPageContainer.js.map

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

package/lib/components/Renderer/FormBodyPaginated.d.ts

@@ -1,6 +1,6 @@
 import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
-import type { PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithQrItemChangeHandler } from '../../interfaces/renderProps.interface';
-interface FormBodyPaginatedProps extends PropsWithQrItemChangeHandler, PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute {
+import type { PropsWithParentIsReadOnlyAttribute, PropsWithQrItemChangeHandler } from '../../interfaces/renderProps.interface';
+interface FormBodyPaginatedProps extends PropsWithQrItemChangeHandler, PropsWithParentIsReadOnlyAttribute {
     topLevelQItems: QuestionnaireItem[];
     topLevelQRItems: (QuestionnaireResponseItem | QuestionnaireResponseItem[] | undefined)[];
 }

package/lib/components/Renderer/FormBodyPaginated.js

@@ -5,21 +5,20 @@ import TabContext from '@mui/lab/TabContext';
 import TabPanel from '@mui/lab/TabPanel';
 import GroupItem from '../FormComponents/GroupItem/GroupItem';
 import { useQuestionnaireStore } from '../../stores';
-import { useRendererStylingStore } from '../../stores/rendererStylingStore';
+import { useRendererConfigStore } from '../../stores/rendererConfigStore';
 import { SingleItem } from '../FormComponents';
 import PageButtonsWrapper from '../FormComponents/GroupItem/PageButtonWrapper';
 import { QGroupContainerBox } from '../Box.styles';
 import { GroupCard } from '../FormComponents/GroupItem/GroupItem.styles';
 import { isFooter, isHeader } from '../../utils/page';
-import { extendItemPath } from '../../utils/itemPath';
 // TODO This implementation doesnt take into account repeat items and repeat groups
 // TODO need to fix this before bringing it into release
 // Every group item in here is rendered as a page
 function FormBodyPaginated(props) {
-    const { topLevelQItems, topLevelQRItems, itemPath, parentIsReadOnly, onQrItemChange } = props;
+    const { topLevelQItems, topLevelQRItems, parentIsReadOnly, onQrItemChange } = props;
     const pages = useQuestionnaireStore.use.pages();
     const currentPage = useQuestionnaireStore.use.currentPageIndex();
-    const disableCardView = useRendererStylingStore.use.disablePageCardView();
+    const disableCardView = useRendererConfigStore.use.disablePageCardView();
     const { headerQItems, pageQItems, footerQItems } = useMemo(() => {
         const headerQItems = [];
         const pageQItems = [];
@@ -38,7 +37,6 @@ function FormBodyPaginated(props) {
         return { headerQItems, pageQItems, footerQItems };
     }, [topLevelQItems]);
     return (_jsxs(_Fragment, { children: [headerQItems.map((headerQItem) => {
-                var _a;
                 const [qItem, qrItemIndex] = headerQItem;
                 const qrItemOrItems = topLevelQRItems[qrItemIndex];
                 const isRepeatGroup = Array.isArray(qrItemOrItems);
@@ -46,10 +44,9 @@ function FormBodyPaginated(props) {
                     // Does not work with repeat groups
                     return null;
                 }
-                const isRepeated = (_a = qItem.repeats) !== null && _a !== void 0 ? _a : false;
-                return (_jsx(GroupItem, { qItem: qItem, qrItem: qrItemOrItems !== null && qrItemOrItems !== void 0 ? qrItemOrItems : null, itemPath: extendItemPath(itemPath, qItem.linkId), isRepeated: isRepeated, groupCardElevation: 1, disableCardView: disableCardView, currentPageIndex: currentPage, parentIsReadOnly: parentIsReadOnly, onQrItemChange: onQrItemChange }, qItem.linkId));
+                const isRepeated = qItem.repeats ?? false;
+                return (_jsx(GroupItem, { qItem: qItem, qrItem: qrItemOrItems ?? null, isRepeated: isRepeated, groupCardElevation: 1, disableCardView: disableCardView, currentPageIndex: currentPage, parentIsReadOnly: parentIsReadOnly, onQrItemChange: onQrItemChange }, qItem.linkId));
             }), _jsx(Grid, { container: true, spacing: 1.5, children: _jsx(TabContext, { value: currentPage.toString(), children: _jsx(Grid, { size: { xs: 12, md: 12, lg: 12 }, children: pageQItems.map((pageQItem, i) => {
-                            var _a, _b, _c, _d, _e;
                             const [qItem, qrItemIndex] = pageQItem;
                             const qrItem = topLevelQRItems[qrItemIndex];
                             const isNotRepeatGroup = !Array.isArray(qrItem);
@@ -60,16 +57,15 @@ function FormBodyPaginated(props) {
                                 // Something has gone horribly wrong
                                 return null;
                             }
-                            const isRepeated = (_a = qItem.repeats) !== null && _a !== void 0 ? _a : false;
-                            const pageIsMarkedAsComplete = (_b = pages[qItem.linkId].isComplete) !== null && _b !== void 0 ? _b : false;
+                            const isRepeated = qItem.repeats ?? false;
+                            const pageIsMarkedAsComplete = pages[qItem.linkId].isComplete ?? false;
                             // Render this page as a group
                             if (itemIsGroup) {
-                                return (_jsx(TabPanel, { "aria-label": `${(_c = qItem.text) !== null && _c !== void 0 ? _c : 'Unnamed'} page`, sx: { p: 0 }, value: i.toString(), "data-test": "renderer-page-panel", children: _jsx(GroupItem, { qItem: qItem, qrItem: qrItem !== null && qrItem !== void 0 ? qrItem : null, itemPath: extendItemPath(itemPath, qItem.linkId), isRepeated: isRepeated, groupCardElevation: 1, disableCardView: disableCardView, pageIsMarkedAsComplete: pageIsMarkedAsComplete, pages: pages, currentPageIndex: currentPage, parentIsReadOnly: parentIsReadOnly, onQrItemChange: onQrItemChange }) }, qItem.linkId));
+                                return (_jsx(TabPanel, { "aria-label": `${qItem.text ?? 'Unnamed'} page`, sx: { p: 0 }, value: i.toString(), "data-test": "renderer-page-panel", children: _jsx(GroupItem, { qItem: qItem, qrItem: qrItem ?? null, isRepeated: isRepeated, groupCardElevation: 1, disableCardView: disableCardView, pageIsMarkedAsComplete: pageIsMarkedAsComplete, pages: pages, currentPageIndex: currentPage, parentIsReadOnly: parentIsReadOnly, onQrItemChange: onQrItemChange }) }, qItem.linkId));
                             }
                             // Page consists of a non-group item
-                            return (_jsx(TabPanel, { "aria-label": `${(_d = qItem.text) !== null && _d !== void 0 ? _d : 'Unnamed'} page`, sx: { p: 0 }, value: i.toString(), "data-test": "renderer-page-panel", children: _jsx(QGroupContainerBox, { cardElevation: 1, isRepeated: isRepeated, "data-test": "q-item-group-box", role: "region", "aria-label": (_e = qItem.text) !== null && _e !== void 0 ? _e : 'Unnamed group', children: disableCardView ? (_jsxs(_Fragment, { children: [_jsx(SingleItem, { qItem: qItem, qrItem: qrItem !== null && qrItem !== void 0 ? qrItem : null, itemPath: extendItemPath(itemPath, qItem.linkId), isRepeated: isRepeated, groupCardElevation: 1, parentIsReadOnly: parentIsReadOnly, onQrItemChange: onQrItemChange, isTabled: false }), _jsx(PageButtonsWrapper, { currentPageIndex: currentPage, pages: pages })] })) : (_jsxs(GroupCard, { elevation: 1, isRepeated: isRepeated, children: [_jsx(SingleItem, { qItem: qItem, qrItem: qrItem !== null && qrItem !== void 0 ? qrItem : null, itemPath: extendItemPath(itemPath, qItem.linkId), isRepeated: isRepeated, groupCardElevation: 1, parentIsReadOnly: parentIsReadOnly, onQrItemChange: onQrItemChange, isTabled: false }), _jsx(PageButtonsWrapper, { currentPageIndex: currentPage, pages: pages })] })) }) }, qItem.linkId));
+                            return (_jsx(TabPanel, { "aria-label": `${qItem.text ?? 'Unnamed'} page`, sx: { p: 0 }, value: i.toString(), "data-test": "renderer-page-panel", children: _jsx(QGroupContainerBox, { cardElevation: 1, isRepeated: isRepeated, "data-test": "q-item-group-box", role: "region", "aria-label": qItem.text ?? 'Unnamed group', children: disableCardView ? (_jsxs(_Fragment, { children: [_jsx(SingleItem, { qItem: qItem, qrItem: qrItem ?? null, isRepeated: isRepeated, groupCardElevation: 1, parentIsReadOnly: parentIsReadOnly, onQrItemChange: onQrItemChange, isTabled: false }), _jsx(PageButtonsWrapper, { currentPageIndex: currentPage, pages: pages })] })) : (_jsxs(GroupCard, { elevation: 1, isRepeated: isRepeated, children: [_jsx(SingleItem, { qItem: qItem, qrItem: qrItem ?? null, isRepeated: isRepeated, groupCardElevation: 1, parentIsReadOnly: parentIsReadOnly, onQrItemChange: onQrItemChange, isTabled: false }), _jsx(PageButtonsWrapper, { currentPageIndex: currentPage, pages: pages })] })) }) }, qItem.linkId));
                         }) }) }) }), footerQItems.map((footerQItem) => {
-                var _a;
                 const [qItem, qrItemIndex] = footerQItem;
                 const qrItemOrItems = topLevelQRItems[qrItemIndex];
                 const isRepeatGroup = Array.isArray(qrItemOrItems);
@@ -77,8 +73,8 @@ function FormBodyPaginated(props) {
                     // Does not work with repeat groups
                     return null;
                 }
-                const isRepeated = (_a = qItem.repeats) !== null && _a !== void 0 ? _a : false;
-                return (_jsx(GroupItem, { qItem: qItem, qrItem: qrItemOrItems !== null && qrItemOrItems !== void 0 ? qrItemOrItems : null, itemPath: extendItemPath(itemPath, qItem.linkId), isRepeated: isRepeated, groupCardElevation: 1, disableCardView: disableCardView, currentPageIndex: currentPage, parentIsReadOnly: parentIsReadOnly, onQrItemChange: onQrItemChange }, qItem.linkId));
+                const isRepeated = qItem.repeats ?? false;
+                return (_jsx(GroupItem, { qItem: qItem, qrItem: qrItemOrItems ?? null, isRepeated: isRepeated, groupCardElevation: 1, disableCardView: disableCardView, currentPageIndex: currentPage, parentIsReadOnly: parentIsReadOnly, onQrItemChange: onQrItemChange }, qItem.linkId));
             })] }));
 }
 export default FormBodyPaginated;

package/lib/components/Renderer/FormBodyPaginated.js.map

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

package/lib/components/Renderer/FormBodySingleCollapsible.js

@@ -11,10 +11,9 @@ import { getShortText } from '../../utils/extensions';
 import ContextDisplayItem from '../FormComponents/ItemParts/ContextDisplayItem';
 import { getItemTextToDisplay } from '../../utils/itemTextToDisplay';
 const FormBodySingleCollapsible = memo(function FormBodySingleCollapsible(props) {
-    var _a, _b;
     const { qItem, index, selectedIndex, onToggleExpand, children } = props;
     const contextDisplayItems = getContextDisplays(qItem);
-    const collapsibleLabel = (_b = (_a = getShortText(qItem)) !== null && _a !== void 0 ? _a : getItemTextToDisplay(qItem)) !== null && _b !== void 0 ? _b : '';
+    const collapsibleLabel = getShortText(qItem) ?? getItemTextToDisplay(qItem) ?? '';
     const isExpanded = selectedIndex === index;
     return (_jsxs(Accordion, { expanded: isExpanded, slotProps: {
             transition: { unmountOnExit: true, timeout: 250 }

package/lib/components/Renderer/FormBodySingleCollapsible.js.map

@@ -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,MAAA,MAAA,YAAY,CAAC,KAAK,CAAC,mCAAI,oBAAoB,CAAC,KAAK,CAAC,mCAAI,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,EACD,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"}
+{"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,EACD,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"}

package/lib/components/Renderer/FormBodySingleCollapsibleWrapper.d.ts

@@ -1,6 +1,6 @@
 import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
-import type { PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithQrItemChangeHandler } from '../../interfaces/renderProps.interface';
-interface FormBodySingleCollapsibleProps extends PropsWithQrItemChangeHandler, PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute {
+import type { PropsWithParentIsReadOnlyAttribute, PropsWithQrItemChangeHandler } from '../../interfaces/renderProps.interface';
+interface FormBodySingleCollapsibleProps extends PropsWithQrItemChangeHandler, PropsWithParentIsReadOnlyAttribute {
     qItem: QuestionnaireItem;
     qrItem: QuestionnaireResponseItem | null;
     index: number;

package/lib/components/Renderer/FormBodySingleCollapsibleWrapper.js

@@ -3,12 +3,12 @@ import GroupItem from '../FormComponents/GroupItem/GroupItem';
 import FormBodySingleCollapsible from './FormBodySingleCollapsible';
 import useHidden from '../../hooks/useHidden';
 function FormBodySingleCollapsibleWrapper(props) {
-    const { qItem, qrItem, index, selectedIndex, parentIsReadOnly, itemPath, onToggleExpand, onQrItemChange } = props;
+    const { qItem, qrItem, index, selectedIndex, parentIsReadOnly, onToggleExpand, onQrItemChange } = props;
     const itemIsHidden = useHidden(qItem);
     if (itemIsHidden) {
         return null;
     }
-    return (_jsx(FormBodySingleCollapsible, { qItem: qItem, index: index, selectedIndex: selectedIndex, onToggleExpand: onToggleExpand, children: _jsx(GroupItem, { qItem: qItem, qrItem: qrItem, itemPath: itemPath, isRepeated: true, groupCardElevation: 1, parentIsReadOnly: parentIsReadOnly, onQrItemChange: onQrItemChange }) }, qItem.linkId));
+    return (_jsx(FormBodySingleCollapsible, { qItem: qItem, index: index, selectedIndex: selectedIndex, onToggleExpand: onToggleExpand, children: _jsx(GroupItem, { qItem: qItem, qrItem: qrItem, isRepeated: true, groupCardElevation: 1, parentIsReadOnly: parentIsReadOnly, onQrItemChange: onQrItemChange }) }, qItem.linkId));
 }
 export default FormBodySingleCollapsibleWrapper;
 //# sourceMappingURL=FormBodySingleCollapsibleWrapper.js.map

package/lib/components/Renderer/FormBodySingleCollapsibleWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"FormBodySingleCollapsibleWrapper.js","sourceRoot":"","sources":["../../../src/components/Renderer/FormBodySingleCollapsibleWrapper.tsx"],"names":[],"mappings":";AAmBA,OAAO,SAAS,MAAM,uCAAuC,CAAC;AAC9D,OAAO,yBAAyB,MAAM,6BAA6B,CAAC;AAMpE,OAAO,SAAS,MAAM,uBAAuB,CAAC;AAa9C,SAAS,gCAAgC,CAAC,KAAqC;IAC7E,MAAM,EACJ,KAAK,EACL,MAAM,EACN,KAAK,EACL,aAAa,EACb,gBAAgB,EAChB,QAAQ,EACR,cAAc,EACd,cAAc,EACf,GAAG,KAAK,CAAC;IAEV,MAAM,YAAY,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IACtC,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CACL,KAAC,yBAAyB,IAExB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,KAAK,EACZ,aAAa,EAAE,aAAa,EAC5B,cAAc,EAAE,cAAc,YAC9B,KAAC,SAAS,IACR,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,QAAQ,EAClB,UAAU,EAAE,IAAI,EAChB,kBAAkB,EAAE,CAAC,EACrB,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,cAAc,GAC9B,IAbG,KAAK,CAAC,MAAM,CAcS,CAC7B,CAAC;AACJ,CAAC;AAED,eAAe,gCAAgC,CAAC"}
+{"version":3,"file":"FormBodySingleCollapsibleWrapper.js","sourceRoot":"","sources":["../../../src/components/Renderer/FormBodySingleCollapsibleWrapper.tsx"],"names":[],"mappings":";AAmBA,OAAO,SAAS,MAAM,uCAAuC,CAAC;AAC9D,OAAO,yBAAyB,MAAM,6BAA6B,CAAC;AAKpE,OAAO,SAAS,MAAM,uBAAuB,CAAC;AAY9C,SAAS,gCAAgC,CAAC,KAAqC;IAC7E,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,gBAAgB,EAAE,cAAc,EAAE,cAAc,EAAE,GAC7F,KAAK,CAAC;IAER,MAAM,YAAY,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;IACtC,IAAI,YAAY,EAAE,CAAC;QACjB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,OAAO,CACL,KAAC,yBAAyB,IAExB,KAAK,EAAE,KAAK,EACZ,KAAK,EAAE,KAAK,EACZ,aAAa,EAAE,aAAa,EAC5B,cAAc,EAAE,cAAc,YAC9B,KAAC,SAAS,IACR,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,IAAI,EAChB,kBAAkB,EAAE,CAAC,EACrB,gBAAgB,EAAE,gBAAgB,EAClC,cAAc,EAAE,cAAc,GAC9B,IAZG,KAAK,CAAC,MAAM,CAaS,CAC7B,CAAC;AACJ,CAAC;AAED,eAAe,gCAAgC,CAAC"}

package/lib/components/Renderer/FormBodyTabbed.d.ts

@@ -1,6 +1,6 @@
 import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
-import type { PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithQrItemChangeHandler } from '../../interfaces/renderProps.interface';
-interface FormBodyTabbedProps extends PropsWithQrItemChangeHandler, PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute {
+import type { PropsWithParentIsReadOnlyAttribute, PropsWithQrItemChangeHandler } from '../../interfaces/renderProps.interface';
+interface FormBodyTabbedProps extends PropsWithQrItemChangeHandler, PropsWithParentIsReadOnlyAttribute {
     topLevelQItem: QuestionnaireItem;
     topLevelQRItem: QuestionnaireResponseItem | null;
 }

package/lib/components/Renderer/FormBodyTabbed.js

@@ -23,20 +23,19 @@ import { getQrItemsIndex, mapQItemsIndex } from '../../utils/mapItem';
 import GroupItem from '../FormComponents/GroupItem/GroupItem';
 import { createEmptyQrGroup, updateQrItemsInGroup } from '../../utils/qrItem';
 import FormBodyTabListWrapper from '../Tabs/FormBodyTabListWrapper';
-import { useQuestionnaireStore, useRendererStylingStore } from '../../stores';
-import { extendItemPath } from '../../utils/itemPath';
+import { useQuestionnaireStore, useRendererConfigStore } from '../../stores';
 function FormBodyTabbed(props) {
-    const { topLevelQItem, topLevelQRItem, itemPath, parentIsReadOnly, onQrItemChange } = props;
+    const { topLevelQItem, topLevelQRItem, parentIsReadOnly, onQrItemChange } = props;
     const tabs = useQuestionnaireStore.use.tabs();
     const currentTab = useQuestionnaireStore.use.currentTabIndex();
-    const tabListWidthOrResponsive = useRendererStylingStore.use.tabListWidthOrResponsive();
+    const tabListWidthOrResponsive = useRendererConfigStore.use.tabListWidthOrResponsive();
     const indexMap = useMemo(() => mapQItemsIndex(topLevelQItem), [topLevelQItem]);
-    const nonNullTopLevelQRItem = topLevelQRItem !== null && topLevelQRItem !== void 0 ? topLevelQRItem : createEmptyQrGroup(topLevelQItem);
+    const nonNullTopLevelQRItem = topLevelQRItem ?? createEmptyQrGroup(topLevelQItem);
     const qItems = topLevelQItem.item;
     const qrItems = nonNullTopLevelQRItem.item;
-    function handleQrGroupChange(qrItem, targetItemPath) {
+    function handleQrGroupChange(qrItem) {
         updateQrItemsInGroup(qrItem, null, nonNullTopLevelQRItem, indexMap);
-        onQrItemChange(nonNullTopLevelQRItem, targetItemPath);
+        onQrItemChange(nonNullTopLevelQRItem);
     }
     if (!qItems || !qrItems) {
         return _jsx(_Fragment, { children: "Unable to load form" });
@@ -46,12 +45,11 @@ function FormBodyTabbed(props) {
     // If tabListWidthOrBreakpoints is an object, it is a MUI Breakpoints object
     const tabListWrapperProps = typeof tabListWidthOrResponsive === 'number'
         ? { sx: { width: tabListWidthOrResponsive, flexShrink: 0 } }
-        : { size: Object.assign({}, tabListWidthOrResponsive.tabListBreakpoints) };
+        : { size: { ...tabListWidthOrResponsive.tabListBreakpoints } };
     const qItemTabPanelProps = typeof tabListWidthOrResponsive === 'number'
         ? { sx: { flexGrow: 1 } }
-        : { size: Object.assign({}, tabListWidthOrResponsive.tabContentBreakpoints) };
-    return (_jsx(Grid, { container: true, spacing: 1.5, sx: { flexWrap: 'nowrap' }, children: _jsxs(TabContext, { value: currentTab.toString(), children: [_jsx(Grid, Object.assign({}, tabListWrapperProps, { children: _jsx(FormBodyTabListWrapper, { topLevelItems: qItems, currentTabIndex: currentTab, tabs: tabs }) })), _jsx(Grid, Object.assign({}, qItemTabPanelProps, { children: qItems.map((qItem, i) => {
-                        var _a, _b;
+        : { size: { ...tabListWidthOrResponsive.tabContentBreakpoints } };
+    return (_jsx(Grid, { container: true, spacing: 1.5, sx: { flexWrap: 'nowrap' }, children: _jsxs(TabContext, { value: currentTab.toString(), children: [_jsx(Grid, { ...tabListWrapperProps, children: _jsx(FormBodyTabListWrapper, { topLevelItems: qItems, currentTabIndex: currentTab, tabs: tabs }) }), _jsx(Grid, { ...qItemTabPanelProps, children: qItems.map((qItem, i) => {
                         const qrItem = qrItemsByIndex[i];
                         const isNotRepeatGroup = !Array.isArray(qrItem);
                         const isTab = !!tabs[qItem.linkId];
@@ -59,10 +57,10 @@ function FormBodyTabbed(props) {
                             // Something has gone horribly wrong
                             return null;
                         }
-                        const isRepeated = (_a = qItem.repeats) !== null && _a !== void 0 ? _a : false;
-                        const tabIsMarkedAsComplete = (_b = tabs[qItem.linkId].isComplete) !== null && _b !== void 0 ? _b : false;
-                        return (_jsx(TabPanel, { "aria-labelledby": `tab-${i}`, sx: { p: 0 }, value: i.toString(), id: `tabpanel-${i}`, "data-test": "renderer-tab-panel", children: _jsx(GroupItem, { qItem: qItem, qrItem: qrItem !== null && qrItem !== void 0 ? qrItem : null, isRepeated: isRepeated, groupCardElevation: 1, tabIsMarkedAsComplete: tabIsMarkedAsComplete, tabs: tabs, currentTabIndex: currentTab, parentIsReadOnly: parentIsReadOnly, itemPath: extendItemPath(itemPath, qItem.linkId), onQrItemChange: handleQrGroupChange }) }, qItem.linkId));
-                    }) }))] }) }));
+                        const isRepeated = qItem.repeats ?? false;
+                        const tabIsMarkedAsComplete = tabs[qItem.linkId].isComplete ?? false;
+                        return (_jsx(TabPanel, { "aria-labelledby": `tab-${i}`, sx: { p: 0 }, value: i.toString(), id: `tabpanel-${i}`, "data-test": "renderer-tab-panel", children: _jsx(GroupItem, { qItem: qItem, qrItem: qrItem ?? null, isRepeated: isRepeated, groupCardElevation: 1, tabIsMarkedAsComplete: tabIsMarkedAsComplete, tabs: tabs, currentTabIndex: currentTab, parentIsReadOnly: parentIsReadOnly, onQrItemChange: handleQrGroupChange }) }, qItem.linkId));
+                    }) })] }) }));
 }
 export default FormBodyTabbed;
 //# sourceMappingURL=FormBodyTabbed.js.map

package/lib/components/Renderer/FormBodyTabbed.js.map

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

package/lib/components/Renderer/FormTopLevelItem.d.ts

@@ -1,6 +1,6 @@
 import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
-import type { PropsWithItemPathAttribute, PropsWithParentIsReadOnlyAttribute, PropsWithQrItemChangeHandler, PropsWithQrRepeatGroupChangeHandler } from '../../interfaces/renderProps.interface';
-interface FormTopLevelItemProps extends PropsWithQrItemChangeHandler, PropsWithItemPathAttribute, PropsWithQrRepeatGroupChangeHandler, PropsWithParentIsReadOnlyAttribute {
+import type { PropsWithParentIsReadOnlyAttribute, PropsWithQrItemChangeHandler, PropsWithQrRepeatGroupChangeHandler } from '../../interfaces/renderProps.interface';
+interface FormTopLevelItemProps extends PropsWithQrItemChangeHandler, PropsWithQrRepeatGroupChangeHandler, PropsWithParentIsReadOnlyAttribute {
     topLevelQItem: QuestionnaireItem;
     topLevelQRItemOrItems: QuestionnaireResponseItem | QuestionnaireResponseItem[] | null;
     wholeFormIsPaginated: boolean;

package/lib/components/Renderer/FormTopLevelItem.js

@@ -13,18 +13,18 @@ import { isRepeatItemAndNotCheckbox, isSpecificItemControl } from '../../utils';
 import GroupTable from '../FormComponents/Tables/GroupTable';
 import RepeatItem from '../FormComponents/RepeatItem/RepeatItem';
 import GridGroup from '../FormComponents/GridGroup/GridGroup';
-import { useRendererStylingStore } from '../../stores';
+import { useRendererConfigStore } from '../../stores';
 import { isPage } from '../../utils/page';
 import FormBodyPageContainer from './FormBodyPageContainer';
 function FormTopLevelItem(props) {
-    const { topLevelQItem, topLevelQRItemOrItems, itemPath, parentIsReadOnly, wholeFormIsPaginated, onQrItemChange, onQrRepeatGroupChange } = props;
+    const { topLevelQItem, topLevelQRItemOrItems, parentIsReadOnly, wholeFormIsPaginated, onQrItemChange, onQrRepeatGroupChange } = props;
     const itemIsTabContainer = isTabContainer(topLevelQItem);
     const itemContainsTabs = containsTabs(topLevelQItem);
     // itemIsPageContainer is there for backwards compatibility only - see https://github.com/aehrc/smart-forms/issues/1041
     // The proper way to do it ATM is to make every single top-level item a page
     // Unfortunately, "header" and "footer" itemControl is not supported.
     const itemIsPageContainer = isPage(topLevelQItem);
-    const showTabbedFormAt = useRendererStylingStore.use.showTabbedFormAt();
+    const showTabbedFormAt = useRendererConfigStore.use.showTabbedFormAt();
     const isTabbedForm = useResponsive(showTabbedFormAt);
     const itemIsGroup = topLevelQItem.type === 'group';
     const readOnly = useReadOnly(topLevelQItem, parentIsReadOnly);
@@ -35,16 +35,16 @@ function FormTopLevelItem(props) {
     // If item has multiple answers, use a group item switcher to determine how to render it.
     const hasMultipleAnswers = Array.isArray(topLevelQRItemOrItems);
     if (hasMultipleAnswers) {
-        return (_jsx(GroupItemSwitcher, { qItem: topLevelQItem, qrItemOrItems: topLevelQRItemOrItems, itemPath: itemPath, groupCardElevation: 1, parentIsReadOnly: readOnly, onQrItemChange: onQrItemChange, onQrRepeatGroupChange: onQrRepeatGroupChange }));
+        return (_jsx(GroupItemSwitcher, { qItem: topLevelQItem, qrItemOrItems: topLevelQRItemOrItems, groupCardElevation: 1, parentIsReadOnly: readOnly, onQrItemChange: onQrItemChange, onQrRepeatGroupChange: onQrRepeatGroupChange }));
     }
     // At this point, item only has one answer
     const topLevelQRItem = topLevelQRItemOrItems;
     // If form is tabbed, it is rendered as a tabbed form
     if (itemContainsTabs || itemIsTabContainer) {
         if (isTabbedForm) {
-            return (_jsx(FormBodyTabbed, { topLevelQItem: topLevelQItem, topLevelQRItem: topLevelQRItem, itemPath: itemPath, parentIsReadOnly: readOnly, onQrItemChange: onQrItemChange }, topLevelQItem.linkId));
+            return (_jsx(FormBodyTabbed, { topLevelQItem: topLevelQItem, topLevelQRItem: topLevelQRItem, parentIsReadOnly: readOnly, onQrItemChange: onQrItemChange }, topLevelQItem.linkId));
         }
-        return (_jsx(FormBodyCollapsible, { topLevelQItem: topLevelQItem, topLevelQRItem: topLevelQRItem, itemPath: itemPath, parentIsReadOnly: readOnly, onQrItemChange: onQrItemChange }, topLevelQItem.linkId));
+        return (_jsx(FormBodyCollapsible, { topLevelQItem: topLevelQItem, topLevelQRItem: topLevelQRItem, parentIsReadOnly: readOnly, onQrItemChange: onQrItemChange }, topLevelQItem.linkId));
     }
     /* Using "page" item as a page-container - only preserved for backwards compatibility (not complaint with https://hl7.org/fhir/extensions/CodeSystem-questionnaire-item-control.html#questionnaire-item-control-page)
      * - The first "page" item in the questionnaire will be considered as a page-container, and all its children will be considered as pages
@@ -54,27 +54,27 @@ function FormTopLevelItem(props) {
      * Note: This will only be used if wholeFormIsPaginated=false
      */
     if (!wholeFormIsPaginated && itemIsPageContainer) {
-        return (_jsx(FormBodyPageContainer, { topLevelQItem: topLevelQItem, topLevelQRItem: topLevelQRItem, itemPath: itemPath, parentIsReadOnly: readOnly, onQrItemChange: onQrItemChange }, topLevelQItem.linkId));
+        return (_jsx(FormBodyPageContainer, { topLevelQItem: topLevelQItem, topLevelQRItem: topLevelQRItem, parentIsReadOnly: readOnly, onQrItemChange: onQrItemChange }, topLevelQItem.linkId));
     }
     // If form is untabbed, it is rendered as a regular group
     if (itemIsGroup) {
         // Item is 'grid'
         const itemIsGrid = isSpecificItemControl(topLevelQItem, 'grid');
         if (itemIsGrid) {
-            return (_jsx(GridGroup, { qItem: topLevelQItem, qrItem: topLevelQRItem, itemPath: itemPath, groupCardElevation: 1, parentIsReadOnly: parentIsReadOnly, onQrItemChange: onQrItemChange }));
+            return (_jsx(GridGroup, { qItem: topLevelQItem, qrItem: topLevelQRItem, groupCardElevation: 1, parentIsReadOnly: parentIsReadOnly, onQrItemChange: onQrItemChange }));
         }
         // GroupTable "gtable" can be rendered with either repeats:true or false
         if (isSpecificItemControl(topLevelQItem, 'gtable')) {
-            return (_jsx(GroupTable, { qItem: topLevelQItem, qrItems: topLevelQRItem ? [topLevelQRItem] : [], itemPath: itemPath, groupCardElevation: 1, isRepeated: false, parentIsReadOnly: parentIsReadOnly, onQrRepeatGroupChange: onQrRepeatGroupChange }, topLevelQItem.linkId));
+            return (_jsx(GroupTable, { qItem: topLevelQItem, qrItems: topLevelQRItem ? [topLevelQRItem] : [], groupCardElevation: 1, isRepeated: false, parentIsReadOnly: parentIsReadOnly, onQrRepeatGroupChange: onQrRepeatGroupChange }, topLevelQItem.linkId));
         }
-        return (_jsx(GroupItem, { qItem: topLevelQItem, qrItem: topLevelQRItem, itemPath: itemPath, groupCardElevation: 1, isRepeated: false, parentIsReadOnly: readOnly, onQrItemChange: onQrItemChange }, topLevelQItem.linkId));
+        return (_jsx(GroupItem, { qItem: topLevelQItem, qrItem: topLevelQRItem, groupCardElevation: 1, isRepeated: false, parentIsReadOnly: readOnly, onQrItemChange: onQrItemChange }, topLevelQItem.linkId));
     }
     // Otherwise, it is rendered as a non-group item
     const itemRepeatsAndIsNotCheckbox = isRepeatItemAndNotCheckbox(topLevelQItem);
     if (itemRepeatsAndIsNotCheckbox) {
-        return (_jsx(Box, { mt: 1, children: _jsx(RepeatItem, { qItem: topLevelQItem, qrItem: topLevelQRItem, itemPath: itemPath, groupCardElevation: 1, parentIsReadOnly: readOnly, onQrItemChange: onQrItemChange }, topLevelQItem.linkId) }));
+        return (_jsx(Box, { mt: 1, children: _jsx(RepeatItem, { qItem: topLevelQItem, qrItem: topLevelQRItem, groupCardElevation: 1, parentIsReadOnly: readOnly, onQrItemChange: onQrItemChange }, topLevelQItem.linkId) }));
     }
-    return (_jsx(Box, { mt: 1, children: _jsx(SingleItem, { qItem: topLevelQItem, qrItem: topLevelQRItem, itemPath: itemPath, isRepeated: false, isTabled: false, groupCardElevation: 1, parentIsReadOnly: readOnly, onQrItemChange: onQrItemChange }, topLevelQItem.linkId) }));
+    return (_jsx(Box, { mt: 1, children: _jsx(SingleItem, { qItem: topLevelQItem, qrItem: topLevelQRItem, isRepeated: false, isTabled: false, groupCardElevation: 1, parentIsReadOnly: readOnly, onQrItemChange: onQrItemChange }, topLevelQItem.linkId) }));
 }
 export default FormTopLevelItem;
 //# sourceMappingURL=FormTopLevelItem.js.map