make sure closeNav resolves, even if already closed (#387)

closes rdar://94461604

Author: Dobromir Hristov

src/components/NavBase.vue

@@ -214,12 +214,15 @@ export default {
       this.isTransitioning = true;
     },
     closeNav() {
+      const oldValue = this.isOpen;
+      // close the nav
       this.isOpen = false;
-      return this.resolveOnceTransitionsEnd();
+      // return a promise, that resolves when transitions end
+      return this.resolveOnceTransitionsEnd(oldValue);
     },
-    resolveOnceTransitionsEnd() {
-      // if outside the breakpoint, resolve as there is no tray animation
-      if (!this.inBreakpoint) return Promise.resolve();
+    resolveOnceTransitionsEnd(oldIsOpen) {
+      // if outside the breakpoint, or was already closed, resolve as there is no tray animation
+      if (!oldIsOpen || !this.inBreakpoint) return Promise.resolve();
       // enable the transitioning up tracking
       this.isTransitioning = true;
       // resolve a promise, when we stop transitioning

tests/unit/components/NavBase.spec.js

@@ -574,5 +574,13 @@ describe('NavBase', () => {
       await wrapper.vm.$nextTick();
       expect(resolved).toBe(true);
     });
+
+    it('resolves closeNav immediately, if already closed and in breakpoint', async () => {
+      wrapper = await createWrapper({
+        data: () => ({ inBreakpoint: true, isOpen: false }),
+      });
+      expect(wrapper.classes()).not.toContain(NavStateClasses.isOpen);
+      await expect(wrapper.vm.closeNav()).resolves.toBeUndefined();
+    });
   });
 });