#184 Ignore iOS home indicator (#185)

del-systems · Jun 1, 2023 · ce34677 · ce34677
1 parent abfa064
commit ce34677
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 7 deletions.
diff --git a/dist/index.mjs b/dist/index.mjs
@@ -13,7 +13,7 @@ import looksSame from 'looks-same';
 import imageSize from 'image-size';
 import nodeFetch from 'node-fetch';
 
-var swatcherVersion = '1.6.0';
+var swatcherVersion = '1.6.1';
 
 class GithubActionsEnvironment {
   constructor (githubPayload) {
@@ -397,7 +397,15 @@ const doesClusterContains = (bigger, smaller) => (
 );
 
 const isClusterHomeIndicator = (dimensions, cluster) => (
-  isInRange(cluster.height, 4, 6) && isInRange(dimensions.height - cluster.bottom, 7, 9)
+  doesClusterContains(
+    {
+      left: (dimensions.width - 148) / 2,
+      top: dimensions.height - 15,
+      right: (dimensions.width + 148) / 2,
+      bottom: dimensions.height
+    },
+    cluster
+  )
 );
 
 const isClusterTextFieldCaret = (dimensions, cluster) => (

diff --git a/e2e/fixtures/iphone_home_1.png b/e2e/fixtures/iphone_home_1.png
diff --git a/e2e/fixtures/iphone_home_2.png b/e2e/fixtures/iphone_home_2.png
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@del-systems/swatcher",
-  "version": "1.6.0",
+  "version": "1.6.1",
   "description": "Screenshot Watcher",
   "keywords": [
     "screenshots",

diff --git a/src/__tests__/compare_pngs_ignore_home_indicator.js b/src/__tests__/compare_pngs_ignore_home_indicator.js
@@ -25,3 +25,11 @@ it('should ignore iOS home indicator but nothing else', async () => {
   )
   expect(equal).toBeFalsy()
 }, DEFAULT_TIMEOUT)
+
+it('should ignore iOS home indicator', async () => {
+  const { equal } = await comparePNGs(
+    fixturePath('iphone_home_1.png'),
+    fixturePath('iphone_home_2.png')
+  )
+  expect(equal).toBeTruthy()
+}, DEFAULT_TIMEOUT)
diff --git a/src/compare_pngs.js b/src/compare_pngs.js
@@ -65,7 +65,15 @@ const doesClusterContains = (bigger, smaller) => (
 )
 
 const isClusterHomeIndicator = (dimensions, cluster) => (
-  isInRange(cluster.height, 4, 6) && isInRange(dimensions.height - cluster.bottom, 7, 9)
+  doesClusterContains(
+    {
+      left: (dimensions.width - 148) / 2,
+      top: dimensions.height - 15,
+      right: (dimensions.width + 148) / 2,
+      bottom: dimensions.height
+    },
+    cluster
+  )
 )
 
 const isClusterTextFieldCaret = (dimensions, cluster) => (

diff --git a/version.js b/version.js
@@ -1 +1 @@
-export default '1.6.0'
+export default '1.6.1'