@aehrc/smart-forms-renderer 1.0.0-alpha.99 → 1.1.0

package/lib/hooks/useDateTimeCalculatedExpression.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 useDateTimeCalculatedExpression(props) {
-    const { qItem, valueDateTimeFhir, 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 = valueDateTimeFhir === '' && !calcExpression.value;
-        if (inputAndCalcValueAreBothFalsy) {
-            return;
-        }
-        // only update if calculated value is different from current value
-        if (calcExpression.value !== valueDateTimeFhir &&
-            (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 useDateTimeCalculatedExpression;
+"use strict";
 //# sourceMappingURL=useDateTimeCalculatedExpression.js.map

package/lib/hooks/useDateTimeCalculatedExpression.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDateTimeCalculatedExpression.js","sourceRoot":"","sources":["../../src/hooks/useDateTimeCalculatedExpression.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,+BAA+B,CACtC,KAA2C;IAE3C,MAAM,EAAE,KAAK,EAAE,iBAAiB,EAAE,8BAA8B,EAAE,4BAA4B,EAAE,GAC9F,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,iBAAiB,KAAK,EAAE,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC;QACxF,IAAI,6BAA6B,EAAE,CAAC;YAClC,OAAO;QACT,CAAC;QAED,kEAAkE;QAClE,IACE,cAAc,CAAC,KAAK,KAAK,iBAAiB;YAC1C,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,+BAA+B,CAAC"}
+{"version":3,"file":"useDateTimeCalculatedExpression.js","sourceRoot":"","sources":["../../src/hooks/useDateTimeCalculatedExpression.ts"],"names":[],"mappings":""}

package/lib/hooks/useDisplayCqfAndCalculatedExpression.d.ts

@@ -1,3 +1,15 @@
 import type { QuestionnaireItem } from 'fhir/r4';
-declare function useDisplayCqfAndCalculatedExpression(qItem: QuestionnaireItem): string | null;
+import type { CalculatedExpression } from '../interfaces';
+/**
+ * Returns the value of a cqf-expression, calculatedExpression or ItemTextAriaLabelExpression.
+ *
+ * - If no expression is found → returns null.
+ * - If the value is null → returns an empty string.
+ * - If the value is a string or number → returns it as a string.
+ *
+ * @param {QuestionnaireItem} qItem - The questionnaire item.
+ * @param {CalculatedExpression['from']} from - The expression source. Should be a one of 'item._text' or 'item._text.aria-label'
+ * @returns {string | null} The display value as a string, empty string, or null.
+ */
+declare function useDisplayCqfAndCalculatedExpression(qItem: QuestionnaireItem, from: CalculatedExpression['from']): string | null;
 export default useDisplayCqfAndCalculatedExpression;

package/lib/hooks/useDisplayCqfAndCalculatedExpression.js

@@ -15,11 +15,21 @@
  * limitations under the License.
  */
 import { useQuestionnaireStore } from '../stores';
-function useDisplayCqfAndCalculatedExpression(qItem) {
-    var _a;
+/**
+ * Returns the value of a cqf-expression, calculatedExpression or ItemTextAriaLabelExpression.
+ *
+ * - If no expression is found → returns null.
+ * - If the value is null → returns an empty string.
+ * - If the value is a string or number → returns it as a string.
+ *
+ * @param {QuestionnaireItem} qItem - The questionnaire item.
+ * @param {CalculatedExpression['from']} from - The expression source. Should be a one of 'item._text' or 'item._text.aria-label'
+ * @returns {string | null} The display value as a string, empty string, or null.
+ */
+function useDisplayCqfAndCalculatedExpression(qItem, from) {
     const calculatedExpressions = useQuestionnaireStore.use.calculatedExpressions();
-    const cqfOrCalcExpression = (_a = calculatedExpressions === null || calculatedExpressions === void 0 ? void 0 : calculatedExpressions[qItem.linkId]) === null || _a === void 0 ? void 0 : _a.find((exp) => exp && exp.from === 'item._text' // Add null check for exp
-    );
+    const cqfOrCalcExpression = calculatedExpressions?.[qItem.linkId]?.find((exp) => exp && exp.from === from);
+    // Add null check for exp
     if (!cqfOrCalcExpression) {
         return null;
     }

package/lib/hooks/useDisplayCqfAndCalculatedExpression.js.map

@@ -1 +1 @@
-{"version":3,"file":"useDisplayCqfAndCalculatedExpression.js","sourceRoot":"","sources":["../../src/hooks/useDisplayCqfAndCalculatedExpression.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAGlD,SAAS,oCAAoC,CAAC,KAAwB;;IACpE,MAAM,qBAAqB,GAAG,qBAAqB,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC;IAEhF,MAAM,mBAAmB,GAAG,MAAA,qBAAqB,aAArB,qBAAqB,uBAArB,qBAAqB,CAAG,KAAK,CAAC,MAAM,CAAC,0CAAE,IAAI,CACrE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,YAAY,CAAC,yBAAyB;KACpE,CAAC;IAEF,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IACE,OAAO,mBAAmB,CAAC,KAAK,KAAK,QAAQ;QAC7C,OAAO,mBAAmB,CAAC,KAAK,KAAK,QAAQ;QAC7C,mBAAmB,CAAC,KAAK,KAAK,IAAI,EAClC,CAAC;QACD,qCAAqC;QACrC,IAAI,mBAAmB,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;YACvC,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,iDAAiD;QACjD,OAAO,OAAO,mBAAmB,CAAC,KAAK,KAAK,QAAQ;YAClD,CAAC,CAAC,mBAAmB,CAAC,KAAK;YAC3B,CAAC,CAAC,mBAAmB,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;IAC3C,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,eAAe,oCAAoC,CAAC"}
+{"version":3,"file":"useDisplayCqfAndCalculatedExpression.js","sourceRoot":"","sources":["../../src/hooks/useDisplayCqfAndCalculatedExpression.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAIlD;;;;;;;;;;GAUG;AACH,SAAS,oCAAoC,CAC3C,KAAwB,EACxB,IAAkC;IAElC,MAAM,qBAAqB,GAAG,qBAAqB,CAAC,GAAG,CAAC,qBAAqB,EAAE,CAAC;IAEhF,MAAM,mBAAmB,GAAG,qBAAqB,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,IAAI,CACrE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,IAAI,GAAG,CAAC,IAAI,KAAK,IAAI,CAClC,CAAC;IAEF,yBAAyB;IACzB,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IACE,OAAO,mBAAmB,CAAC,KAAK,KAAK,QAAQ;QAC7C,OAAO,mBAAmB,CAAC,KAAK,KAAK,QAAQ;QAC7C,mBAAmB,CAAC,KAAK,KAAK,IAAI,EAClC,CAAC;QACD,qCAAqC;QACrC,IAAI,mBAAmB,CAAC,KAAK,KAAK,IAAI,EAAE,CAAC;YACvC,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,iDAAiD;QACjD,OAAO,OAAO,mBAAmB,CAAC,KAAK,KAAK,QAAQ;YAClD,CAAC,CAAC,mBAAmB,CAAC,KAAK;YAC3B,CAAC,CAAC,mBAAmB,CAAC,KAAK,CAAC,QAAQ,EAAE,CAAC;IAC3C,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,eAAe,oCAAoC,CAAC"}

package/lib/hooks/useDynamicValueSetEffect.js

@@ -1,12 +1,3 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { useEffect, useRef } from 'react';
 import { getValueSetCodings, getValueSetPromise } from '../utils/valueSet';
 import { addDisplayToCodingArray } from '../utils/questionnaireStoreUtils/addDisplayToCodings';
@@ -39,10 +30,10 @@ function useDynamicValueSetEffect(qItem, terminologyServerUrl, processedValueSet
             return;
         }
         promise
-            .then((valueSet) => __awaiter(this, void 0, void 0, function* () {
+            .then(async (valueSet) => {
             const newCodings = getValueSetCodings(valueSet);
             try {
-                const newCodingsWithDisplay = yield addDisplayToCodingArray(newCodings, terminologyServerUrl);
+                const newCodingsWithDisplay = await addDisplayToCodingArray(newCodings, terminologyServerUrl);
                 addCodingToCache(updatableValueSetUrl, newCodingsWithDisplay);
                 onSetCodings(newCodingsWithDisplay.length > 0 ? newCodingsWithDisplay : []);
                 // Update UI to show calculated value changes
@@ -53,7 +44,7 @@ function useDynamicValueSetEffect(qItem, terminologyServerUrl, processedValueSet
             catch (error) {
                 onSetServerError(error);
             }
-        }))
+        })
             .catch((error) => {
             onSetServerError(error);
         });
@@ -70,14 +61,13 @@ function useDynamicValueSetEffect(qItem, terminologyServerUrl, processedValueSet
 }
 // Get updatableValueSetUrl from cqfAnswerValueSetCqfExpression or processedValueSets's updatableValueSetUrl, otherwise return empty string
 export function getUpdatableValueSetUrl(qItem, calculatedExpressions, processedValueSets) {
-    var _a, _b, _c, _d;
-    const cqfAnswerValueSetCqfExpression = (_a = calculatedExpressions[qItem.linkId]) === null || _a === void 0 ? void 0 : _a.find((exp) => exp.from === 'item._answerValueSet');
+    const cqfAnswerValueSetCqfExpression = calculatedExpressions[qItem.linkId]?.find((exp) => exp.from === 'item._answerValueSet');
     if (cqfAnswerValueSetCqfExpression &&
-        typeof (cqfAnswerValueSetCqfExpression === null || cqfAnswerValueSetCqfExpression === void 0 ? void 0 : cqfAnswerValueSetCqfExpression.value) === 'string' &&
+        typeof cqfAnswerValueSetCqfExpression?.value === 'string' &&
         cqfAnswerValueSetCqfExpression.value !== '') {
         return cqfAnswerValueSetCqfExpression.value;
     }
-    return (_d = (_c = processedValueSets[(_b = qItem.answerValueSet) !== null && _b !== void 0 ? _b : '']) === null || _c === void 0 ? void 0 : _c.updatableValueSetUrl) !== null && _d !== void 0 ? _d : '';
+    return processedValueSets[qItem.answerValueSet ?? '']?.updatableValueSetUrl ?? '';
 }
 export default useDynamicValueSetEffect;
 //# sourceMappingURL=useDynamicValueSetEffect.js.map

package/lib/hooks/useDynamicValueSetEffect.js.map

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

package/lib/hooks/useHidden.js

@@ -17,7 +17,7 @@
 import { useQuestionnaireStore } from '../stores';
 import { isHiddenByEnableWhen } from '../utils/qItem';
 import { structuredDataCapture } from 'fhir-sdc-helpers';
-import { useRendererStylingStore } from '../stores/rendererStylingStore';
+import { useRendererConfigStore } from '../stores/rendererConfigStore';
 /**
  * React hook to determine if a QuestionnaireItem is hidden via item.hidden, enableWhens, enableWhenExpressions.
  * When checking for repeating group enableWhen items, the parentRepeatGroupIndex should be provided.
@@ -28,7 +28,7 @@ function useHidden(qItem, parentRepeatGroupIndex) {
     const enableWhenIsActivated = useQuestionnaireStore.use.enableWhenIsActivated();
     const enableWhenItems = useQuestionnaireStore.use.enableWhenItems();
     const enableWhenExpressions = useQuestionnaireStore.use.enableWhenExpressions();
-    const enableWhenAsReadOnly = useRendererStylingStore.use.enableWhenAsReadOnly();
+    const enableWhenAsReadOnly = useRendererConfigStore.use.enableWhenAsReadOnly();
     if (structuredDataCapture.getHidden(qItem)) {
         return true;
     }

package/lib/hooks/useHidden.js.map

@@ -1 +1 @@
-{"version":3,"file":"useHidden.js","sourceRoot":"","sources":["../../src/hooks/useHidden.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AAEzE;;;;;GAKG;AACH,SAAS,SAAS,CAAC,KAAwB,EAAE,sBAA+B;IAC1E,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,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC;IAEhF,IAAI,qBAAqB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,4GAA4G;IAC5G,uGAAuG;IACvG,IACE,oBAAoB,KAAK,IAAI;QAC7B,CAAC,oBAAoB,YAAY,GAAG,IAAI,oBAAoB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAC7E,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,oBAAoB,CAAC;QAC1B,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,qBAAqB;QACrB,eAAe;QACf,qBAAqB;QACrB,sBAAsB;KACvB,CAAC,CAAC;AACL,CAAC;AAED,eAAe,SAAS,CAAC"}
+{"version":3,"file":"useHidden.js","sourceRoot":"","sources":["../../src/hooks/useHidden.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AAEvE;;;;;GAKG;AACH,SAAS,SAAS,CAAC,KAAwB,EAAE,sBAA+B;IAC1E,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,MAAM,oBAAoB,GAAG,sBAAsB,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC;IAE/E,IAAI,qBAAqB,CAAC,SAAS,CAAC,KAAK,CAAC,EAAE,CAAC;QAC3C,OAAO,IAAI,CAAC;IACd,CAAC;IAED,4GAA4G;IAC5G,uGAAuG;IACvG,IACE,oBAAoB,KAAK,IAAI;QAC7B,CAAC,oBAAoB,YAAY,GAAG,IAAI,oBAAoB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAC7E,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,oBAAoB,CAAC;QAC1B,MAAM,EAAE,KAAK,CAAC,MAAM;QACpB,qBAAqB;QACrB,eAAe;QACf,qBAAqB;QACrB,sBAAsB;KACvB,CAAC,CAAC;AACL,CAAC;AAED,eAAe,SAAS,CAAC"}

package/lib/hooks/useInitialiseForm.d.ts

@@ -5,6 +5,9 @@ import type Client from 'fhirclient/lib/Client';
  * - Calling the buildForm() function to build a form from a questionnaire, an optional QuestionnaireResponse and other optional properties.
  * - Setting a FHIRClient object to make further FHIR calls i.e. answerExpressions.
  *
+ * Deprecated in favour of directly calling {@link buildForm} or using the {@link useBuildForm} hook in your own code.
+ * You can still use it, but it might not be compatible with renderer appearance and behaviour customisation via {@link rendererConfigStore}.
+ *
  * @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
@@ -12,8 +15,6 @@ import type Client from 'fhirclient/lib/Client';
  * @param additionalVariables - Additional key-value pair of SDC variables `Record<name, variable extension>` for testing (optional)
  * @param fhirClient - FHIRClient object to perform further FHIR calls. At the moment it's only used in answerExpressions (optional)
  *
- * @see buildForm() for more information.
- *
  * @author Sean Fong
  */
 declare function useInitialiseForm(questionnaire: Questionnaire, questionnaireResponse?: QuestionnaireResponse, readOnly?: boolean, terminologyServerUrl?: string, additionalVariables?: Record<string, any>, fhirClient?: Client): boolean;

package/lib/hooks/useInitialiseForm.js

@@ -23,6 +23,9 @@ import { initialiseFhirClient } from '../utils/manageForm';
  * - Calling the buildForm() function to build a form from a questionnaire, an optional QuestionnaireResponse and other optional properties.
  * - Setting a FHIRClient object to make further FHIR calls i.e. answerExpressions.
  *
+ * Deprecated in favour of directly calling {@link buildForm} or using the {@link useBuildForm} hook in your own code.
+ * You can still use it, but it might not be compatible with renderer appearance and behaviour customisation via {@link rendererConfigStore}.
+ *
  * @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
@@ -30,8 +33,6 @@ import { initialiseFhirClient } from '../utils/manageForm';
  * @param additionalVariables - Additional key-value pair of SDC variables `Record<name, variable extension>` for testing (optional)
  * @param fhirClient - FHIRClient object to perform further FHIR calls. At the moment it's only used in answerExpressions (optional)
  *
- * @see buildForm() for more information.
- *
  * @author Sean Fong
  */
 function useInitialiseForm(questionnaire, questionnaireResponse, readOnly, terminologyServerUrl, additionalVariables, fhirClient) {
@@ -51,7 +52,13 @@ function useInitialiseForm(questionnaire, questionnaireResponse, readOnly, termi
         }
         // Initialise form including Questionnaire and other optionally provided parameters
         // Includes initialisation for enableWhen, enableWhenExpressions, calculatedExpressions, initialExpressions, answerExpressions, cache answerValueSets
-        buildForm(questionnaire, questionnaireResponse, readOnly, terminologyServerUrl, additionalVariables).then(() => {
+        buildForm({
+            questionnaire,
+            questionnaireResponse,
+            readOnly,
+            terminologyServerUrl,
+            additionalContext: additionalVariables
+        }).then(() => {
             setIsBuilding(false);
         });
     }, [

package/lib/hooks/useInitialiseForm.js.map

@@ -1 +1 @@
-{"version":3,"file":"useInitialiseForm.js","sourceRoot":"","sources":["../../src/hooks/useInitialiseForm.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE3D;;;;;;;;;;;;;;;GAeG;AACH,SAAS,iBAAiB,CACxB,aAA4B,EAC5B,qBAA6C,EAC7C,QAAkB,EAClB,oBAA6B,EAC7B,mBAAyC,EACzC,UAAmB;IAEnB,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IACjE,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEnD,MAAM,cAAc,GAAG,mBAAmB,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;IAC3D,MAAM,UAAU,GAAG,mBAAmB,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;IACxD,MAAM,OAAO,GAAG,mBAAmB,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAClD,MAAM,YAAY,GAAG,mBAAmB,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC;IAE5D,eAAe,CAAC,GAAG,EAAE;QACnB,aAAa,CAAC,IAAI,CAAC,CAAC;QACpB,IAAI,UAAU,EAAE,CAAC;YACf,oBAAoB,CAAC,IAAI,CAAC,CAAC;YAC3B,oBAAoB,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;gBACzC,oBAAoB,CAAC,KAAK,CAAC,CAAC;YAC9B,CAAC,CAAC,CAAC;QACL,CAAC;QAED,mFAAmF;QACnF,qJAAqJ;QACrJ,SAAS,CACP,aAAa,EACb,qBAAqB,EACrB,QAAQ,EACR,oBAAoB,EACpB,mBAAmB,CACpB,CAAC,IAAI,CAAC,GAAG,EAAE;YACV,aAAa,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC,EAAE;QACD,aAAa;QACb,qBAAqB;QACrB,mBAAmB;QACnB,oBAAoB;QACpB,UAAU;QACV,QAAQ;QACR,cAAc;QACd,UAAU;QACV,OAAO;QACP,YAAY;KACb,CAAC,CAAC;IAEH,OAAO,iBAAiB,IAAI,UAAU,CAAC;AACzC,CAAC;AAED,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"useInitialiseForm.js","sourceRoot":"","sources":["../../src/hooks/useInitialiseForm.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAErC,OAAO,EAAE,mBAAmB,EAAE,MAAM,WAAW,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AAE3D;;;;;;;;;;;;;;;;GAgBG;AACH,SAAS,iBAAiB,CACxB,aAA4B,EAC5B,qBAA6C,EAC7C,QAAkB,EAClB,oBAA6B,EAC7B,mBAAyC,EACzC,UAAmB;IAEnB,MAAM,CAAC,iBAAiB,EAAE,oBAAoB,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IACjE,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;IAEnD,MAAM,cAAc,GAAG,mBAAmB,CAAC,GAAG,CAAC,SAAS,EAAE,CAAC;IAC3D,MAAM,UAAU,GAAG,mBAAmB,CAAC,GAAG,CAAC,UAAU,EAAE,CAAC;IACxD,MAAM,OAAO,GAAG,mBAAmB,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAClD,MAAM,YAAY,GAAG,mBAAmB,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC;IAE5D,eAAe,CAAC,GAAG,EAAE;QACnB,aAAa,CAAC,IAAI,CAAC,CAAC;QACpB,IAAI,UAAU,EAAE,CAAC;YACf,oBAAoB,CAAC,IAAI,CAAC,CAAC;YAC3B,oBAAoB,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;gBACzC,oBAAoB,CAAC,KAAK,CAAC,CAAC;YAC9B,CAAC,CAAC,CAAC;QACL,CAAC;QAED,mFAAmF;QACnF,qJAAqJ;QACrJ,SAAS,CAAC;YACR,aAAa;YACb,qBAAqB;YACrB,QAAQ;YACR,oBAAoB;YACpB,iBAAiB,EAAE,mBAAmB;SACvC,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;YACX,aAAa,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC,EAAE;QACD,aAAa;QACb,qBAAqB;QACrB,mBAAmB;QACnB,oBAAoB;QACpB,UAAU;QACV,QAAQ;QACR,cAAc;QACd,UAAU;QACV,OAAO;QACP,YAAY;KACb,CAAC,CAAC;IAEH,OAAO,iBAAiB,IAAI,UAAU,CAAC;AACzC,CAAC;AAED,eAAe,iBAAiB,CAAC"}

package/lib/hooks/useInitialiseRepeatAnswers.js

@@ -18,13 +18,13 @@ import { useMemo } from 'react';
 import { generateExistingRepeatId, generateNewRepeatId } from '../utils/repeatId';
 function useInitialiseRepeatAnswers(linkId, qrItem) {
     return useMemo(() => {
-        if (!(qrItem === null || qrItem === void 0 ? void 0 : qrItem.answer)) {
+        if (!qrItem?.answer) {
             return [{ id: generateNewRepeatId(linkId) }];
         }
-        return qrItem.answer.map((answer, index) => {
-            var _a;
-            return (Object.assign(Object.assign({}, answer), { id: (_a = answer.id) !== null && _a !== void 0 ? _a : generateExistingRepeatId(linkId, index) }));
-        });
+        return qrItem.answer.map((answer, index) => ({
+            ...answer,
+            id: answer.id ?? generateExistingRepeatId(linkId, index)
+        }));
     }, [linkId, qrItem]);
 }
 export default useInitialiseRepeatAnswers;

package/lib/hooks/useInitialiseRepeatAnswers.js.map

@@ -1 +1 @@
-{"version":3,"file":"useInitialiseRepeatAnswers.js","sourceRoot":"","sources":["../../src/hooks/useInitialiseRepeatAnswers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAElF,SAAS,0BAA0B,CACjC,MAAc,EACd,MAAwC;IAExC,OAAO,OAAO,CAAC,GAAG,EAAE;QAClB,IAAI,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAA,EAAE,CAAC;YACpB,OAAO,CAAC,EAAE,EAAE,EAAE,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;;YAAC,OAAA,iCACvC,MAAM,KACT,EAAE,EAAE,MAAA,MAAM,CAAC,EAAE,mCAAI,wBAAwB,CAAC,MAAM,EAAE,KAAK,CAAC,IACxD,CAAA;SAAA,CAAC,CAAC;IACN,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AACvB,CAAC;AAED,eAAe,0BAA0B,CAAC"}
+{"version":3,"file":"useInitialiseRepeatAnswers.js","sourceRoot":"","sources":["../../src/hooks/useInitialiseRepeatAnswers.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAChC,OAAO,EAAE,wBAAwB,EAAE,mBAAmB,EAAE,MAAM,mBAAmB,CAAC;AAElF,SAAS,0BAA0B,CACjC,MAAc,EACd,MAAwC;IAExC,OAAO,OAAO,CAAC,GAAG,EAAE;QAClB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC;YACpB,OAAO,CAAC,EAAE,EAAE,EAAE,mBAAmB,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAC/C,CAAC;QAED,OAAO,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;YAC3C,GAAG,MAAM;YACT,EAAE,EAAE,MAAM,CAAC,EAAE,IAAI,wBAAwB,CAAC,MAAM,EAAE,KAAK,CAAC;SACzD,CAAC,CAAC,CAAC;IACN,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AACvB,CAAC;AAED,eAAe,0BAA0B,CAAC"}

package/lib/hooks/useParseXhtml.js

@@ -43,7 +43,7 @@ export function useParseXhtml(qItem) {
                     classNames.forEach((className) => {
                         const classStyles = getStylesFromClass(className);
                         if (classStyles) {
-                            extractedStyles = Object.assign(Object.assign({}, extractedStyles), classStyles);
+                            extractedStyles = { ...extractedStyles, ...classStyles };
                         }
                     });
                 }
@@ -100,7 +100,7 @@ export function useParseXhtml(qItem) {
                             };
                         }
                         delete domNode.attribs.onclick;
-                        return (_jsx("button", Object.assign({}, attributesToProps(domNode.attribs), { onClick: clickHandler || (() => console.log('No specific handler defined')), children: domToReact(domNode.children, htmlParseOptions) })));
+                        return (_jsx("button", { ...attributesToProps(domNode.attribs), onClick: clickHandler || (() => console.log('No specific handler defined')), children: domToReact(domNode.children, htmlParseOptions) }));
                     }
                 }
             }

package/lib/hooks/useParseXhtml.js.map

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

package/lib/hooks/useReadOnly.js

@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 import useRenderingExtensions from './useRenderingExtensions';
-import { useRendererStylingStore } from '../stores/rendererStylingStore';
+import { useRendererConfigStore } from '../stores/rendererConfigStore';
 import { isHiddenByEnableWhen } from '../utils/qItem';
 import { useQuestionnaireStore } from '../stores';
 function useReadOnly(qItem, parentIsReadOnly, parentRepeatGroupIndex) {
@@ -23,7 +23,7 @@ function useReadOnly(qItem, parentIsReadOnly, parentRepeatGroupIndex) {
     const enableWhenIsActivated = useQuestionnaireStore.use.enableWhenIsActivated();
     const enableWhenItems = useQuestionnaireStore.use.enableWhenItems();
     const enableWhenExpressions = useQuestionnaireStore.use.enableWhenExpressions();
-    const enableWhenAsReadOnly = useRendererStylingStore.use.enableWhenAsReadOnly();
+    const enableWhenAsReadOnly = useRendererConfigStore.use.enableWhenAsReadOnly();
     // If enableWhenAsReadOnly is true, then items hidden by enableWhen should be displayed, but set as readOnly
     // If enableWhenAsReadOnly is a Set, all item types in the set should be displayed, but set as readOnly
     if (!readOnly) {

package/lib/hooks/useReadOnly.js.map

@@ -1 +1 @@
-{"version":3,"file":"useReadOnly.js","sourceRoot":"","sources":["../../src/hooks/useReadOnly.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,sBAAsB,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,gCAAgC,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAElD,SAAS,WAAW,CAClB,KAAwB,EACxB,gBAAqC,EACrC,sBAA+B;IAE/B,IAAI,EAAE,QAAQ,EAAE,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAEjD,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,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC;IAEhF,4GAA4G;IAC5G,uGAAuG;IACvG,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,IACE,oBAAoB,KAAK,IAAI;YAC7B,CAAC,oBAAoB,YAAY,GAAG,IAAI,oBAAoB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAC7E,CAAC;YACD,QAAQ,GAAG,oBAAoB,CAAC;gBAC9B,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,qBAAqB;gBACrB,eAAe;gBACf,qBAAqB;gBACrB,sBAAsB;aACvB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,IAAI,OAAO,gBAAgB,KAAK,SAAS,IAAI,gBAAgB,EAAE,CAAC;QAC9D,QAAQ,GAAG,gBAAgB,CAAC;IAC9B,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,eAAe,WAAW,CAAC"}
+{"version":3,"file":"useReadOnly.js","sourceRoot":"","sources":["../../src/hooks/useReadOnly.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,sBAAsB,MAAM,0BAA0B,CAAC;AAC9D,OAAO,EAAE,sBAAsB,EAAE,MAAM,+BAA+B,CAAC;AACvE,OAAO,EAAE,oBAAoB,EAAE,MAAM,gBAAgB,CAAC;AACtD,OAAO,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AAElD,SAAS,WAAW,CAClB,KAAwB,EACxB,gBAAqC,EACrC,sBAA+B;IAE/B,IAAI,EAAE,QAAQ,EAAE,GAAG,sBAAsB,CAAC,KAAK,CAAC,CAAC;IAEjD,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,MAAM,oBAAoB,GAAG,sBAAsB,CAAC,GAAG,CAAC,oBAAoB,EAAE,CAAC;IAE/E,4GAA4G;IAC5G,uGAAuG;IACvG,IAAI,CAAC,QAAQ,EAAE,CAAC;QACd,IACE,oBAAoB,KAAK,IAAI;YAC7B,CAAC,oBAAoB,YAAY,GAAG,IAAI,oBAAoB,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,EAC7E,CAAC;YACD,QAAQ,GAAG,oBAAoB,CAAC;gBAC9B,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,qBAAqB;gBACrB,eAAe;gBACf,qBAAqB;gBACrB,sBAAsB;aACvB,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,IAAI,OAAO,gBAAgB,KAAK,SAAS,IAAI,gBAAgB,EAAE,CAAC;QAC9D,QAAQ,GAAG,gBAAgB,CAAC;IAC9B,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,eAAe,WAAW,CAAC"}

package/lib/hooks/useRenderingExtensions.js

@@ -18,20 +18,17 @@ import { getQuantityUnit, getTextDisplayFlyover, getTextDisplayInstructions, get
 import { structuredDataCapture } from 'fhir-sdc-helpers';
 import { useMemo } from 'react';
 function useRenderingExtensions(qItem) {
-    return useMemo(() => {
-        var _a, _b;
-        return ({
-            displayUnit: getTextDisplayUnit(qItem),
-            displayPrompt: getTextDisplayPrompt(qItem),
-            displayInstructions: getTextDisplayInstructions(qItem),
-            displayFlyover: getTextDisplayFlyover(qItem),
-            readOnly: !!qItem.readOnly,
-            entryFormat: (_a = structuredDataCapture.getEntryFormat(qItem)) !== null && _a !== void 0 ? _a : '',
-            required: (_b = qItem.required) !== null && _b !== void 0 ? _b : false,
-            quantityUnit: getQuantityUnit(qItem),
-            isRepopulatable: isItemRepopulatable(qItem)
-        });
-    }, [qItem]);
+    return useMemo(() => ({
+        displayUnit: getTextDisplayUnit(qItem),
+        displayPrompt: getTextDisplayPrompt(qItem),
+        displayInstructions: getTextDisplayInstructions(qItem),
+        displayFlyover: getTextDisplayFlyover(qItem),
+        readOnly: !!qItem.readOnly,
+        entryFormat: structuredDataCapture.getEntryFormat(qItem) ?? '',
+        required: qItem.required ?? false,
+        quantityUnit: getQuantityUnit(qItem),
+        isRepopulatable: isItemRepopulatable(qItem)
+    }), [qItem]);
 }
 export default useRenderingExtensions;
 //# sourceMappingURL=useRenderingExtensions.js.map

package/lib/hooks/useRenderingExtensions.js.map

@@ -1 +1 @@
-{"version":3,"file":"useRenderingExtensions.js","sourceRoot":"","sources":["../../src/hooks/useRenderingExtensions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,0BAA0B,EAC1B,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAchC,SAAS,sBAAsB,CAAC,KAAwB;IACtD,OAAO,OAAO,CACZ,GAAG,EAAE;;QAAC,OAAA,CAAC;YACL,WAAW,EAAE,kBAAkB,CAAC,KAAK,CAAC;YACtC,aAAa,EAAE,oBAAoB,CAAC,KAAK,CAAC;YAC1C,mBAAmB,EAAE,0BAA0B,CAAC,KAAK,CAAC;YACtD,cAAc,EAAE,qBAAqB,CAAC,KAAK,CAAC;YAC5C,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ;YAC1B,WAAW,EAAE,MAAA,qBAAqB,CAAC,cAAc,CAAC,KAAK,CAAC,mCAAI,EAAE;YAC9D,QAAQ,EAAE,MAAA,KAAK,CAAC,QAAQ,mCAAI,KAAK;YACjC,YAAY,EAAE,eAAe,CAAC,KAAK,CAAC;YACpC,eAAe,EAAE,mBAAmB,CAAC,KAAK,CAAC;SAC5C,CAAC,CAAA;KAAA,EACF,CAAC,KAAK,CAAC,CACR,CAAC;AACJ,CAAC;AAED,eAAe,sBAAsB,CAAC"}
+{"version":3,"file":"useRenderingExtensions.js","sourceRoot":"","sources":["../../src/hooks/useRenderingExtensions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EACL,eAAe,EACf,qBAAqB,EACrB,0BAA0B,EAC1B,oBAAoB,EACpB,kBAAkB,EAClB,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;AAE7B,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,OAAO,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAchC,SAAS,sBAAsB,CAAC,KAAwB;IACtD,OAAO,OAAO,CACZ,GAAG,EAAE,CAAC,CAAC;QACL,WAAW,EAAE,kBAAkB,CAAC,KAAK,CAAC;QACtC,aAAa,EAAE,oBAAoB,CAAC,KAAK,CAAC;QAC1C,mBAAmB,EAAE,0BAA0B,CAAC,KAAK,CAAC;QACtD,cAAc,EAAE,qBAAqB,CAAC,KAAK,CAAC;QAC5C,QAAQ,EAAE,CAAC,CAAC,KAAK,CAAC,QAAQ;QAC1B,WAAW,EAAE,qBAAqB,CAAC,cAAc,CAAC,KAAK,CAAC,IAAI,EAAE;QAC9D,QAAQ,EAAE,KAAK,CAAC,QAAQ,IAAI,KAAK;QACjC,YAAY,EAAE,eAAe,CAAC,KAAK,CAAC;QACpC,eAAe,EAAE,mBAAmB,CAAC,KAAK,CAAC;KAC5C,CAAC,EACF,CAAC,KAAK,CAAC,CACR,CAAC;AACJ,CAAC;AAED,eAAe,sBAAsB,CAAC"}

package/lib/hooks/useResizeColumns.d.ts

@@ -0,0 +1,8 @@
+/**
+ * Hook to observe a container element's width and call a callback whenever it changes.
+ *
+ * Uses `ResizeObserver` to track changes to the element’s dimensions.
+ * Works with libraries like Allotment that resize elements without triggering a window resize event.
+ *
+ */
+export declare function useResizeColumns(ref: React.RefObject<HTMLDivElement | null>, onSetTableWidth: (width: number) => void): void;

package/lib/hooks/useResizeColumns.js

@@ -0,0 +1,46 @@
+/*
+ * 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 { useLayoutEffect } from 'react';
+/**
+ * Hook to observe a container element's width and call a callback whenever it changes.
+ *
+ * Uses `ResizeObserver` to track changes to the element’s dimensions.
+ * Works with libraries like Allotment that resize elements without triggering a window resize event.
+ *
+ */
+export function useResizeColumns(ref, onSetTableWidth) {
+    useLayoutEffect(() => {
+        if (!ref.current) {
+            return;
+        }
+        const node = ref.current;
+        const observer = new ResizeObserver((entries) => {
+            for (const entry of entries) {
+                if (entry.contentRect) {
+                    onSetTableWidth(entry.contentRect.width);
+                }
+            }
+        });
+        observer.observe(node);
+        // Set initial width
+        onSetTableWidth(node.offsetWidth);
+        return () => {
+            observer.disconnect();
+        };
+    }, [onSetTableWidth, ref]);
+}
+//# sourceMappingURL=useResizeColumns.js.map

package/lib/hooks/useResizeColumns.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"useResizeColumns.js","sourceRoot":"","sources":["../../src/hooks/useResizeColumns.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,eAAe,EAAE,MAAM,OAAO,CAAC;AAExC;;;;;;GAMG;AACH,MAAM,UAAU,gBAAgB,CAC9B,GAA2C,EAC3C,eAAwC;IAExC,eAAe,CAAC,GAAG,EAAE;QACnB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO;QACT,CAAC;QAED,MAAM,IAAI,GAAG,GAAG,CAAC,OAAO,CAAC;QACzB,MAAM,QAAQ,GAAG,IAAI,cAAc,CAAC,CAAC,OAAO,EAAE,EAAE;YAC9C,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE,CAAC;gBAC5B,IAAI,KAAK,CAAC,WAAW,EAAE,CAAC;oBACtB,eAAe,CAAC,KAAK,CAAC,WAAW,CAAC,KAAK,CAAC,CAAC;gBAC3C,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAC;QACH,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAEvB,oBAAoB;QACpB,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;QAElC,OAAO,GAAG,EAAE;YACV,QAAQ,CAAC,UAAU,EAAE,CAAC;QACxB,CAAC,CAAC;IACJ,CAAC,EAAE,CAAC,eAAe,EAAE,GAAG,CAAC,CAAC,CAAC;AAC7B,CAAC"}

package/lib/hooks/useSliderExtensions.js

@@ -22,15 +22,14 @@ const defaultMaxValue = 100;
 const defaultMaxLabel = '100';
 const defaultStepValue = 1;
 function useSliderExtensions(qItem) {
-    var _a, _b, _c, _d, _e, _f, _g;
-    const minValue = (_a = getMinValue(qItem)) !== null && _a !== void 0 ? _a : defaultMinValue;
-    const maxValue = (_b = getMaxValue(qItem)) !== null && _b !== void 0 ? _b : defaultMaxValue;
+    const minValue = getMinValue(qItem) ?? defaultMinValue;
+    const maxValue = getMaxValue(qItem) ?? defaultMaxValue;
     return {
         minValue: minValue,
-        minLabel: (_d = (_c = getTextDisplayLower(qItem)) !== null && _c !== void 0 ? _c : minValue.toString()) !== null && _d !== void 0 ? _d : defaultMinLabel,
+        minLabel: getTextDisplayLower(qItem) ?? minValue.toString() ?? defaultMinLabel,
         maxValue: maxValue,
-        maxLabel: (_f = (_e = getTextDisplayUpper(qItem)) !== null && _e !== void 0 ? _e : maxValue.toString()) !== null && _f !== void 0 ? _f : defaultMaxLabel,
-        stepValue: (_g = getSliderStepValue(qItem)) !== null && _g !== void 0 ? _g : defaultStepValue
+        maxLabel: getTextDisplayUpper(qItem) ?? maxValue.toString() ?? defaultMaxLabel,
+        stepValue: getSliderStepValue(qItem) ?? defaultStepValue
     };
 }
 export default useSliderExtensions;

package/lib/hooks/useSliderExtensions.js.map

@@ -1 +1 @@
-{"version":3,"file":"useSliderExtensions.js","sourceRoot":"","sources":["../../src/hooks/useSliderExtensions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE/E,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAE/E,MAAM,eAAe,GAAG,CAAC,CAAC;AAC1B,MAAM,eAAe,GAAG,GAAG,CAAC;AAE5B,MAAM,eAAe,GAAG,GAAG,CAAC;AAC5B,MAAM,eAAe,GAAG,KAAK,CAAC;AAE9B,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAU3B,SAAS,mBAAmB,CAAC,KAAwB;;IACnD,MAAM,QAAQ,GAAG,MAAA,WAAW,CAAC,KAAK,CAAC,mCAAI,eAAe,CAAC;IACvD,MAAM,QAAQ,GAAG,MAAA,WAAW,CAAC,KAAK,CAAC,mCAAI,eAAe,CAAC;IACvD,OAAO;QACL,QAAQ,EAAE,QAAQ;QAClB,QAAQ,EAAE,MAAA,MAAA,mBAAmB,CAAC,KAAK,CAAC,mCAAI,QAAQ,CAAC,QAAQ,EAAE,mCAAI,eAAe;QAC9E,QAAQ,EAAE,QAAQ;QAClB,QAAQ,EAAE,MAAA,MAAA,mBAAmB,CAAC,KAAK,CAAC,mCAAI,QAAQ,CAAC,QAAQ,EAAE,mCAAI,eAAe;QAC9E,SAAS,EAAE,MAAA,kBAAkB,CAAC,KAAK,CAAC,mCAAI,gBAAgB;KACzD,CAAC;AACJ,CAAC;AAED,eAAe,mBAAmB,CAAC"}
+{"version":3,"file":"useSliderExtensions.js","sourceRoot":"","sources":["../../src/hooks/useSliderExtensions.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAEH,OAAO,EAAE,mBAAmB,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAE/E,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,iBAAiB,CAAC;AAE/E,MAAM,eAAe,GAAG,CAAC,CAAC;AAC1B,MAAM,eAAe,GAAG,GAAG,CAAC;AAE5B,MAAM,eAAe,GAAG,GAAG,CAAC;AAC5B,MAAM,eAAe,GAAG,KAAK,CAAC;AAE9B,MAAM,gBAAgB,GAAG,CAAC,CAAC;AAU3B,SAAS,mBAAmB,CAAC,KAAwB;IACnD,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,eAAe,CAAC;IACvD,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,CAAC,IAAI,eAAe,CAAC;IACvD,OAAO;QACL,QAAQ,EAAE,QAAQ;QAClB,QAAQ,EAAE,mBAAmB,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,QAAQ,EAAE,IAAI,eAAe;QAC9E,QAAQ,EAAE,QAAQ;QAClB,QAAQ,EAAE,mBAAmB,CAAC,KAAK,CAAC,IAAI,QAAQ,CAAC,QAAQ,EAAE,IAAI,eAAe;QAC9E,SAAS,EAAE,kBAAkB,CAAC,KAAK,CAAC,IAAI,gBAAgB;KACzD,CAAC;AACJ,CAAC;AAED,eAAe,mBAAmB,CAAC"}

package/lib/hooks/useTerminologyServerQuery.js

@@ -19,7 +19,6 @@ import { useQuestionnaireStore, useTerminologyServerStore } from '../stores';
 import { useQuery } from '@tanstack/react-query';
 import { getItemTerminologyServerToUse } from '../utils/preferredTerminologyServer';
 function useTerminologyServerQuery(qItem, maxList, input, searchTerm) {
-    var _a, _b;
     const processedValueSets = useQuestionnaireStore.use.processedValueSets();
     const itemPreferredTerminologyServers = useQuestionnaireStore.use.itemPreferredTerminologyServers();
     const defaultTerminologyServerUrl = useTerminologyServerStore.use.url();
@@ -39,7 +38,7 @@ function useTerminologyServerQuery(qItem, maxList, input, searchTerm) {
             answerValueSetUrl = answerValueSetUrl.slice(1);
         }
         // attempt to get url from contained value sets when loading questionnaire
-        if ((_a = processedValueSets[answerValueSetUrl]) === null || _a === void 0 ? void 0 : _a.updatableValueSetUrl) {
+        if (processedValueSets[answerValueSetUrl]?.updatableValueSetUrl) {
             answerValueSetUrl = processedValueSets[answerValueSetUrl].updatableValueSetUrl;
         }
         const urlWithTrailingAmpersand = answerValueSetUrl + (answerValueSetUrl[answerValueSetUrl.length - 1] !== '&' ? '&' : '');
@@ -60,7 +59,7 @@ function useTerminologyServerQuery(qItem, maxList, input, searchTerm) {
         };
     }
     if (data) {
-        if (((_b = data.expansion) === null || _b === void 0 ? void 0 : _b.total) !== 0) {
+        if (data.expansion?.total !== 0) {
             options = getValueSetCodings(data);
         }
         else {

package/lib/hooks/useTerminologyServerQuery.js.map

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

package/lib/hooks/useValidationFeedback.js

@@ -18,7 +18,6 @@ import { getMaxQuantityValue, getMaxQuantityValueFeedback, getMaxValue, getMaxVa
 import { useQuestionnaireResponseStore, useQuestionnaireStore } from '../stores';
 import { structuredDataCapture } from 'fhir-sdc-helpers';
 function useValidationFeedback(qItem, feedbackFromParent) {
-    var _a, _b;
     const invalidItems = useQuestionnaireResponseStore.use.invalidItems();
     const requiredItemsIsHighlighted = useQuestionnaireResponseStore.use.requiredItemsIsHighlighted();
     // Target constraint-based validation
@@ -56,13 +55,13 @@ function useValidationFeedback(qItem, feedbackFromParent) {
         const requiredIssue = invalidOperationOutcome.issue.find((issue) => issue.code === 'required');
         if (requiredIssue) {
             const requiredFeedback = getRequiredFeedback(qItem);
-            return requiredFeedback !== null && requiredFeedback !== void 0 ? requiredFeedback : 'This field is required.';
+            return requiredFeedback ?? 'This field is required.';
         }
     }
     // Iterate through the issues but we only return the first validation feedback we find.
     // Once that's resolved, the subsequent feedbacks will be returned.
     for (const issue of invalidOperationOutcome.issue) {
-        const validationCode = (_b = (_a = issue === null || issue === void 0 ? void 0 : issue.details) === null || _a === void 0 ? void 0 : _a.coding) === null || _b === void 0 ? void 0 : _b[0].code;
+        const validationCode = issue?.details?.coding?.[0].code;
         // If no validation code is provided, something is wrong with the validation - should never happen
         if (!validationCode) {
             return 'Input is invalid but no specific issues are found. Please report this at https://github.com/aehrc/smart-forms/issues.';

package/lib/hooks/useValidationFeedback.js.map

@@ -1 +1 @@
-{"version":3,"file":"useValidationFeedback.js","sourceRoot":"","sources":["../../src/hooks/useValidationFeedback.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;GAeG;AAGH,OAAO,EACL,mBAAmB,EACnB,2BAA2B,EAC3B,WAAW,EACX,mBAAmB,EACnB,mBAAmB,EACnB,2BAA2B,EAC3B,WAAW,EACX,mBAAmB,EACnB,kBAAkB,EAClB,mBAAmB,EACpB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,6BAA6B,EAAE,qBAAqB,EAAE,MAAM,WAAW,CAAC;AACjF,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AAEzD,SAAS,qBAAqB,CAC5B,KAAwB,EACxB,kBAAsC;;IAEtC,MAAM,YAAY,GAAG,6BAA6B,CAAC,GAAG,CAAC,YAAY,EAAE,CAAC;IACtE,MAAM,0BAA0B,GAAG,6BAA6B,CAAC,GAAG,CAAC,0BAA0B,EAAE,CAAC;IAElG,qCAAqC;IACrC,MAAM,iBAAiB,GAAG,qBAAqB,CAAC,GAAG,CAAC,iBAAiB,EAAE,CAAC;IACxE,MAAM,uBAAuB,GAAG,qBAAqB,CAAC,GAAG,CAAC,uBAAuB,EAAE,CAAC;IACpF,MAAM,oBAAoB,GAAG,uBAAuB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACnE,IAAI,oBAAoB,IAAI,oBAAoB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC5D,KAAK,MAAM,mBAAmB,IAAI,oBAAoB,EAAE,CAAC;YACvD,MAAM,gBAAgB,GAAG,iBAAiB,CAAC,mBAAmB,CAAC,CAAC;YAChE,IAAI,gBAAgB,EAAE,CAAC;gBACrB,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,gBAAgB,CAAC;gBAC9C,IAAI,SAAS,EAAE,CAAC;oBACd,OAAO,KAAK,CAAC;gBACf,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAED,uBAAuB;IACvB,IAAI,kBAAkB,EAAE,CAAC;QACvB,OAAO,kBAAkB,CAAC;IAC5B,CAAC;IAED,kDAAkD;IAClD,MAAM,uBAAuB,GAAG,YAAY,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IAE3D,yDAAyD;IACzD,IAAI,CAAC,uBAAuB,EAAE,CAAC;QAC7B,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,kHAAkH;IAClH,IAAI,CAAC,uBAAuB,CAAC,KAAK,IAAI,uBAAuB,CAAC,KAAK,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACjF,OAAO,uHAAuH,CAAC;IACjI,CAAC;IAED,4BAA4B;IAC5B,iEAAiE;IACjE,IAAI,0BAA0B,EAAE,CAAC;QAC/B,MAAM,aAAa,GAAG,uBAAuB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC;QAC/F,IAAI,aAAa,EAAE,CAAC;YAClB,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;YACpD,OAAO,gBAAgB,aAAhB,gBAAgB,cAAhB,gBAAgB,GAAI,yBAAyB,CAAC;QACvD,CAAC;IACH,CAAC;IAED,uFAAuF;IACvF,mEAAmE;IACnE,KAAK,MAAM,KAAK,IAAI,uBAAuB,CAAC,KAAK,EAAE,CAAC;QAClD,MAAM,cAAc,GAAG,MAAA,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,0CAAE,MAAM,0CAAG,CAAC,EAAE,IAAI,CAAC;QAExD,kGAAkG;QAClG,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,OAAO,uHAAuH,CAAC;QACjI,CAAC;QAED,gDAAgD;QAChD,IAAI,cAAc,KAAK,OAAO,EAAE,CAAC;YAC/B,MAAM,eAAe,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAC;YAClD,IAAI,eAAe,EAAE,CAAC;gBACpB,OAAO,2CAA2C,eAAe,CAAC,UAAU,EAAE,CAAC;YACjF,CAAC;YAED,OAAO,yCAAyC,CAAC;QACnD,CAAC;QAED,oDAAoD;QACpD,IAAI,cAAc,KAAK,WAAW,EAAE,CAAC;YACnC,MAAM,SAAS,GAAG,qBAAqB,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;YAC5D,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;gBAClC,OAAO,kBAAkB,SAAS,cAAc,CAAC;YACnD,CAAC;YAED,OAAO,6CAA6C,CAAC;QACvD,CAAC;QAED,+BAA+B;QAC/B,IAAI,cAAc,KAAK,WAAW,EAAE,CAAC;YACnC,MAAM,SAAS,GAAG,KAAK,CAAC,SAAS,CAAC;YAClC,IAAI,OAAO,SAAS,KAAK,QAAQ,EAAE,CAAC;gBAClC,OAAO,sBAAsB,SAAS,cAAc,CAAC;YACvD,CAAC;YAED,OAAO,6CAA6C,CAAC;QACvD,CAAC;QAED,2DAA2D;QAC3D,IAAI,cAAc,KAAK,kBAAkB,EAAE,CAAC;YAC1C,MAAM,gBAAgB,GAAG,qBAAqB,CAAC,mBAAmB,CAAC,KAAK,CAAC,CAAC;YAC1E,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE,CAAC;gBACzC,OAAO,oCAAoC,gBAAgB,kBAAkB,CAAC;YAChF,CAAC;YAED,OAAO,oCAAoC,CAAC;QAC9C,CAAC;QAED,mDAAmD;QACnD,IAAI,cAAc,KAAK,UAAU,EAAE,CAAC;YAClC,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;YACpD,IAAI,gBAAgB,EAAE,CAAC;gBACrB,OAAO,gBAAgB,CAAC;YAC1B,CAAC;YAED,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;YACpC,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBACjE,OAAO,0CAA0C,QAAQ,GAAG,CAAC;YAC/D,CAAC;YAED,OAAO,+CAA+C,CAAC;QACzD,CAAC;QAED,mDAAmD;QACnD,IAAI,cAAc,KAAK,UAAU,EAAE,CAAC;YAClC,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;YACpD,IAAI,gBAAgB,EAAE,CAAC;gBACrB,OAAO,gBAAgB,CAAC;YAC1B,CAAC;YAED,MAAM,QAAQ,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC;YACpC,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;gBACjE,OAAO,uCAAuC,QAAQ,GAAG,CAAC;YAC5D,CAAC;YAED,OAAO,0CAA0C,CAAC;QACpD,CAAC;QAED,+EAA+E;QAC/E,IAAI,cAAc,KAAK,kBAAkB,EAAE,CAAC;YAC1C,MAAM,mBAAmB,GAAG,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC/D,IAAI,mBAAmB,EAAE,CAAC;gBACxB,OAAO,mBAAmB,CAAC;YAC7B,CAAC;YAED,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;YACpD,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE,CAAC;gBACzC,OAAO,6CAA6C,gBAAgB,GAAG,CAAC;YAC1E,CAAC;YAED,OAAO,kDAAkD,CAAC;QAC5D,CAAC;QAED,+EAA+E;QAC/E,IAAI,cAAc,KAAK,kBAAkB,EAAE,CAAC;YAC1C,MAAM,mBAAmB,GAAG,2BAA2B,CAAC,KAAK,CAAC,CAAC;YAC/D,IAAI,mBAAmB,EAAE,CAAC;gBACxB,OAAO,mBAAmB,CAAC;YAC7B,CAAC;YAED,MAAM,gBAAgB,GAAG,mBAAmB,CAAC,KAAK,CAAC,CAAC;YACpD,IAAI,OAAO,gBAAgB,KAAK,QAAQ,EAAE,CAAC;gBACzC,OAAO,0CAA0C,gBAAgB,GAAG,CAAC;YACvE,CAAC;YAED,OAAO,6CAA6C,CAAC;QACvD,CAAC;QAED,qDAAqD;IACvD,CAAC;IAED,mEAAmE;IACnE,OAAO,EAAE,CAAC;AACZ,CAAC;AAED,eAAe,qBAAqB,CAAC"}
+{"version":3,"file":"useValidationFeedback.js","sourceRoot":"","sources":["../../src/hooks/useValidationFeedback.ts"],"names":[],"mappings":"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"}