@aehrc/smart-forms-renderer 0.9.0 → 0.9.2

package/README.md

@@ -1,7 +1,7 @@
 # Smart Forms Renderer
 This React-based package acts as the rendering engine for the [Smart Forms app](https://github.com/aehrc/smart-forms).
 
-Try out a minimal demo here: https://www.smartforms.io/standalone.
+Try out a minimal demo here: https://smartforms.csiro.au/standalone.
 
 ## Installation
 ```bash
@@ -27,8 +27,10 @@ export default function App () {
     </div>  
   )
 }
-
 ```
+Note: The SmartFormsRenderer component is extremely basic and experimental, do not use it in production!
+
+
 ### SmartFormsRenderer Props 
 
 

package/lib/components/FormComponents/GroupItem/GroupItem.styles.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 export declare const GroupCard: import("@emotion/styled").StyledComponent<import("@mui/material/Card").CardOwnProps & import("@mui/material/OverridableComponent").CommonProps & Omit<Omit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLDivElement>, HTMLDivElement>, "ref"> & {
     ref?: ((instance: HTMLDivElement | null) => void) | import("react").RefObject<HTMLDivElement> | null | undefined;
-}, "style" | "className" | "children" | "sx" | "classes" | "elevation" | "variant" | "square" | "raised"> & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme> & {
+}, "style" | "children" | "className" | "sx" | "classes" | "elevation" | "variant" | "square" | "raised"> & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme> & {
     elevation: number;
     isRepeated: boolean;
 }, {}, {}>;

package/lib/components/FormComponents/Lists.styles.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 export declare const PrimarySelectableList: import("@emotion/styled").StyledComponent<import("@mui/material/List").ListOwnProps & import("@mui/material/OverridableComponent").CommonProps & Omit<Omit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLUListElement>, HTMLUListElement>, "ref"> & {
     ref?: ((instance: HTMLUListElement | null) => void) | import("react").RefObject<HTMLUListElement> | null | undefined;
-}, "style" | "className" | "children" | "sx" | "classes" | "dense" | "disablePadding" | "subheader"> & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, {}, {}>;
+}, "style" | "children" | "className" | "sx" | "classes" | "dense" | "disablePadding" | "subheader"> & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, {}, {}>;

package/lib/components/Lists.styles.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 export declare const PrimarySelectableList: import("@emotion/styled").StyledComponent<import("@mui/material/List").ListOwnProps & import("@mui/material/OverridableComponent").CommonProps & Omit<Omit<import("react").DetailedHTMLProps<import("react").HTMLAttributes<HTMLUListElement>, HTMLUListElement>, "ref"> & {
     ref?: ((instance: HTMLUListElement | null) => void) | import("react").RefObject<HTMLUListElement> | null | undefined;
-}, "style" | "className" | "children" | "sx" | "classes" | "dense" | "disablePadding" | "subheader"> & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, {}, {}>;
+}, "style" | "children" | "className" | "sx" | "classes" | "dense" | "disablePadding" | "subheader"> & import("@mui/system").MUIStyledCommonProps<import("@mui/material/styles").Theme>, {}, {}>;

package/lib/components/Renderer/SmartFormsRenderer.js

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 import React from 'react';
+import ThemeProvider from '../../theme/Theme';
 import useInitialiseRenderer from '../../hooks/useInitialiseRenderer';
 import Box from '@mui/material/Box';
 import CircularProgress from '@mui/material/CircularProgress';
@@ -22,7 +23,6 @@ import Typography from '@mui/material/Typography';
 import { QueryClientProvider } from '@tanstack/react-query';
 import useQueryClient from '../../hooks/useQueryClient';
 import BaseRenderer from './BaseRenderer';
-import ThemeProvider from '../../theme/Theme';
 function SmartFormsRenderer(props) {
     const { questionnaire, questionnaireResponse, additionalVariables, terminologyServerUrl, fhirClient } = props;
     const isLoading = useInitialiseRenderer(questionnaire, questionnaireResponse, additionalVariables, terminologyServerUrl, fhirClient);

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

@@ -1 +1 @@
-{"version":3,"file":"SmartFormsRenderer.js","sourceRoot":"","sources":["../../../src/components/Renderer/SmartFormsRenderer.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,qBAAqB,MAAM,mCAAmC,CAAC;AACtE,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;AAC9D,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAElD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,cAAc,MAAM,4BAA4B,CAAC;AACxD,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAC1C,OAAO,aAAa,MAAM,mBAAmB,CAAC;AAW9C,SAAS,kBAAkB,CAAC,KAA8B;IACxD,MAAM,EACJ,aAAa,EACb,qBAAqB,EACrB,mBAAmB,EACnB,oBAAoB,EACpB,UAAU,EACX,GAAG,KAAK,CAAC;IAEV,MAAM,SAAS,GAAG,qBAAqB,CACrC,aAAa,EACb,qBAAqB,EACrB,mBAAmB,EACnB,oBAAoB,EACpB,UAAU,CACX,CAAC;IACF,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IAErC,IAAI,SAAS,EAAE;QACb,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,aAAa;QACZ,oBAAC,mBAAmB,IAAC,MAAM,EAAE,WAAW;YACtC,oBAAC,YAAY,OAAG,CACI,CACR,CACjB,CAAC;AACJ,CAAC;AAED,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"SmartFormsRenderer.js","sourceRoot":"","sources":["../../../src/components/Renderer/SmartFormsRenderer.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,aAAa,MAAM,mBAAmB,CAAC;AAE9C,OAAO,qBAAqB,MAAM,mCAAmC,CAAC;AACtE,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,gBAAgB,MAAM,gCAAgC,CAAC;AAC9D,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAElD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,cAAc,MAAM,4BAA4B,CAAC;AACxD,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAW1C,SAAS,kBAAkB,CAAC,KAA8B;IACxD,MAAM,EACJ,aAAa,EACb,qBAAqB,EACrB,mBAAmB,EACnB,oBAAoB,EACpB,UAAU,EACX,GAAG,KAAK,CAAC;IAEV,MAAM,SAAS,GAAG,qBAAqB,CACrC,aAAa,EACb,qBAAqB,EACrB,mBAAmB,EACnB,oBAAoB,EACpB,UAAU,CACX,CAAC;IACF,MAAM,WAAW,GAAG,cAAc,EAAE,CAAC;IAErC,IAAI,SAAS,EAAE;QACb,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,aAAa;QACZ,oBAAC,mBAAmB,IAAC,MAAM,EAAE,WAAW;YACtC,oBAAC,YAAY,OAAG,CACI,CACR,CACjB,CAAC;AACJ,CAAC;AAED,eAAe,kBAAkB,CAAC"}

package/lib/stores/selector.d.ts

@@ -0,0 +1,10 @@
+import { StoreApi } from 'zustand';
+type WithSelectors<S> = S extends {
+    getState: () => infer T;
+} ? S & {
+    use: {
+        [K in keyof T]: () => T[K];
+    };
+} : never;
+export declare const createSelectors: <S extends StoreApi<object>>(_store: S) => WithSelectors<S>;
+export {};

package/lib/stores/selector.js

@@ -0,0 +1,11 @@
+import { useStore } from 'zustand';
+export const createSelectors = (_store) => {
+    const store = _store;
+    store.use = {};
+    for (const k of Object.keys(store.getState())) {
+        // eslint-disable-next-line react-hooks/rules-of-hooks
+        store.use[k] = () => useStore(_store, (s) => s[k]);
+    }
+    return store;
+};
+//# sourceMappingURL=selector.js.map

package/lib/stores/selector.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"selector.js","sourceRoot":"","sources":["../../src/stores/selector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,QAAQ,EAAE,MAAM,SAAS,CAAC;AAM7C,MAAM,CAAC,MAAM,eAAe,GAAG,CAA6B,MAAS,EAAE,EAAE;IACvE,MAAM,KAAK,GAAG,MAAsC,CAAC;IACrD,KAAK,CAAC,GAAG,GAAG,EAAE,CAAC;IACf,KAAK,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC,EAAE;QAC7C,sDAAsD;QACrD,KAAK,CAAC,GAAW,CAAC,CAAC,CAAC,GAAG,GAAG,EAAE,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAmB,CAAC,CAAC,CAAC;KAC/E;IAED,OAAO,KAAK,CAAC;AACf,CAAC,CAAC"}

package/lib/theme/customGlobalStyles.js

@@ -36,7 +36,8 @@ export default function CustomGlobalStyles() {
             },
             '#root': {
                 width: '100%',
-                height: '100%'
+                height: '100%',
+                textAlign: 'left'
             },
             input: {
                 '&[type=number]': {

package/lib/theme/customGlobalStyles.js.map

@@ -1 +1 @@
-{"version":3,"file":"customGlobalStyles.js","sourceRoot":"","sources":["../../src/theme/customGlobalStyles.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,YAAY,MAAM,4BAA4B,CAAC;AAEtD,MAAM,CAAC,OAAO,UAAU,kBAAkB;IACxC,OAAO,CACL,oBAAC,YAAY,IACX,MAAM,EAAE;YACN,GAAG,EAAE;gBACH,SAAS,EAAE,YAAY;aACxB;YACD,IAAI,EAAE;gBACJ,MAAM,EAAE,CAAC;gBACT,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE,MAAM;gBACb,MAAM,EAAE,MAAM;gBACd,uBAAuB,EAAE,OAAO;aACjC;YACD,IAAI,EAAE;gBACJ,MAAM,EAAE,CAAC;gBACT,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE,MAAM;gBACb,MAAM,EAAE,MAAM;aACf;YACD,OAAO,EAAE;gBACP,KAAK,EAAE,MAAM;gBACb,MAAM,EAAE,MAAM;aACf;YACD,KAAK,EAAE;gBACL,gBAAgB,EAAE;oBAChB,aAAa,EAAE,WAAW;oBAC1B,8BAA8B,EAAE;wBAC9B,MAAM,EAAE,CAAC;wBACT,gBAAgB,EAAE,MAAM;qBACzB;oBACD,8BAA8B,EAAE;wBAC9B,MAAM,EAAE,CAAC;wBACT,gBAAgB,EAAE,MAAM;qBACzB;iBACF;aACF;YACD,GAAG,EAAE;gBACH,OAAO,EAAE,OAAO;gBAChB,QAAQ,EAAE,MAAM;aACjB;SACF,GACD,CACH,CAAC;AACJ,CAAC"}
+{"version":3,"file":"customGlobalStyles.js","sourceRoot":"","sources":["../../src/theme/customGlobalStyles.tsx"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AACH,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,YAAY,MAAM,4BAA4B,CAAC;AAEtD,MAAM,CAAC,OAAO,UAAU,kBAAkB;IACxC,OAAO,CACL,oBAAC,YAAY,IACX,MAAM,EAAE;YACN,GAAG,EAAE;gBACH,SAAS,EAAE,YAAY;aACxB;YACD,IAAI,EAAE;gBACJ,MAAM,EAAE,CAAC;gBACT,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE,MAAM;gBACb,MAAM,EAAE,MAAM;gBACd,uBAAuB,EAAE,OAAO;aACjC;YACD,IAAI,EAAE;gBACJ,MAAM,EAAE,CAAC;gBACT,OAAO,EAAE,CAAC;gBACV,KAAK,EAAE,MAAM;gBACb,MAAM,EAAE,MAAM;aACf;YACD,OAAO,EAAE;gBACP,KAAK,EAAE,MAAM;gBACb,MAAM,EAAE,MAAM;gBACd,SAAS,EAAE,MAAM;aAClB;YACD,KAAK,EAAE;gBACL,gBAAgB,EAAE;oBAChB,aAAa,EAAE,WAAW;oBAC1B,8BAA8B,EAAE;wBAC9B,MAAM,EAAE,CAAC;wBACT,gBAAgB,EAAE,MAAM;qBACzB;oBACD,8BAA8B,EAAE;wBAC9B,MAAM,EAAE,CAAC;wBACT,gBAAgB,EAAE,MAAM;qBACzB;iBACF;aACF;YACD,GAAG,EAAE;gBACH,OAAO,EAAE,OAAO;gBAChB,QAAQ,EAAE,MAAM;aACjB;SACF,GACD,CACH,CAAC;AACJ,CAAC"}

package/lib/theme/typography.js

@@ -33,45 +33,45 @@ export function responsiveFontSizes(props) {
 }
 // ----------------------------------------------------------------------
 const typography = {
-    fontFamily: ['Inter', 'sans-serif', 'Roboto', 'Arial', '"Helvetica Neue"', 'Helvetica'].join(','),
+    fontFamily: ['Inter', 'sans-serif', 'Helvetica', 'Arial', 'Roboto', '"Helvetica Neue"'].join(','),
     fontWeightRegular: 500,
     h1: Object.assign({ fontWeight: 800, lineHeight: 80 / 64, fontSize: pxToRem(36) }, responsiveFontSizes({ sm: 40, md: 48, lg: 54 })),
     h2: Object.assign({ fontWeight: 800, lineHeight: 64 / 48, fontSize: pxToRem(28) }, responsiveFontSizes({ sm: 32, md: 34, lg: 36 })),
     h3: Object.assign({ fontWeight: 700, lineHeight: 1.5, fontSize: pxToRem(20) }, responsiveFontSizes({ sm: 22, md: 26, lg: 28 })),
     h4: Object.assign({ fontWeight: 700, lineHeight: 1.5, fontSize: pxToRem(16) }, responsiveFontSizes({ sm: 18, md: 20, lg: 20 })),
     h5: Object.assign({ fontWeight: 700, lineHeight: 1.5, fontSize: pxToRem(14) }, responsiveFontSizes({ sm: 15, md: 16, lg: 16 })),
-    h6: Object.assign({ fontWeight: 700, lineHeight: 28 / 18, fontSize: pxToRem(13) }, responsiveFontSizes({ sm: 14, md: 14, lg: 14 })),
+    h6: Object.assign({ fontWeight: 700, lineHeight: 28 / 18, fontSize: pxToRem(13.5) }, responsiveFontSizes({ sm: 14, md: 14, lg: 14 })),
     subtitle1: {
         fontWeight: 600,
         lineHeight: 1.5,
-        fontSize: pxToRem(13)
+        fontSize: pxToRem(13.5)
     },
     subtitle2: {
         fontWeight: 600,
         lineHeight: 22 / 14,
-        fontSize: pxToRem(11.5)
+        fontSize: pxToRem(12)
     },
     body1: {
         lineHeight: 1.5,
-        fontSize: pxToRem(12.25)
+        fontSize: pxToRem(13)
     },
     body2: {
         lineHeight: 22 / 14,
-        fontSize: pxToRem(11)
+        fontSize: pxToRem(11.5)
     },
     caption: {
         lineHeight: 1.5,
-        fontSize: pxToRem(10)
+        fontSize: pxToRem(10.5)
     },
     overline: {
         fontWeight: 700,
         lineHeight: 1.5,
-        fontSize: pxToRem(10)
+        fontSize: pxToRem(10.5)
     },
     button: {
         fontWeight: 700,
         lineHeight: 24 / 14,
-        fontSize: pxToRem(12)
+        fontSize: pxToRem(12.5)
     }
 };
 export default typography;

package/lib/theme/typography.js.map

@@ -1 +1 @@
-{"version":3,"file":"typography.js","sourceRoot":"","sources":["../../src/theme/typography.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"typography.js","sourceRoot":"","sources":["../../src/theme/typography.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,MAAM,UAAU,OAAO,CAAC,KAAa;IACnC,OAAO,GAAG,KAAK,GAAG,EAAE,KAAK,CAAC;AAC5B,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,KAA6C;IAC/E,MAAM,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,KAAK,CAAC;IAC7B,OAAO;QACL,0BAA0B,EAAE;YAC1B,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;SACtB;QACD,0BAA0B,EAAE;YAC1B,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;SACtB;QACD,2BAA2B,EAAE;YAC3B,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;SACtB;KACF,CAAC;AACJ,CAAC;AAED,yEAAyE;AAEzE,MAAM,UAAU,GAAG;IACjB,UAAU,EAAE,CAAC,OAAO,EAAE,YAAY,EAAE,WAAW,EAAE,OAAO,EAAE,QAAQ,EAAE,kBAAkB,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC;IACjG,iBAAiB,EAAE,GAAG;IACtB,EAAE,kBACA,UAAU,EAAE,GAAG,EACf,UAAU,EAAE,EAAE,GAAG,EAAE,EACnB,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC,IAClB,mBAAmB,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CACnD;IACD,EAAE,kBACA,UAAU,EAAE,GAAG,EACf,UAAU,EAAE,EAAE,GAAG,EAAE,EACnB,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC,IAClB,mBAAmB,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CACnD;IACD,EAAE,kBACA,UAAU,EAAE,GAAG,EACf,UAAU,EAAE,GAAG,EACf,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC,IAClB,mBAAmB,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CACnD;IACD,EAAE,kBACA,UAAU,EAAE,GAAG,EACf,UAAU,EAAE,GAAG,EACf,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC,IAClB,mBAAmB,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CACnD;IACD,EAAE,kBACA,UAAU,EAAE,GAAG,EACf,UAAU,EAAE,GAAG,EACf,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC,IAClB,mBAAmB,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CACnD;IACD,EAAE,kBACA,UAAU,EAAE,GAAG,EACf,UAAU,EAAE,EAAE,GAAG,EAAE,EACnB,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,IACpB,mBAAmB,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,CACnD;IACD,SAAS,EAAE;QACT,UAAU,EAAE,GAAG;QACf,UAAU,EAAE,GAAG;QACf,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC;KACxB;IACD,SAAS,EAAE;QACT,UAAU,EAAE,GAAG;QACf,UAAU,EAAE,EAAE,GAAG,EAAE;QACnB,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;KACtB;IACD,KAAK,EAAE;QACL,UAAU,EAAE,GAAG;QACf,QAAQ,EAAE,OAAO,CAAC,EAAE,CAAC;KACtB;IACD,KAAK,EAAE;QACL,UAAU,EAAE,EAAE,GAAG,EAAE;QACnB,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC;KACxB;IACD,OAAO,EAAE;QACP,UAAU,EAAE,GAAG;QACf,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC;KACxB;IACD,QAAQ,EAAE;QACR,UAAU,EAAE,GAAG;QACf,UAAU,EAAE,GAAG;QACf,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC;KACxB;IACD,MAAM,EAAE;QACN,UAAU,EAAE,GAAG;QACf,UAAU,EAAE,EAAE,GAAG,EAAE;QACnB,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC;KACxB;CACF,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/lib/utils/populateContexts.d.ts

@@ -1,13 +1,3 @@
-import type { Extension, Questionnaire } from 'fhir/r4';
-import type { LaunchContext, QuestionnaireLevelXFhirQueryVariable, SourceQuery } from '../interfaces/populate.interface';
-export declare function getLaunchContexts(questionnaire: Questionnaire): LaunchContext[];
+import type { Extension } from 'fhir/r4';
+import type { LaunchContext } from '../interfaces/populate.interface';
 export declare function isLaunchContext(extension: Extension): extension is LaunchContext;
-export declare function getSourceQueries(questionnaire: Questionnaire): SourceQuery[];
-export declare function isSourceQuery(extension: Extension): extension is SourceQuery;
-/**
- * Filter x-fhir-query variables from questionnaire's extensions needed for population
- *
- * @author Sean Fong
- */
-export declare function getQuestionnaireLevelXFhirQueryVariables(questionnaire: Questionnaire): QuestionnaireLevelXFhirQueryVariable[];
-export declare function isXFhirQueryVariable(extension: Extension): extension is QuestionnaireLevelXFhirQueryVariable;

package/lib/utils/populateContexts.js

@@ -14,12 +14,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-export function getLaunchContexts(questionnaire) {
-    if (questionnaire.extension && questionnaire.extension.length > 0) {
-        return questionnaire.extension.filter((extension) => isLaunchContext(extension));
-    }
-    return [];
-}
 export function isLaunchContext(extension) {
     var _a, _b;
     const hasLaunchContextName = extension.url ===
@@ -43,34 +37,4 @@ export function isLaunchContext(extension) {
         hasLaunchContextName &&
         hasLaunchContextType);
 }
-// get source query references
-export function getSourceQueries(questionnaire) {
-    if (questionnaire.extension && questionnaire.extension.length > 0) {
-        return questionnaire.extension.filter((extension) => isSourceQuery(extension));
-    }
-    return [];
-}
-export function isSourceQuery(extension) {
-    return (extension.url ===
-        'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-sourceQueries' &&
-        !!extension.valueReference);
-}
-/**
- * Filter x-fhir-query variables from questionnaire's extensions needed for population
- *
- * @author Sean Fong
- */
-export function getQuestionnaireLevelXFhirQueryVariables(questionnaire) {
-    if (questionnaire.extension && questionnaire.extension.length > 0) {
-        return questionnaire.extension.filter((extension) => isXFhirQueryVariable(extension));
-    }
-    return [];
-}
-export function isXFhirQueryVariable(extension) {
-    var _a, _b, _c;
-    return (extension.url === 'http://hl7.org/fhir/StructureDefinition/variable' &&
-        !!((_a = extension.valueExpression) === null || _a === void 0 ? void 0 : _a.name) &&
-        ((_b = extension.valueExpression) === null || _b === void 0 ? void 0 : _b.language) === 'application/x-fhir-query' &&
-        !!((_c = extension.valueExpression) === null || _c === void 0 ? void 0 : _c.expression));
-}
 //# sourceMappingURL=populateContexts.js.map

package/lib/utils/populateContexts.js.map

@@ -1 +1 @@
-{"version":3,"file":"populateContexts.js","sourceRoot":"","sources":["../../src/utils/populateContexts.ts"],"names":[],"mappings":"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"}
+{"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,CAAA,MAAA,SAAS,CAAC,SAAS,0CAAE,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,CAAA,CAAC;IAEJ,MAAM,oBAAoB,GAAG,CAAC,CAAC,CAAA,MAAA,SAAS,CAAC,SAAS,0CAAE,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,CAAA,CAAC;IAEF,OAAO,CACL,SAAS,CAAC,GAAG;QACX,gFAAgF;QAClF,oBAAoB;QACpB,oBAAoB,CACrB,CAAC;AACJ,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aehrc/smart-forms-renderer",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "FHIR Structured Data Captured (SDC) rendering engine for Smart Forms",
   "main": "lib/index.js",
   "scripts": {
@@ -25,17 +25,18 @@
   "dependencies": {
     "@aehrc/sdc-assemble": "^1.0.2",
     "@iconify/react": "^4.1.1",
-    "@types/fhir": "^0.0.37",
+    "@types/fhir": "^0.0.38",
     "dayjs": "^1.11.10",
     "deep-diff": "^1.0.2",
     "fhirclient": "^2.5.2",
     "fhirpath": "^3.7.1",
-    "html-react-parser": "^4.2.0",
+    "html-react-parser": "^5.0.6",
     "lodash.clonedeep": "^4.5.0",
     "lodash.debounce": "^4.0.8",
     "nanoid": "^5.0.1",
     "react-markdown": "^8.0.7",
-    "zustand": "^4.4.1"
+    "zustand": "^4.4.1",
+    "moment": "^2.29.4"
   },
   "peerDependencies": {
     "@emotion/react": ">=11.11.0",
@@ -49,13 +50,13 @@
     "react-dom": ">=18.0.0"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.0",
+    "@babel/core": "^7.23.3",
     "@storybook/addon-essentials": "^7.4.6",
     "@storybook/addon-interactions": "^7.4.6",
-    "@storybook/addon-links": "^7.4.0",
+    "@storybook/addon-links": "^7.5.2",
     "@storybook/addon-onboarding": "^1.0.8",
     "@storybook/addon-styling": "^1.3.7",
-    "@storybook/blocks": "^7.4.0",
+    "@storybook/blocks": "^7.5.2",
     "@storybook/react": "^7.4.3",
     "@storybook/react-vite": "^7.4.5",
     "@storybook/testing-library": "^0.2.1",
@@ -63,10 +64,10 @@
     "@testing-library/react": "^14.0.0",
     "@testing-library/react-hooks": "^7.0.2",
     "@types/deep-diff": "^1.0.4",
-    "@types/jest": "^29.5.5",
+    "@types/jest": "^29.5.7",
     "@types/lodash.debounce": "^4.0.7",
     "@types/lodash.clonedeep": "^4.5.7",
-    "@types/react": "^18.2.18",
+    "@types/react": "^18.2.37",
     "@types/react-dom": "^18.2.9",
     "jest": "^29.7.0",
     "jest-environment-jsdom": "^29.7.0",

package/src/components/Renderer/SmartFormsRenderer.tsx

@@ -16,6 +16,7 @@
  */
 
 import React from 'react';
+import ThemeProvider from '../../theme/Theme';
 import type { Questionnaire, QuestionnaireResponse } from 'fhir/r4';
 import useInitialiseRenderer from '../../hooks/useInitialiseRenderer';
 import Box from '@mui/material/Box';
@@ -25,7 +26,6 @@ import Typography from '@mui/material/Typography';
 import { QueryClientProvider } from '@tanstack/react-query';
 import useQueryClient from '../../hooks/useQueryClient';
 import BaseRenderer from './BaseRenderer';
-import ThemeProvider from '../../theme/Theme';
 import type Client from 'fhirclient/lib/Client';
 
 interface SmartFormsRendererProps {

package/src/stores/selector.ts

@@ -0,0 +1,16 @@
+import { StoreApi, useStore } from 'zustand';
+
+type WithSelectors<S> = S extends { getState: () => infer T }
+  ? S & { use: { [K in keyof T]: () => T[K] } }
+  : never;
+
+export const createSelectors = <S extends StoreApi<object>>(_store: S) => {
+  const store = _store as WithSelectors<typeof _store>;
+  store.use = {};
+  for (const k of Object.keys(store.getState())) {
+    // eslint-disable-next-line react-hooks/rules-of-hooks
+    (store.use as any)[k] = () => useStore(_store, (s) => s[k as keyof typeof s]);
+  }
+
+  return store;
+};

package/src/theme/customGlobalStyles.tsx

@@ -39,7 +39,8 @@ export default function CustomGlobalStyles() {
         },
         '#root': {
           width: '100%',
-          height: '100%'
+          height: '100%',
+          textAlign: 'left'
         },
         input: {
           '&[type=number]': {

package/src/theme/typography.ts

@@ -37,7 +37,7 @@ export function responsiveFontSizes(props: { sm: number; md: number; lg: number
 // ----------------------------------------------------------------------
 
 const typography = {
-  fontFamily: ['Inter', 'sans-serif', 'Roboto', 'Arial', '"Helvetica Neue"', 'Helvetica'].join(','),
+  fontFamily: ['Inter', 'sans-serif', 'Helvetica', 'Arial', 'Roboto', '"Helvetica Neue"'].join(','),
   fontWeightRegular: 500,
   h1: {
     fontWeight: 800,
@@ -72,40 +72,40 @@ const typography = {
   h6: {
     fontWeight: 700,
     lineHeight: 28 / 18,
-    fontSize: pxToRem(13),
+    fontSize: pxToRem(13.5),
     ...responsiveFontSizes({ sm: 14, md: 14, lg: 14 })
   },
   subtitle1: {
     fontWeight: 600,
     lineHeight: 1.5,
-    fontSize: pxToRem(13)
+    fontSize: pxToRem(13.5)
   },
   subtitle2: {
     fontWeight: 600,
     lineHeight: 22 / 14,
-    fontSize: pxToRem(11.5)
+    fontSize: pxToRem(12)
   },
   body1: {
     lineHeight: 1.5,
-    fontSize: pxToRem(12.25)
+    fontSize: pxToRem(13)
   },
   body2: {
     lineHeight: 22 / 14,
-    fontSize: pxToRem(11)
+    fontSize: pxToRem(11.5)
   },
   caption: {
     lineHeight: 1.5,
-    fontSize: pxToRem(10)
+    fontSize: pxToRem(10.5)
   },
   overline: {
     fontWeight: 700,
     lineHeight: 1.5,
-    fontSize: pxToRem(10)
+    fontSize: pxToRem(10.5)
   },
   button: {
     fontWeight: 700,
     lineHeight: 24 / 14,
-    fontSize: pxToRem(12)
+    fontSize: pxToRem(12.5)
   }
 };
 

package/src/utils/populateContexts.ts

@@ -15,22 +15,8 @@
  * limitations under the License.
  */
 
-import type { Extension, Questionnaire } from 'fhir/r4';
-import type {
-  LaunchContext,
-  QuestionnaireLevelXFhirQueryVariable,
-  SourceQuery
-} from '../interfaces/populate.interface';
-
-export function getLaunchContexts(questionnaire: Questionnaire): LaunchContext[] {
-  if (questionnaire.extension && questionnaire.extension.length > 0) {
-    return questionnaire.extension.filter((extension) =>
-      isLaunchContext(extension)
-    ) as LaunchContext[];
-  }
-
-  return [];
-}
+import type { Extension } from 'fhir/r4';
+import type { LaunchContext } from '../interfaces/populate.interface';
 
 export function isLaunchContext(extension: Extension): extension is LaunchContext {
   const hasLaunchContextName =
@@ -65,48 +51,3 @@ export function isLaunchContext(extension: Extension): extension is LaunchContex
     hasLaunchContextType
   );
 }
-
-// get source query references
-export function getSourceQueries(questionnaire: Questionnaire): SourceQuery[] {
-  if (questionnaire.extension && questionnaire.extension.length > 0) {
-    return questionnaire.extension.filter((extension) => isSourceQuery(extension)) as SourceQuery[];
-  }
-
-  return [];
-}
-
-export function isSourceQuery(extension: Extension): extension is SourceQuery {
-  return (
-    extension.url ===
-      'http://hl7.org/fhir/uv/sdc/StructureDefinition/sdc-questionnaire-sourceQueries' &&
-    !!extension.valueReference
-  );
-}
-
-/**
- * Filter x-fhir-query variables from questionnaire's extensions needed for population
- *
- * @author Sean Fong
- */
-export function getQuestionnaireLevelXFhirQueryVariables(
-  questionnaire: Questionnaire
-): QuestionnaireLevelXFhirQueryVariable[] {
-  if (questionnaire.extension && questionnaire.extension.length > 0) {
-    return questionnaire.extension.filter((extension) =>
-      isXFhirQueryVariable(extension)
-    ) as QuestionnaireLevelXFhirQueryVariable[];
-  }
-
-  return [];
-}
-
-export function isXFhirQueryVariable(
-  extension: Extension
-): extension is QuestionnaireLevelXFhirQueryVariable {
-  return (
-    extension.url === 'http://hl7.org/fhir/StructureDefinition/variable' &&
-    !!extension.valueExpression?.name &&
-    extension.valueExpression?.language === 'application/x-fhir-query' &&
-    !!extension.valueExpression?.expression
-  );
-}

package/src/utils/populateInputParams.ts

@@ -1,242 +0,0 @@
-/*
- * Copyright 2023 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.
- */
-
-// If none are specified, then the subject is unlimited.
-import type {
-  Encounter,
-  FhirResource,
-  Parameters,
-  ParametersParameter,
-  Patient,
-  Practitioner,
-  Questionnaire,
-  Reference
-} from 'fhir/r4';
-import type {
-  LaunchContext,
-  QuestionnaireLevelXFhirQueryVariable,
-  SourceQuery
-} from '../interfaces/populate.interface';
-
-function createPatientSubject(questionnaire: Questionnaire, patient: Patient): Reference | null {
-  const subjectTypes = questionnaire.subjectType;
-
-  // If subjectTypes array is not empty AND "Patient" is not in the array, we cannot create a Patient subject reference.
-  if (subjectTypes && subjectTypes.length > 0) {
-    const patientSubject = subjectTypes.find((subject) => subject === 'Patient');
-    if (!patientSubject) {
-      return null;
-    }
-  }
-
-  return {
-    type: 'Patient',
-    reference: 'Patient/' + patient.id
-  };
-}
-
-function createCanonicalParam(canonicalUrl: string): ParametersParameter {
-  return {
-    name: 'canonical',
-    valueString: canonicalUrl
-  };
-}
-
-// setting local parameter as false as we are calling $populate with an NPM package, not a server
-// package doesn't contain any fhir resources to "know" the context from
-function createLocalParam(): ParametersParameter {
-  return {
-    name: 'local',
-    valueBoolean: false
-  };
-}
-
-function createLaunchContextParam(
-  launchContext: LaunchContext,
-  patient: Patient,
-  user: Practitioner,
-  encounter: Encounter | null
-): ParametersParameter | null {
-  const name = launchContext.extension[0].valueId ?? launchContext.extension[0].valueCoding?.code;
-  if (!name) {
-    return null;
-  }
-
-  // let resource :string
-  const resourceType = launchContext.extension[1].valueCode;
-  let resource: FhirResource | null;
-  switch (resourceType) {
-    case 'Patient':
-      resource = patient;
-      break;
-    case 'Practitioner':
-      resource = user;
-      break;
-    case 'Encounter':
-      resource = encounter;
-      break;
-    default:
-      return null;
-  }
-
-  if (!resource) {
-    return null;
-  }
-
-  return {
-    name: 'context',
-    part: [
-      {
-        name: 'name',
-        valueString: name
-      },
-      {
-        name: 'content',
-        resource: resource
-      }
-    ]
-  };
-}
-
-function createSourceQueryParams(sourceQuery: SourceQuery, index: number): ParametersParameter {
-  const reference = sourceQuery.valueReference.reference;
-  if (reference && reference.startsWith('#')) {
-    const containedReference = reference.slice(1);
-    return {
-      name: 'context',
-      part: [
-        {
-          name: 'name',
-          valueString: containedReference
-        },
-        {
-          name: 'content',
-          valueReference: sourceQuery.valueReference
-        }
-      ]
-    };
-  }
-
-  // if sourceQuery cannot be referenced to a contained bundle, return itself as a context
-  // this most likely shouldn't happen
-  return {
-    name: 'context',
-    part: [
-      {
-        name: 'name',
-        valueString: `sourceQuery${index}`
-      },
-      {
-        name: 'content',
-        valueReference: sourceQuery.valueReference
-      }
-    ]
-  };
-}
-
-function createVariableParam(variable: QuestionnaireLevelXFhirQueryVariable): ParametersParameter {
-  const query = variable.valueExpression.expression;
-  const resourceType = query.split('?')[0];
-
-  return {
-    name: 'context',
-    part: [
-      {
-        name: 'name',
-        valueString: variable.valueExpression.name
-      },
-      {
-        name: 'content',
-        valueReference: { reference: query, type: resourceType }
-      }
-    ]
-  };
-}
-
-/**
- * Define population input parameters without any batch response contexts
- *
- * @author Sean Fong
- */
-export function createPopulateInputParameters(
-  questionnaire: Questionnaire,
-  patient: Patient,
-  user: Practitioner,
-  encounter: Encounter | null,
-  launchContexts: LaunchContext[],
-  sourceQueries: SourceQuery[],
-  questionnaireLevelVariables: QuestionnaireLevelXFhirQueryVariable[]
-): Parameters | null {
-  const patientSubject = createPatientSubject(questionnaire, patient);
-  if (!patientSubject) {
-    return null;
-  }
-
-  const inputParameters: Parameters = {
-    resourceType: 'Parameters',
-    parameter: [
-      {
-        name: 'questionnaire',
-        resource: questionnaire
-      },
-      {
-        name: 'subject',
-        valueReference: patientSubject
-      }
-    ]
-  };
-
-  // canonical
-  if (questionnaire.url) {
-    inputParameters.parameter?.push(createCanonicalParam(questionnaire.url));
-  }
-
-  // contexts
-  const contexts: ParametersParameter[] = [];
-  // add launch contexts
-  if (launchContexts.length > 0) {
-    for (const launchContext of launchContexts) {
-      const launchContextParam = createLaunchContextParam(launchContext, patient, user, encounter);
-      if (launchContextParam) {
-        contexts.push(launchContextParam);
-      }
-    }
-  }
-
-  // add source queries
-  if (sourceQueries.length > 0) {
-    for (const [index, sourceQuery] of sourceQueries.entries()) {
-      contexts.push(createSourceQueryParams(sourceQuery, index));
-    }
-  }
-
-  // add questionnaire-level variables
-  if (questionnaireLevelVariables.length > 0) {
-    for (const variable of questionnaireLevelVariables) {
-      contexts.push(createVariableParam(variable));
-    }
-  }
-
-  if (contexts.length > 0) {
-    inputParameters.parameter?.push(...contexts);
-  }
-
-  // local
-  inputParameters.parameter?.push(createLocalParam());
-
-  return inputParameters;
-}