@openmrs/esm-react-utils 6.3.1-pre.3136 → 6.3.1-pre.3140

package/.turbo/turbo-build.log

@@ -1,3 +1,3 @@
-[0] Successfully compiled: 52 files with swc (125.02ms)
+[0] Successfully compiled: 52 files with swc (118.84ms)
 [0] swc --strip-leading-paths src -d dist exited with code 0
 [1] tsc --project tsconfig.build.json exited with code 0

package/dist/useVisit.js

@@ -42,8 +42,8 @@ dayjs.extend(isToday);
     ]);
     const previousCurrentVisit = useRef(null);
     useEffect(()=>{
-        // if an active visit is created and either there is no visit in context or we've switched to a different patient, set the context to the active visit
-        if (!activeIsValidating && activeVisit && (visitStorePatientUuid != patientUuid || manuallySetVisitUuid == null)) {
+        // if an active visit is created for the visit store patient and they have no visit in context, set the context to the active visit
+        if (!activeIsValidating && activeVisit && visitStorePatientUuid === patientUuid && manuallySetVisitUuid === null) {
             setVisitContext(activeVisit);
         }
         if (!retroIsValidating) {

package/dist/useVisitContextStore.js

@@ -1,12 +1,16 @@
 import { useEffect, useId } from "react";
 import { getVisitStore } from "@openmrs/esm-emr-api";
 import { useStoreWithActions } from "./useStore.js";
-// TODO: add better typing with `satisfies` keyword when we upgrade typescript
 const visitContextStoreActions = {
     setVisitContext (_, newSelectedVisit) {
+        if (newSelectedVisit == null) {
+            return {
+                manuallySetVisitUuid: null
+            };
+        }
         return {
-            manuallySetVisitUuid: newSelectedVisit?.uuid ?? null,
-            patientUuid: newSelectedVisit?.patient?.uuid ?? null
+            manuallySetVisitUuid: newSelectedVisit.uuid,
+            patientUuid: newSelectedVisit.patient?.uuid
         };
     },
     mutateVisit (currState) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-react-utils",
-  "version": "6.3.1-pre.3136",
+  "version": "6.3.1-pre.3140",
   "license": "MPL-2.0",
   "description": "React utilities for OpenMRS.",
   "type": "module",
@@ -78,17 +78,17 @@
     "swr": "2.x"
   },
   "devDependencies": {
-    "@openmrs/esm-api": "6.3.1-pre.3136",
-    "@openmrs/esm-config": "6.3.1-pre.3136",
-    "@openmrs/esm-context": "6.3.1-pre.3136",
-    "@openmrs/esm-emr-api": "6.3.1-pre.3136",
-    "@openmrs/esm-error-handling": "6.3.1-pre.3136",
-    "@openmrs/esm-extensions": "6.3.1-pre.3136",
-    "@openmrs/esm-feature-flags": "6.3.1-pre.3136",
-    "@openmrs/esm-globals": "6.3.1-pre.3136",
-    "@openmrs/esm-navigation": "6.3.1-pre.3136",
-    "@openmrs/esm-state": "6.3.1-pre.3136",
-    "@openmrs/esm-utils": "6.3.1-pre.3136",
+    "@openmrs/esm-api": "6.3.1-pre.3140",
+    "@openmrs/esm-config": "6.3.1-pre.3140",
+    "@openmrs/esm-context": "6.3.1-pre.3140",
+    "@openmrs/esm-emr-api": "6.3.1-pre.3140",
+    "@openmrs/esm-error-handling": "6.3.1-pre.3140",
+    "@openmrs/esm-extensions": "6.3.1-pre.3140",
+    "@openmrs/esm-feature-flags": "6.3.1-pre.3140",
+    "@openmrs/esm-globals": "6.3.1-pre.3140",
+    "@openmrs/esm-navigation": "6.3.1-pre.3140",
+    "@openmrs/esm-state": "6.3.1-pre.3140",
+    "@openmrs/esm-utils": "6.3.1-pre.3140",
     "@swc/cli": "^0.7.7",
     "@swc/core": "^1.11.29",
     "concurrently": "^9.1.2",

package/src/useVisit.ts

@@ -76,8 +76,8 @@ export function useVisit(patientUuid: string, representation = defaultVisitCusto
   const previousCurrentVisit = useRef<Visit | null>(null);
 
   useEffect(() => {
-    // if an active visit is created and either there is no visit in context or we've switched to a different patient, set the context to the active visit
-    if (!activeIsValidating && activeVisit && (visitStorePatientUuid != patientUuid || manuallySetVisitUuid == null)) {
+    // if an active visit is created for the visit store patient and they have no visit in context, set the context to the active visit
+    if (!activeIsValidating && activeVisit && visitStorePatientUuid === patientUuid && manuallySetVisitUuid === null) {
       setVisitContext(activeVisit);
     }
     if (!retroIsValidating) {

package/src/useVisitContextStore.ts

@@ -1,13 +1,15 @@
 import { useEffect, useId } from 'react';
 import { getVisitStore, type Visit, type VisitStoreState } from '@openmrs/esm-emr-api';
-import { useStoreWithActions } from './useStore';
+import { type Actions, useStoreWithActions } from './useStore';
 
-// TODO: add better typing with `satisfies` keyword when we upgrade typescript
 const visitContextStoreActions = {
   setVisitContext(_: VisitStoreState, newSelectedVisit: Visit | null) {
+    if (newSelectedVisit == null) {
+      return { manuallySetVisitUuid: null };
+    }
     return {
-      manuallySetVisitUuid: newSelectedVisit?.uuid ?? null,
-      patientUuid: newSelectedVisit?.patient?.uuid ?? null,
+      manuallySetVisitUuid: newSelectedVisit.uuid,
+      patientUuid: newSelectedVisit.patient?.uuid,
     };
   },
   mutateVisit(currState: VisitStoreState) {
@@ -16,7 +18,7 @@ const visitContextStoreActions = {
     }
     return {};
   },
-};
+} satisfies Actions<VisitStoreState>;
 
 /**
  * A hook to return the visit context store and corresponding actions.