@aehrc/smart-forms-renderer 1.2.12 → 1.2.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (61) hide show
  1. package/lib/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetFields.js +1 -1
  2. package/lib/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetFields.js.map +1 -1
  3. package/lib/components/FormComponents/GridGroup/GridGroup.js +1 -1
  4. package/lib/components/FormComponents/GroupItem/GroupItem.styles.js +1 -1
  5. package/lib/components/FormComponents/GroupItem/GroupItem.styles.js.map +1 -1
  6. package/lib/components/FormComponents/GroupItem/GroupItemView.js +2 -2
  7. package/lib/components/FormComponents/GroupItem/GroupItemView.js.map +1 -1
  8. package/lib/components/FormComponents/GroupItem/TabButtonsWrapper.js +1 -1
  9. package/lib/components/FormComponents/GroupItem/TabButtonsWrapper.js.map +1 -1
  10. package/lib/components/FormComponents/ItemParts/CheckboxSingle.js +2 -1
  11. package/lib/components/FormComponents/ItemParts/CheckboxSingle.js.map +1 -1
  12. package/lib/components/FormComponents/RepeatGroup/AddItemButton.js +1 -1
  13. package/lib/components/FormComponents/RepeatGroup/AddItemButton.js.map +1 -1
  14. package/lib/components/FormComponents/RepeatGroup/RepeatGroupView.js +1 -1
  15. package/lib/components/FormComponents/RepeatItem/AddItemButton.js +1 -1
  16. package/lib/components/FormComponents/RepeatItem/AddItemButton.js.map +1 -1
  17. package/lib/components/FormComponents/RepeatItem/RepeatItem.styles.js +2 -4
  18. package/lib/components/FormComponents/RepeatItem/RepeatItem.styles.js.map +1 -1
  19. package/lib/components/FormComponents/Tables/GroupTableView.js +1 -1
  20. package/lib/components/Renderer/FormBodySingleCollapsible.js +1 -1
  21. package/lib/components/Renderer/FormBodySingleCollapsible.js.map +1 -1
  22. package/lib/components/Tabs/FormBodyTabList.js +1 -1
  23. package/lib/components/Tabs/FormBodyTabList.js.map +1 -1
  24. package/lib/hooks/useCalculatedExpressionAnimating.d.ts +1 -0
  25. package/lib/hooks/useCalculatedExpressionAnimating.js +18 -0
  26. package/lib/hooks/useCalculatedExpressionAnimating.js.map +1 -0
  27. package/lib/hooks/useShowFeedback.d.ts +11 -0
  28. package/lib/hooks/useShowFeedback.js +33 -0
  29. package/lib/hooks/useShowFeedback.js.map +1 -0
  30. package/lib/interfaces/itemPath.interface.d.ts +31 -0
  31. package/lib/interfaces/itemPath.interface.js +2 -0
  32. package/lib/interfaces/itemPath.interface.js.map +1 -0
  33. package/lib/stores/rendererStylingStore.d.ts +144 -0
  34. package/lib/stores/rendererStylingStore.js +68 -0
  35. package/lib/stores/rendererStylingStore.js.map +1 -0
  36. package/lib/stories/storybookWrappers/InitialiseFormWrapperForStorybook.d.ts +2 -3
  37. package/lib/stories/storybookWrappers/InitialiseFormWrapperForStorybook.js +4 -25
  38. package/lib/stories/storybookWrappers/InitialiseFormWrapperForStorybook.js.map +1 -1
  39. package/lib/stories/storybookWrappers/index.js +1 -1
  40. package/lib/utils/calculatedExpression.js +10 -6
  41. package/lib/utils/calculatedExpression.js.map +1 -1
  42. package/lib/utils/itemPath.d.ts +57 -0
  43. package/lib/utils/itemPath.js +75 -0
  44. package/lib/utils/itemPath.js.map +1 -0
  45. package/lib/utils/questionnaireStoreUtils/addAdditionalVariables.js +1 -1
  46. package/lib/utils/questionnaireStoreUtils/addAdditionalVariables.js.map +1 -1
  47. package/package.json +1 -1
  48. package/src/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetFields.tsx +1 -0
  49. package/src/components/FormComponents/GridGroup/GridGroup.tsx +1 -1
  50. package/src/components/FormComponents/GroupItem/GroupItem.styles.ts +1 -1
  51. package/src/components/FormComponents/GroupItem/GroupItemView.tsx +4 -0
  52. package/src/components/FormComponents/GroupItem/TabButtonsWrapper.tsx +1 -1
  53. package/src/components/FormComponents/ItemParts/CheckboxSingle.tsx +3 -0
  54. package/src/components/FormComponents/RepeatGroup/AddItemButton.tsx +1 -1
  55. package/src/components/FormComponents/RepeatGroup/RepeatGroupView.tsx +1 -1
  56. package/src/components/FormComponents/RepeatItem/AddItemButton.tsx +1 -1
  57. package/src/components/FormComponents/RepeatItem/RepeatItem.styles.tsx +2 -4
  58. package/src/components/FormComponents/Tables/GroupTableView.tsx +1 -1
  59. package/src/components/Renderer/FormBodySingleCollapsible.tsx +2 -0
  60. package/src/components/Tabs/FormBodyTabList.tsx +5 -1
  61. package/src/utils/calculatedExpression.ts +10 -11
@@ -0,0 +1,68 @@
1
+ /*
2
+ * Copyright 2025 Commonwealth Scientific and Industrial Research
3
+ * Organisation (CSIRO) ABN 41 687 119 230.
4
+ *
5
+ * Licensed under the Apache License, Version 2.0 (the "License");
6
+ * you may not use this file except in compliance with the License.
7
+ * You may obtain a copy of the License at
8
+ *
9
+ * http://www.apache.org/licenses/LICENSE-2.0
10
+ *
11
+ * Unless required by applicable law or agreed to in writing, software
12
+ * distributed under the License is distributed on an "AS IS" BASIS,
13
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14
+ * See the License for the specific language governing permissions and
15
+ * limitations under the License.
16
+ */
17
+ import { createStore } from 'zustand/vanilla';
18
+ import { createSelectors } from './selector';
19
+ /**
20
+ * @author Sean Fong
21
+ */
22
+ export const rendererStylingStore = createStore()((set) => ({
23
+ readOnlyVisualStyle: 'disabled',
24
+ requiredIndicatorPosition: 'start',
25
+ itemResponsive: {
26
+ labelBreakpoints: { xs: 12, md: 4 },
27
+ fieldBreakpoints: { xs: 12, md: 8 },
28
+ columnGapPixels: 32,
29
+ rowGapPixels: 4
30
+ },
31
+ tabListWidthOrResponsive: {
32
+ tabListBreakpoints: { xs: 12, sm: 3, md: 3, lg: 2.75 },
33
+ tabContentBreakpoints: { xs: 12, sm: 9, md: 9, lg: 9.25 }
34
+ },
35
+ showTabbedFormAt: { query: 'up', start: 'md' },
36
+ textFieldWidth: 320,
37
+ inputsFlexGrow: false,
38
+ reverseBooleanYesNo: false,
39
+ hideClearButton: false,
40
+ hideQuantityComparatorField: false,
41
+ enableWhenAsReadOnly: false,
42
+ disablePageCardView: false,
43
+ disablePageButtons: false,
44
+ disableTabButtons: false,
45
+ setRendererStyling: (params) => {
46
+ set((state) => {
47
+ var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
48
+ return ({
49
+ readOnlyVisualStyle: (_a = params.readOnlyVisualStyle) !== null && _a !== void 0 ? _a : state.readOnlyVisualStyle,
50
+ requiredIndicatorPosition: (_b = params.requiredIndicatorPosition) !== null && _b !== void 0 ? _b : state.requiredIndicatorPosition,
51
+ itemResponsive: (_c = params.itemResponsive) !== null && _c !== void 0 ? _c : state.itemResponsive,
52
+ tabListWidthOrResponsive: (_d = params.tabListWidthOrResponsive) !== null && _d !== void 0 ? _d : state.tabListWidthOrResponsive,
53
+ showTabbedFormAt: (_e = params.showTabbedFormAt) !== null && _e !== void 0 ? _e : state.showTabbedFormAt,
54
+ textFieldWidth: (_f = params.textFieldWidth) !== null && _f !== void 0 ? _f : state.textFieldWidth,
55
+ inputsFlexGrow: (_g = params.inputsFlexGrow) !== null && _g !== void 0 ? _g : state.inputsFlexGrow,
56
+ reverseBooleanYesNo: (_h = params.reverseBooleanYesNo) !== null && _h !== void 0 ? _h : state.reverseBooleanYesNo,
57
+ hideClearButton: (_j = params.hideClearButton) !== null && _j !== void 0 ? _j : state.hideClearButton,
58
+ hideQuantityComparatorField: (_k = params.hideQuantityComparatorField) !== null && _k !== void 0 ? _k : state.hideQuantityComparatorField,
59
+ enableWhenAsReadOnly: (_l = params.enableWhenAsReadOnly) !== null && _l !== void 0 ? _l : state.enableWhenAsReadOnly,
60
+ disablePageCardView: (_m = params.disablePageCardView) !== null && _m !== void 0 ? _m : state.disablePageCardView,
61
+ disablePageButtons: (_o = params.disablePageButtons) !== null && _o !== void 0 ? _o : state.disablePageButtons,
62
+ disableTabButtons: (_p = params.disableTabButtons) !== null && _p !== void 0 ? _p : state.disableTabButtons
63
+ });
64
+ });
65
+ }
66
+ }));
67
+ export const useRendererStylingStore = createSelectors(rendererStylingStore);
68
+ //# sourceMappingURL=rendererStylingStore.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"rendererStylingStore.js","sourceRoot":"","sources":["../../src/stores/rendererStylingStore.ts"],"names":[],"mappings":"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"}
@@ -1,4 +1,3 @@
1
- import React from 'react';
2
1
  import type { Questionnaire, QuestionnaireResponse } from 'fhir/r4';
3
2
  import type Client from 'fhirclient/lib/Client';
4
3
  export interface InitialiseFormWrapperProps {
@@ -6,7 +5,7 @@ export interface InitialiseFormWrapperProps {
6
5
  questionnaireResponse?: QuestionnaireResponse;
7
6
  readOnly?: boolean;
8
7
  terminologyServerUrl?: string;
9
- additionalVariables?: Record<string, object>;
8
+ additionalVariables?: Record<string, any>;
10
9
  fhirClient?: Client;
11
10
  }
12
11
  /**
@@ -27,5 +26,5 @@ export interface InitialiseFormWrapperProps {
27
26
  *
28
27
  * @author Sean Fong
29
28
  */
30
- declare function InitialiseFormWrapperForStorybook(props: InitialiseFormWrapperProps): React.JSX.Element;
29
+ declare function InitialiseFormWrapperForStorybook(props: InitialiseFormWrapperProps): import("react/jsx-runtime").JSX.Element;
31
30
  export default InitialiseFormWrapperForStorybook;
@@ -1,29 +1,12 @@
1
- /*
2
- * Copyright 2024 Commonwealth Scientific and Industrial Research
3
- * Organisation (CSIRO) ABN 41 687 119 230.
4
- *
5
- * Licensed under the Apache License, Version 2.0 (the "License");
6
- * you may not use this file except in compliance with the License.
7
- * You may obtain a copy of the License at
8
- *
9
- * http://www.apache.org/licenses/LICENSE-2.0
10
- *
11
- * Unless required by applicable law or agreed to in writing, software
12
- * distributed under the License is distributed on an "AS IS" BASIS,
13
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14
- * See the License for the specific language governing permissions and
15
- * limitations under the License.
16
- */
17
- // @ts-ignore
18
- import React from 'react';
1
+ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
19
2
  import { BaseRenderer } from '../../components';
20
3
  import { QueryClientProvider } from '@tanstack/react-query';
21
- import RendererThemeProvider from '../../theme/Theme';
22
4
  import useRendererQueryClient from '../../hooks/useRendererQueryClient';
23
5
  import useInitialiseForm from '../../hooks/useInitialiseForm';
24
6
  import Box from '@mui/material/Box';
25
7
  import CircularProgress from '@mui/material/CircularProgress';
26
8
  import Typography from '@mui/material/Typography';
9
+ import RendererThemeProvider from '../../theme/RendererThemeProvider';
27
10
  /**
28
11
  * This is a one-to-one replacement for the SmartFormsRenderer for demo purposes.
29
12
  * Instead of using this React component, define your own wrapper component that uses the BaseRenderer directly.
@@ -55,13 +38,9 @@ function InitialiseFormWrapperForStorybook(props) {
55
38
  const isInitialising = useInitialiseForm(questionnaire, questionnaireResponse, readOnly, terminologyServerUrl, additionalVariables, fhirClient);
56
39
  // Free feel to customise your loading animation here
57
40
  if (isInitialising) {
58
- return (React.createElement(Box, { display: "flex", alignItems: "center", columnGap: 2 },
59
- React.createElement(CircularProgress, null),
60
- React.createElement(Typography, null, "Loading questionnaire...")));
41
+ return (_jsxs(Box, { display: "flex", alignItems: "center", columnGap: 2, children: [_jsx(CircularProgress, {}), _jsx(Typography, { children: "Loading questionnaire..." })] }));
61
42
  }
62
- return (React.createElement(RendererThemeProvider, null,
63
- React.createElement(QueryClientProvider, { client: queryClient },
64
- React.createElement(BaseRenderer, null))));
43
+ return (_jsx(RendererThemeProvider, { children: _jsx(QueryClientProvider, { client: queryClient, children: _jsx(BaseRenderer, {}) }) }));
65
44
  }
66
45
  export default InitialiseFormWrapperForStorybook;
67
46
  //# sourceMappingURL=InitialiseFormWrapperForStorybook.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"InitialiseFormWrapperForStorybook.js","sourceRoot":"","sources":["../../../src/stories/storybookWrappers/InitialiseFormWrapperForStorybook.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,aAAa;AACb,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,qBAAqB,MAAM,mBAAmB,CAAC;AACtD,OAAO,sBAAsB,MAAM,oCAAoC,CAAC;AAExE,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAC9D,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;AAC9D,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAWlD;;;;;;;;;;;;;;;;;GAiBG;AACH,SAAS,iCAAiC,CAAC,KAAiC;IAC1E,MAAM,EACJ,aAAa,EACb,qBAAqB,EACrB,QAAQ,EACR,oBAAoB,EACpB,mBAAmB,EACnB,UAAU,EACX,GAAG,KAAK,CAAC;IAEV,qFAAqF;IACrF,MAAM,WAAW,GAAG,sBAAsB,EAAE,CAAC;IAE7C;;;;;OAKG;IACH,MAAM,cAAc,GAAG,iBAAiB,CACtC,aAAa,EACb,qBAAqB,EACrB,QAAQ,EACR,oBAAoB,EACpB,mBAAmB,EACnB,UAAU,CACX,CAAC;IAEF,qDAAqD;IACrD,IAAI,cAAc,EAAE;QAClB,OAAO,CACL,oBAAC,GAAG,IAAC,OAAO,EAAC,MAAM,EAAC,UAAU,EAAC,QAAQ,EAAC,SAAS,EAAE,CAAC;YAClD,oBAAC,gBAAgB,OAAG;YACpB,oBAAC,UAAU,mCAAsC,CAC7C,CACP,CAAC;KACH;IAED,OAAO,CACL,oBAAC,qBAAqB;QACpB,oBAAC,mBAAmB,IAAC,MAAM,EAAE,WAAW;YACtC,oBAAC,YAAY,OAAG,CACI,CACA,CACzB,CAAC;AACJ,CAAC;AAED,eAAe,iCAAiC,CAAC"}
1
+ {"version":3,"file":"InitialiseFormWrapperForStorybook.js","sourceRoot":"","sources":["../../../src/stories/storybookWrappers/InitialiseFormWrapperForStorybook.tsx"],"names":[],"mappings":";AAoBA,OAAO,EAAE,YAAY,EAAE,MAAM,kBAAkB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,sBAAsB,MAAM,oCAAoC,CAAC;AAExE,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAC9D,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;AAC9D,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,qBAAqB,MAAM,mCAAmC,CAAC;AAWtE;;;;;;;;;;;;;;;;;GAiBG;AACH,SAAS,iCAAiC,CAAC,KAAiC;IAC1E,MAAM,EACJ,aAAa,EACb,qBAAqB,EACrB,QAAQ,EACR,oBAAoB,EACpB,mBAAmB,EACnB,UAAU,EACX,GAAG,KAAK,CAAC;IAEV,qFAAqF;IACrF,MAAM,WAAW,GAAG,sBAAsB,EAAE,CAAC;IAE7C;;;;;OAKG;IACH,MAAM,cAAc,GAAG,iBAAiB,CACtC,aAAa,EACb,qBAAqB,EACrB,QAAQ,EACR,oBAAoB,EACpB,mBAAmB,EACnB,UAAU,CACX,CAAC;IAEF,qDAAqD;IACrD,IAAI,cAAc,EAAE,CAAC;QACnB,OAAO,CACL,MAAC,GAAG,IAAC,OAAO,EAAC,MAAM,EAAC,UAAU,EAAC,QAAQ,EAAC,SAAS,EAAE,CAAC,aAClD,KAAC,gBAAgB,KAAG,EACpB,KAAC,UAAU,2CAAsC,IAC7C,CACP,CAAC;IACJ,CAAC;IAED,OAAO,CACL,KAAC,qBAAqB,cACpB,KAAC,mBAAmB,IAAC,MAAM,EAAE,WAAW,YACtC,KAAC,YAAY,KAAG,GACI,GACA,CACzB,CAAC;AACJ,CAAC;AAED,eAAe,iCAAiC,CAAC"}
@@ -1,5 +1,5 @@
1
1
  /*
2
- * Copyright 2024 Commonwealth Scientific and Industrial Research
2
+ * Copyright 2025 Commonwealth Scientific and Industrial Research
3
3
  * Organisation (CSIRO) ABN 41 687 119 230.
4
4
  *
5
5
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -225,10 +225,6 @@ function applyCalculatedExpressionValuesRecursive(qItem, qrItemOrItems, calculat
225
225
  let qrItem = qrItemOrItems;
226
226
  const childQItems = qItem.item;
227
227
  if (childQItems && childQItems.length > 0) {
228
- // If item.type is 'group', create empty group qrItem
229
- if (qItem.type === 'group') {
230
- qrItem = qrItemOrItems ?? structuredClone(createEmptyQrGroup(qItem));
231
- }
232
228
  const childQrItems = qrItem?.item ?? [];
233
229
  const indexMap = mapQItemsIndex(qItem);
234
230
  const qrItemsByIndex = getQrItemsIndex(childQItems, childQrItems, indexMap);
@@ -239,17 +235,25 @@ function applyCalculatedExpressionValuesRecursive(qItem, qrItemOrItems, calculat
239
235
  // Update QR items in repeating group
240
236
  if (Array.isArray(updatedChildQRItemOrItems)) {
241
237
  if (updatedChildQRItemOrItems.length > 0) {
238
+ // Lazily initialise qrItem so all children are added to the same group object
239
+ if (!qrItem) {
240
+ qrItem = structuredClone(createEmptyQrGroup(qItem));
241
+ }
242
242
  updateQrItemsInGroup(null, {
243
243
  linkId: childQItem.linkId,
244
244
  qrItems: updatedChildQRItemOrItems
245
- }, qrItem ?? structuredClone(createEmptyQrGroup(qItem)), indexMap);
245
+ }, qrItem, indexMap);
246
246
  }
247
247
  continue;
248
248
  }
249
249
  // Update QR items in non-repeating group
250
250
  const updatedChildQRItem = updatedChildQRItemOrItems;
251
251
  if (updatedChildQRItem) {
252
- updateQrItemsInGroup(updatedChildQRItem, null, qrItem ?? structuredClone(createEmptyQrGroup(qItem)), indexMap);
252
+ // Lazily initialise qrItem so all children are added to the same group object
253
+ if (!qrItem) {
254
+ qrItem = structuredClone(createEmptyQrGroup(qItem));
255
+ }
256
+ updateQrItemsInGroup(updatedChildQRItem, null, qrItem, indexMap);
253
257
  }
254
258
  }
255
259
  return applyCalculatedExpressionValuesInNonLeafItem(qItem, qrItem, calculatedExpressions);
@@ -1 +1 @@
1
- {"version":3,"file":"calculatedExpression.js","sourceRoot":"","sources":["../../src/utils/calculatedExpression.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"calculatedExpression.js","sourceRoot":"","sources":["../../src/utils/calculatedExpression.ts"],"names":[],"mappings":"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"}
@@ -0,0 +1,57 @@
1
+ import type { ItemPath } from '../interfaces/itemPath.interface';
2
+ /**
3
+ * Creates an `ItemPath` containing a single segment for the given `linkId`.
4
+ * This is useful when you want to construct a path to a specific item without referencing its ancestry,
5
+ * such as when working with top-level items or when only the item's identity is relevant.
6
+ *
7
+ * @param linkId - The `linkId` of the item.
8
+ * @param repeatIndex - (Optional) If the item is part of a repeating group, specify its index.
9
+ * @returns An `ItemPath` containing one segment.
10
+ *
11
+ * @example
12
+ * ```ts
13
+ * const path = createSingleItemPath('question-1');
14
+ * // Output: [{ linkId: 'question-1' }]
15
+ *
16
+ * const pathWithRepeat = createSingleItemPath('question-1', 2);
17
+ * // Output: [{ linkId: 'question-1', repeatIndex: 2 }]
18
+ * ```
19
+ */
20
+ export declare function createSingleItemPath(linkId: string, repeatIndex?: number): ItemPath;
21
+ /**
22
+ * Creates a new `ItemPath` by extending the given path with a new segment for the provided `linkId`.
23
+ * This version does NOT include a `repeatIndex`. If repeat handling is needed,
24
+ * use `appendRepeatIndexToLastSegment` after extending.
25
+ *
26
+ * @param currentPath - The existing item path.
27
+ * @param linkId - The `linkId` to use in the new path segment.
28
+ * @returns A new `ItemPath` with the added segment.
29
+ */
30
+ export declare function extendItemPath(currentPath: ItemPath, linkId: string): ItemPath;
31
+ /**
32
+ * Returns a new `ItemPath` with a `repeatIndex` applied to the last segment.
33
+ * Useful for denoting which repetition of a group is being accessed.
34
+ *
35
+ * @param path - The item path to modify.
36
+ * @param repeatIndex - The index to assign to the final segment.
37
+ * @returns A new `ItemPath` with the last segment modified to include `repeatIndex`.
38
+ *
39
+ * @example
40
+ * const basePath = [{ linkId: 'groupA' }, { linkId: 'groupB' }];
41
+ * appendRepeatIndexToLastSegment(basePath, 2);
42
+ * // → [{ linkId: 'groupA' }, { linkId: 'groupB', repeatIndex: 2 }]
43
+ */
44
+ export declare function appendRepeatIndexToLastSegment(path: ItemPath, repeatIndex: number): ItemPath;
45
+ /**
46
+ * Converts an `ItemPath` to a FHIRPath-compatible string.
47
+ *
48
+ * For example, the path:
49
+ * [
50
+ * { linkId: 'groupA' },
51
+ * { linkId: 'repeatingGroup', repeatIndex: 1 },
52
+ * { linkId: 'questionB' }
53
+ * ]
54
+ *
55
+ * Returns: "item.where(linkId='groupA').item.where(linkId='repeatingGroup')[1].item.where(linkId='questionB')"
56
+ */
57
+ export declare function itemPathToFhirPathString(path: ItemPath): string;
@@ -0,0 +1,75 @@
1
+ /**
2
+ * Creates an `ItemPath` containing a single segment for the given `linkId`.
3
+ * This is useful when you want to construct a path to a specific item without referencing its ancestry,
4
+ * such as when working with top-level items or when only the item's identity is relevant.
5
+ *
6
+ * @param linkId - The `linkId` of the item.
7
+ * @param repeatIndex - (Optional) If the item is part of a repeating group, specify its index.
8
+ * @returns An `ItemPath` containing one segment.
9
+ *
10
+ * @example
11
+ * ```ts
12
+ * const path = createSingleItemPath('question-1');
13
+ * // Output: [{ linkId: 'question-1' }]
14
+ *
15
+ * const pathWithRepeat = createSingleItemPath('question-1', 2);
16
+ * // Output: [{ linkId: 'question-1', repeatIndex: 2 }]
17
+ * ```
18
+ */
19
+ export function createSingleItemPath(linkId, repeatIndex) {
20
+ return repeatIndex !== undefined ? [{ linkId, repeatIndex }] : [{ linkId }];
21
+ }
22
+ /**
23
+ * Creates a new `ItemPath` by extending the given path with a new segment for the provided `linkId`.
24
+ * This version does NOT include a `repeatIndex`. If repeat handling is needed,
25
+ * use `appendRepeatIndexToLastSegment` after extending.
26
+ *
27
+ * @param currentPath - The existing item path.
28
+ * @param linkId - The `linkId` to use in the new path segment.
29
+ * @returns A new `ItemPath` with the added segment.
30
+ */
31
+ export function extendItemPath(currentPath, linkId) {
32
+ return [...currentPath, { linkId }];
33
+ }
34
+ /**
35
+ * Returns a new `ItemPath` with a `repeatIndex` applied to the last segment.
36
+ * Useful for denoting which repetition of a group is being accessed.
37
+ *
38
+ * @param path - The item path to modify.
39
+ * @param repeatIndex - The index to assign to the final segment.
40
+ * @returns A new `ItemPath` with the last segment modified to include `repeatIndex`.
41
+ *
42
+ * @example
43
+ * const basePath = [{ linkId: 'groupA' }, { linkId: 'groupB' }];
44
+ * appendRepeatIndexToLastSegment(basePath, 2);
45
+ * // → [{ linkId: 'groupA' }, { linkId: 'groupB', repeatIndex: 2 }]
46
+ */
47
+ export function appendRepeatIndexToLastSegment(path, repeatIndex) {
48
+ if (path.length === 0)
49
+ return [];
50
+ const newPath = [...path];
51
+ newPath[path.length - 1] = Object.assign(Object.assign({}, newPath[path.length - 1]), { repeatIndex });
52
+ return newPath;
53
+ }
54
+ /**
55
+ * Converts an `ItemPath` to a FHIRPath-compatible string.
56
+ *
57
+ * For example, the path:
58
+ * [
59
+ * { linkId: 'groupA' },
60
+ * { linkId: 'repeatingGroup', repeatIndex: 1 },
61
+ * { linkId: 'questionB' }
62
+ * ]
63
+ *
64
+ * Returns: "item.where(linkId='groupA').item.where(linkId='repeatingGroup')[1].item.where(linkId='questionB')"
65
+ */
66
+ export function itemPathToFhirPathString(path) {
67
+ return path
68
+ .map((segment, index) => {
69
+ const base = `where(linkId='${segment.linkId}')`;
70
+ const repeat = segment.repeatIndex !== undefined ? `[${segment.repeatIndex}]` : '';
71
+ return (index === 0 ? 'item.' : '') + base + repeat;
72
+ })
73
+ .join('.item.');
74
+ }
75
+ //# sourceMappingURL=itemPath.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"itemPath.js","sourceRoot":"","sources":["../../src/utils/itemPath.ts"],"names":[],"mappings":"AAEA;;;;;;;;;;;;;;;;;GAiBG;AACH,MAAM,UAAU,oBAAoB,CAAC,MAAc,EAAE,WAAoB;IACvE,OAAO,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC;AAC9E,CAAC;AAED;;;;;;;;GAQG;AACH,MAAM,UAAU,cAAc,CAAC,WAAqB,EAAE,MAAc;IAClE,OAAO,CAAC,GAAG,WAAW,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;AACtC,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,8BAA8B,CAAC,IAAc,EAAE,WAAmB;IAChF,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,EAAE,CAAC;IAEjC,MAAM,OAAO,GAAG,CAAC,GAAG,IAAI,CAAC,CAAC;IAC1B,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,mCAAQ,OAAO,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,KAAE,WAAW,GAAE,CAAC;IACxE,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;;;;;;;;;;GAWG;AACH,MAAM,UAAU,wBAAwB,CAAC,IAAc;IACrD,OAAO,IAAI;SACR,GAAG,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;QACtB,MAAM,IAAI,GAAG,iBAAiB,OAAO,CAAC,MAAM,IAAI,CAAC;QACjD,MAAM,MAAM,GAAG,OAAO,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,WAAW,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QACnF,OAAO,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,IAAI,GAAG,MAAM,CAAC;IACtD,CAAC,CAAC;SACD,IAAI,CAAC,QAAQ,CAAC,CAAC;AACpB,CAAC"}
@@ -1,5 +1,5 @@
1
1
  /*
2
- * Copyright 2024 Commonwealth Scientific and Industrial Research
2
+ * Copyright 2025 Commonwealth Scientific and Industrial Research
3
3
  * Organisation (CSIRO) ABN 41 687 119 230.
4
4
  *
5
5
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -1 +1 @@
1
- {"version":3,"file":"addAdditionalVariables.js","sourceRoot":"","sources":["../../../src/utils/questionnaireStoreUtils/addAdditionalVariables.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH,MAAM,UAAU,sBAAsB,CACpC,iBAA4B,EAC5B,mBAA2C;IAE3C,KAAK,MAAM,GAAG,IAAI,mBAAmB,EAAE;QACrC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;QAE1C,IAAI,QAAQ,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE;YACpC,MAAM,UAAU,GAAG,QAAQ,CAAC,eAAe,CAAC;YAC5C,IAAI,UAAU,IAAI,UAAU,CAAC,QAAQ,IAAI,UAAU,CAAC,IAAI,EAAE;gBACxD,IAAI,UAAU,CAAC,QAAQ,KAAK,eAAe,EAAE;oBAC3C,iBAAiB,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;iBAC5E;qBAAM,IAAI,UAAU,CAAC,QAAQ,KAAK,0BAA0B,EAAE;oBAC7D,iBAAiB,CAAC,mBAAmB,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG;wBACvD,eAAe,EAAE,UAAU;qBAC5B,CAAC;iBACH;aACF;SACF;KACF;IAED,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED,SAAS,UAAU,CAAC,QAAgB;;IAClC,MAAM,CAAC,GAAG,QAAqB,CAAC;IAChC,OAAO,CACL,CAAC,CAAC,CAAC,GAAG,KAAK,kDAAkD;QAC3D,CAAA,MAAA,CAAC,CAAC,eAAe,0CAAE,QAAQ,MAAK,eAAe,CAAC;QAClD,CAAA,MAAA,CAAC,CAAC,eAAe,0CAAE,QAAQ,MAAK,0BAA0B,CAC3D,CAAC;AACJ,CAAC"}
1
+ {"version":3,"file":"addAdditionalVariables.js","sourceRoot":"","sources":["../../../src/utils/questionnaireStoreUtils/addAdditionalVariables.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH,MAAM,UAAU,sBAAsB,CACpC,iBAA4B,EAC5B,mBAA2C;IAE3C,KAAK,MAAM,GAAG,IAAI,mBAAmB,EAAE,CAAC;QACtC,MAAM,QAAQ,GAAG,mBAAmB,CAAC,GAAG,CAAC,CAAC;QAE1C,IAAI,QAAQ,IAAI,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YACrC,MAAM,UAAU,GAAG,QAAQ,CAAC,eAAe,CAAC;YAC5C,IAAI,UAAU,IAAI,UAAU,CAAC,QAAQ,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;gBACzD,IAAI,UAAU,CAAC,QAAQ,KAAK,eAAe,EAAE,CAAC;oBAC5C,iBAAiB,CAAC,iBAAiB,CAAC,oBAAoB,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;gBAC7E,CAAC;qBAAM,IAAI,UAAU,CAAC,QAAQ,KAAK,0BAA0B,EAAE,CAAC;oBAC9D,iBAAiB,CAAC,mBAAmB,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG;wBACvD,eAAe,EAAE,UAAU;qBAC5B,CAAC;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED,SAAS,UAAU,CAAC,QAAgB;;IAClC,MAAM,CAAC,GAAG,QAAqB,CAAC;IAChC,OAAO,CACL,CAAC,CAAC,CAAC,GAAG,KAAK,kDAAkD;QAC3D,CAAA,MAAA,CAAC,CAAC,eAAe,0CAAE,QAAQ,MAAK,eAAe,CAAC;QAClD,CAAA,MAAA,CAAC,CAAC,eAAe,0CAAE,QAAQ,MAAK,0BAA0B,CAC3D,CAAC;AACJ,CAAC"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@aehrc/smart-forms-renderer",
3
- "version": "1.2.12",
3
+ "version": "1.2.14",
4
4
  "description": "FHIR Structured Data Captured (SDC) rendering engine for Smart Forms",
5
5
  "main": "lib/index.js",
6
6
  "scripts": {
@@ -85,6 +85,7 @@ function ChoiceSelectAnswerValueSetFields(props: ChoiceSelectAnswerValueSetField
85
85
  readOnly={readOnly && readOnlyVisualStyle === 'readonly'}
86
86
  renderInput={(params) => (
87
87
  <StandardTextField
88
+ multiline
88
89
  textFieldWidth={textFieldWidth}
89
90
  isTabled={isTabled}
90
91
  placeholder={entryFormat || displayPrompt}
@@ -159,7 +159,7 @@ function GridGroup(props: GridGroupProps) {
159
159
  <QGroupContainerBox
160
160
  cardElevation={groupCardElevation}
161
161
  isRepeated={false}
162
- py={3}
162
+ py={0}
163
163
  data-linkid={qItem.linkId}
164
164
  data-label={qItem.text}
165
165
  onClick={() => onFocusLinkId(qItem.linkId)}
@@ -22,7 +22,7 @@ export const GroupCard = styled(Card, {
22
22
  shouldForwardProp: (prop) => prop !== 'elevation' && prop !== 'isRepeated'
23
23
  })<{ elevation: number; isRepeated: boolean }>(({ elevation, isRepeated }) => ({
24
24
  paddingTop: '20px',
25
- paddingBottom: '20px',
25
+ paddingBottom: '0px',
26
26
  paddingLeft: elevation === 1 ? '26px' : '24px',
27
27
  paddingRight: elevation === 1 ? '26px' : '24px',
28
28
  marginBottom: isRepeated ? 0 : '28px'
@@ -171,6 +171,8 @@ function GroupItemView(props: GroupItemViewProps) {
171
171
  data-test="q-item-group-box"
172
172
  role="region"
173
173
  aria-label={qItem.text ?? 'Unnamed group'}
174
+ data-linkid={qItem.linkId}
175
+ data-label={qItem.text}
174
176
  style={combinedStyles || undefined}>
175
177
  {/* Show group heading when item.repeats=false AND itemTextToDisplay is valid */}
176
178
  {!isRepeated && itemTextToDisplay ? (
@@ -216,6 +218,8 @@ function GroupItemView(props: GroupItemViewProps) {
216
218
  cardElevation={groupCardElevation}
217
219
  isRepeated={isRepeated}
218
220
  data-test="q-item-group-box"
221
+ data-linkid={qItem.linkId}
222
+ data-label={qItem.text}
219
223
  role="region"
220
224
  aria-label={qItem.text ?? 'Unnamed group'}>
221
225
  <GroupCard
@@ -97,7 +97,7 @@ const TabButtonsWrapper = memo(function TabButtonsWrapper(props: TabButtonsWrapp
97
97
  const tabButtonsDisabled = numOfVisibleTabs <= 1;
98
98
 
99
99
  return (
100
- <Box display="flex" mt={3}>
100
+ <Box display="flex" mt={3} mb={3}>
101
101
  {previousTabButtonHidden ? null : (
102
102
  <PreviousTabButton
103
103
  isDisabled={tabButtonsDisabled}
@@ -53,6 +53,8 @@ function CheckboxSingle(props: CheckboxSingleProps) {
53
53
  const isHtmlDisabled = readOnlyWithDisabledStyle || disabledViaToggleExpression;
54
54
  const isHtmlReadOnly = readOnlyWithReadOnlyStyle && !disabledViaToggleExpression;
55
55
 
56
+ const textForDataTest = labelText ?? (typeof label === 'string' ? label : value);
57
+
56
58
  return (
57
59
  <FormControlLabel
58
60
  sx={{
@@ -66,6 +68,7 @@ function CheckboxSingle(props: CheckboxSingleProps) {
66
68
  value={value}
67
69
  control={
68
70
  <StandardCheckbox
71
+ data-test={`checkbox-single-${textForDataTest}`}
69
72
  size="small"
70
73
  checked={isChecked}
71
74
  readOnly={isHtmlReadOnly}
@@ -33,7 +33,7 @@ function AddItemButton(props: AddItemButtonProps) {
33
33
  const isDisabled = repeatGroups[repeatGroups.length - 1]?.qrItem === null || readOnly;
34
34
 
35
35
  return (
36
- <Box display="flex" flexDirection="row-reverse">
36
+ <Box display="flex" flexDirection="row-reverse" sx={{ mt: 1 }}>
37
37
  <Button
38
38
  variant="contained"
39
39
  size="small"
@@ -139,7 +139,7 @@ function RepeatGroupView(props: RepeatGroupViewProps) {
139
139
  cardElevation={groupCardElevation}
140
140
  isRepeated={true}
141
141
  style={parentStyles || undefined}>
142
- <Card elevation={groupCardElevation} sx={{ p: 3, py: 2.5, mb: 3.5 }}>
142
+ <Card elevation={groupCardElevation} sx={{ p: 3, py: 1.5, mb: 2.5 }}>
143
143
  {itemTextToDisplay ? (
144
144
  <>
145
145
  <GroupHeading
@@ -37,7 +37,7 @@ function AddItemButton(props: AddItemButtonProps) {
37
37
  lastAnswer === null || Object.keys(lastAnswer ?? {}).join() === 'id' || readOnly;
38
38
 
39
39
  return (
40
- <Box display="flex" flexDirection="row-reverse">
40
+ <Box display="flex" flexDirection="row-reverse" sx={{ mt: 1 }}>
41
41
  <Button
42
42
  variant="contained"
43
43
  size="small"
@@ -24,11 +24,9 @@ export const RepeatRemoveTooltip = styled(Tooltip)(() => ({
24
24
  }));
25
25
 
26
26
  export const RepeatItemContainerStack = styled(Stack)(() => ({
27
- alignItems: 'center',
28
- paddingBottom: 8
27
+ alignItems: 'center'
29
28
  }));
30
29
 
31
30
  export const RepeatGroupContainerStack = styled(Stack)(() => ({
32
- alignItems: 'center',
33
- paddingBottom: 16
31
+ alignItems: 'center'
34
32
  }));
@@ -193,7 +193,7 @@ function GroupTableView(props: GroupTableViewProps) {
193
193
  <QGroupContainerBox
194
194
  cardElevation={groupCardElevation}
195
195
  isRepeated={false}
196
- py={3}
196
+ py={0}
197
197
  data-linkid={qItem.linkId}
198
198
  data-label={qItem.text}
199
199
  onClick={() => onFocusLinkId(qItem.linkId)}
@@ -54,6 +54,8 @@ const FormBodySingleCollapsible = memo(function FormBodySingleCollapsible(
54
54
  slotProps={{
55
55
  transition: { unmountOnExit: true, timeout: 250 }
56
56
  }}
57
+ data-linkid={qItem.linkId}
58
+ data-label={qItem.text}
57
59
  onChange={() => onToggleExpand(index)}>
58
60
  <AccordionSummary expandIcon={<ExpandMoreIcon />}>
59
61
  <Box display="flex" alignItems="center" justifyContent="space-between" width="100%" mr={3}>
@@ -66,7 +66,11 @@ const FormBodyTabList = memo(function FormBodyTabList(props: FormBodyTabListProp
66
66
  const tabLabel = getShortText(qItem) ?? getItemTextToDisplay(qItem) ?? '';
67
67
 
68
68
  return (
69
- <Collapse key={qItem.linkId} timeout={100}>
69
+ <Collapse
70
+ key={qItem.linkId}
71
+ timeout={100}
72
+ data-linkid={qItem.linkId}
73
+ data-label={qItem.text}>
70
74
  <FormBodySingleTab
71
75
  qItem={qItem}
72
76
  contextDisplayItems={contextDisplayItems}