Test changes

- Updated the original tests and helpers, to accommodate new test
- Added new simple test for collisions

Author: glenn2223

tests/Helpers.ts

@@ -70,6 +70,7 @@ export class Helper {
         tP: CombinedAlignment,
         my?: CombinedAlignment,
         at?: CombinedAlignment,
+        onCollision?: (input: number) => number,
     ) {
         let left = 0;
 
@@ -116,18 +117,16 @@ export class Helper {
             }
         }
 
-        if (this.collision === CollisionHandler.ignore) {
-            return left;
-        }
-
-        // Work on collision
-        return left;
+        return this.collision !== CollisionHandler.ignore && onCollision
+            ? onCollision(left)
+            : left;
     }
 
     getTop(
         tP: CombinedAlignment,
         my?: CombinedAlignment,
         at?: CombinedAlignment,
+        onCollision?: (input: number) => number,
     ) {
         let top = 0;
 
@@ -180,12 +179,9 @@ export class Helper {
             }
         }
 
-        if (this.collision === CollisionHandler.ignore) {
-            return top;
-        }
-
-        // Work on collision
-        return top;
+        return this.collision !== CollisionHandler.ignore && onCollision
+            ? onCollision(top)
+            : top;
     }
 
     /**

tests/collision.test.ts

@@ -0,0 +1,45 @@
+import { CollisionHandler, position } from '../src/index';
+import { allData, Helper, SizeData } from './Helpers';
+
+const windowSize: SizeData = {
+        height: 1000,
+        width: 1000,
+    },
+    anchorSize: SizeData = {
+        height: 100,
+        width: 100,
+    },
+    targetSize: SizeData = {
+        height: 100,
+        width: 200,
+    },
+    helper = new Helper(CollisionHandler.bestFit, anchorSize, targetSize),
+    leftCollision: (input: number) => number = () => 800;
+
+helper.setupEnvironment(windowSize);
+
+test('Collision changes the output', () => {
+    const tP = 'center right',
+        myA = 'top center',
+        atA = 'bottom center';
+
+    helper.setupTest(tP);
+
+    const pData = position({
+        ...{ debug: true },
+        ...{
+            my: myA,
+            at: atA,
+            target: document.querySelector<HTMLDivElement>('.target')!,
+            anchor: document.querySelector<HTMLElement>('.anchor')!,
+        },
+    }) as allData;
+
+    expect({
+        left: parseInt(pData.left, 10),
+        top: parseInt(pData.top, 10),
+    }).toStrictEqual({
+        left: helper.getLeft(tP, myA, atA, leftCollision),
+        top: helper.getTop(tP, myA, atA),
+    });
+});

tests/index.test.ts

@@ -1,5 +1,4 @@
 import { CollisionHandler, CombinedAlignment, position } from '../src/index';
-// @ts-ignore
 import { allData, Helper, SizeData } from './Helpers';
 
 const windowSize: SizeData = {
@@ -25,79 +24,83 @@ const windowSize: SizeData = {
         'bottom center',
         'bottom right',
     ],
-    helper = new Helper(CollisionHandler.ignore, anchorSize, targetSize);
+    helper = new Helper(CollisionHandler.ignore, anchorSize, targetSize),
+    collisionHandler: (input: number) => number = (input) => input + 50;
 
 helper.setupEnvironment(windowSize);
 
 describe('HoverPosition (collisions ignored)', () => {
-    // Add base style
-
     describe.each(positionArray)('Target Position: %s', (tP) => {
-        describe.each(positionArray)('options.my: %s', (myAlignment) => {
-            test.each(positionArray)('options.at: %s', (atAlignment) => {
+        describe.each(positionArray)('options.my: %s', (myPlacement) => {
+            test.each(positionArray)('options.at: %s', (atPlacement) => {
                 helper.setupTest(tP);
 
                 const pData = position({
                     ...{ debug: true },
                     ...{
-                        my: myAlignment,
-                        at: atAlignment,
+                        my: myPlacement,
+                        at: atPlacement,
                         target: document.querySelector<HTMLDivElement>(
                             '.target',
                         )!,
                         anchor: document.querySelector<HTMLElement>('.anchor')!,
                         collision: CollisionHandler.ignore,
                     },
                 }) as allData;
-                /*
-                console.log(
-                    `${tP}|${myAlignment}|${atAlignment}`,
-                    pData,
-                );
-                */
+
                 expect({
                     left: parseInt(pData.left, 10),
                     top: parseInt(pData.top, 10),
                 }).toStrictEqual({
-                    left: helper.getLeft(tP, myAlignment, atAlignment),
-                    top: helper.getTop(tP, myAlignment, atAlignment),
+                    left: helper.getLeft(tP, myPlacement, atPlacement),
+                    top: helper.getTop(tP, myPlacement, atPlacement),
                 });
             });
         });
     });
 });
 
 test('Window scroll adjusts output', () => {
+    // Set the window scroll position
     window.scrollX = 50;
     window.scrollY = 50;
-    
-    const tP = 'top left',
-        myA = 'top center',
-        atA = 'bottom center';
-    
-    helper.setupTest(tP);
+
+    const targetWindowPosition = 'top left',
+        myPlacement = 'top center',
+        atPlacement = 'bottom center';
+
+    helper.setupTest(targetWindowPosition);
 
     const pData = position({
         ...{ debug: true },
         ...{
-            my: myA,
-            at: atA,
-            target: document.querySelector<HTMLDivElement>(
-                '.target',
-            )!,
+            my: myPlacement,
+            at: atPlacement,
+            target: document.querySelector<HTMLDivElement>('.target')!,
             anchor: document.querySelector<HTMLElement>('.anchor')!,
             collision: CollisionHandler.ignore,
         },
     }) as allData;
-    
+
     expect({
         left: parseInt(pData.left, 10),
         top: parseInt(pData.top, 10),
     }).toStrictEqual({
-        left: helper.getLeft(tP, myA, atA) + 50,
-        top: helper.getTop(tP, myA, atA) + 50,
+        left: helper.getLeft(
+            targetWindowPosition,
+            myPlacement,
+            atPlacement,
+            collisionHandler,
+        ),
+        top: helper.getTop(
+            targetWindowPosition,
+            myPlacement,
+            atPlacement,
+            collisionHandler,
+        ),
     });
-    
-    window.scrollX = 50;
-    window.scrollY = 50;
+
+    // Reset the window scroll position
+    window.scrollX = 0;
+    window.scrollY = 0;
 });