@aehrc/smart-forms-renderer 1.0.0-alpha.98 → 1.0.0

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

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

package/lib/components/Renderer/SmartFormsRenderer.d.ts

@@ -22,10 +22,12 @@ export interface SmartFormsRendererProps {
 }
 /**
  * A self-initialising wrapper around the BaseRenderer rendering engine.
- * Will be deprecated in version 1.0.0. For alternative usage, see:
+ *
+ * This component is now deprecated. You can still use it, but it might not be compatible with renderer appearance and behaviour customisation via via {@link rendererConfigStore}.
+ * For alternative usage, see:
  * - https://github.com/aehrc/smart-forms/blob/main/packages/smart-forms-renderer/src/stories/storybookWrappers/InitialiseFormWrapperForStorybook.tsx#L40-L57
  *
- * @see SmartFormsRendererProps for props.
+ * @see {@link SmartFormsRendererProps} for props.
  *
  * @author Sean Fong
  */

package/lib/components/Renderer/SmartFormsRenderer.js

@@ -9,10 +9,12 @@ import BaseRenderer from './BaseRenderer';
 import RendererThemeProvider from '../../theme/RendererThemeProvider';
 /**
  * A self-initialising wrapper around the BaseRenderer rendering engine.
- * Will be deprecated in version 1.0.0. For alternative usage, see:
+ *
+ * This component is now deprecated. You can still use it, but it might not be compatible with renderer appearance and behaviour customisation via via {@link rendererConfigStore}.
+ * For alternative usage, see:
  * - https://github.com/aehrc/smart-forms/blob/main/packages/smart-forms-renderer/src/stories/storybookWrappers/InitialiseFormWrapperForStorybook.tsx#L40-L57
  *
- * @see SmartFormsRendererProps for props.
+ * @see {@link SmartFormsRendererProps} for props.
  *
  * @author Sean Fong
  */

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

@@ -1 +1 @@
-{"version":3,"file":"SmartFormsRenderer.js","sourceRoot":"","sources":["../../../src/components/Renderer/SmartFormsRenderer.tsx"],"names":[],"mappings":";AAmBA,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAC9D,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,sBAAsB,MAAM,oCAAoC,CAAC;AACxE,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAE1C,OAAO,qBAAqB,MAAM,mCAAmC,CAAC;AAuBtE;;;;;;;;GAQG;AACH,SAAS,kBAAkB,CAAC,KAA8B;IACxD,MAAM,EACJ,aAAa,EACb,qBAAqB,EACrB,mBAAmB,EACnB,oBAAoB,EACpB,UAAU,EACV,QAAQ,EACT,GAAG,KAAK,CAAC;IAEV,MAAM,SAAS,GAAG,iBAAiB,CACjC,aAAa,EACb,qBAAqB,EACrB,QAAQ,EACR,oBAAoB,EACpB,mBAAmB,EACnB,UAAU,CACX,CAAC;IACF,MAAM,WAAW,GAAG,sBAAsB,EAAE,CAAC;IAE7C,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,CACL,MAAC,GAAG,IAAC,OAAO,EAAC,MAAM,EAAC,UAAU,EAAC,QAAQ,EAAC,SAAS,EAAE,CAAC,aAClD,KAAC,gBAAgB,KAAG,EACpB,KAAC,UAAU,2CAAsC,IAC7C,CACP,CAAC;IACJ,CAAC;IAED,OAAO,CACL,KAAC,qBAAqB,cACpB,KAAC,mBAAmB,IAAC,MAAM,EAAE,WAAW,YACtC,KAAC,YAAY,KAAG,GACI,GACA,CACzB,CAAC;AACJ,CAAC;AAED,eAAe,kBAAkB,CAAC"}
+{"version":3,"file":"SmartFormsRenderer.js","sourceRoot":"","sources":["../../../src/components/Renderer/SmartFormsRenderer.tsx"],"names":[],"mappings":";AAmBA,OAAO,iBAAiB,MAAM,+BAA+B,CAAC;AAC9D,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,sBAAsB,MAAM,oCAAoC,CAAC;AACxE,OAAO,YAAY,MAAM,gBAAgB,CAAC;AAE1C,OAAO,qBAAqB,MAAM,mCAAmC,CAAC;AAuBtE;;;;;;;;;;GAUG;AACH,SAAS,kBAAkB,CAAC,KAA8B;IACxD,MAAM,EACJ,aAAa,EACb,qBAAqB,EACrB,mBAAmB,EACnB,oBAAoB,EACpB,UAAU,EACV,QAAQ,EACT,GAAG,KAAK,CAAC;IAEV,MAAM,SAAS,GAAG,iBAAiB,CACjC,aAAa,EACb,qBAAqB,EACrB,QAAQ,EACR,oBAAoB,EACpB,mBAAmB,EACnB,UAAU,CACX,CAAC;IACF,MAAM,WAAW,GAAG,sBAAsB,EAAE,CAAC;IAE7C,IAAI,SAAS,EAAE,CAAC;QACd,OAAO,CACL,MAAC,GAAG,IAAC,OAAO,EAAC,MAAM,EAAC,UAAU,EAAC,QAAQ,EAAC,SAAS,EAAE,CAAC,aAClD,KAAC,gBAAgB,KAAG,EACpB,KAAC,UAAU,2CAAsC,IAC7C,CACP,CAAC;IACJ,CAAC;IAED,OAAO,CACL,KAAC,qBAAqB,cACpB,KAAC,mBAAmB,IAAC,MAAM,EAAE,WAAW,YACtC,KAAC,YAAY,KAAG,GACI,GACA,CACzB,CAAC;AACJ,CAAC;AAED,eAAe,kBAAkB,CAAC"}

package/lib/components/Tabs/FormBodySingleTab.d.ts

@@ -1,6 +1,7 @@
 import React from 'react';
 import type { QuestionnaireItem } from 'fhir/r4';
 interface FormBodySingleTabProps {
+    qItem: QuestionnaireItem;
     contextDisplayItems: QuestionnaireItem[];
     selected: boolean;
     tabLabel: string;

package/lib/components/Tabs/FormBodySingleTab.js

@@ -23,10 +23,13 @@ import Typography from '@mui/material/Typography';
 import { useQuestionnaireStore } from '../../stores';
 import ContextDisplayItem from '../FormComponents/ItemParts/ContextDisplayItem';
 import { useFocusTabHeading } from '../../hooks/useFocusTabHeading';
+import useDisplayCqfAndCalculatedExpression from '../../hooks/useDisplayCqfAndCalculatedExpression';
 const FormBodySingleTab = memo(function FormBodySingleTab(props) {
-    const { contextDisplayItems, selected, tabLabel, listIndex } = props;
+    const { qItem, contextDisplayItems, selected, tabLabel, listIndex } = props;
     const switchTab = useQuestionnaireStore.use.switchTab();
     const focusHeading = useFocusTabHeading();
+    // Get aria-label text if available
+    const itemTextAriaLabel = useDisplayCqfAndCalculatedExpression(qItem, 'item._text.aria-label') ?? undefined;
     function handleTabClick() {
         switchTab(listIndex);
         window.scrollTo(0, 0);
@@ -35,7 +38,7 @@ const FormBodySingleTab = memo(function FormBodySingleTab(props) {
             focusHeading(`tabpanel-${listIndex}`);
         }, 100); // Small delay to ensure panel is rendered
     }
-    return (_jsx(_Fragment, { children: _jsx(ListItemButton, { selected: selected, sx: { my: 0.1, minHeight: '36px' }, onClick: handleTabClick, children: _jsx(ListItemText, { primary: _jsxs(Box, { display: "flex", alignItems: "center", justifyContent: "space-between", children: [_jsx(Typography, { id: `tab-${listIndex}`, component: "span", fontWeight: 600, fontSize: "0.8125rem", children: tabLabel }), _jsx(Box, { display: "flex", minHeight: 24, minWidth: 24, ml: 1, children: contextDisplayItems.map((item) => {
+    return (_jsx(_Fragment, { children: _jsx(ListItemButton, { selected: selected, sx: { my: 0.1, minHeight: '36px' }, onClick: handleTabClick, children: _jsx(ListItemText, { primary: _jsxs(Box, { display: "flex", alignItems: "center", justifyContent: "space-between", children: [_jsx(Typography, { id: `tab-${listIndex}`, component: "span", fontWeight: 600, fontSize: "0.8125rem", "aria-label": itemTextAriaLabel, children: tabLabel }), _jsx(Box, { display: "flex", minHeight: 24, minWidth: 24, ml: 1, children: contextDisplayItems.map((item) => {
                                 return _jsx(ContextDisplayItem, { displayItem: item }, item.linkId);
                             }) })] }) }) }) }));
 });

package/lib/components/Tabs/FormBodySingleTab.js.map

@@ -1 +1 @@
-{"version":3,"file":"FormBodySingleTab.js","sourceRoot":"","sources":["../../../src/components/Tabs/FormBodySingleTab.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAc,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAC1D,OAAO,YAAY,MAAM,4BAA4B,CAAC;AACtD,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAErD,OAAO,kBAAkB,MAAM,gDAAgD,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AASpE,MAAM,iBAAiB,GAAG,IAAI,CAAC,SAAS,iBAAiB,CAAC,KAA6B;IACrF,MAAM,EAAE,mBAAmB,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAErE,MAAM,SAAS,GAAG,qBAAqB,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;IACxD,MAAM,YAAY,GAAG,kBAAkB,EAAE,CAAC;IAE1C,SAAS,cAAc;QACrB,SAAS,CAAC,SAAS,CAAC,CAAC;QACrB,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEtB,+CAA+C;QAC/C,UAAU,CAAC,GAAG,EAAE;YACd,YAAY,CAAC,YAAY,SAAS,EAAE,CAAC,CAAC;QACxC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,0CAA0C;IACrD,CAAC;IAED,OAAO,CACL,4BACE,KAAC,cAAc,IACb,QAAQ,EAAE,QAAQ,EAClB,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,EAClC,OAAO,EAAE,cAAc,YACvB,KAAC,YAAY,IACX,OAAO,EACL,MAAC,GAAG,IAAC,OAAO,EAAC,MAAM,EAAC,UAAU,EAAC,QAAQ,EAAC,cAAc,EAAC,eAAe,aACpE,KAAC,UAAU,IACT,EAAE,EAAE,OAAO,SAAS,EAAE,EACtB,SAAS,EAAC,MAAM,EAChB,UAAU,EAAE,GAAG,EACf,QAAQ,EAAC,WAAW,YACnB,QAAQ,GACE,EACb,KAAC,GAAG,IAAC,OAAO,EAAC,MAAM,EAAC,SAAS,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,YACnD,mBAAmB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gCAChC,OAAO,KAAC,kBAAkB,IAAmB,WAAW,EAAE,IAAI,IAA9B,IAAI,CAAC,MAAM,CAAuB,CAAC;4BACrE,CAAC,CAAC,GACE,IACF,GAER,GACa,GAChB,CACJ,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"FormBodySingleTab.js","sourceRoot":"","sources":["../../../src/components/Tabs/FormBodySingleTab.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAc,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,GAAG,MAAM,mBAAmB,CAAC;AACpC,OAAO,cAAc,MAAM,8BAA8B,CAAC;AAC1D,OAAO,YAAY,MAAM,4BAA4B,CAAC;AACtD,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AAErD,OAAO,kBAAkB,MAAM,gDAAgD,CAAC;AAChF,OAAO,EAAE,kBAAkB,EAAE,MAAM,gCAAgC,CAAC;AACpE,OAAO,oCAAoC,MAAM,kDAAkD,CAAC;AAUpG,MAAM,iBAAiB,GAAG,IAAI,CAAC,SAAS,iBAAiB,CAAC,KAA6B;IACrF,MAAM,EAAE,KAAK,EAAE,mBAAmB,EAAE,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAE5E,MAAM,SAAS,GAAG,qBAAqB,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;IACxD,MAAM,YAAY,GAAG,kBAAkB,EAAE,CAAC;IAE1C,mCAAmC;IACnC,MAAM,iBAAiB,GACrB,oCAAoC,CAAC,KAAK,EAAE,uBAAuB,CAAC,IAAI,SAAS,CAAC;IAEpF,SAAS,cAAc;QACrB,SAAS,CAAC,SAAS,CAAC,CAAC;QACrB,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAEtB,+CAA+C;QAC/C,UAAU,CAAC,GAAG,EAAE;YACd,YAAY,CAAC,YAAY,SAAS,EAAE,CAAC,CAAC;QACxC,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,0CAA0C;IACrD,CAAC;IAED,OAAO,CACL,4BACE,KAAC,cAAc,IACb,QAAQ,EAAE,QAAQ,EAClB,EAAE,EAAE,EAAE,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,MAAM,EAAE,EAClC,OAAO,EAAE,cAAc,YACvB,KAAC,YAAY,IACX,OAAO,EACL,MAAC,GAAG,IAAC,OAAO,EAAC,MAAM,EAAC,UAAU,EAAC,QAAQ,EAAC,cAAc,EAAC,eAAe,aACpE,KAAC,UAAU,IACT,EAAE,EAAE,OAAO,SAAS,EAAE,EACtB,SAAS,EAAC,MAAM,EAChB,UAAU,EAAE,GAAG,EACf,QAAQ,EAAC,WAAW,gBACR,iBAAiB,YAC5B,QAAQ,GACE,EACb,KAAC,GAAG,IAAC,OAAO,EAAC,MAAM,EAAC,SAAS,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,YACnD,mBAAmB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE;gCAChC,OAAO,KAAC,kBAAkB,IAAmB,WAAW,EAAE,IAAI,IAA9B,IAAI,CAAC,MAAM,CAAuB,CAAC;4BACrE,CAAC,CAAC,GACE,IACF,GAER,GACa,GAChB,CACJ,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,eAAe,iBAAiB,CAAC"}

package/lib/components/Tabs/FormBodyTabList.js

@@ -29,7 +29,6 @@ const FormBodyTabList = memo(function FormBodyTabList(props) {
     const enableWhenItems = useQuestionnaireStore.use.enableWhenItems();
     const enableWhenExpressions = useQuestionnaireStore.use.enableWhenExpressions();
     return (_jsx(TransitionGroup, { children: topLevelItems.map((qItem, i) => {
-            var _a, _b;
             const contextDisplayItems = allContextDisplayItems[i];
             const isTab = !!tabs[qItem.linkId];
             if (isTabHidden({
@@ -44,8 +43,8 @@ const FormBodyTabList = memo(function FormBodyTabList(props) {
                 return null;
             }
             const tabIsSelected = currentTabIndex.toString() === i.toString();
-            const tabLabel = (_b = (_a = getShortText(qItem)) !== null && _a !== void 0 ? _a : getItemTextToDisplay(qItem)) !== null && _b !== void 0 ? _b : '';
-            return (_jsx(Collapse, { timeout: 100, children: _jsx(FormBodySingleTab, { contextDisplayItems: contextDisplayItems, selected: tabIsSelected, tabLabel: tabLabel, listIndex: i }) }, qItem.linkId));
+            const tabLabel = getShortText(qItem) ?? getItemTextToDisplay(qItem) ?? '';
+            return (_jsx(Collapse, { timeout: 100, children: _jsx(FormBodySingleTab, { qItem: qItem, contextDisplayItems: contextDisplayItems, selected: tabIsSelected, tabLabel: tabLabel, listIndex: i }) }, qItem.linkId));
         }) }));
 });
 export default FormBodyTabList;

package/lib/components/Tabs/FormBodyTabList.js.map

@@ -1 +1 @@
-{"version":3,"file":"FormBodyTabList.js","sourceRoot":"","sources":["../../../src/components/Tabs/FormBodyTabList.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAc,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAUrE,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,eAAe,CAAC,KAA2B;IAC/E,MAAM,EAAE,aAAa,EAAE,eAAe,EAAE,IAAI,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,GAC5F,KAAK,CAAC;IAER,MAAM,qBAAqB,GAAG,qBAAqB,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC;IAChF,MAAM,eAAe,GAAG,qBAAqB,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC;IACpE,MAAM,qBAAqB,GAAG,qBAAqB,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC;IAEhF,OAAO,CACL,KAAC,eAAe,cACb,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;;YAC9B,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC;YACtD,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAEnC,IACE,WAAW,CAAC;gBACV,KAAK;gBACL,mBAAmB;gBACnB,KAAK;gBACL,qBAAqB;gBACrB,eAAe;gBACf,qBAAqB;gBACrB,sBAAsB;aACvB,CAAC,EACF,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,aAAa,GAAG,eAAe,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;YAClE,MAAM,QAAQ,GAAG,MAAA,MAAA,YAAY,CAAC,KAAK,CAAC,mCAAI,oBAAoB,CAAC,KAAK,CAAC,mCAAI,EAAE,CAAC;YAE1E,OAAO,CACL,KAAC,QAAQ,IAAoB,OAAO,EAAE,GAAG,YACvC,KAAC,iBAAiB,IAChB,mBAAmB,EAAE,mBAAmB,EACxC,QAAQ,EAAE,aAAa,EACvB,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,CAAC,GACZ,IANW,KAAK,CAAC,MAAM,CAOhB,CACZ,CAAC;QACJ,CAAC,CAAC,GACc,CACnB,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,eAAe,eAAe,CAAC"}
+{"version":3,"file":"FormBodyTabList.js","sourceRoot":"","sources":["../../../src/components/Tabs/FormBodyTabList.tsx"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAc,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AACpC,OAAO,QAAQ,MAAM,wBAAwB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEtD,OAAO,iBAAiB,MAAM,qBAAqB,CAAC;AAEpD,OAAO,EAAE,qBAAqB,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,oBAAoB,EAAE,MAAM,+BAA+B,CAAC;AAUrE,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,eAAe,CAAC,KAA2B;IAC/E,MAAM,EAAE,aAAa,EAAE,eAAe,EAAE,IAAI,EAAE,sBAAsB,EAAE,sBAAsB,EAAE,GAC5F,KAAK,CAAC;IAER,MAAM,qBAAqB,GAAG,qBAAqB,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC;IAChF,MAAM,eAAe,GAAG,qBAAqB,CAAC,GAAG,CAAC,eAAe,EAAE,CAAC;IACpE,MAAM,qBAAqB,GAAG,qBAAqB,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC;IAEhF,OAAO,CACL,KAAC,eAAe,cACb,aAAa,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;YAC9B,MAAM,mBAAmB,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC;YACtD,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YAEnC,IACE,WAAW,CAAC;gBACV,KAAK;gBACL,mBAAmB;gBACnB,KAAK;gBACL,qBAAqB;gBACrB,eAAe;gBACf,qBAAqB;gBACrB,sBAAsB;aACvB,CAAC,EACF,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,MAAM,aAAa,GAAG,eAAe,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,QAAQ,EAAE,CAAC;YAClE,MAAM,QAAQ,GAAG,YAAY,CAAC,KAAK,CAAC,IAAI,oBAAoB,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;YAE1E,OAAO,CACL,KAAC,QAAQ,IAAoB,OAAO,EAAE,GAAG,YACvC,KAAC,iBAAiB,IAChB,KAAK,EAAE,KAAK,EACZ,mBAAmB,EAAE,mBAAmB,EACxC,QAAQ,EAAE,aAAa,EACvB,QAAQ,EAAE,QAAQ,EAClB,SAAS,EAAE,CAAC,GACZ,IAPW,KAAK,CAAC,MAAM,CAQhB,CACZ,CAAC;QACJ,CAAC,CAAC,GACc,CACnB,CAAC;AACJ,CAAC,CAAC,CAAC;AAEH,eAAe,eAAe,CAAC"}

package/lib/hooks/index.d.ts

@@ -5,8 +5,6 @@ export { default as useRendererQueryClient } from './useRendererQueryClient';
 export { default as useRenderingExtensions } from './useRenderingExtensions';
 export { default as useValidationFeedback } from './useValidationFeedback';
 export { default as useValueSetCodings } from './useValueSetCodings';
-export { default as useStringCalculatedExpression } from './useStringCalculatedExpression';
 export { default as useDisplayCqfAndCalculatedExpression } from './useDisplayCqfAndCalculatedExpression';
-export { default as useCodingCalculatedExpression, objectIsCoding } from './useCodingCalculatedExpression';
 export { default as useResponsive } from './useResponsive';
 export type { UseResponsiveProps } from './useResponsive';

package/lib/hooks/index.js

@@ -5,10 +5,8 @@ export { default as useRendererQueryClient } from './useRendererQueryClient';
 export { default as useRenderingExtensions } from './useRenderingExtensions';
 export { default as useValidationFeedback } from './useValidationFeedback';
 export { default as useValueSetCodings } from './useValueSetCodings';
-// CalculatedExpression hooks
-export { default as useStringCalculatedExpression } from './useStringCalculatedExpression';
+// CalculatedExpression and cqf-expression hooks
 export { default as useDisplayCqfAndCalculatedExpression } from './useDisplayCqfAndCalculatedExpression';
-export { default as useCodingCalculatedExpression, objectIsCoding } from './useCodingCalculatedExpression';
 // Responsiveness-related hooks
 export { default as useResponsive } from './useResponsive';
 //# sourceMappingURL=index.js.map

package/lib/hooks/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,OAAO,IAAI,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAErE,6BAA6B;AAC7B,OAAO,EAAE,OAAO,IAAI,6BAA6B,EAAE,MAAM,iCAAiC,CAAC;AAC3F,OAAO,EAAE,OAAO,IAAI,oCAAoC,EAAE,MAAM,wCAAwC,CAAC;AACzG,OAAO,EACL,OAAO,IAAI,6BAA6B,EACxC,cAAc,EACf,MAAM,iCAAiC,CAAC;AAEzC,+BAA+B;AAC/B,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/hooks/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,IAAI,SAAS,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,eAAe,CAAC;AACvD,OAAO,EAAE,OAAO,IAAI,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACzD,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,OAAO,IAAI,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAC7E,OAAO,EAAE,OAAO,IAAI,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAC3E,OAAO,EAAE,OAAO,IAAI,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAErE,gDAAgD;AAChD,OAAO,EAAE,OAAO,IAAI,oCAAoC,EAAE,MAAM,wCAAwC,CAAC;AAEzG,+BAA+B;AAC/B,OAAO,EAAE,OAAO,IAAI,aAAa,EAAE,MAAM,iBAAiB,CAAC"}

package/lib/hooks/useAnswerOptionsToggleExpressions.js

@@ -64,11 +64,10 @@ export function hasMapChanged(map1, map2) {
     return false;
 }
 export function generateOptionKey(option) {
-    var _a, _b, _c;
     if (option.valueCoding) {
-        const systemKey = (_a = option.valueCoding.system) !== null && _a !== void 0 ? _a : ' ';
-        const codeKey = (_b = option.valueCoding.code) !== null && _b !== void 0 ? _b : ' ';
-        const displayKey = (_c = option.valueCoding.display) !== null && _c !== void 0 ? _c : ' ';
+        const systemKey = option.valueCoding.system ?? ' ';
+        const codeKey = option.valueCoding.code ?? ' ';
+        const displayKey = option.valueCoding.display ?? ' ';
         return `coding:${systemKey}-${codeKey}-${displayKey}`;
     }
     if (option.valueString !== undefined) {
@@ -82,10 +81,9 @@ export function generateOptionKey(option) {
 // An exact copy of isOptionDisabled, except instead of using QuestionnaireItemAnswerOption it usings codings.
 // It makes sense to align these two functions when we refactor choice/open-choice items https://github.com/aehrc/smart-forms/issues/1205
 export function generateCodingKey(coding) {
-    var _a, _b, _c;
-    const systemKey = (_a = coding.system) !== null && _a !== void 0 ? _a : ' ';
-    const codeKey = (_b = coding.code) !== null && _b !== void 0 ? _b : ' ';
-    const displayKey = (_c = coding.display) !== null && _c !== void 0 ? _c : ' ';
+    const systemKey = coding.system ?? ' ';
+    const codeKey = coding.code ?? ' ';
+    const displayKey = coding.display ?? ' ';
     return `coding:${systemKey}-${codeKey}-${displayKey}`;
 }
 export default useAnswerOptionsToggleExpressions;

package/lib/hooks/useAnswerOptionsToggleExpressions.js.map

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

package/lib/hooks/useAttachmentUrlValidation.js

@@ -19,7 +19,7 @@ function useAttachmentUrlValidation(url) {
         new URL(url);
         return true;
     }
-    catch (_a) {
+    catch {
         return false;
     }
 }

package/lib/hooks/useAttachmentUrlValidation.js.map

@@ -1 +1 @@
-{"version":3,"file":"useAttachmentUrlValidation.js","sourceRoot":"","sources":["../../src/hooks/useAttachmentUrlValidation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,SAAS,0BAA0B,CAAC,GAAW;IAC7C,IAAI,CAAC;QACH,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QACb,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,WAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,eAAe,0BAA0B,CAAC"}
+{"version":3,"file":"useAttachmentUrlValidation.js","sourceRoot":"","sources":["../../src/hooks/useAttachmentUrlValidation.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,SAAS,0BAA0B,CAAC,GAAW;IAC7C,IAAI,CAAC;QACH,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;QACb,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED,eAAe,0BAA0B,CAAC"}

package/lib/hooks/useBuildForm.d.ts

@@ -1,22 +1,20 @@
-import type { ComponentType } from 'react';
-import type { Questionnaire, QuestionnaireResponse } from 'fhir/r4';
-import type { RendererStyling } from '../stores/rendererStylingStore';
-import type { QItemOverrideComponentProps, SdcUiOverrideComponentProps } from '../interfaces';
+import type { BuildFormParams } from '../utils/manageForm';
 /**
- * React hook wrapping around the buildForm() function to build a form from a questionnaire and an optional QuestionnaireResponse.
- * @see buildForm() for more information.
+ * React hook wrapping around {@link buildForm} to build a form from a Questionnaire and an optional filled QuestionnaireResponse.
+ * If a QuestionnaireResponse is not provided, an empty QuestionnaireResponse is set as the initial QuestionnaireResponse.
  *
- * @param questionnaire - Questionnaire to be rendered
- * @param questionnaireResponse - Pre-populated/draft/loaded QuestionnaireResponse to be rendered (optional)
- * @param readOnly - Applies read-only mode to all items in the form view
- * @param terminologyServerUrl - Terminology server url to fetch terminology. If not provided, the default terminology server will be used. (optional)
- * @param additionalVariables - Additional key-value pair of SDC variables + values to be fed into the renderer's FhirPathContext `Record<name, value>` (likely coming from a pre-population module) e.g. `{ 'ObsBodyHeight': <Bundle of height observations> } }`.
- * @param rendererStylingOptions - Renderer styling to be applied to the form. See docs for styling options. (optional)
- * @param qItemOverrideComponents - Key-value pair of React component overrides for Questionnaire Items via linkId `Record<linkId, React component>`
- * @param sdcUiOverrideComponents - Key-value pair of React component overrides for SDC UI Controls https://hl7.org/fhir/extensions/ValueSet-questionnaire-item-control.html `Record<SDC UI code, React component>`
+ * The build process also supports:
+ * - Applying readOnly mode to all items in the form view
+ * - Providing a default terminology server URL (fallbacks to a public Ontoserver instance if not provided)
+ * - Passing additional SDC variables into the FhirPathContext (e.g. for pre-population purposes)
+ * - Adjusting renderer styling and behaviour via `rendererConfigStore`
+ * - Overriding QuestionnaireItem rendering via `qItemOverrideComponents`
+ * - Overriding SDC UI controls via `sdcUiOverrideComponents`
  *
+ * @param params - {@link BuildFormParams} containing the configuration for building the form
+ * @returns Hook result for form building lifecycle
  *
  * @author Sean Fong
  */
-declare function useBuildForm(questionnaire: Questionnaire, questionnaireResponse?: QuestionnaireResponse, readOnly?: boolean, terminologyServerUrl?: string, additionalVariables?: Record<string, any>, rendererStylingOptions?: RendererStyling, qItemOverrideComponents?: Record<string, ComponentType<QItemOverrideComponentProps>>, sdcUiOverrideComponents?: Record<string, ComponentType<SdcUiOverrideComponentProps>>): boolean;
+declare function useBuildForm(params: BuildFormParams): boolean;
 export default useBuildForm;

package/lib/hooks/useBuildForm.js

@@ -16,32 +16,37 @@
  */
 import { useLayoutEffect, useState } from 'react';
 import { buildForm } from '../utils';
-import { useRendererStylingStore } from '../stores/rendererStylingStore';
 /**
- * React hook wrapping around the buildForm() function to build a form from a questionnaire and an optional QuestionnaireResponse.
- * @see buildForm() for more information.
+ * React hook wrapping around {@link buildForm} to build a form from a Questionnaire and an optional filled QuestionnaireResponse.
+ * If a QuestionnaireResponse is not provided, an empty QuestionnaireResponse is set as the initial QuestionnaireResponse.
  *
- * @param questionnaire - Questionnaire to be rendered
- * @param questionnaireResponse - Pre-populated/draft/loaded QuestionnaireResponse to be rendered (optional)
- * @param readOnly - Applies read-only mode to all items in the form view
- * @param terminologyServerUrl - Terminology server url to fetch terminology. If not provided, the default terminology server will be used. (optional)
- * @param additionalVariables - Additional key-value pair of SDC variables + values to be fed into the renderer's FhirPathContext `Record<name, value>` (likely coming from a pre-population module) e.g. `{ 'ObsBodyHeight': <Bundle of height observations> } }`.
- * @param rendererStylingOptions - Renderer styling to be applied to the form. See docs for styling options. (optional)
- * @param qItemOverrideComponents - Key-value pair of React component overrides for Questionnaire Items via linkId `Record<linkId, React component>`
- * @param sdcUiOverrideComponents - Key-value pair of React component overrides for SDC UI Controls https://hl7.org/fhir/extensions/ValueSet-questionnaire-item-control.html `Record<SDC UI code, React component>`
+ * The build process also supports:
+ * - Applying readOnly mode to all items in the form view
+ * - Providing a default terminology server URL (fallbacks to a public Ontoserver instance if not provided)
+ * - Passing additional SDC variables into the FhirPathContext (e.g. for pre-population purposes)
+ * - Adjusting renderer styling and behaviour via `rendererConfigStore`
+ * - Overriding QuestionnaireItem rendering via `qItemOverrideComponents`
+ * - Overriding SDC UI controls via `sdcUiOverrideComponents`
  *
+ * @param params - {@link BuildFormParams} containing the configuration for building the form
+ * @returns Hook result for form building lifecycle
  *
  * @author Sean Fong
  */
-function useBuildForm(questionnaire, questionnaireResponse, readOnly, terminologyServerUrl, additionalVariables, rendererStylingOptions, qItemOverrideComponents, sdcUiOverrideComponents) {
+function useBuildForm(params) {
+    const { questionnaire, questionnaireResponse, readOnly, terminologyServerUrl, additionalContext, rendererConfigOptions, qItemOverrideComponents, sdcUiOverrideComponents } = params;
     const [isBuilding, setIsBuilding] = useState(true);
-    const setRendererStyling = useRendererStylingStore.use.setRendererStyling();
     useLayoutEffect(() => {
-        // Set optional renderer styling
-        if (rendererStylingOptions) {
-            setRendererStyling(rendererStylingOptions);
-        }
-        buildForm(questionnaire, questionnaireResponse, readOnly, terminologyServerUrl, additionalVariables, qItemOverrideComponents, sdcUiOverrideComponents)
+        buildForm({
+            questionnaire,
+            questionnaireResponse,
+            readOnly,
+            terminologyServerUrl,
+            additionalContext,
+            rendererConfigOptions,
+            qItemOverrideComponents,
+            sdcUiOverrideComponents
+        })
             .then(() => {
             setIsBuilding(false);
         })
@@ -54,11 +59,10 @@ function useBuildForm(questionnaire, questionnaireResponse, readOnly, terminolog
         questionnaireResponse,
         readOnly,
         terminologyServerUrl,
-        additionalVariables,
-        rendererStylingOptions,
+        additionalContext,
+        rendererConfigOptions,
         qItemOverrideComponents,
-        sdcUiOverrideComponents,
-        setRendererStyling
+        sdcUiOverrideComponents
     ]);
     return isBuilding;
 }

package/lib/hooks/useBuildForm.js.map

@@ -1 +1 @@
-{"version":3,"file":"useBuildForm.js","sourceRoot":"","sources":["../../src/hooks/useBuildForm.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAGrC,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAGzE;;;;;;;;;;;;;;;GAeG;AACH,SAAS,YAAY,CACnB,aAA4B,EAC5B,qBAA6C,EAC7C,QAAkB,EAClB,oBAA6B,EAC7B,mBAAyC,EACzC,sBAAwC,EACxC,uBAAoF,EACpF,uBAAoF;IAEpF,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEnD,MAAM,kBAAkB,GAAG,uBAAuB,CAAC,GAAG,CAAC,kBAAkB,EAAE,CAAC;IAE5E,eAAe,CAAC,GAAG,EAAE;QACnB,gCAAgC;QAChC,IAAI,sBAAsB,EAAE,CAAC;YAC3B,kBAAkB,CAAC,sBAAsB,CAAC,CAAC;QAC7C,CAAC;QAED,SAAS,CACP,aAAa,EACb,qBAAqB,EACrB,QAAQ,EACR,oBAAoB,EACpB,mBAAmB,EACnB,uBAAuB,EACvB,uBAAuB,CACxB;aACE,IAAI,CAAC,GAAG,EAAE;YACT,aAAa,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,aAAa,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,CAAC,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;IACP,CAAC,EAAE;QACD,aAAa;QACb,qBAAqB;QACrB,QAAQ;QACR,oBAAoB;QACpB,mBAAmB;QACnB,sBAAsB;QACtB,uBAAuB;QACvB,uBAAuB;QACvB,kBAAkB;KACnB,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"useBuildForm.js","sourceRoot":"","sources":["../../src/hooks/useBuildForm.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAGrC;;;;;;;;;;;;;;;;GAgBG;AACH,SAAS,YAAY,CAAC,MAAuB;IAC3C,MAAM,EACJ,aAAa,EACb,qBAAqB,EACrB,QAAQ,EACR,oBAAoB,EACpB,iBAAiB,EACjB,qBAAqB,EACrB,uBAAuB,EACvB,uBAAuB,EACxB,GAAG,MAAM,CAAC;IAEX,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEnD,eAAe,CAAC,GAAG,EAAE;QACnB,SAAS,CAAC;YACR,aAAa;YACb,qBAAqB;YACrB,QAAQ;YACR,oBAAoB;YACpB,iBAAiB;YACjB,qBAAqB;YACrB,uBAAuB;YACvB,uBAAuB;SACxB,CAAC;aACC,IAAI,CAAC,GAAG,EAAE;YACT,aAAa,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC,CAAC;aACD,KAAK,CAAC,CAAC,CAAC,EAAE,EAAE;YACX,aAAa,CAAC,KAAK,CAAC,CAAC;YACrB,OAAO,CAAC,KAAK,CAAC,mCAAmC,EAAE,CAAC,CAAC,CAAC;QACxD,CAAC,CAAC,CAAC;IACP,CAAC,EAAE;QACD,aAAa;QACb,qBAAqB;QACrB,QAAQ;QACR,oBAAoB;QACpB,iBAAiB;QACjB,qBAAqB;QACrB,uBAAuB;QACvB,uBAAuB;KACxB,CAAC,CAAC;IAEH,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,eAAe,YAAY,CAAC"}

package/lib/hooks/useCalculatedExpressionUpdated.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Detects when an item value changes due to a calculatedExpression.
+ * Returns true for ~700ms whenever the calculated value updates.
+ *
+ * Ignores the initial mount (so it won't re-animate when the user switch between tabs).
+ */
+export declare function useCalculatedExpressionUpdated(answerKey: string | undefined): boolean;

package/lib/hooks/useCalculatedExpressionUpdated.js

@@ -0,0 +1,31 @@
+import { useEffect, useRef, useState } from 'react';
+/**
+ * Detects when an item value changes due to a calculatedExpression.
+ * Returns true for ~700ms whenever the calculated value updates.
+ *
+ * Ignores the initial mount (so it won't re-animate when the user switch between tabs).
+ */
+export function useCalculatedExpressionUpdated(answerKey) {
+    const [animating, setAnimating] = useState(false);
+    const previousAnswerKey = useRef(null);
+    useEffect(() => {
+        // Skip the first render — just store the current key
+        if (previousAnswerKey.current === null) {
+            previousAnswerKey.current = answerKey ?? null;
+            return;
+        }
+        // Answer key has changed, and it is a calculatedExpression
+        if (answerKey &&
+            answerKey !== previousAnswerKey.current &&
+            // values generated via calculatedExpression will have "calculatedExpression" in their key e.g. obs-bmi-calculatedExpression-_Cye5_m-d4cjxZqY4-9XL
+            answerKey.includes('calculatedExpression')) {
+            previousAnswerKey.current = answerKey;
+            setAnimating(true);
+            const timer = setTimeout(() => setAnimating(false), 700);
+            return () => clearTimeout(timer);
+        }
+        return undefined;
+    }, [answerKey]);
+    return animating;
+}
+//# sourceMappingURL=useCalculatedExpressionUpdated.js.map

package/lib/hooks/useCalculatedExpressionUpdated.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useCalculatedExpressionUpdated.js","sourceRoot":"","sources":["../../src/hooks/useCalculatedExpressionUpdated.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAEpD;;;;;GAKG;AACH,MAAM,UAAU,8BAA8B,CAAC,SAA6B;IAC1E,MAAM,CAAC,SAAS,EAAE,YAAY,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAClD,MAAM,iBAAiB,GAAG,MAAM,CAAgB,IAAI,CAAC,CAAC;IAEtD,SAAS,CAAC,GAAG,EAAE;QACb,qDAAqD;QACrD,IAAI,iBAAiB,CAAC,OAAO,KAAK,IAAI,EAAE,CAAC;YACvC,iBAAiB,CAAC,OAAO,GAAG,SAAS,IAAI,IAAI,CAAC;YAC9C,OAAO;QACT,CAAC;QAED,2DAA2D;QAC3D,IACE,SAAS;YACT,SAAS,KAAK,iBAAiB,CAAC,OAAO;YACvC,kJAAkJ;YAClJ,SAAS,CAAC,QAAQ,CAAC,sBAAsB,CAAC,EAC1C,CAAC;YACD,iBAAiB,CAAC,OAAO,GAAG,SAAS,CAAC;YACtC,YAAY,CAAC,IAAI,CAAC,CAAC;YAEnB,MAAM,KAAK,GAAG,UAAU,CAAC,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,CAAC;YAEzD,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;QACnC,CAAC;QAED,OAAO,SAAS,CAAC;IACnB,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC;IAEhB,OAAO,SAAS,CAAC;AACnB,CAAC"}

package/lib/hooks/useCodingCalculatedExpression.d.ts

@@ -1,13 +0,0 @@
-import type { Coding, QuestionnaireItem } from 'fhir/r4';
-interface UseCodingCalculatedExpression {
-    calcExpUpdated: boolean;
-}
-interface UseCodingCalculatedExpressionProps {
-    qItem: QuestionnaireItem;
-    valueInString: string;
-    onChangeByCalcExpressionString: (newValueInString: string) => void;
-    onChangeByCalcExpressionNull: () => void;
-}
-declare function useCodingCalculatedExpression(props: UseCodingCalculatedExpressionProps): UseCodingCalculatedExpression;
-export declare function objectIsCoding(obj: any): obj is Coding;
-export default useCodingCalculatedExpression;

package/lib/hooks/useCodingCalculatedExpression.js

@@ -1,75 +1,2 @@
-/*
- * 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 { useEffect, useState } from 'react';
-import { useQuestionnaireStore } from '../stores';
-// TODO use this in all choice and open choice items if possible
-function useCodingCalculatedExpression(props) {
-    const { qItem, valueInString, onChangeByCalcExpressionString, onChangeByCalcExpressionNull } = props;
-    const calculatedExpressions = useQuestionnaireStore.use.calculatedExpressions();
-    const [calcExpUpdated, setCalcExpUpdated] = useState(false);
-    useEffect(() => {
-        var _a;
-        const calcExpression = (_a = calculatedExpressions[qItem.linkId]) === null || _a === void 0 ? void 0 : _a.find((exp) => exp.from === 'item');
-        if (!calcExpression) {
-            return;
-        }
-        // If both input and calculated value are falsy, there is nothing to update
-        const inputAndCalcValueAreBothFalsy = valueInString === '' && !calcExpression.value;
-        if (inputAndCalcValueAreBothFalsy) {
-            return;
-        }
-        // only update if calculated value is different from current value
-        if (calcExpression.value !== valueInString &&
-            (typeof calcExpression.value === 'string' ||
-                typeof calcExpression.value === 'number' ||
-                typeof calcExpression.value === 'object' ||
-                calcExpression.value === null)) {
-            // update ui to show calculated value changes
-            setCalcExpUpdated(true);
-            const timeoutId = setTimeout(() => {
-                setCalcExpUpdated(false);
-            }, 500);
-            // calculatedExpression value is null
-            if (calcExpression.value === null) {
-                onChangeByCalcExpressionNull();
-                return () => clearTimeout(timeoutId);
-            }
-            // calculatedExpression value is object, check if it is a Coding object
-            if (typeof calcExpression.value === 'object' && objectIsCoding(calcExpression.value)) {
-                if (calcExpression.value.code) {
-                    onChangeByCalcExpressionString(calcExpression.value.code);
-                    return () => clearTimeout(timeoutId);
-                }
-            }
-            // calculatedExpression value is a string or number
-            const newValueString = typeof calcExpression.value === 'string'
-                ? calcExpression.value
-                : calcExpression.value.toString();
-            onChangeByCalcExpressionString(newValueString);
-            return () => clearTimeout(timeoutId);
-        }
-    }, 
-    // Only trigger this effect if calculatedExpression of item changes
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [calculatedExpressions]);
-    return { calcExpUpdated: calcExpUpdated };
-}
-export function objectIsCoding(obj) {
-    return !!(obj && obj.code && typeof obj.code === 'string');
-}
-export default useCodingCalculatedExpression;
+"use strict";
 //# sourceMappingURL=useCodingCalculatedExpression.js.map

package/lib/hooks/useCodingCalculatedExpression.js.map

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

package/lib/hooks/useDateCalculatedExpression.d.ts

@@ -1,12 +0,0 @@
-import type { QuestionnaireItem } from 'fhir/r4';
-interface UseDateCalculatedExpressionReturn {
-    calcExpUpdated: boolean;
-}
-interface UseDateCalculatedExpressionProps {
-    qItem: QuestionnaireItem;
-    valueDateFhir: string;
-    onChangeByCalcExpressionString: (newValueDateFhir: string) => void;
-    onChangeByCalcExpressionNull: () => void;
-}
-declare function useDateCalculatedExpression(props: UseDateCalculatedExpressionProps): UseDateCalculatedExpressionReturn;
-export default useDateCalculatedExpression;

package/lib/hooks/useDateCalculatedExpression.js

@@ -1,59 +1,2 @@
-/*
- * 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 { useEffect, useState } from 'react';
-import { useQuestionnaireStore } from '../stores';
-function useDateCalculatedExpression(props) {
-    const { qItem, valueDateFhir, onChangeByCalcExpressionString, onChangeByCalcExpressionNull } = props;
-    const calculatedExpressions = useQuestionnaireStore.use.calculatedExpressions();
-    const [calcExpUpdated, setCalcExpUpdated] = useState(false);
-    useEffect(() => {
-        var _a;
-        const calcExpression = (_a = calculatedExpressions[qItem.linkId]) === null || _a === void 0 ? void 0 : _a.find((exp) => exp.from === 'item');
-        if (!calcExpression) {
-            return;
-        }
-        // If both input and calculated value are falsy, there is nothing to update
-        const inputAndCalcValueAreBothFalsy = valueDateFhir === '' && !calcExpression.value;
-        if (inputAndCalcValueAreBothFalsy) {
-            return;
-        }
-        // only update if calculated value is different from current value
-        if (calcExpression.value !== valueDateFhir &&
-            (typeof calcExpression.value === 'string' || calcExpression.value === null)) {
-            // update ui to show calculated value changes
-            setCalcExpUpdated(true);
-            const timeoutId = setTimeout(() => {
-                setCalcExpUpdated(false);
-            }, 500);
-            // calculatedExpression value is null
-            if (calcExpression.value === null) {
-                onChangeByCalcExpressionNull();
-                return () => clearTimeout(timeoutId);
-            }
-            // calculatedExpression value is string
-            onChangeByCalcExpressionString(calcExpression.value);
-            return () => clearTimeout(timeoutId);
-        }
-        return undefined;
-    }, 
-    // Only trigger this effect if calculatedExpression of item changes
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [calculatedExpressions]);
-    return { calcExpUpdated };
-}
-export default useDateCalculatedExpression;
+"use strict";
 //# sourceMappingURL=useDateCalculatedExpression.js.map

package/lib/hooks/useDateCalculatedExpression.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDateCalculatedExpression.js","sourceRoot":"","sources":["../../src/hooks/useDateCalculatedExpression.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAE5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAalD,SAAS,2BAA2B,CAClC,KAAuC;IAEvC,MAAM,EAAE,KAAK,EAAE,aAAa,EAAE,8BAA8B,EAAE,4BAA4B,EAAE,GAC1F,KAAK,CAAC;IAER,MAAM,qBAAqB,GAAG,qBAAqB,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC;IAEhF,MAAM,CAAC,cAAc,EAAE,iBAAiB,CAAC,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC;IAE5D,SAAS,CACP,GAAG,EAAE;;QACH,MAAM,cAAc,GAAG,MAAA,qBAAqB,CAAC,KAAK,CAAC,MAAM,CAAC,0CAAE,IAAI,CAC9D,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,KAAK,MAAM,CAC7B,CAAC;QAEF,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO;QACT,CAAC;QAED,2EAA2E;QAC3E,MAAM,6BAA6B,GAAG,aAAa,KAAK,EAAE,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC;QACpF,IAAI,6BAA6B,EAAE,CAAC;YAClC,OAAO;QACT,CAAC;QAED,kEAAkE;QAClE,IACE,cAAc,CAAC,KAAK,KAAK,aAAa;YACtC,CAAC,OAAO,cAAc,CAAC,KAAK,KAAK,QAAQ,IAAI,cAAc,CAAC,KAAK,KAAK,IAAI,CAAC,EAC3E,CAAC;YACD,6CAA6C;YAC7C,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACxB,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;gBAChC,iBAAiB,CAAC,KAAK,CAAC,CAAC;YAC3B,CAAC,EAAE,GAAG,CAAC,CAAC;YAER,qCAAqC;YACrC,IAAI,cAAc,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;gBAClC,4BAA4B,EAAE,CAAC;gBAC/B,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;YACvC,CAAC;YAED,uCAAuC;YACvC,8BAA8B,CAAC,cAAc,CAAC,KAAe,CAAC,CAAC;YAC/D,OAAO,GAAG,EAAE,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;QACvC,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;IACD,mEAAmE;IACnE,uDAAuD;IACvD,CAAC,qBAAqB,CAAC,CACxB,CAAC;IAEF,OAAO,EAAE,cAAc,EAAE,CAAC;AAC5B,CAAC;AAED,eAAe,2BAA2B,CAAC"}
+{"version":3,"file":"useDateCalculatedExpression.js","sourceRoot":"","sources":["../../src/hooks/useDateCalculatedExpression.ts"],"names":[],"mappings":""}

package/lib/hooks/useDateTimeCalculatedExpression.d.ts

@@ -1,12 +0,0 @@
-import type { QuestionnaireItem } from 'fhir/r4';
-interface UseDateTimeCalculatedExpressionReturn {
-    calcExpUpdated: boolean;
-}
-interface UseDateTimeCalculatedExpressionProps {
-    qItem: QuestionnaireItem;
-    valueDateTimeFhir: string;
-    onChangeByCalcExpressionString: (newValueDateTimeFhir: string) => void;
-    onChangeByCalcExpressionNull: () => void;
-}
-declare function useDateTimeCalculatedExpression(props: UseDateTimeCalculatedExpressionProps): UseDateTimeCalculatedExpressionReturn;
-export default useDateTimeCalculatedExpression;