@aehrc/smart-forms-renderer 1.2.14 → 1.3.1

package/lib/hooks/useValueSetCodings.js

@@ -27,6 +27,7 @@ function useValueSetCodings(qItem) {
     const patient = useSmartConfigStore.use.patient();
     const user = useSmartConfigStore.use.user();
     const encounter = useSmartConfigStore.use.encounter();
+    const resolvedFhirContextReferences = useSmartConfigStore.use.resolvedFhirContextReferences();
     const launchContexts = useQuestionnaireStore.use.launchContexts();
     const processedValueSets = useQuestionnaireStore.use.processedValueSets();
     const cachedValueSetCodings = useQuestionnaireStore.use.cachedValueSetCodings();
@@ -46,7 +47,7 @@ function useValueSetCodings(qItem) {
             // get answer expression resource from launch contexts
             if (launchContexts[variable]) {
                 const resourceType = launchContexts[variable].extension[1].valueCode;
-                const resource = getResourceFromLaunchContext(resourceType, patient, user, encounter);
+                const resource = getResourceFromLaunchContext(resourceType, patient, user, encounter, resolvedFhirContextReferences);
                 if (resource) {
                     contextMap[variable] = resource;
                 }

package/lib/hooks/useValueSetCodings.js.map

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

package/lib/stores/rendererConfigStore.d.ts

@@ -25,6 +25,10 @@ import type { Breakpoints } from '@mui/material';
  * @property tabListWidthOrResponsive - Configures the width of the tab list, either as a fixed number or responsive breakpoints.
  *   - Default: `{ tabListBreakpoints: { xs: 12, sm: 3, md: 3, lg: 2.75 }, tabContentBreakpoints: { xs: 12, sm: 9, md: 9, lg: 9.25 } }`
  *
+ * @property tabListStickyTop - The pixel offset from the top of the viewport at which the tab list becomes sticky.
+ *   Set this to the height of any sticky header in the consuming app so the tab list sticks immediately below it.
+ *   - Default: `0`
+ *
  * @property textFieldWidth - Defines the default width for text input fields (in pixels).
  *   - Default: `320`
  *
@@ -74,6 +78,7 @@ export interface RendererConfig {
         tabListBreakpoints: Partial<Breakpoints['values']>;
         tabContentBreakpoints: Partial<Breakpoints['values']>;
     };
+    tabListStickyTop?: number;
     textFieldWidth?: number;
     inputsFlexGrow?: boolean;
     reverseBooleanYesNo?: boolean;
@@ -103,6 +108,7 @@ export interface RendererConfigStoreType {
         tabListBreakpoints: Partial<Breakpoints['values']>;
         tabContentBreakpoints: Partial<Breakpoints['values']>;
     };
+    tabListStickyTop: number;
     showTabbedFormAt: UseResponsiveProps;
     textFieldWidth: number;
     inputsFlexGrow: boolean;
@@ -134,6 +140,7 @@ export declare const useRendererConfigStore: import("zustand/vanilla").StoreApi<
             tabListBreakpoints: Partial<Breakpoints["values"]>;
             tabContentBreakpoints: Partial<Breakpoints["values"]>;
         };
+        tabListStickyTop: () => number;
         showTabbedFormAt: () => UseResponsiveProps;
         textFieldWidth: () => number;
         inputsFlexGrow: () => boolean;

package/lib/stores/rendererConfigStore.js

@@ -32,6 +32,7 @@ export const rendererConfigStore = createStore()((set) => ({
         tabListBreakpoints: { xs: 12, sm: 3, md: 3, lg: 2.75 },
         tabContentBreakpoints: { xs: 12, sm: 9, md: 9, lg: 9.25 }
     },
+    tabListStickyTop: 0,
     showTabbedFormAt: { query: 'up', start: 'md' },
     textFieldWidth: 320,
     inputsFlexGrow: false,
@@ -49,6 +50,7 @@ export const rendererConfigStore = createStore()((set) => ({
             requiredIndicatorPosition: params.requiredIndicatorPosition ?? state.requiredIndicatorPosition,
             itemResponsive: params.itemResponsive ?? state.itemResponsive,
             tabListWidthOrResponsive: params.tabListWidthOrResponsive ?? state.tabListWidthOrResponsive,
+            tabListStickyTop: params.tabListStickyTop ?? state.tabListStickyTop,
             showTabbedFormAt: params.showTabbedFormAt ?? state.showTabbedFormAt,
             textFieldWidth: params.textFieldWidth ?? state.textFieldWidth,
             inputsFlexGrow: params.inputsFlexGrow ?? state.inputsFlexGrow,

package/lib/stores/rendererConfigStore.js.map

@@ -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;AA8H7C;;GAEG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,WAAW,EAA2B,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAClF,mBAAmB,EAAE,UAAU;IAC/B,yBAAyB,EAAE,OAAO;IAClC,cAAc,EAAE;QACd,gBAAgB,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE;QACnC,gBAAgB,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE;QACnC,eAAe,EAAE,EAAE;QACnB,YAAY,EAAE,CAAC;KAChB;IACD,wBAAwB,EAAE;QACxB,kBAAkB,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE;QACtD,qBAAqB,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE;KAC1D;IACD,gBAAgB,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE;IAC9C,cAAc,EAAE,GAAG;IACnB,cAAc,EAAE,KAAK;IACrB,mBAAmB,EAAE,KAAK;IAC1B,eAAe,EAAE,KAAK;IACtB,2BAA2B,EAAE,KAAK;IAClC,oBAAoB,EAAE,KAAK;IAC3B,mBAAmB,EAAE,KAAK;IAC1B,kBAAkB,EAAE,KAAK;IACzB,iBAAiB,EAAE,KAAK;IACxB,8BAA8B,EAAE,KAAK;IACrC,iBAAiB,EAAE,CAAC,MAAsB,EAAE,EAAE;QAC5C,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;YACd,mBAAmB,EAAE,MAAM,CAAC,mBAAmB,IAAI,KAAK,CAAC,mBAAmB;YAC5E,yBAAyB,EACvB,MAAM,CAAC,yBAAyB,IAAI,KAAK,CAAC,yBAAyB;YACrE,cAAc,EAAE,MAAM,CAAC,cAAc,IAAI,KAAK,CAAC,cAAc;YAC7D,wBAAwB,EAAE,MAAM,CAAC,wBAAwB,IAAI,KAAK,CAAC,wBAAwB;YAC3F,gBAAgB,EAAE,MAAM,CAAC,gBAAgB,IAAI,KAAK,CAAC,gBAAgB;YACnE,cAAc,EAAE,MAAM,CAAC,cAAc,IAAI,KAAK,CAAC,cAAc;YAC7D,cAAc,EAAE,MAAM,CAAC,cAAc,IAAI,KAAK,CAAC,cAAc;YAC7D,mBAAmB,EAAE,MAAM,CAAC,mBAAmB,IAAI,KAAK,CAAC,mBAAmB;YAC5E,eAAe,EAAE,MAAM,CAAC,eAAe,IAAI,KAAK,CAAC,eAAe;YAChE,2BAA2B,EACzB,MAAM,CAAC,2BAA2B,IAAI,KAAK,CAAC,2BAA2B;YACzE,oBAAoB,EAAE,MAAM,CAAC,oBAAoB,IAAI,KAAK,CAAC,oBAAoB;YAC/E,mBAAmB,EAAE,MAAM,CAAC,mBAAmB,IAAI,KAAK,CAAC,mBAAmB;YAC5E,kBAAkB,EAAE,MAAM,CAAC,kBAAkB,IAAI,KAAK,CAAC,kBAAkB;YACzE,iBAAiB,EAAE,MAAM,CAAC,iBAAiB,IAAI,KAAK,CAAC,iBAAiB;YACtE,8BAA8B,EAC5B,MAAM,CAAC,8BAA8B,IAAI,KAAK,CAAC,8BAA8B;SAChF,CAAC,CAAC,CAAC;IACN,CAAC;CACF,CAAC,CAAC,CAAC;AAEJ,MAAM,CAAC,MAAM,sBAAsB,GAAG,eAAe,CAAC,mBAAmB,CAAC,CAAC"}
+{"version":3,"file":"rendererConfigStore.js","sourceRoot":"","sources":["../../src/stores/rendererConfigStore.ts"],"names":[],"mappings":"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"}

package/lib/stores/smartConfigStore.d.ts

@@ -1,4 +1,4 @@
-import type { Encounter, Patient, Practitioner } from 'fhir/r4';
+import type { Encounter, FhirResource, Patient, Practitioner } from 'fhir/r4';
 import type Client from 'fhirclient/lib/Client';
 import type { FhirContext } from '@aehrc/sdc-populate';
 /**
@@ -11,11 +11,13 @@ import type { FhirContext } from '@aehrc/sdc-populate';
  * @property user - The user resource in context
  * @property encounter - The encounter resource in context
  * @property fhirContext - fhirContext array from SMART App Launch
+ * @property resolvedFhirContextReferences - resolved references from fhirContext, keyed by resource type e.g. `{ "PractitionerRole": <PractitionerRole> }`
  * @property setClient - Set the FHIRClient object when launching via SMART App Launch
  * @property setPatient - Set the patient resource in context
  * @property setUser - Set the user resource in context
  * @property setEncounter - Set the encounter resource in context
  * @property setFhirContext - Set the fhirContext array from SMART App Launch
+ * @property setResolvedFhirContextReferences - Set the resolvedFhirContextReferences object
  *
  * @author Sean Fong
  */
@@ -25,11 +27,13 @@ export interface SmartConfigStoreType {
     user: Practitioner | null;
     encounter: Encounter | null;
     fhirContext: FhirContext[] | null;
+    resolvedFhirContextReferences: Record<string, FhirResource> | null;
     setClient: (client: Client) => void;
     setPatient: (patient: Patient) => void;
     setUser: (user: Practitioner) => void;
     setEncounter: (encounter: Encounter) => void;
     setFhirContext: (fhirContext: FhirContext[]) => void;
+    setResolvedFhirContextReferences: (resolvedFhirContextReferences: Record<string, FhirResource>) => void;
 }
 /**
  * Smart Config state management store. This is only used for answerExpressions.
@@ -60,10 +64,12 @@ export declare const useSmartConfigStore: import("zustand/vanilla").StoreApi<Sma
         user: () => Practitioner | null;
         encounter: () => Encounter | null;
         fhirContext: () => FhirContext[] | null;
+        resolvedFhirContextReferences: () => Record<string, FhirResource> | null;
         setClient: () => (client: Client) => void;
         setPatient: () => (patient: Patient) => void;
         setUser: () => (user: Practitioner) => void;
         setEncounter: () => (encounter: Encounter) => void;
         setFhirContext: () => (fhirContext: FhirContext[]) => void;
+        setResolvedFhirContextReferences: () => (resolvedFhirContextReferences: Record<string, FhirResource>) => void;
     };
 };

package/lib/stores/smartConfigStore.js

@@ -32,11 +32,13 @@ export const smartConfigStore = createStore()((set) => ({
     user: null,
     encounter: null,
     fhirContext: null,
+    resolvedFhirContextReferences: null,
     setClient: (client) => set(() => ({ client: client })),
     setPatient: (patient) => set(() => ({ patient: patient })),
     setUser: (user) => set(() => ({ user: user })),
     setEncounter: (encounter) => set(() => ({ encounter: encounter })),
-    setFhirContext: (fhirContext) => set(() => ({ fhirContext: fhirContext }))
+    setFhirContext: (fhirContext) => set(() => ({ fhirContext: fhirContext })),
+    setResolvedFhirContextReferences: (resolvedFhirContextReferences) => set(() => ({ resolvedFhirContextReferences }))
 }));
 /**
  * Smart Config state management store. This is only used for answerExpressions.

package/lib/stores/smartConfigStore.js.map

@@ -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;AAkC7C;;;;;;;;;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,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;CAC1F,CAAC,CAAC,CAAC;AAEJ;;;;;;;;;;GAUG;AACH,MAAM,CAAC,MAAM,mBAAmB,GAAG,eAAe,CAAC,gBAAgB,CAAC,CAAC"}
+{"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"}

package/lib/utils/populateContexts.js

@@ -17,20 +17,8 @@
 export function isLaunchContext(extension) {
     const hasLaunchContextName = extension.url ===
         'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext' &&
-        !!extension.extension?.find((ext) => ext.url === 'name' &&
-            (ext.valueId ||
-                (ext.valueCoding &&
-                    (ext.valueCoding.code === 'patient' ||
-                        ext.valueCoding.code === 'encounter' ||
-                        ext.valueCoding.code === 'location' ||
-                        ext.valueCoding.code === 'user' ||
-                        ext.valueCoding.code === 'study' ||
-                        ext.valueCoding.code === 'sourceQueries'))));
-    const hasLaunchContextType = !!extension.extension?.find((ext) => ext.url === 'type' &&
-        ext.valueCode &&
-        (ext.valueCode === 'Patient' ||
-            ext.valueCode === 'Practitioner' ||
-            ext.valueCode === 'Encounter'));
+        !!extension.extension?.find((ext) => ext.url === 'name' && (ext.valueId || (ext.valueCoding && ext.valueCoding.code)));
+    const hasLaunchContextType = !!extension.extension?.find((ext) => ext.url === 'type' && ext.valueCode);
     return (extension.url ===
         'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-launchContext' &&
         hasLaunchContextName &&

package/lib/utils/populateContexts.js.map

@@ -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,CACN,GAAG,CAAC,GAAG,KAAK,MAAM;YAClB,CAAC,GAAG,CAAC,OAAO;gBACV,CAAC,GAAG,CAAC,WAAW;oBACd,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,SAAS;wBACjC,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,WAAW;wBACpC,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,UAAU;wBACnC,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,MAAM;wBAC/B,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,OAAO;wBAChC,GAAG,CAAC,WAAW,CAAC,IAAI,KAAK,eAAe,CAAC,CAAC,CAAC,CACpD,CAAC;IAEJ,MAAM,oBAAoB,GAAG,CAAC,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CACtD,CAAC,GAAG,EAAE,EAAE,CACN,GAAG,CAAC,GAAG,KAAK,MAAM;QAClB,GAAG,CAAC,SAAS;QACb,CAAC,GAAG,CAAC,SAAS,KAAK,SAAS;YAC1B,GAAG,CAAC,SAAS,KAAK,cAAc;YAChC,GAAG,CAAC,SAAS,KAAK,WAAW,CAAC,CACnC,CAAC;IAEF,OAAO,CACL,SAAS,CAAC,GAAG;QACX,gFAAgF;QAClF,oBAAoB;QACpB,oBAAoB,CACrB,CAAC;AACJ,CAAC"}
+{"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

@@ -19,7 +19,7 @@ export declare function getValueSetCodings(valueSet: ValueSet): Coding[];
  */
 export declare function evaluateAnswerExpressionValueSet(answerExpression: Expression, itemLevelVariables: Expression[], preprocessedCodings: Record<string, Coding[]>): Coding[];
 export declare function createValueSetToXFhirQueryVariableNameMap(variables: Record<string, VariableXFhirQuery>): Record<string, string>;
-export declare function getResourceFromLaunchContext(resourceType: FhirResourceString, patient: Patient | null, user: Practitioner | null, encounter: Encounter | null): FhirResource | null;
+export declare function getResourceFromLaunchContext(resourceType: FhirResourceString, patient: Patient | null, user: Practitioner | null, encounter: Encounter | null, resolvedFhirContextReferences: Record<string, FhirResource> | null): FhirResource | null;
 /**
  * Retrieves the codings for a given answer value set URL.
  *

package/lib/utils/valueSet.js

@@ -131,7 +131,7 @@ export function createValueSetToXFhirQueryVariableNameMap(variables) {
     }
     return valueSetToNameMap;
 }
-export function getResourceFromLaunchContext(resourceType, patient, user, encounter) {
+export function getResourceFromLaunchContext(resourceType, patient, user, encounter, resolvedFhirContextReferences) {
     switch (resourceType) {
         case 'Patient':
             return patient;
@@ -140,7 +140,7 @@ export function getResourceFromLaunchContext(resourceType, patient, user, encoun
         case 'Encounter':
             return encounter;
     }
-    return null;
+    return resolvedFhirContextReferences?.[resourceType] ?? null;
 }
 /**
  * Retrieves the codings for a given answer value set URL.

package/lib/utils/valueSet.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aehrc/smart-forms-renderer",
-  "version": "1.2.14",
+  "version": "1.3.1",
   "description": "FHIR Structured Data Captured (SDC) rendering engine for Smart Forms",
   "main": "lib/index.js",
   "scripts": {
@@ -28,7 +28,7 @@
   },
   "homepage": "https://github.com/aehrc/smart-forms#readme",
   "dependencies": {
-    "@aehrc/sdc-populate": "^4.6.2",
+    "@aehrc/sdc-populate": "^4.7.0",
     "@aehrc/sdc-template-extract": "^1.0.15",
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
@@ -45,7 +45,7 @@
     "fast-equals": "^5.2.2",
     "fhir-sdc-helpers": "^0.1.0",
     "fhirclient": "^2.6.3",
-    "fhirpath": "3.18.0",
+    "fhirpath": "^4.5.0",
     "html-react-parser": "4.2.10",
     "js-base64": "^3.7.8",
     "lodash.debounce": "^4.0.8",

package/src/components/FormComponents/ChoiceItems/ChoiceAutocompleteField.tsx

@@ -98,7 +98,7 @@ function ChoiceAutocompleteField(props: ChoiceAutocompleteFieldsProps) {
           textFieldWidth={textFieldWidth}
           isTabled={isTabled}
           size="small"
-          placeholder={entryFormat || displayPrompt}
+          placeholder={valueCoding ? undefined : entryFormat || displayPrompt}
           slotProps={{
             input: {
               ...params.InputProps,

package/src/components/FormComponents/ChoiceItems/ChoiceSelectAnswerOptionFields.tsx

@@ -124,7 +124,7 @@ function ChoiceSelectAnswerOptionFields(props: ChoiceSelectAnswerOptionFieldsPro
           <StandardTextField
             textFieldWidth={textFieldWidth}
             isTabled={isTabled}
-            placeholder={entryFormat || displayPrompt}
+            placeholder={valueSelect ? undefined : entryFormat || displayPrompt}
             {...params}
             slotProps={{
               input: {

package/src/components/FormComponents/ChoiceItems/ChoiceSelectAnswerValueSetFields.tsx

@@ -88,7 +88,7 @@ function ChoiceSelectAnswerValueSetFields(props: ChoiceSelectAnswerValueSetField
               multiline
               textFieldWidth={textFieldWidth}
               isTabled={isTabled}
-              placeholder={entryFormat || displayPrompt}
+              placeholder={valueCoding ? undefined : entryFormat || displayPrompt}
               {...params}
               slotProps={{
                 input: {

package/src/components/FormComponents/GridGroup/GridRow.tsx

@@ -113,7 +113,12 @@ function GridRow(props: GridRowProps) {
           <GridAnswerTableCell
             key={colIndex}
             calculatedWidth={calculatedColumnWidths[colIndex]?.width}>
-            <Box display="flex" alignItems="center" justifyContent="center">
+            <Box
+              display="flex"
+              alignItems="center"
+              justifyContent="center"
+              data-linkid={cellQItem.linkId}
+              data-label={cellQItem.text}>
               <SingleItem
                 qItem={cellQItem}
                 qrItem={cellQrItem ?? null}

package/src/components/FormComponents/GroupItem/GroupAccordion.styles.ts

@@ -1,7 +1,7 @@
 import { styled } from '@mui/material/styles';
 import Accordion from '@mui/material/Accordion';
 
-export const GroupAccordion = styled(Accordion, {
+export const StyledGroupAccordion = styled(Accordion, {
   shouldForwardProp: (prop) => prop !== 'elevation'
 })<{ elevation: number }>(({ elevation }) => ({
   paddingTop: '8px',

package/src/components/FormComponents/GroupItem/GroupAccordion.tsx

@@ -0,0 +1,93 @@
+/*
+ * Copyright 2025 Commonwealth Scientific and Industrial Research
+ * Organisation (CSIRO) ABN 41 687 119 230.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import React, { useCallback, useState, useRef } from 'react';
+import type { AccordionProps } from '@mui/material/Accordion';
+import { StyledGroupAccordion } from './GroupAccordion.styles';
+
+// Matches the MUI Accordion transition timeout used in GroupItemView/RepeatGroupView
+const TRANSITION_DURATION_MS = 300;
+
+/**
+ * Walk up the DOM to find the nearest element that actually scrolls.
+ * The page may not scroll on window — e.g. the smart-forms-app uses a styled
+ * `Main` div with `overflow: auto` as the scroll container.
+ */
+function findScrollContainer(el: HTMLElement): HTMLElement | null {
+  let node: HTMLElement | null = el.parentElement;
+  while (node) {
+    const { overflow, overflowY } = window.getComputedStyle(node);
+    if (
+      overflow === 'auto' ||
+      overflow === 'scroll' ||
+      overflowY === 'auto' ||
+      overflowY === 'scroll'
+    ) {
+      return node;
+    }
+    node = node.parentElement;
+  }
+  return null;
+}
+
+interface GroupAccordionProps extends Omit<AccordionProps, 'elevation'> {
+  elevation: number;
+  defaultExpanded?: boolean;
+}
+
+/**
+ * GroupAccordion component.
+ */
+export function GroupAccordion(props: GroupAccordionProps) {
+  const { defaultExpanded = false, onChange, children, ...rest } = props;
+
+  const [expanded, setExpanded] = useState(defaultExpanded);
+  const accordionRef = useRef<HTMLDivElement>(null);
+
+  const handleChange = useCallback(
+    (event: React.SyntheticEvent, isExpanded: boolean) => {
+      // When the accordion expands, its content is mounted into the DOM (unmountOnExit).
+      // The browser's CSS scroll anchoring then adjusts the nearest scrollable ancestor's
+      // scrollTop every animation frame to keep anchor elements below the accordion in
+      // place — visually making the accordion header appear to jump upward.
+      //
+      // Fix: temporarily opt the scroll container out of scroll anchoring for the
+      // duration of the transition, then restore it.
+      const scrollContainer = accordionRef.current
+        ? findScrollContainer(accordionRef.current)
+        : null;
+      if (scrollContainer) {
+        scrollContainer.style.overflowAnchor = 'none';
+        setTimeout(() => {
+          scrollContainer.style.overflowAnchor = '';
+        }, TRANSITION_DURATION_MS);
+      }
+
+      setExpanded(isExpanded);
+      onChange?.(event, isExpanded);
+    },
+    [onChange]
+  );
+
+  return (
+    <StyledGroupAccordion ref={accordionRef} expanded={expanded} onChange={handleChange} {...rest}>
+      {children}
+    </StyledGroupAccordion>
+  );
+}
+
+export default GroupAccordion;

package/src/components/FormComponents/GroupItem/GroupItemView.tsx

@@ -38,10 +38,10 @@ import AccordionDetails from '@mui/material/AccordionDetails';
 import Divider from '@mui/material/Divider';
 import { getGroupCollapsible } from '../../../utils/qItem';
 import useReadOnly from '../../../hooks/useReadOnly';
-import { GroupAccordion } from './GroupAccordion.styles';
 import PageButtonsWrapper from './PageButtonWrapper';
 import { useParseXhtml } from '../../../hooks/useParseXhtml';
 import { getItemTextToDisplay } from '../../../utils/itemTextToDisplay';
+import GroupAccordion from './GroupAccordion';
 
 interface GroupItemViewProps
   extends PropsWithQrItemChangeHandler,

package/src/components/FormComponents/OpenChoiceItems/OpenChoiceSelectAnswerOptionField.tsx

@@ -120,7 +120,7 @@ function OpenChoiceSelectAnswerOptionField(props: OpenChoiceSelectAnswerOptionFi
             multiline
             textFieldWidth={textFieldWidth}
             isTabled={isTabled}
-            placeholder={entryFormat || displayPrompt}
+            placeholder={valueSelect ? undefined : entryFormat || displayPrompt}
             {...params}
             slotProps={{
               input: {

package/src/components/FormComponents/RepeatGroup/RepeatGroupView.tsx

@@ -33,13 +33,13 @@ import AddItemButton from './AddItemButton';
 import type { RepeatGroupSingleModel } from '../../../interfaces/repeatGroup.interface';
 import useReadOnly from '../../../hooks/useReadOnly';
 import { getGroupCollapsible } from '../../../utils/qItem';
-import { GroupAccordion } from '../GroupItem/GroupAccordion.styles';
 import AccordionSummary from '@mui/material/AccordionSummary';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 import AccordionDetails from '@mui/material/AccordionDetails';
 import GroupHeading from '../GroupItem/GroupHeading';
 import { getItemTextToDisplay } from '../../../utils/itemTextToDisplay';
 import { isGroupAddItemButtonHidden } from '../../../utils/extensions';
+import GroupAccordion from '../GroupItem/GroupAccordion';
 
 interface RepeatGroupViewProps
   extends PropsWithParentIsReadOnlyAttribute,

package/src/components/FormComponents/Tables/GroupTableView.tsx

@@ -36,7 +36,6 @@ import type { GroupTableRowModel } from '../../../interfaces/groupTable.interfac
 import GroupTableBody from './GroupTableBody';
 import { useQuestionnaireStore, useRendererConfigStore } from '../../../stores';
 import { getGroupCollapsible } from '../../../utils/qItem';
-import { GroupAccordion } from '../GroupItem/GroupAccordion.styles';
 import AccordionSummary from '@mui/material/AccordionSummary';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 import AccordionDetails from '@mui/material/AccordionDetails';
@@ -45,6 +44,7 @@ import { StandardCheckbox } from '../../Checkbox.styles';
 import { Box } from '@mui/material';
 import { getItemTextToDisplay } from '../../../utils/itemTextToDisplay';
 import { isGroupAddItemButtonHidden } from '../../../utils/extensions';
+import GroupAccordion from '../GroupItem/GroupAccordion';
 
 interface GroupTableViewProps
   extends PropsWithIsRepeatedAttribute,

package/src/components/Renderer/FormBodySingleCollapsible.tsx

@@ -56,10 +56,11 @@ const FormBodySingleCollapsible = memo(function FormBodySingleCollapsible(
       }}
       data-linkid={qItem.linkId}
       data-label={qItem.text}
+      data-test="renderer-accordion"
       onChange={() => onToggleExpand(index)}>
       <AccordionSummary expandIcon={<ExpandMoreIcon />}>
         <Box display="flex" alignItems="center" justifyContent="space-between" width="100%" mr={3}>
-          <Typography>{collapsibleLabel}</Typography>
+          <Typography component="h2">{collapsibleLabel}</Typography>
           <Box display="flex" columnGap={0.5}>
             {contextDisplayItems.map((item) => {
               return <ContextDisplayItem key={item.linkId} displayItem={item} />;

package/src/components/Renderer/FormBodyTabbed.tsx

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import React, { useMemo } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { Grid } from '@mui/material';
 import type { QuestionnaireItem, QuestionnaireResponseItem } from 'fhir/r4';
 import TabContext from '@mui/lab/TabContext';
@@ -45,6 +45,45 @@ function FormBodyTabbed(props: FormBodyTabbedProps) {
   const currentTab = useQuestionnaireStore.use.currentTabIndex();
 
   const tabListWidthOrResponsive = useRendererConfigStore.use.tabListWidthOrResponsive();
+  const tabListStickyTop = useRendererConfigStore.use.tabListStickyTop() ?? 0;
+
+  const tabListGridRef = useRef<HTMLDivElement>(null);
+  const [tabListMaxHeight, setTabListMaxHeight] = useState<string | undefined>();
+
+  useEffect(() => {
+    const el = tabListGridRef.current;
+    if (!el) return;
+
+    // Walk up the DOM to find the nearest scrollable ancestor (the element that
+    // position:sticky sticks relative to). Measure available height directly from
+    // the DOM rather than using hardcoded offsets, so it works regardless of what
+    // containers the renderer is embedded in.
+    const getScrollContainer = (element: HTMLElement): HTMLElement | null => {
+      let parent = element.parentElement;
+      while (parent && parent !== document.documentElement) {
+        const { overflow, overflowY } = getComputedStyle(parent);
+        if (/auto|scroll/.test(overflow) || /auto|scroll/.test(overflowY)) return parent;
+        parent = parent.parentElement;
+      }
+      return null;
+    };
+
+    const scrollContainer = getScrollContainer(el);
+
+    const update = () => {
+      const containerBottom = scrollContainer
+        ? scrollContainer.getBoundingClientRect().bottom
+        : window.innerHeight;
+      const elTop = el.getBoundingClientRect().top;
+      setTabListMaxHeight(`${Math.max(containerBottom - elTop, 0) - 16}px`);
+    };
+
+    update();
+    window.addEventListener('resize', update, { passive: true });
+    return () => {
+      window.removeEventListener('resize', update);
+    };
+  }, []);
 
   const indexMap: Record<string, number> = useMemo(
     () => mapQItemsIndex(topLevelQItem),
@@ -69,10 +108,28 @@ function FormBodyTabbed(props: FormBodyTabbedProps) {
 
   // If tabListWidthOrBreakpoints is a number, it is a fixed width of the tab list - set a fixed width and prevent shrinking
   // If tabListWidthOrBreakpoints is an object, it is a MUI Breakpoints object
+  // position: sticky + alignSelf: flex-start keeps the tab list visible as the user scrolls the form body.
+  // tabListStickyTop should match the height of any sticky header in the consuming app so the tab list
+  // sticks immediately below it rather than sliding behind it.
   const tabListWrapperProps: GridProps =
     typeof tabListWidthOrResponsive === 'number'
-      ? { sx: { width: tabListWidthOrResponsive, flexShrink: 0 } }
-      : { size: { ...tabListWidthOrResponsive.tabListBreakpoints } };
+      ? {
+          sx: {
+            width: tabListWidthOrResponsive,
+            flexShrink: 0,
+            position: 'sticky',
+            top: tabListStickyTop,
+            alignSelf: 'flex-start'
+          }
+        }
+      : {
+          size: { ...tabListWidthOrResponsive.tabListBreakpoints },
+          sx: {
+            position: 'sticky',
+            top: tabListStickyTop,
+            alignSelf: 'flex-start'
+          }
+        };
 
   const qItemTabPanelProps: GridProps =
     typeof tabListWidthOrResponsive === 'number'
@@ -82,8 +139,13 @@ function FormBodyTabbed(props: FormBodyTabbedProps) {
   return (
     <Grid container spacing={1.5} sx={{ flexWrap: 'nowrap' }}>
       <TabContext value={currentTab.toString()}>
-        <Grid {...tabListWrapperProps}>
-          <FormBodyTabListWrapper topLevelItems={qItems} currentTabIndex={currentTab} tabs={tabs} />
+        <Grid ref={tabListGridRef} {...tabListWrapperProps}>
+          <FormBodyTabListWrapper
+            topLevelItems={qItems}
+            currentTabIndex={currentTab}
+            tabs={tabs}
+            maxHeight={tabListMaxHeight}
+          />
         </Grid>
 
         <Grid {...qItemTabPanelProps}>