initialiseAllContainers now triggers adjust calls on dom load

Fixes #21

Author: ZeeCoder

src/initialiseAllContainers.js

@@ -10,6 +10,10 @@ export default function initialiseAllContainers (
 ) {
     const containerInstances = [];
 
+    function adjustAll () {
+        containerInstances.forEach((instance) => instance.adjust());
+    }
+
     for (let containerSelector in containers) {
         document.querySelectorAll(containerSelector).forEach((htmlElement) => {
             containerInstances.push(
@@ -22,10 +26,9 @@ export default function initialiseAllContainers (
     }
 
     if (adjustOnWindowResize) {
-        window.addEventListener('resize', () => {
-            containerInstances.forEach((instance) => {
-                instance.adjust();
-            });
-        });
+        window.addEventListener('resize', adjustAll);
     }
+
+    // Trigger first adjustment
+    document.addEventListener('DOMContentLoaded', adjustAll);
 }

src/initialiseAllContainers.spec.js

@@ -32,11 +32,19 @@ test('should initialise all containers and adjust them on window resize', () =>
         }
     });
 
-    let windowOnResizeFn = null;
-    window.addEventListener = jest.fn((type, onResizeFn) => { windowOnResizeFn = onResizeFn; });
+    let triggerWindowResize = null;
+    let triggerDOMContentLoaded = null;
+    document.addEventListener = jest.fn((type, fn) => {
+        triggerDOMContentLoaded = fn;
+    });
+    window.addEventListener = jest.fn((type, fn) => {
+        triggerWindowResize = fn;
+    });
 
     initialiseAllContainers(containers);
-    windowOnResizeFn();
+
+    triggerDOMContentLoaded();
+    triggerWindowResize();
 
     expect(document.querySelectorAll).toHaveBeenCalledTimes(2);
     expect(document.querySelectorAll).toHaveBeenCalledWith(container1Config.selector);
@@ -48,14 +56,14 @@ test('should initialise all containers and adjust them on window resize', () =>
     expect(Container.mock.calls[2]).toEqual([ container2Element1, container2Config ]);
 
     expect(window.addEventListener).toHaveBeenCalledTimes(1);
-    expect(Container.prototype.adjust).toHaveBeenCalledTimes(3);
+    expect(Container.prototype.adjust).toHaveBeenCalledTimes(6);
 });
 
 test('should not add window resize call if not required', () => {
-    let windowOnResizeFn = null;
-    window.addEventListener = jest.fn((type, onResizeFn) => { windowOnResizeFn = onResizeFn; });
+    let triggerWindowResize = null;
+    window.addEventListener = jest.fn((type, onResizeFn) => { triggerWindowResize = onResizeFn; });
 
     initialiseAllContainers({}, false);
 
-    expect(windowOnResizeFn).toBe(null);
+    expect(triggerWindowResize).toBe(null);
 });

src/runtime/adjustContainer.spec.js

@@ -159,7 +159,7 @@ describe('query styles should be applied, then removed when conditions no longer
 });
 
 test("shouldn't adjust if the configuration is null (invalid)", () => {
-    const getContainerDimensionsMock = require('./getContainerDimensions').default.mockImplementation(() => { console.log('called') });
+    const getContainerDimensionsMock = require('./getContainerDimensions').default;
 
     adjustContainer(container);