@openmrs/esm-react-utils 3.2.1-pre.1020 → 3.2.1-pre.1025

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-react-utils",
-  "version": "3.2.1-pre.1020",
+  "version": "3.2.1-pre.1025",
   "license": "MPL-2.0",
   "description": "React utilities for OpenMRS.",
   "browser": "dist/openmrs-esm-react-utils.js",
@@ -55,11 +55,11 @@
     "react-i18next": "11.x"
   },
   "devDependencies": {
-    "@openmrs/esm-api": "^3.2.1-pre.1020",
-    "@openmrs/esm-config": "^3.2.1-pre.1020",
-    "@openmrs/esm-error-handling": "^3.2.1-pre.1020",
-    "@openmrs/esm-extensions": "^3.2.1-pre.1020",
-    "@openmrs/esm-globals": "^3.2.1-pre.1020",
+    "@openmrs/esm-api": "^3.2.1-pre.1025",
+    "@openmrs/esm-config": "^3.2.1-pre.1025",
+    "@openmrs/esm-error-handling": "^3.2.1-pre.1025",
+    "@openmrs/esm-extensions": "^3.2.1-pre.1025",
+    "@openmrs/esm-globals": "^3.2.1-pre.1025",
     "dayjs": "^1.10.8",
     "i18next": "^19.6.0",
     "react": "^16.13.1",
@@ -68,5 +68,5 @@
     "rxjs": "^6.5.3",
     "unistore": "^3.5.2"
   },
-  "gitHead": "05aa900c651fe7d95b15fcdc746f7a850c60e5ac"
+  "gitHead": "feb09b45245797ce9d01c6cfbebd315ebdfaaf54"
 }

package/src/createUseStore.ts

@@ -18,6 +18,7 @@ function bindActions<T>(store: Store<T>, actions: Actions) {
   return bound;
 }
 
+/** Avoid this; generally prefer to have clients use `useStore(yourStore)` */
 export function createUseStore<T>(store: Store<T>) {
   function useStore(): T;
   function useStore(actions: Actions): T & BoundActions;

package/src/index.ts

@@ -14,7 +14,6 @@ export * from "./useConnectivity";
 export * from "./usePatient";
 export * from "./useCurrentPatient";
 export * from "./useExtensionInternalStore";
-export * from "./useExtensionSlotConfig";
 export * from "./useExtensionSlot";
 export * from "./useExtensionSlotMeta";
 export * from "./useExtensionStore";
@@ -26,7 +25,6 @@ export * from "./useOnClickOutside";
 export * from "./UserHasAccess";
 export * from "./useSessionUser";
 export * from "./useStore";
-export * from "./useStoreState";
 export * from "./useVisit";
 export * from "./useVisitTypes";
 export * from "./usePagination";

package/src/useAssignedExtensions.ts

@@ -23,7 +23,7 @@ export function useAssignedExtensions(slotName: string) {
     }
     update(getExtensionStore().getState());
     return getExtensionStore().subscribe(update);
-  }, [slotName]);
+  }, [slotName, extensions]);
 
   return extensions;
 }

package/src/useExtensionInternalStore.ts

@@ -4,7 +4,9 @@ import {
 } from "@openmrs/esm-extensions";
 import { createUseStore } from "./createUseStore";
 
-/** @internal */
+/** @internal
+ * @deprecated Use `useStore(getExtensionInternalStore())`
+ */
 export const useExtensionInternalStore = createUseStore<ExtensionInternalStore>(
   getExtensionInternalStore()
 );

package/src/useStore.ts

@@ -1,11 +1,58 @@
+import { subscribeTo } from "@openmrs/esm-state";
+import { useEffect, useMemo, useState } from "react";
 import { Store } from "unistore";
-import { Actions, BoundActions, createUseStore } from "./createUseStore";
+import { Actions, BoundActions } from "./createUseStore";
 
-export function useStore<T>(store: Store<T>): T;
-export function useStore<T>(
+function bindActions<T>(store: Store<T>, actions: Actions) {
+  if (typeof actions == "function") {
+    actions = actions(store);
+  }
+
+  const bound = {};
+
+  for (let i in actions) {
+    bound[i] = store.action(actions[i]);
+  }
+
+  return bound;
+}
+
+const defaultSelectFunction = (x) => x;
+
+function useStore<T, U>(store: Store<T>): T;
+function useStore<T, U>(store: Store<T>, select: (state: T) => U): U;
+function useStore<T, U>(
   store: Store<T>,
+  select: undefined,
   actions: Actions
 ): T & BoundActions;
-export function useStore<T>(store: Store<T>, actions?: Actions) {
-  return createUseStore<T>(store)(actions);
+function useStore<T, U>(
+  store: Store<T>,
+  select: (state: T) => U,
+  actions: Actions
+): U & BoundActions;
+function useStore<T, U>(
+  store: Store<T>,
+  select: (state: T) => U = defaultSelectFunction,
+  actions?: Actions
+) {
+  const [state, setState] = useState<U>(() => select(store.getState()));
+  useEffect(() => subscribeTo(store, select, setState), [store, select]);
+
+  let boundActions: BoundActions = {};
+
+  if (actions) {
+    boundActions = useMemo(() => bindActions(store, actions), [store, actions]);
+  }
+
+  return { ...state, ...boundActions };
+}
+
+function useStoreWithActions<T>(
+  store: Store<T>,
+  actions: Actions
+): T & BoundActions {
+  return useStore(store, defaultSelectFunction, actions);
 }
+
+export { useStore, useStoreWithActions };

package/src/useExtensionSlotConfig.ts

@@ -1,24 +0,0 @@
-import { useCallback } from "react";
-import {
-  ExtensionSlotConfigObject,
-  ExtensionSlotConfigStore,
-  getExtensionSlotConfigStore,
-} from "@openmrs/esm-config";
-import { useStoreState } from "./useStoreState";
-
-const defaultConfig: ExtensionSlotConfigObject = {
-  add: [],
-  order: [],
-  remove: [],
-};
-
-/** @internal */
-export function useExtensionSlotConfig(slotName: string) {
-  const store = getExtensionSlotConfigStore(slotName);
-  const select = useCallback(
-    (s: ExtensionSlotConfigStore) => s.config,
-    [slotName]
-  );
-  const config = useStoreState(store, select);
-  return config || defaultConfig;
-}

package/src/useStoreState.ts

@@ -1,11 +0,0 @@
-import { subscribeTo } from "@openmrs/esm-state";
-import { useEffect, useState } from "react";
-import { Store } from "unistore";
-
-export function useStoreState<T, U>(store: Store<T>, select: (state: T) => U) {
-  const [state, setState] = useState<U>(() => select(store.getState()));
-
-  useEffect(() => subscribeTo(store, select, setState), [store, select]);
-
-  return state;
-}