Clarified code and added test

vaadin · Dec 9, 2020 · 30c947e · 30c947e
1 parent dc3f418
commit 30c947e
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/flow-client/src/main/resources/META-INF/resources/frontend/Flow.ts b/flow-client/src/main/resources/META-INF/resources/frontend/Flow.ts
@@ -390,7 +390,11 @@ export class Flow {
     $wnd.Vaadin.Flow.loading = (action: boolean) => {
       const show = action && this.isActiveCount === 0;
       const hide = !action && this.isActiveCount === 1;
-      this.isActiveCount = Math.max(0, this.isActiveCount + (action ? 1 : -1));
+      if (action) {
+        this.isActiveCount++;
+      } else if (this.isActiveCount > 0) {
+        this.isActiveCount--;
+      }
       if (show || hide) {
         clearTimeout(timeout2nd);
         clearTimeout(timeout3rd);

diff --git a/flow-client/src/test/frontend/FlowTests.ts b/flow-client/src/test/frontend/FlowTests.ts
@@ -153,6 +153,20 @@ suite("Flow", () => {
     assert.isFalse(indicator.classList.contains('third'));
   });
 
+  test("loading should stack isActive", async () => {
+    const flow = new Flow({imports: () => {}});
+    assert.isFalse(flow.isActive);
+    $wnd.Vaadin.Flow.loading(true);
+    assert.isTrue(flow.isActive);
+    $wnd.Vaadin.Flow.loading(true);
+    assert.isTrue(flow.isActive);
+    $wnd.Vaadin.Flow.loading(false);
+    assert.isTrue(flow.isActive);
+    $wnd.Vaadin.Flow.loading(false);
+    assert.isFalse(flow.isActive);
+
+  });
+
   test("should initialize Flow server navigation when calling flowInit(true)", () => {
     assert.isUndefined($wnd.Vaadin);