@aehrc/smart-forms-renderer 1.2.13 → 1.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/components/FormComponents/ChoiceItems/ChoiceAutocompleteField.js +1 -1
- package/lib/components/FormComponents/ChoiceItems/ChoiceAutocompleteField.js.map +1 -1
- package/lib/components/FormComponents/ChoiceItems/ChoiceSelectAnswerOptionFields.js +1 -1
- package/lib/components/FormComponents/ChoiceItems/ChoiceSelectAnswerOptionFields.js.map +1 -1
- package/lib/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetFields.js +1 -1
- package/lib/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetFields.js.map +1 -1
- package/lib/components/FormComponents/GridGroup/GridGroup.js +1 -1
- package/lib/components/FormComponents/GridGroup/GridRow.js +1 -1
- package/lib/components/FormComponents/GridGroup/GridRow.js.map +1 -1
- package/lib/components/FormComponents/GroupItem/GroupItem.styles.js +1 -1
- package/lib/components/FormComponents/GroupItem/GroupItem.styles.js.map +1 -1
- package/lib/components/FormComponents/GroupItem/GroupItemView.js +2 -2
- package/lib/components/FormComponents/GroupItem/GroupItemView.js.map +1 -1
- package/lib/components/FormComponents/GroupItem/TabButtonsWrapper.js +1 -1
- package/lib/components/FormComponents/GroupItem/TabButtonsWrapper.js.map +1 -1
- package/lib/components/FormComponents/ItemParts/CheckboxSingle.js +2 -1
- package/lib/components/FormComponents/ItemParts/CheckboxSingle.js.map +1 -1
- package/lib/components/FormComponents/OpenChoiceItems/OpenChoiceSelectAnswerOptionField.js +1 -1
- package/lib/components/FormComponents/OpenChoiceItems/OpenChoiceSelectAnswerOptionField.js.map +1 -1
- package/lib/components/FormComponents/RepeatGroup/AddItemButton.js +1 -1
- package/lib/components/FormComponents/RepeatGroup/AddItemButton.js.map +1 -1
- package/lib/components/FormComponents/RepeatGroup/RepeatGroupView.js +1 -1
- package/lib/components/FormComponents/RepeatItem/AddItemButton.js +1 -1
- package/lib/components/FormComponents/RepeatItem/AddItemButton.js.map +1 -1
- package/lib/components/FormComponents/RepeatItem/RepeatItem.styles.js +2 -4
- package/lib/components/FormComponents/RepeatItem/RepeatItem.styles.js.map +1 -1
- package/lib/components/FormComponents/Tables/GroupTableView.js +1 -1
- package/lib/components/Renderer/FormBodySingleCollapsible.js +1 -1
- package/lib/components/Renderer/FormBodySingleCollapsible.js.map +1 -1
- package/lib/components/Renderer/FormBodyTabbed.js +23 -2
- package/lib/components/Renderer/FormBodyTabbed.js.map +1 -1
- package/lib/components/Tabs/FormBodyTabList.js +1 -1
- package/lib/components/Tabs/FormBodyTabList.js.map +1 -1
- package/lib/hooks/useValueSetCodings.js +2 -1
- package/lib/hooks/useValueSetCodings.js.map +1 -1
- package/lib/stores/rendererConfigStore.d.ts +7 -0
- package/lib/stores/rendererConfigStore.js +2 -0
- package/lib/stores/rendererConfigStore.js.map +1 -1
- package/lib/stores/smartConfigStore.d.ts +7 -1
- package/lib/stores/smartConfigStore.js +3 -1
- package/lib/stores/smartConfigStore.js.map +1 -1
- package/lib/utils/calculatedExpression.js +11 -3
- package/lib/utils/calculatedExpression.js.map +1 -1
- package/lib/utils/populateContexts.js +2 -14
- package/lib/utils/populateContexts.js.map +1 -1
- package/lib/utils/valueSet.d.ts +1 -1
- package/lib/utils/valueSet.js +2 -2
- package/lib/utils/valueSet.js.map +1 -1
- package/package.json +2 -2
- package/src/components/FormComponents/ChoiceItems/ChoiceAutocompleteField.tsx +1 -1
- package/src/components/FormComponents/ChoiceItems/ChoiceSelectAnswerOptionFields.tsx +1 -1
- package/src/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetFields.tsx +2 -1
- package/src/components/FormComponents/GridGroup/GridGroup.tsx +1 -1
- package/src/components/FormComponents/GridGroup/GridRow.tsx +6 -1
- package/src/components/FormComponents/GroupItem/GroupItem.styles.ts +1 -1
- package/src/components/FormComponents/GroupItem/GroupItemView.tsx +4 -0
- package/src/components/FormComponents/GroupItem/TabButtonsWrapper.tsx +1 -1
- package/src/components/FormComponents/ItemParts/CheckboxSingle.tsx +3 -0
- package/src/components/FormComponents/OpenChoiceItems/OpenChoiceSelectAnswerOptionField.tsx +1 -1
- package/src/components/FormComponents/RepeatGroup/AddItemButton.tsx +1 -1
- package/src/components/FormComponents/RepeatGroup/RepeatGroupView.tsx +1 -1
- package/src/components/FormComponents/RepeatItem/AddItemButton.tsx +1 -1
- package/src/components/FormComponents/RepeatItem/RepeatItem.styles.tsx +2 -4
- package/src/components/FormComponents/Tables/GroupTableView.tsx +1 -1
- package/src/components/Renderer/FormBodySingleCollapsible.tsx +3 -0
- package/src/components/Renderer/FormBodyTabbed.tsx +23 -2
- package/src/components/Tabs/FormBodyTabList.tsx +5 -1
- package/src/hooks/useValueSetCodings.ts +8 -1
- package/src/stores/rendererConfigStore.ts +8 -0
- package/src/stores/smartConfigStore.ts +11 -2
- package/src/utils/calculatedExpression.ts +11 -8
- package/src/utils/populateContexts.ts +2 -16
- package/src/utils/valueSet.ts +3 -2
|
@@ -32,6 +32,7 @@ export const rendererConfigStore = createStore()((set) => ({
|
|
|
32
32
|
tabListBreakpoints: { xs: 12, sm: 3, md: 3, lg: 2.75 },
|
|
33
33
|
tabContentBreakpoints: { xs: 12, sm: 9, md: 9, lg: 9.25 }
|
|
34
34
|
},
|
|
35
|
+
tabListStickyTop: 0,
|
|
35
36
|
showTabbedFormAt: { query: 'up', start: 'md' },
|
|
36
37
|
textFieldWidth: 320,
|
|
37
38
|
inputsFlexGrow: false,
|
|
@@ -49,6 +50,7 @@ export const rendererConfigStore = createStore()((set) => ({
|
|
|
49
50
|
requiredIndicatorPosition: params.requiredIndicatorPosition ?? state.requiredIndicatorPosition,
|
|
50
51
|
itemResponsive: params.itemResponsive ?? state.itemResponsive,
|
|
51
52
|
tabListWidthOrResponsive: params.tabListWidthOrResponsive ?? state.tabListWidthOrResponsive,
|
|
53
|
+
tabListStickyTop: params.tabListStickyTop ?? state.tabListStickyTop,
|
|
52
54
|
showTabbedFormAt: params.showTabbedFormAt ?? state.showTabbedFormAt,
|
|
53
55
|
textFieldWidth: params.textFieldWidth ?? state.textFieldWidth,
|
|
54
56
|
inputsFlexGrow: params.inputsFlexGrow ?? state.inputsFlexGrow,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rendererConfigStore.js","sourceRoot":"","sources":["../../src/stores/rendererConfigStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"rendererConfigStore.js","sourceRoot":"","sources":["../../src/stores/rendererConfigStore.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Encounter, Patient, Practitioner } from 'fhir/r4';
|
|
1
|
+
import type { Encounter, FhirResource, Patient, Practitioner } from 'fhir/r4';
|
|
2
2
|
import type Client from 'fhirclient/lib/Client';
|
|
3
3
|
import type { FhirContext } from '@aehrc/sdc-populate';
|
|
4
4
|
/**
|
|
@@ -11,11 +11,13 @@ import type { FhirContext } from '@aehrc/sdc-populate';
|
|
|
11
11
|
* @property user - The user resource in context
|
|
12
12
|
* @property encounter - The encounter resource in context
|
|
13
13
|
* @property fhirContext - fhirContext array from SMART App Launch
|
|
14
|
+
* @property resolvedFhirContextReferences - resolved references from fhirContext, keyed by resource type e.g. `{ "PractitionerRole": <PractitionerRole> }`
|
|
14
15
|
* @property setClient - Set the FHIRClient object when launching via SMART App Launch
|
|
15
16
|
* @property setPatient - Set the patient resource in context
|
|
16
17
|
* @property setUser - Set the user resource in context
|
|
17
18
|
* @property setEncounter - Set the encounter resource in context
|
|
18
19
|
* @property setFhirContext - Set the fhirContext array from SMART App Launch
|
|
20
|
+
* @property setResolvedFhirContextReferences - Set the resolvedFhirContextReferences object
|
|
19
21
|
*
|
|
20
22
|
* @author Sean Fong
|
|
21
23
|
*/
|
|
@@ -25,11 +27,13 @@ export interface SmartConfigStoreType {
|
|
|
25
27
|
user: Practitioner | null;
|
|
26
28
|
encounter: Encounter | null;
|
|
27
29
|
fhirContext: FhirContext[] | null;
|
|
30
|
+
resolvedFhirContextReferences: Record<string, FhirResource> | null;
|
|
28
31
|
setClient: (client: Client) => void;
|
|
29
32
|
setPatient: (patient: Patient) => void;
|
|
30
33
|
setUser: (user: Practitioner) => void;
|
|
31
34
|
setEncounter: (encounter: Encounter) => void;
|
|
32
35
|
setFhirContext: (fhirContext: FhirContext[]) => void;
|
|
36
|
+
setResolvedFhirContextReferences: (resolvedFhirContextReferences: Record<string, FhirResource>) => void;
|
|
33
37
|
}
|
|
34
38
|
/**
|
|
35
39
|
* Smart Config state management store. This is only used for answerExpressions.
|
|
@@ -60,10 +64,12 @@ export declare const useSmartConfigStore: import("zustand/vanilla").StoreApi<Sma
|
|
|
60
64
|
user: () => Practitioner | null;
|
|
61
65
|
encounter: () => Encounter | null;
|
|
62
66
|
fhirContext: () => FhirContext[] | null;
|
|
67
|
+
resolvedFhirContextReferences: () => Record<string, FhirResource> | null;
|
|
63
68
|
setClient: () => (client: Client) => void;
|
|
64
69
|
setPatient: () => (patient: Patient) => void;
|
|
65
70
|
setUser: () => (user: Practitioner) => void;
|
|
66
71
|
setEncounter: () => (encounter: Encounter) => void;
|
|
67
72
|
setFhirContext: () => (fhirContext: FhirContext[]) => void;
|
|
73
|
+
setResolvedFhirContextReferences: () => (resolvedFhirContextReferences: Record<string, FhirResource>) => void;
|
|
68
74
|
};
|
|
69
75
|
};
|
|
@@ -32,11 +32,13 @@ export const smartConfigStore = createStore()((set) => ({
|
|
|
32
32
|
user: null,
|
|
33
33
|
encounter: null,
|
|
34
34
|
fhirContext: null,
|
|
35
|
+
resolvedFhirContextReferences: null,
|
|
35
36
|
setClient: (client) => set(() => ({ client: client })),
|
|
36
37
|
setPatient: (patient) => set(() => ({ patient: patient })),
|
|
37
38
|
setUser: (user) => set(() => ({ user: user })),
|
|
38
39
|
setEncounter: (encounter) => set(() => ({ encounter: encounter })),
|
|
39
|
-
setFhirContext: (fhirContext) => set(() => ({ fhirContext: fhirContext }))
|
|
40
|
+
setFhirContext: (fhirContext) => set(() => ({ fhirContext: fhirContext })),
|
|
41
|
+
setResolvedFhirContextReferences: (resolvedFhirContextReferences) => set(() => ({ resolvedFhirContextReferences }))
|
|
40
42
|
}));
|
|
41
43
|
/**
|
|
42
44
|
* Smart Config state management store. This is only used for answerExpressions.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"smartConfigStore.js","sourceRoot":"","sources":["../../src/stores/smartConfigStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"smartConfigStore.js","sourceRoot":"","sources":["../../src/stores/smartConfigStore.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAG9C,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAwC7C;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,WAAW,EAAwB,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAC5E,MAAM,EAAE,IAAI;IACZ,OAAO,EAAE,IAAI;IACb,IAAI,EAAE,IAAI;IACV,SAAS,EAAE,IAAI;IACf,WAAW,EAAE,IAAI;IACjB,6BAA6B,EAAE,IAAI;IACnC,SAAS,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;IAC9D,UAAU,EAAE,CAAC,OAAgB,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IACnE,OAAO,EAAE,CAAC,IAAkB,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5D,YAAY,EAAE,CAAC,SAAoB,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC,CAAC;IAC7E,cAAc,EAAE,CAAC,WAA0B,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,WAAW,EAAE,WAAW,EAAE,CAAC,CAAC;IACzF,gCAAgC,EAAE,CAAC,6BAA2D,EAAE,EAAE,CAChG,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,6BAA6B,EAAE,CAAC,CAAC;CACjD,CAAC,CAAC,CAAC;AAEJ;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,eAAe,CAAC,gBAAgB,CAAC,CAAC"}
|
|
@@ -222,7 +222,7 @@ function applyCalculatedExpressionValuesRecursive(qItem, qrItemOrItems, calculat
|
|
|
222
222
|
}
|
|
223
223
|
: null, calculatedExpressions);
|
|
224
224
|
}
|
|
225
|
-
|
|
225
|
+
let qrItem = qrItemOrItems;
|
|
226
226
|
const childQItems = qItem.item;
|
|
227
227
|
if (childQItems && childQItems.length > 0) {
|
|
228
228
|
const childQrItems = qrItem?.item ?? [];
|
|
@@ -235,17 +235,25 @@ function applyCalculatedExpressionValuesRecursive(qItem, qrItemOrItems, calculat
|
|
|
235
235
|
// Update QR items in repeating group
|
|
236
236
|
if (Array.isArray(updatedChildQRItemOrItems)) {
|
|
237
237
|
if (updatedChildQRItemOrItems.length > 0) {
|
|
238
|
+
// Lazily initialise qrItem so all children are added to the same group object
|
|
239
|
+
if (!qrItem) {
|
|
240
|
+
qrItem = structuredClone(createEmptyQrGroup(qItem));
|
|
241
|
+
}
|
|
238
242
|
updateQrItemsInGroup(null, {
|
|
239
243
|
linkId: childQItem.linkId,
|
|
240
244
|
qrItems: updatedChildQRItemOrItems
|
|
241
|
-
}, qrItem
|
|
245
|
+
}, qrItem, indexMap);
|
|
242
246
|
}
|
|
243
247
|
continue;
|
|
244
248
|
}
|
|
245
249
|
// Update QR items in non-repeating group
|
|
246
250
|
const updatedChildQRItem = updatedChildQRItemOrItems;
|
|
247
251
|
if (updatedChildQRItem) {
|
|
248
|
-
|
|
252
|
+
// Lazily initialise qrItem so all children are added to the same group object
|
|
253
|
+
if (!qrItem) {
|
|
254
|
+
qrItem = structuredClone(createEmptyQrGroup(qItem));
|
|
255
|
+
}
|
|
256
|
+
updateQrItemsInGroup(updatedChildQRItem, null, qrItem, indexMap);
|
|
249
257
|
}
|
|
250
258
|
}
|
|
251
259
|
return applyCalculatedExpressionValuesInNonLeafItem(qItem, qrItem, calculatedExpressions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"calculatedExpression.js","sourceRoot":"","sources":["../../src/utils/calculatedExpression.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"calculatedExpression.js","sourceRoot":"","sources":["../../src/utils/calculatedExpression.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,20 +17,8 @@
|
|
|
17
17
|
export function isLaunchContext(extension) {
|
|
18
18
|
const hasLaunchContextName = extension.url ===
|
|
19
19
|
'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext' &&
|
|
20
|
-
!!extension.extension?.find((ext) => ext.url === 'name' &&
|
|
21
|
-
|
|
22
|
-
(ext.valueCoding &&
|
|
23
|
-
(ext.valueCoding.code === 'patient' ||
|
|
24
|
-
ext.valueCoding.code === 'encounter' ||
|
|
25
|
-
ext.valueCoding.code === 'location' ||
|
|
26
|
-
ext.valueCoding.code === 'user' ||
|
|
27
|
-
ext.valueCoding.code === 'study' ||
|
|
28
|
-
ext.valueCoding.code === 'sourceQueries'))));
|
|
29
|
-
const hasLaunchContextType = !!extension.extension?.find((ext) => ext.url === 'type' &&
|
|
30
|
-
ext.valueCode &&
|
|
31
|
-
(ext.valueCode === 'Patient' ||
|
|
32
|
-
ext.valueCode === 'Practitioner' ||
|
|
33
|
-
ext.valueCode === 'Encounter'));
|
|
20
|
+
!!extension.extension?.find((ext) => ext.url === 'name' && (ext.valueId || (ext.valueCoding && ext.valueCoding.code)));
|
|
21
|
+
const hasLaunchContextType = !!extension.extension?.find((ext) => ext.url === 'type' && ext.valueCode);
|
|
34
22
|
return (extension.url ===
|
|
35
23
|
'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext' &&
|
|
36
24
|
hasLaunchContextName &&
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"populateContexts.js","sourceRoot":"","sources":["../../src/utils/populateContexts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH,MAAM,UAAU,eAAe,CAAC,SAAoB;IAClD,MAAM,oBAAoB,GACxB,SAAS,CAAC,GAAG;QACX,gFAAgF;QAClF,CAAC,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CACzB,CAAC,GAAG,EAAE,EAAE,
|
|
1
|
+
{"version":3,"file":"populateContexts.js","sourceRoot":"","sources":["../../src/utils/populateContexts.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAKH,MAAM,UAAU,eAAe,CAAC,SAAoB;IAClD,MAAM,oBAAoB,GACxB,SAAS,CAAC,GAAG;QACX,gFAAgF;QAClF,CAAC,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CACzB,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,MAAM,IAAI,CAAC,GAAG,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,WAAW,IAAI,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,CAC1F,CAAC;IAEJ,MAAM,oBAAoB,GAAG,CAAC,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CACtD,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,GAAG,KAAK,MAAM,IAAI,GAAG,CAAC,SAAS,CAC7C,CAAC;IAEF,OAAO,CACL,SAAS,CAAC,GAAG;QACX,gFAAgF;QAClF,oBAAoB;QACpB,oBAAoB,CACrB,CAAC;AACJ,CAAC"}
|
package/lib/utils/valueSet.d.ts
CHANGED
|
@@ -19,7 +19,7 @@ export declare function getValueSetCodings(valueSet: ValueSet): Coding[];
|
|
|
19
19
|
*/
|
|
20
20
|
export declare function evaluateAnswerExpressionValueSet(answerExpression: Expression, itemLevelVariables: Expression[], preprocessedCodings: Record<string, Coding[]>): Coding[];
|
|
21
21
|
export declare function createValueSetToXFhirQueryVariableNameMap(variables: Record<string, VariableXFhirQuery>): Record<string, string>;
|
|
22
|
-
export declare function getResourceFromLaunchContext(resourceType: FhirResourceString, patient: Patient | null, user: Practitioner | null, encounter: Encounter | null): FhirResource | null;
|
|
22
|
+
export declare function getResourceFromLaunchContext(resourceType: FhirResourceString, patient: Patient | null, user: Practitioner | null, encounter: Encounter | null, resolvedFhirContextReferences: Record<string, FhirResource> | null): FhirResource | null;
|
|
23
23
|
/**
|
|
24
24
|
* Retrieves the codings for a given answer value set URL.
|
|
25
25
|
*
|
package/lib/utils/valueSet.js
CHANGED
|
@@ -131,7 +131,7 @@ export function createValueSetToXFhirQueryVariableNameMap(variables) {
|
|
|
131
131
|
}
|
|
132
132
|
return valueSetToNameMap;
|
|
133
133
|
}
|
|
134
|
-
export function getResourceFromLaunchContext(resourceType, patient, user, encounter) {
|
|
134
|
+
export function getResourceFromLaunchContext(resourceType, patient, user, encounter, resolvedFhirContextReferences) {
|
|
135
135
|
switch (resourceType) {
|
|
136
136
|
case 'Patient':
|
|
137
137
|
return patient;
|
|
@@ -140,7 +140,7 @@ export function getResourceFromLaunchContext(resourceType, patient, user, encoun
|
|
|
140
140
|
case 'Encounter':
|
|
141
141
|
return encounter;
|
|
142
142
|
}
|
|
143
|
-
return null;
|
|
143
|
+
return resolvedFhirContextReferences?.[resourceType] ?? null;
|
|
144
144
|
}
|
|
145
145
|
/**
|
|
146
146
|
* Retrieves the codings for a given answer value set URL.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"valueSet.js","sourceRoot":"","sources":["../../src/utils/valueSet.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAaH,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAQpC,OAAO,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAC;AAEvD,MAAM,yBAAyB,GAC7B,mGAAmG,CAAC;AAEtG,MAAM,6BAA6B,GAAG,UAAU,CAAC;AAEjD,4EAA4E;AAC5E,MAAM,UAAU,uBAAuB,CAAC,KAAwB;IAC9D,MAAM,WAAW,GAAG,KAAK,CAAC,SAAS,EAAE,IAAI,CACvC,CAAC,SAAoB,EAAE,EAAE,CACvB,SAAS,CAAC,GAAG,KAAK,4DAA4D,CACjF,CAAC;IACF,IAAI,WAAW,EAAE,CAAC;QAChB,OAAO,WAAW,CAAC,QAAQ,CAAC;IAC9B,CAAC;IACD,OAAO,SAAS,CAAC;AACnB,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,GAAW,EAAE,oBAA4B;IAC1E,IAAI,WAAW,GAAG,GAAG,CAAC;IAEtB,IAAI,GAAG,CAAC,QAAQ,CAAC,uBAAuB,CAAC,EAAE,CAAC;QAC1C,MAAM,QAAQ,GAAG,GAAG,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;QACpD,IAAI,QAAQ,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;YAC/B,oBAAoB,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;YACnC,WAAW,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC5B,CAAC;IACH,CAAC;IAED,WAAW,GAAG,WAAW,CAAC,OAAO,CAAC,GAAG,EAAE,WAAW,CAAC,CAAC;IAEpD,OAAO,MAAM,CAAC,EAAE,SAAS,EAAE,oBAAoB,EAAE,CAAC,CAAC,OAAO,CAAC;QACzD,GAAG,EAAE,uBAAuB,GAAG,WAAW;KAC3C,CAAC,CAAC;AACL,CAAC;AAED,SAAS,2BAA2B,CAAC,QAAa;IAChD,OAAO,CACL,QAAQ;QACR,QAAQ,CAAC,YAAY,KAAK,YAAY;QACtC,QAAQ,CAAC,SAAS;QAClB,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC;QACtD,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,SAAS;QAChE,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC;QACxD,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAC,QAAQ;QACjE,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC;QACzD,QAAQ,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,SAAS,CAAC,CAAC,WAAW,CACtE,CAAC;AACJ,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,GAAW,EACX,MAAc,EACd,IAAY,EACZ,oBAA4B;IAE5B,MAAM,oBAAoB,GAAG,MAAM,MAAM,CAAC,EAAE,SAAS,EAAE,oBAAoB,EAAE,CAAC,CAAC,OAAO,CAAC;QACrF,GAAG,EAAE,+BAA+B,GAAG,WAAW,MAAM,SAAS,IAAI,EAAE;KACxE,CAAC,CAAC;IAEH,IAAI,oBAAoB,IAAI,2BAA2B,CAAC,oBAAoB,CAAC,EAAE,CAAC;QAC9E,OAAO,oBAAoB,CAAC;IAC9B,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,mBAAmB,CAAC,OAAqB,EAAE,SAAiB;IACzE,MAAM,cAAc,GAAG,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,EAAE,EAAE;QAC/C,UAAU,CAAC,GAAG,EAAE;YACd,MAAM,CAAC,IAAI,KAAK,CAAC,2BAA2B,SAAS,eAAe,CAAC,CAAC,CAAC;QACzE,CAAC,EAAE,SAAS,CAAC,CAAC;IAChB,CAAC,CAAC,CAAC;IAEH,kFAAkF;IAClF,OAAO,OAAO,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAC3C,gBAAiD;IAEjD,MAAM,mBAAmB,GAAoC,EAAE,CAAC;IAEhE,MAAM,mBAAmB,GAAG,MAAM,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;IAC1D,MAAM,qBAAqB,GAAG,MAAM,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IAE9D,MAAM,SAAS,GAAG,IAAI,CAAC;IACvB,MAAM,QAAQ,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAC,eAAe,EAAE,EAAE,CAC7D,mBAAmB,CAAC,eAAe,CAAC,OAAO,EAAE,SAAS,CAAC,CACxD,CAAC;IAEF,MAAM,eAAe,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;IAE3D,KAAK,MAAM,CAAC,CAAC,EAAE,cAAc,CAAC,IAAI,eAAe,CAAC,OAAO,EAAE,EAAE,CAAC;QAC5D,iDAAiD;QACjD,IAAI,cAAc,CAAC,MAAM,KAAK,WAAW,EAAE,CAAC;YAC1C,MAAM,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC;YACtC,MAAM,GAAG,GAAG,mBAAmB,CAAC,CAAC,CAAC,CAAC;YACnC,MAAM,eAAe,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAC;YAEjD,IAAI,GAAG,IAAI,eAAe,EAAE,CAAC;gBAC3B,eAAe,CAAC,QAAQ,GAAG,QAAQ,CAAC;gBACpC,mBAAmB,CAAC,GAAG,CAAC,GAAG,eAAe,CAAC;YAC7C,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,mBAAmB,CAAC;AAC7B,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,kBAAkB,CAAC,QAAkB;IACnD,OAAO,QAAQ,CAAC,SAAS,EAAE,QAAQ,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,2BAA2B,CAAC,MAAM,CAAC,CAAC,IAAI,EAAE,CAAC;AAClG,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,gCAAgC,CAC9C,gBAA4B,EAC5B,kBAAgC,EAChC,mBAA6C;IAE7C,MAAM,UAAU,GAAG,gBAAgB,CAAC,UAAU,CAAC;IAC/C,IAAI,CAAC,UAAU;QAAE,OAAO,EAAE,CAAC;IAE3B,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;IAC9D,MAAM,YAAY,GAAG,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC;IAChC,IAAI,CAAC,YAAY;QAAE,OAAO,EAAE,CAAC;IAE7B,MAAM,eAAe,GAAG,kBAAkB,EAAE,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,KAAK,YAAY,CAAC,CAAC;IAC/F,IAAI,CAAC,eAAe;QAAE,OAAO,EAAE,CAAC;IAEhC,MAAM,kBAAkB,GAAG,eAAe,CAAC,UAAU,CAAC;IACtD,IAAI,CAAC,kBAAkB;QAAE,OAAO,EAAE,CAAC;IAEnC,IAAI,CAAC,yBAAyB,CAAC,IAAI,CAAC,kBAAkB,CAAC;QAAE,OAAO,EAAE,CAAC;IAEnE,OAAO,mBAAmB,CAAC,kBAAkB,CAAC,IAAI,EAAE,CAAC;AACvD,CAAC;AAED,MAAM,UAAU,yCAAyC,CACvD,SAA6C;IAE7C,MAAM,iBAAiB,GAA2B,EAAE,CAAC;IACrD,KAAK,MAAM,CAAC,IAAI,EAAE,QAAQ,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,CAAC;QACzD,MAAM,aAAa,GAAG,QAAQ,CAAC,eAAe,CAAC,UAAU,CAAC;QAC1D,IAAI,aAAa,IAAI,yBAAyB,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;YACnE,iBAAiB,CAAC,aAAa,CAAC,GAAG,IAAI,CAAC;QAC1C,CAAC;IACH,CAAC;IACD,OAAO,iBAAiB,CAAC;AAC3B,CAAC;AAED,MAAM,UAAU,4BAA4B,CAC1C,YAAgC,EAChC,OAAuB,EACvB,IAAyB,EACzB,SAA2B;
|
|
1
|
+
{"version":3,"file":"valueSet.js","sourceRoot":"","sources":["../../src/utils/valueSet.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@aehrc/smart-forms-renderer",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.3.0",
|
|
4
4
|
"description": "FHIR Structured Data Captured (SDC) rendering engine for Smart Forms",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -28,7 +28,7 @@
|
|
|
28
28
|
},
|
|
29
29
|
"homepage": "https://github.com/aehrc/smart-forms#readme",
|
|
30
30
|
"dependencies": {
|
|
31
|
-
"@aehrc/sdc-populate": "^4.6.
|
|
31
|
+
"@aehrc/sdc-populate": "^4.6.3",
|
|
32
32
|
"@aehrc/sdc-template-extract": "^1.0.15",
|
|
33
33
|
"@emotion/react": "^11.14.0",
|
|
34
34
|
"@emotion/styled": "^11.14.1",
|
|
@@ -98,7 +98,7 @@ function ChoiceAutocompleteField(props: ChoiceAutocompleteFieldsProps) {
|
|
|
98
98
|
textFieldWidth={textFieldWidth}
|
|
99
99
|
isTabled={isTabled}
|
|
100
100
|
size="small"
|
|
101
|
-
placeholder={entryFormat || displayPrompt}
|
|
101
|
+
placeholder={valueCoding ? undefined : entryFormat || displayPrompt}
|
|
102
102
|
slotProps={{
|
|
103
103
|
input: {
|
|
104
104
|
...params.InputProps,
|
|
@@ -124,7 +124,7 @@ function ChoiceSelectAnswerOptionFields(props: ChoiceSelectAnswerOptionFieldsPro
|
|
|
124
124
|
<StandardTextField
|
|
125
125
|
textFieldWidth={textFieldWidth}
|
|
126
126
|
isTabled={isTabled}
|
|
127
|
-
placeholder={entryFormat || displayPrompt}
|
|
127
|
+
placeholder={valueSelect ? undefined : entryFormat || displayPrompt}
|
|
128
128
|
{...params}
|
|
129
129
|
slotProps={{
|
|
130
130
|
input: {
|
|
@@ -85,9 +85,10 @@ 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
|
-
placeholder={entryFormat || displayPrompt}
|
|
91
|
+
placeholder={valueCoding ? undefined : entryFormat || displayPrompt}
|
|
91
92
|
{...params}
|
|
92
93
|
slotProps={{
|
|
93
94
|
input: {
|
|
@@ -159,7 +159,7 @@ function GridGroup(props: GridGroupProps) {
|
|
|
159
159
|
<QGroupContainerBox
|
|
160
160
|
cardElevation={groupCardElevation}
|
|
161
161
|
isRepeated={false}
|
|
162
|
-
py={
|
|
162
|
+
py={0}
|
|
163
163
|
data-linkid={qItem.linkId}
|
|
164
164
|
data-label={qItem.text}
|
|
165
165
|
onClick={() => onFocusLinkId(qItem.linkId)}
|
|
@@ -113,7 +113,12 @@ function GridRow(props: GridRowProps) {
|
|
|
113
113
|
<GridAnswerTableCell
|
|
114
114
|
key={colIndex}
|
|
115
115
|
calculatedWidth={calculatedColumnWidths[colIndex]?.width}>
|
|
116
|
-
<Box
|
|
116
|
+
<Box
|
|
117
|
+
display="flex"
|
|
118
|
+
alignItems="center"
|
|
119
|
+
justifyContent="center"
|
|
120
|
+
data-linkid={cellQItem.linkId}
|
|
121
|
+
data-label={cellQItem.text}>
|
|
117
122
|
<SingleItem
|
|
118
123
|
qItem={cellQItem}
|
|
119
124
|
qrItem={cellQrItem ?? null}
|
|
@@ -22,7 +22,7 @@ export const GroupCard = styled(Card, {
|
|
|
22
22
|
shouldForwardProp: (prop) => prop !== 'elevation' && prop !== 'isRepeated'
|
|
23
23
|
})<{ elevation: number; isRepeated: boolean }>(({ elevation, isRepeated }) => ({
|
|
24
24
|
paddingTop: '20px',
|
|
25
|
-
paddingBottom: '
|
|
25
|
+
paddingBottom: '0px',
|
|
26
26
|
paddingLeft: elevation === 1 ? '26px' : '24px',
|
|
27
27
|
paddingRight: elevation === 1 ? '26px' : '24px',
|
|
28
28
|
marginBottom: isRepeated ? 0 : '28px'
|
|
@@ -171,6 +171,8 @@ function GroupItemView(props: GroupItemViewProps) {
|
|
|
171
171
|
data-test="q-item-group-box"
|
|
172
172
|
role="region"
|
|
173
173
|
aria-label={qItem.text ?? 'Unnamed group'}
|
|
174
|
+
data-linkid={qItem.linkId}
|
|
175
|
+
data-label={qItem.text}
|
|
174
176
|
style={combinedStyles || undefined}>
|
|
175
177
|
{/* Show group heading when item.repeats=false AND itemTextToDisplay is valid */}
|
|
176
178
|
{!isRepeated && itemTextToDisplay ? (
|
|
@@ -216,6 +218,8 @@ function GroupItemView(props: GroupItemViewProps) {
|
|
|
216
218
|
cardElevation={groupCardElevation}
|
|
217
219
|
isRepeated={isRepeated}
|
|
218
220
|
data-test="q-item-group-box"
|
|
221
|
+
data-linkid={qItem.linkId}
|
|
222
|
+
data-label={qItem.text}
|
|
219
223
|
role="region"
|
|
220
224
|
aria-label={qItem.text ?? 'Unnamed group'}>
|
|
221
225
|
<GroupCard
|
|
@@ -97,7 +97,7 @@ const TabButtonsWrapper = memo(function TabButtonsWrapper(props: TabButtonsWrapp
|
|
|
97
97
|
const tabButtonsDisabled = numOfVisibleTabs <= 1;
|
|
98
98
|
|
|
99
99
|
return (
|
|
100
|
-
<Box display="flex" mt={3}>
|
|
100
|
+
<Box display="flex" mt={3} mb={3}>
|
|
101
101
|
{previousTabButtonHidden ? null : (
|
|
102
102
|
<PreviousTabButton
|
|
103
103
|
isDisabled={tabButtonsDisabled}
|
|
@@ -53,6 +53,8 @@ function CheckboxSingle(props: CheckboxSingleProps) {
|
|
|
53
53
|
const isHtmlDisabled = readOnlyWithDisabledStyle || disabledViaToggleExpression;
|
|
54
54
|
const isHtmlReadOnly = readOnlyWithReadOnlyStyle && !disabledViaToggleExpression;
|
|
55
55
|
|
|
56
|
+
const textForDataTest = labelText ?? (typeof label === 'string' ? label : value);
|
|
57
|
+
|
|
56
58
|
return (
|
|
57
59
|
<FormControlLabel
|
|
58
60
|
sx={{
|
|
@@ -66,6 +68,7 @@ function CheckboxSingle(props: CheckboxSingleProps) {
|
|
|
66
68
|
value={value}
|
|
67
69
|
control={
|
|
68
70
|
<StandardCheckbox
|
|
71
|
+
data-test={`checkbox-single-${textForDataTest}`}
|
|
69
72
|
size="small"
|
|
70
73
|
checked={isChecked}
|
|
71
74
|
readOnly={isHtmlReadOnly}
|
|
@@ -120,7 +120,7 @@ function OpenChoiceSelectAnswerOptionField(props: OpenChoiceSelectAnswerOptionFi
|
|
|
120
120
|
multiline
|
|
121
121
|
textFieldWidth={textFieldWidth}
|
|
122
122
|
isTabled={isTabled}
|
|
123
|
-
placeholder={entryFormat || displayPrompt}
|
|
123
|
+
placeholder={valueSelect ? undefined : entryFormat || displayPrompt}
|
|
124
124
|
{...params}
|
|
125
125
|
slotProps={{
|
|
126
126
|
input: {
|
|
@@ -33,7 +33,7 @@ function AddItemButton(props: AddItemButtonProps) {
|
|
|
33
33
|
const isDisabled = repeatGroups[repeatGroups.length - 1]?.qrItem === null || readOnly;
|
|
34
34
|
|
|
35
35
|
return (
|
|
36
|
-
<Box display="flex" flexDirection="row-reverse">
|
|
36
|
+
<Box display="flex" flexDirection="row-reverse" sx={{ mt: 1 }}>
|
|
37
37
|
<Button
|
|
38
38
|
variant="contained"
|
|
39
39
|
size="small"
|
|
@@ -139,7 +139,7 @@ function RepeatGroupView(props: RepeatGroupViewProps) {
|
|
|
139
139
|
cardElevation={groupCardElevation}
|
|
140
140
|
isRepeated={true}
|
|
141
141
|
style={parentStyles || undefined}>
|
|
142
|
-
<Card elevation={groupCardElevation} sx={{ p: 3, py:
|
|
142
|
+
<Card elevation={groupCardElevation} sx={{ p: 3, py: 1.5, mb: 2.5 }}>
|
|
143
143
|
{itemTextToDisplay ? (
|
|
144
144
|
<>
|
|
145
145
|
<GroupHeading
|
|
@@ -37,7 +37,7 @@ function AddItemButton(props: AddItemButtonProps) {
|
|
|
37
37
|
lastAnswer === null || Object.keys(lastAnswer ?? {}).join() === 'id' || readOnly;
|
|
38
38
|
|
|
39
39
|
return (
|
|
40
|
-
<Box display="flex" flexDirection="row-reverse">
|
|
40
|
+
<Box display="flex" flexDirection="row-reverse" sx={{ mt: 1 }}>
|
|
41
41
|
<Button
|
|
42
42
|
variant="contained"
|
|
43
43
|
size="small"
|
|
@@ -24,11 +24,9 @@ export const RepeatRemoveTooltip = styled(Tooltip)(() => ({
|
|
|
24
24
|
}));
|
|
25
25
|
|
|
26
26
|
export const RepeatItemContainerStack = styled(Stack)(() => ({
|
|
27
|
-
alignItems: 'center'
|
|
28
|
-
paddingBottom: 8
|
|
27
|
+
alignItems: 'center'
|
|
29
28
|
}));
|
|
30
29
|
|
|
31
30
|
export const RepeatGroupContainerStack = styled(Stack)(() => ({
|
|
32
|
-
alignItems: 'center'
|
|
33
|
-
paddingBottom: 16
|
|
31
|
+
alignItems: 'center'
|
|
34
32
|
}));
|
|
@@ -193,7 +193,7 @@ function GroupTableView(props: GroupTableViewProps) {
|
|
|
193
193
|
<QGroupContainerBox
|
|
194
194
|
cardElevation={groupCardElevation}
|
|
195
195
|
isRepeated={false}
|
|
196
|
-
py={
|
|
196
|
+
py={0}
|
|
197
197
|
data-linkid={qItem.linkId}
|
|
198
198
|
data-label={qItem.text}
|
|
199
199
|
onClick={() => onFocusLinkId(qItem.linkId)}
|
|
@@ -54,6 +54,9 @@ 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}
|
|
59
|
+
data-test="renderer-accordion"
|
|
57
60
|
onChange={() => onToggleExpand(index)}>
|
|
58
61
|
<AccordionSummary expandIcon={<ExpandMoreIcon />}>
|
|
59
62
|
<Box display="flex" alignItems="center" justifyContent="space-between" width="100%" mr={3}>
|
|
@@ -45,6 +45,7 @@ function FormBodyTabbed(props: FormBodyTabbedProps) {
|
|
|
45
45
|
const currentTab = useQuestionnaireStore.use.currentTabIndex();
|
|
46
46
|
|
|
47
47
|
const tabListWidthOrResponsive = useRendererConfigStore.use.tabListWidthOrResponsive();
|
|
48
|
+
const tabListStickyTop = useRendererConfigStore.use.tabListStickyTop() ?? 0;
|
|
48
49
|
|
|
49
50
|
const indexMap: Record<string, number> = useMemo(
|
|
50
51
|
() => mapQItemsIndex(topLevelQItem),
|
|
@@ -69,10 +70,30 @@ function FormBodyTabbed(props: FormBodyTabbedProps) {
|
|
|
69
70
|
|
|
70
71
|
// If tabListWidthOrBreakpoints is a number, it is a fixed width of the tab list - set a fixed width and prevent shrinking
|
|
71
72
|
// If tabListWidthOrBreakpoints is an object, it is a MUI Breakpoints object
|
|
73
|
+
// position: sticky + alignSelf: flex-start keeps the tab list visible as the user scrolls the form body.
|
|
74
|
+
// tabListStickyTop should match the height of any sticky header in the consuming app so the tab list
|
|
75
|
+
// sticks immediately below it rather than sliding behind it.
|
|
72
76
|
const tabListWrapperProps: GridProps =
|
|
73
77
|
typeof tabListWidthOrResponsive === 'number'
|
|
74
|
-
? {
|
|
75
|
-
|
|
78
|
+
? {
|
|
79
|
+
sx: {
|
|
80
|
+
width: tabListWidthOrResponsive,
|
|
81
|
+
flexShrink: 0,
|
|
82
|
+
position: 'sticky',
|
|
83
|
+
top: tabListStickyTop,
|
|
84
|
+
alignSelf: 'flex-start',
|
|
85
|
+
maxHeight: `calc(100vh - ${tabListStickyTop}px)`
|
|
86
|
+
}
|
|
87
|
+
}
|
|
88
|
+
: {
|
|
89
|
+
size: { ...tabListWidthOrResponsive.tabListBreakpoints },
|
|
90
|
+
sx: {
|
|
91
|
+
position: 'sticky',
|
|
92
|
+
top: tabListStickyTop,
|
|
93
|
+
alignSelf: 'flex-start',
|
|
94
|
+
maxHeight: `calc(100vh - ${tabListStickyTop}px)`
|
|
95
|
+
}
|
|
96
|
+
};
|
|
76
97
|
|
|
77
98
|
const qItemTabPanelProps: GridProps =
|
|
78
99
|
typeof tabListWidthOrResponsive === 'number'
|
|
@@ -66,7 +66,11 @@ const FormBodyTabList = memo(function FormBodyTabList(props: FormBodyTabListProp
|
|
|
66
66
|
const tabLabel = getShortText(qItem) ?? getItemTextToDisplay(qItem) ?? '';
|
|
67
67
|
|
|
68
68
|
return (
|
|
69
|
-
<Collapse
|
|
69
|
+
<Collapse
|
|
70
|
+
key={qItem.linkId}
|
|
71
|
+
timeout={100}
|
|
72
|
+
data-linkid={qItem.linkId}
|
|
73
|
+
data-label={qItem.text}>
|
|
70
74
|
<FormBodySingleTab
|
|
71
75
|
qItem={qItem}
|
|
72
76
|
contextDisplayItems={contextDisplayItems}
|
|
@@ -44,6 +44,7 @@ function useValueSetCodings(qItem: QuestionnaireItem): {
|
|
|
44
44
|
const patient = useSmartConfigStore.use.patient();
|
|
45
45
|
const user = useSmartConfigStore.use.user();
|
|
46
46
|
const encounter = useSmartConfigStore.use.encounter();
|
|
47
|
+
const resolvedFhirContextReferences = useSmartConfigStore.use.resolvedFhirContextReferences();
|
|
47
48
|
|
|
48
49
|
const launchContexts = useQuestionnaireStore.use.launchContexts();
|
|
49
50
|
const processedValueSets = useQuestionnaireStore.use.processedValueSets();
|
|
@@ -75,7 +76,13 @@ function useValueSetCodings(qItem: QuestionnaireItem): {
|
|
|
75
76
|
// get answer expression resource from launch contexts
|
|
76
77
|
if (launchContexts[variable]) {
|
|
77
78
|
const resourceType = launchContexts[variable].extension[1].valueCode;
|
|
78
|
-
const resource = getResourceFromLaunchContext(
|
|
79
|
+
const resource = getResourceFromLaunchContext(
|
|
80
|
+
resourceType,
|
|
81
|
+
patient,
|
|
82
|
+
user,
|
|
83
|
+
encounter,
|
|
84
|
+
resolvedFhirContextReferences
|
|
85
|
+
);
|
|
79
86
|
if (resource) {
|
|
80
87
|
contextMap[variable] = resource;
|
|
81
88
|
}
|