✨ (breakpoints) more stuff that should have happened in last patch

evanshunt · Aug 21, 2020 · 9f6928e · 9f6928e
1 parent 707c385
commit 9f6928e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/dist/main.js b/dist/main.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@evanshunt/derekstrap",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "A base layout and styles library by Evans Hunt",
   "main": "dist/main.js",
   "sass": "_index.scss",

diff --git a/src/Breakpoints.js b/src/Breakpoints.js
@@ -46,14 +46,17 @@ const Breakpoints = {
     eventEmitter: debounce(() => {
         const newBreakpoint = Breakpoints.getCurrent();
         if (newBreakpoint !== Breakpoints.currentBreakpoint) {
+            const oldBreakpoint = Breakpoints.currentBreakpoint;
+            Breakpoints.currentBreakpoint = newBreakpoint;
+            Breakpoints.current = Breakpoints.get();
+
             window.dispatchEvent(new CustomEvent('breakpointChange', {
                 detail: {
                     breakpoint: newBreakpoint,
-                    lastBreakpoint: Breakpoints.currentBreakpoint
+                    breakpoints: breakpoints.current,
+                    lastBreakpoint: oldBreakpoint
                 }
             }));
-            Breakpoints.currentBreakpoint = newBreakpoint;
-            Breakpoints.current = Breakpoints.get();
         }
     }, 50),
 };