@aehrc/smart-forms-renderer 1.2.13 → 1.3.0

package/src/stores/rendererConfigStore.ts

@@ -45,6 +45,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`
  *
@@ -96,6 +100,7 @@ export interface RendererConfig {
         tabListBreakpoints: Partial<Breakpoints['values']>;
         tabContentBreakpoints: Partial<Breakpoints['values']>;
       };
+  tabListStickyTop?: number;
   textFieldWidth?: number;
   inputsFlexGrow?: boolean;
   reverseBooleanYesNo?: boolean;
@@ -128,6 +133,7 @@ export interface RendererConfigStoreType {
         tabListBreakpoints: Partial<Breakpoints['values']>;
         tabContentBreakpoints: Partial<Breakpoints['values']>;
       };
+  tabListStickyTop: number;
   showTabbedFormAt: UseResponsiveProps;
   textFieldWidth: number;
   inputsFlexGrow: boolean; // radio, checkbox and boolean inputs should have flexGrow: 1
@@ -158,6 +164,7 @@ export const rendererConfigStore = createStore<RendererConfigStoreType>()((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,
@@ -176,6 +183,7 @@ export const rendererConfigStore = createStore<RendererConfigStoreType>()((set)
         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/src/stores/smartConfigStore.ts

@@ -16,7 +16,7 @@
  */
 
 import { createStore } from 'zustand/vanilla';
-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 { createSelectors } from './selector';
 import type { FhirContext } from '@aehrc/sdc-populate';
@@ -31,11 +31,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
  */
@@ -45,11 +47,15 @@ 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;
 }
 
 /**
@@ -68,11 +74,14 @@ export const smartConfigStore = createStore<SmartConfigStoreType>()((set) => ({
   user: null,
   encounter: null,
   fhirContext: null,
+  resolvedFhirContextReferences: null,
   setClient: (client: Client) => set(() => ({ client: client })),
   setPatient: (patient: Patient) => set(() => ({ patient: patient })),
   setUser: (user: Practitioner) => set(() => ({ user: user })),
   setEncounter: (encounter: Encounter) => set(() => ({ encounter: encounter })),
-  setFhirContext: (fhirContext: FhirContext[]) => set(() => ({ fhirContext: fhirContext }))
+  setFhirContext: (fhirContext: FhirContext[]) => set(() => ({ fhirContext: fhirContext })),
+  setResolvedFhirContextReferences: (resolvedFhirContextReferences: Record<string, FhirResource>) =>
+    set(() => ({ resolvedFhirContextReferences }))
 }));
 
 /**

package/src/utils/calculatedExpression.ts

@@ -370,7 +370,7 @@ function applyCalculatedExpressionValuesRecursive(
     );
   }
 
-  const qrItem = qrItemOrItems;
+  let qrItem = qrItemOrItems;
   const childQItems = qItem.item;
   if (childQItems && childQItems.length > 0) {
     const childQrItems = qrItem?.item ?? [];
@@ -391,13 +391,17 @@ function applyCalculatedExpressionValuesRecursive(
       // Update QR items in repeating group
       if (Array.isArray(updatedChildQRItemOrItems)) {
         if (updatedChildQRItemOrItems.length > 0) {
+          // Lazily initialise qrItem so all children are added to the same group object
+          if (!qrItem) {
+            qrItem = structuredClone(createEmptyQrGroup(qItem));
+          }
           updateQrItemsInGroup(
             null,
             {
               linkId: childQItem.linkId,
               qrItems: updatedChildQRItemOrItems
             },
-            qrItem ?? structuredClone(createEmptyQrGroup(qItem)),
+            qrItem,
             indexMap
           );
         }
@@ -407,12 +411,11 @@ function applyCalculatedExpressionValuesRecursive(
       // Update QR items in non-repeating group
       const updatedChildQRItem = updatedChildQRItemOrItems;
       if (updatedChildQRItem) {
-        updateQrItemsInGroup(
-          updatedChildQRItem,
-          null,
-          qrItem ?? structuredClone(createEmptyQrGroup(qItem)),
-          indexMap
-        );
+        // Lazily initialise qrItem so all children are added to the same group object
+        if (!qrItem) {
+          qrItem = structuredClone(createEmptyQrGroup(qItem));
+        }
+        updateQrItemsInGroup(updatedChildQRItem, null, qrItem, indexMap);
       }
     }
 

package/src/utils/populateContexts.ts

@@ -23,25 +23,11 @@ export function isLaunchContext(extension: Extension): extension is LaunchContex
     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')))
+      (ext) => ext.url === 'name' && (ext.valueId || (ext.valueCoding && ext.valueCoding.code))
     );
 
   const hasLaunchContextType = !!extension.extension?.find(
-    (ext) =>
-      ext.url === 'type' &&
-      ext.valueCode &&
-      (ext.valueCode === 'Patient' ||
-        ext.valueCode === 'Practitioner' ||
-        ext.valueCode === 'Encounter')
+    (ext) => ext.url === 'type' && ext.valueCode
   );
 
   return (

package/src/utils/valueSet.ts

@@ -198,7 +198,8 @@ export function getResourceFromLaunchContext(
   resourceType: FhirResourceString,
   patient: Patient | null,
   user: Practitioner | null,
-  encounter: Encounter | null
+  encounter: Encounter | null,
+  resolvedFhirContextReferences: Record<string, FhirResource> | null
 ): FhirResource | null {
   switch (resourceType) {
     case 'Patient':
@@ -208,7 +209,7 @@ export function getResourceFromLaunchContext(
     case 'Encounter':
       return encounter;
   }
-  return null;
+  return resolvedFhirContextReferences?.[resourceType] ?? null;
 }
 
 /**