@arrai-innovations/reactive-helpers 2.1.0 → 2.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@arrai-innovations/reactive-helpers",
-    "version": "2.1.0",
+    "version": "2.1.1",
     "description": "VueJS 3 utility composition functions to help manipulate objects and lists.",
     "main": "index.js",
     "directories": {

package/use/listSubscription.js

@@ -4,6 +4,7 @@ import { cloneDeep, isEmpty, isObject } from "lodash";
 import { assignReactiveObject } from "../utils/assignReactiveObject";
 import inspect from "browser-util-inspect";
 import { useCancellableIntent } from "../utils/cancellableIntent";
+import loadingCombine from "../utils/loadingCombine";
 
 export class ListSubscriptionError extends Error {
     constructor(message) {
@@ -140,7 +141,7 @@ export function useListSubscription({ listInstance, crudArgs, listArgs, retrieve
     const es = effectScope();
 
     es.run(() => {
-        state.loading = computed(() => listInstance.state.loading || state.subscriptionLoading);
+        state.loading = computed(() => loadingCombine(listInstance.state.loading, state.subscriptionLoading));
         state.errored = computed(() => listInstance.state.errored || state.subscriptionErrored);
         state.error = computed(() => listInstance.state.error || state.subscriptionError);
 

package/use/objectSubscription.js

@@ -3,6 +3,7 @@ import { computed, effectScope, reactive, toRef } from "vue";
 import { assignReactiveObject } from "../utils/assignReactiveObject";
 import { useObjectInstance } from "./objectInstance";
 import { useCancellableIntent } from "../utils/cancellableIntent";
+import loadingCombine from "../utils/loadingCombine";
 
 export class ObjectSubscriptionError extends Error {
     constructor(message) {
@@ -149,7 +150,7 @@ export function useObjectSubscription({ objectInstance, crudArgs, id, retrieveAr
     const es = effectScope();
 
     es.run(() => {
-        state.loading = computed(() => objectInstance.state.loading || state.subscriptionLoading);
+        state.loading = computed(() => loadingCombine(objectInstance.state.loading, state.subscriptionLoading));
         state.errored = computed(() => objectInstance.state.errored || state.subscriptionErrored);
         state.error = computed(() => objectInstance.state.error || state.subscriptionError);
 

package/utils/loadingCombine.js

@@ -0,0 +1,13 @@
+export default function (...loadingStates) {
+    // loadingStates is an array of booleans or undefined
+    // if any true, return true
+    // if all undefined, return undefined
+    // otherwise return false (all false)
+    if (loadingStates.some((loadingState) => loadingState === true)) {
+        return true;
+    }
+    if (loadingStates.every((loadingState) => loadingState === undefined)) {
+        return undefined;
+    }
+    return false;
+}