diff --git a/integration/__snapshots__/body.test.js.snap b/integration/__snapshots__/body.test.js.snap
index c257f4dd..047d9182 100644
--- a/integration/__snapshots__/body.test.js.snap
+++ b/integration/__snapshots__/body.test.js.snap
@@ -5,7 +5,7 @@ Array [
Object {
"el": "html",
"left": 0,
- "top": 750,
+ "top": 500,
},
]
`;
diff --git a/integration/__snapshots__/iframe_outside_viewport.test.js.snap b/integration/__snapshots__/iframe_outside_viewport.test.js.snap
index 3c43d630..0fa4c062 100644
--- a/integration/__snapshots__/iframe_outside_viewport.test.js.snap
+++ b/integration/__snapshots__/iframe_outside_viewport.test.js.snap
@@ -5,7 +5,12 @@ Array [
Object {
"el": "html",
"left": 0,
- "top": 366,
+ "top": 300,
+ },
+ Object {
+ "el": "html",
+ "left": 0,
+ "top": 124,
},
]
`;
diff --git a/integration/iframe_outside_viewport.html b/integration/iframe_outside_viewport.html
index e5e6ca09..21148456 100644
--- a/integration/iframe_outside_viewport.html
+++ b/integration/iframe_outside_viewport.html
@@ -1,12 +1,14 @@
-
+
-
diff --git a/integration/iframe_outside_viewport.test.js b/integration/iframe_outside_viewport.test.js
index b0ed15fb..d1b35fda 100644
--- a/integration/iframe_outside_viewport.test.js
+++ b/integration/iframe_outside_viewport.test.js
@@ -4,7 +4,7 @@ beforeAll(async () => {
describe('target in iframe is outside viewport', () => {
test('should scroll top window', async () => {
- expect.assertions(3)
+ expect.assertions(4)
const actual = await page.evaluate(() => {
const iframe = document.querySelector('iframe')
const target = iframe.contentDocument.querySelector('.target')
@@ -14,8 +14,9 @@ describe('target in iframe is outside viewport', () => {
})
.map(window.mapActions)
})
- expect(actual).toHaveLength(1)
+ expect(actual).toHaveLength(2)
expect(actual[0]).toMatchObject({ el: 'html' })
+ expect(actual[1]).toMatchObject({ el: 'html' }, { el: 'html' })
expect(actual).toMatchSnapshot()
})
})
diff --git a/package-lock.json b/package-lock.json
index 714a594c..fbac02e4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -25,19 +25,19 @@
}
},
"@babel/core": {
- "version": "7.10.1",
- "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.1.tgz",
- "integrity": "sha512-u8XiZ6sMXW/gPmoP5ijonSUln4unazG291X0XAQ5h0s8qnAFr6BRRZGUEK+jtRWdmB0NTJQt7Uga25q8GetIIg==",
+ "version": "7.10.2",
+ "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.10.2.tgz",
+ "integrity": "sha512-KQmV9yguEjQsXqyOUGKjS4+3K8/DlOCE2pZcq4augdQmtTy5iv5EHtmMSJ7V4c1BIPjuwtZYqYLCq9Ga+hGBRQ==",
"dev": true,
"requires": {
"@babel/code-frame": "^7.10.1",
- "@babel/generator": "^7.10.1",
+ "@babel/generator": "^7.10.2",
"@babel/helper-module-transforms": "^7.10.1",
"@babel/helpers": "^7.10.1",
- "@babel/parser": "^7.10.1",
+ "@babel/parser": "^7.10.2",
"@babel/template": "^7.10.1",
"@babel/traverse": "^7.10.1",
- "@babel/types": "^7.10.1",
+ "@babel/types": "^7.10.2",
"convert-source-map": "^1.7.0",
"debug": "^4.1.0",
"gensync": "^1.0.0-beta.1",
@@ -57,12 +57,12 @@
}
},
"@babel/generator": {
- "version": "7.10.1",
- "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.1.tgz",
- "integrity": "sha512-AT0YPLQw9DI21tliuJIdplVfLHya6mcGa8ctkv7n4Qv+hYacJrKmNWIteAK1P9iyLikFIAkwqJ7HAOqIDLFfgA==",
+ "version": "7.10.2",
+ "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.10.2.tgz",
+ "integrity": "sha512-AxfBNHNu99DTMvlUPlt1h2+Hn7knPpH5ayJ8OqDWSeLld+Fi2AYBTC/IejWDM9Edcii4UzZRCsbUt0WlSDsDsA==",
"dev": true,
"requires": {
- "@babel/types": "^7.10.1",
+ "@babel/types": "^7.10.2",
"jsesc": "^2.5.1",
"lodash": "^4.17.13",
"source-map": "^0.5.0"
@@ -117,9 +117,9 @@
}
},
"@babel/helper-compilation-targets": {
- "version": "7.10.1",
- "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.1.tgz",
- "integrity": "sha512-YuF8IrgSmX/+MV2plPkjEnzlC2wf+gaok8ehMNN0jodF3/sejZauExqpEVGbJua62oaWoNYIXwz4RmAsVcGyHw==",
+ "version": "7.10.2",
+ "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.2.tgz",
+ "integrity": "sha512-hYgOhF4To2UTB4LTaZepN/4Pl9LD4gfbJx8A34mqoluT8TLbof1mhUlYuNWTEebONa8+UlCC4X0TEXu7AOUyGA==",
"dev": true,
"requires": {
"@babel/compat-data": "^7.10.1",
@@ -130,9 +130,9 @@
}
},
"@babel/helper-create-class-features-plugin": {
- "version": "7.10.1",
- "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.1.tgz",
- "integrity": "sha512-bwhdehBJZt84HuPUcP1HaTLuc/EywVS8rc3FgsEPDcivg+DCW+SHuLHVkYOmcBA1ZfI+Z/oZjQc/+bPmIO7uAA==",
+ "version": "7.10.2",
+ "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.2.tgz",
+ "integrity": "sha512-5C/QhkGFh1vqcziq1vAL6SI9ymzUp8BCYjFpvYVhWP4DlATIb3u5q3iUd35mvlyGs8fO7hckkW7i0tmH+5+bvQ==",
"dev": true,
"requires": {
"@babel/helper-function-name": "^7.10.1",
@@ -346,9 +346,9 @@
}
},
"@babel/parser": {
- "version": "7.10.1",
- "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.1.tgz",
- "integrity": "sha512-AUTksaz3FqugBkbTZ1i+lDLG5qy8hIzCaAxEtttU6C0BtZZU9pkNZtWSVAht4EW9kl46YBiyTGMp9xTTGqViNg==",
+ "version": "7.10.2",
+ "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.10.2.tgz",
+ "integrity": "sha512-PApSXlNMJyB4JiGVhCOlzKIif+TKFTvu0aQAhnTvfP/z3vVSN6ZypH5bfUNwFXXjRQtUEBNFd2PtmCmG2Py3qQ==",
"dev": true
},
"@babel/plugin-proposal-async-generator-functions": {
@@ -927,13 +927,13 @@
}
},
"@babel/preset-env": {
- "version": "7.10.1",
- "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.10.1.tgz",
- "integrity": "sha512-bGWNfjfXRLnqbN2T4lB3pMfoic8dkRrmHpVZamSFHzGy5xklyHTobZ28TVUD2grhE5WDnu67tBj8oslIhkiOMQ==",
+ "version": "7.10.2",
+ "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.10.2.tgz",
+ "integrity": "sha512-MjqhX0RZaEgK/KueRzh+3yPSk30oqDKJ5HP5tqTSB1e2gzGS3PLy7K0BIpnp78+0anFuSwOeuCf1zZO7RzRvEA==",
"dev": true,
"requires": {
"@babel/compat-data": "^7.10.1",
- "@babel/helper-compilation-targets": "^7.10.1",
+ "@babel/helper-compilation-targets": "^7.10.2",
"@babel/helper-module-imports": "^7.10.1",
"@babel/helper-plugin-utils": "^7.10.1",
"@babel/plugin-proposal-async-generator-functions": "^7.10.1",
@@ -990,7 +990,7 @@
"@babel/plugin-transform-unicode-escapes": "^7.10.1",
"@babel/plugin-transform-unicode-regex": "^7.10.1",
"@babel/preset-modules": "^0.1.3",
- "@babel/types": "^7.10.1",
+ "@babel/types": "^7.10.2",
"browserslist": "^4.12.0",
"core-js-compat": "^3.6.2",
"invariant": "^2.2.2",
@@ -1034,9 +1034,9 @@
}
},
"@babel/runtime": {
- "version": "7.10.1",
- "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.1.tgz",
- "integrity": "sha512-nQbbCbQc9u/rpg1XCxoMYQTbSMVZjCDxErQ1ClCn9Pvcmv1lGads19ep0a2VsEiIJeHqjZley6EQGEC3Yo1xMA==",
+ "version": "7.10.2",
+ "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.10.2.tgz",
+ "integrity": "sha512-6sF3uQw2ivImfVIl62RZ7MXhO2tap69WeWK57vAaimT6AZbE4FbqjdEJIN1UqoD6wI6B+1n9UiagafH1sxjOtg==",
"dev": true,
"requires": {
"regenerator-runtime": "^0.13.4"
@@ -1071,9 +1071,9 @@
}
},
"@babel/types": {
- "version": "7.10.1",
- "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.1.tgz",
- "integrity": "sha512-L2yqUOpf3tzlW9GVuipgLEcZxnO+96SzR6fjXMuxxNkIgFJ5+07mHCZ+HkHqaeZu8+3LKnNJJ1bKbjBETQAsrA==",
+ "version": "7.10.2",
+ "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.10.2.tgz",
+ "integrity": "sha512-AD3AwWBSz0AWF0AkCN9VPiWrvldXq+/e3cHa4J89vo4ymjz1XwrBFFVZmkJTsQIPNk+ZVomPSXUJqq8yyjZsng==",
"dev": true,
"requires": {
"@babel/helper-validator-identifier": "^7.10.1",
@@ -1660,9 +1660,9 @@
}
},
"@rollup/plugin-alias": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/@rollup/plugin-alias/-/plugin-alias-3.1.0.tgz",
- "integrity": "sha512-IzoejtAqdfwAvx4D0bztAJFoL5Js36kJgnbO00zfI1B9jf9G80vWysyG0C4+E6w5uG5hz0EeetPpoBWKdNktCQ==",
+ "version": "3.1.1",
+ "resolved": "https://registry.npmjs.org/@rollup/plugin-alias/-/plugin-alias-3.1.1.tgz",
+ "integrity": "sha512-hNcQY4bpBUIvxekd26DBPgF7BT4mKVNDF5tBG4Zi+3IgwLxGYRY0itHs9D0oLVwXM5pvJDWJlBQro+au8WaUWw==",
"dev": true,
"requires": {
"slash": "^3.0.0"
@@ -1684,9 +1684,9 @@
}
},
"@rollup/plugin-json": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.0.3.tgz",
- "integrity": "sha512-QMUT0HZNf4CX17LMdwaslzlYHUKTYGuuk34yYIgZrNdu+pMEfqMS55gck7HEeHBKXHM4cz5Dg1OVwythDdbbuQ==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/@rollup/plugin-json/-/plugin-json-4.1.0.tgz",
+ "integrity": "sha512-yfLbTdNS6amI/2OpmbiBoW12vngr5NW2jCJVZSBEz+H5KfUJZ2M7sDjk0U6GOOdCWFVScShte29o9NezJ53TPw==",
"dev": true,
"requires": {
"@rollup/pluginutils": "^3.0.8"
@@ -1706,9 +1706,9 @@
}
},
"@rollup/pluginutils": {
- "version": "3.0.10",
- "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.0.10.tgz",
- "integrity": "sha512-d44M7t+PjmMrASHbhgpSbVgtL6EFyX7J4mYxwQ/c5eoaE6N2VgCgEcWVzNnwycIloti+/MpwFr8qfw+nRw00sw==",
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-3.1.0.tgz",
+ "integrity": "sha512-GksZ6pr6TpIjHm8h9lSQ8pi8BE9VeubNT0OMJ3B5uZJ8pz73NPiqOtCog/x2/QzM1ENChPKxMDhiQuRHsqc+lg==",
"dev": true,
"requires": {
"@types/estree": "0.0.39",
@@ -1716,15 +1716,6 @@
"picomatch": "^2.2.2"
}
},
- "@samverschueren/stream-to-observable": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz",
- "integrity": "sha512-MI4Xx6LHs4Webyvi6EbspgyAb4D2Q2VtnCQ1blOJcoLS6mVa8lNN2rkIy1CVxfTUpoyIbCTkXES1rLXztFD1lg==",
- "dev": true,
- "requires": {
- "any-observable": "^0.3.0"
- }
- },
"@sinonjs/commons": {
"version": "1.8.0",
"resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.0.tgz",
@@ -1744,9 +1735,9 @@
}
},
"@types/babel__core": {
- "version": "7.1.7",
- "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.7.tgz",
- "integrity": "sha512-RL62NqSFPCDK2FM1pSDH0scHpJvsXtZNiYlMB73DgPBaG1E38ZYVL+ei5EkWRbr+KC4YNiAUNBnRj+bgwpgjMw==",
+ "version": "7.1.8",
+ "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.8.tgz",
+ "integrity": "sha512-KXBiQG2OXvaPWFPDS1rD8yV9vO0OuWIqAEqLsbfX0oU2REN5KuoMnZ1gClWcBhO5I3n6oTVAmrMufOvRqdmFTQ==",
"dev": true,
"requires": {
"@babel/parser": "^7.1.0",
@@ -1776,9 +1767,9 @@
}
},
"@types/babel__traverse": {
- "version": "7.0.11",
- "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.11.tgz",
- "integrity": "sha512-ddHK5icION5U6q11+tV2f9Mo6CZVuT8GJKld2q9LqHSZbvLbH34Kcu2yFGckZut453+eQU6btIA3RihmnRgI+Q==",
+ "version": "7.0.12",
+ "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.12.tgz",
+ "integrity": "sha512-t4CoEokHTfcyfb4hUaF9oOHu9RmmNWnm1CP0YmMqOOfClKascOmvlEM736vlqeScuGvBDsHkf8R2INd4DWreQA==",
"dev": true,
"requires": {
"@babel/types": "^7.3.0"
@@ -1831,9 +1822,9 @@
}
},
"@types/node": {
- "version": "14.0.5",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.5.tgz",
- "integrity": "sha512-90hiq6/VqtQgX8Sp0EzeIsv3r+ellbGj4URKj5j30tLlZvRUpnAe9YbYnjl3pJM93GyXU0tghHhvXHq+5rnCKA==",
+ "version": "14.0.11",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.11.tgz",
+ "integrity": "sha512-lCvvI24L21ZVeIiyIUHZ5Oflv1hhHQ5E1S25IRlKIXaRkVgmXpJMI3wUJkmym2bTbCe+WoIibQnMVAU3FguaOg==",
"dev": true
},
"@types/normalize-package-data": {
@@ -2052,12 +2043,6 @@
"color-convert": "^1.9.0"
}
},
- "any-observable": {
- "version": "0.3.0",
- "resolved": "https://registry.npmjs.org/any-observable/-/any-observable-0.3.0.tgz",
- "integrity": "sha512-/FQM1EDkTsf63Ub2C6O7GuYFDsSXUwsaZDurV0np41ocwq0jthUAYCmhBX9f+KwlaCgIuWyr/4WlUQUBfKfZog==",
- "dev": true
- },
"anymatch": {
"version": "3.1.1",
"resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz",
@@ -2650,9 +2635,9 @@
}
},
"caniuse-lite": {
- "version": "1.0.30001066",
- "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001066.tgz",
- "integrity": "sha512-Gfj/WAastBtfxLws0RCh2sDbTK/8rJuSeZMecrSkNGYxPcv7EzblmDGfWQCFEQcSqYE2BRgQiJh8HOD07N5hIw==",
+ "version": "1.0.30001078",
+ "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001078.tgz",
+ "integrity": "sha512-sF12qXe9VMm32IEf/+NDvmTpwJaaU7N1igpiH2FdI4DyABJSsOqG3ZAcFvszLkoLoo1y6VJLMYivukUAxaMASw==",
"dev": true
},
"capture-exit": {
@@ -2868,12 +2853,6 @@
"wrap-ansi": "^5.1.0"
}
},
- "clone": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/clone/-/clone-1.0.4.tgz",
- "integrity": "sha1-2jCcwmPfFZlMaIypAheco8fNfH4=",
- "dev": true
- },
"clone-deep": {
"version": "0.2.4",
"resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-0.2.4.tgz",
@@ -3320,9 +3299,9 @@
}
},
"css-what": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.2.1.tgz",
- "integrity": "sha512-WwOrosiQTvyms+Ti5ZC5vGEK0Vod3FTt1ca+payZqvKuGJF+dq7bG63DstxtN0dpm6FxY27a/zS3Wten+gEtGw==",
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/css-what/-/css-what-3.3.0.tgz",
+ "integrity": "sha512-pv9JPyatiPaQ6pf4OvD/dbfm0o5LviWmwxNWzblYf/1u9QZd0ihV+PMwy5jdQWQ3349kZmKEx9WXuSka2dM4cg==",
"dev": true
},
"cssesc": {
@@ -3575,15 +3554,6 @@
"integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
"dev": true
},
- "defaults": {
- "version": "1.0.3",
- "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz",
- "integrity": "sha1-xlYFHpgX2f8I7YgUd/P+QBnz730=",
- "dev": true,
- "requires": {
- "clone": "^1.0.2"
- }
- },
"define-properties": {
"version": "1.1.3",
"resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz",
@@ -3737,15 +3707,9 @@
}
},
"electron-to-chromium": {
- "version": "1.3.453",
- "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.453.tgz",
- "integrity": "sha512-IQbCfjJR0NDDn/+vojTlq7fPSREcALtF8M1n01gw7nQghCtfFYrJ2dfhsp8APr8bANoFC8vRTFVXMOGpT0eetw==",
- "dev": true
- },
- "elegant-spinner": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/elegant-spinner/-/elegant-spinner-2.0.0.tgz",
- "integrity": "sha512-5YRYHhvhYzV/FC4AiMdeSIg3jAYGq9xFvbhZMpPlJoBsfYgrw2DSCYeXfat6tYBu45PWiyRr3+flaCPPmviPaA==",
+ "version": "1.3.464",
+ "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.464.tgz",
+ "integrity": "sha512-Oo+0+CN9d2z6FToQW6Hwvi9ez09Y/usKwr0tsDsyg43a871zVJCi1nR0v03djLbRNcaCKjtrnVf2XJhTxEpPCg==",
"dev": true
},
"emoji-regex": {
@@ -3779,9 +3743,9 @@
}
},
"entities": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.2.tgz",
- "integrity": "sha512-dmD3AvJQBUjKpcNkoqr+x+IF0SdRtPz9Vk0uTy4yWqga9ibB6s4v++QFWNohjiUGoMlF552ZvNyXDxz5iW0qmw==",
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/entities/-/entities-2.0.3.tgz",
+ "integrity": "sha512-MyoZ0jgnLvB2X3Lg5HqpFmn1kybDiIfEQmKzTb5apr51Rb+T3KdmMiqa70T+bhGnyv7bQ6WMj2QMHpGMmlrUYQ==",
"dev": true
},
"error-ex": {
@@ -3836,9 +3800,9 @@
"dev": true
},
"escodegen": {
- "version": "1.14.1",
- "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.1.tgz",
- "integrity": "sha512-Bmt7NcRySdIfNPfU2ZoXDrrXsG9ZjvDxcAlMfDUgRBjLOWTuIACXPBFJH7Z+cLb40JeQco5toikyc9t9P8E9SQ==",
+ "version": "1.14.2",
+ "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.2.tgz",
+ "integrity": "sha512-InuOIiKk8wwuOFg6x9BQXbzjrQhtyXh46K9bqVTPzSo2FnyMBaYGBMC6PhQy7yxxil9vIedFBweQBMK74/7o8A==",
"dev": true,
"requires": {
"esprima": "^4.0.1",
@@ -4959,9 +4923,9 @@
"dev": true
},
"is-callable": {
- "version": "1.1.5",
- "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
- "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.0.tgz",
+ "integrity": "sha512-pyVD9AaGLxtg6srb2Ng6ynWJqkHU9bEM087AKck0w8QwDarTfNcpIYoU8x8Hv2Icm8u6kFJM18Dag8lyqGkviw==",
"dev": true
},
"is-ci": {
@@ -5097,21 +5061,29 @@
"dev": true
},
"is-reference": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.1.4.tgz",
- "integrity": "sha512-uJA/CDPO3Tao3GTrxYn6AwkM4nUPJiGGYu5+cB8qbC7WGFlrKZbiRo7SFKxUAEpFUfiHofWCXBUNhvYJMh+6zw==",
+ "version": "1.2.0",
+ "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.0.tgz",
+ "integrity": "sha512-ZVxq+5TkOx6GQdnoMm2aRdCKADdcrOWXLGzGT+vIA8DMpqEJaRk5AL1bS80zJ2bjHunVmjdzfCt0e4BymIEqKQ==",
"dev": true,
"requires": {
- "@types/estree": "0.0.39"
+ "@types/estree": "0.0.44"
+ },
+ "dependencies": {
+ "@types/estree": {
+ "version": "0.0.44",
+ "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.44.tgz",
+ "integrity": "sha512-iaIVzr+w2ZJ5HkidlZ3EJM8VTZb2MJLCjw3V+505yVts0gRC4UMvjw0d1HPtGqI/HQC/KdsYtayfzl+AXY2R8g==",
+ "dev": true
+ }
}
},
"is-regex": {
- "version": "1.0.5",
- "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
- "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
+ "version": "1.1.0",
+ "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.0.tgz",
+ "integrity": "sha512-iI97M8KTWID2la5uYXlkbSDQIg4F6o1sYboZKKTDpnDQMLtUL86zxhgDet3Q2SriaYsyGqZ6Mn2SjbRKeLHdqw==",
"dev": true,
"requires": {
- "has": "^1.0.3"
+ "has-symbols": "^1.0.1"
}
},
"is-regexp": {
@@ -7141,9 +7113,9 @@
"dev": true
},
"lint-staged": {
- "version": "10.2.6",
- "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.2.6.tgz",
- "integrity": "sha512-2oEBWyPZHkdyjKcIv2U6ay80Q52ZMlZZrUnfsV0WTVcgzPlt3o2t5UFy2v8ETUTsIDZ0xSJVnffWCgD3LF6xTQ==",
+ "version": "10.2.10",
+ "resolved": "https://registry.npmjs.org/lint-staged/-/lint-staged-10.2.10.tgz",
+ "integrity": "sha512-dgelFaNH6puUGAcU+OVMgbfpKSerNYsPSn6+nlbRDjovL0KigpsVpCu0PFZG6BJxX8gnHJqaZlR9krZamQsb0w==",
"dev": true,
"requires": {
"chalk": "^4.0.0",
@@ -7152,8 +7124,9 @@
"cosmiconfig": "^6.0.0",
"debug": "^4.1.1",
"dedent": "^0.7.0",
+ "enquirer": "^2.3.5",
"execa": "^4.0.1",
- "listr2": "^2.0.2",
+ "listr2": "^2.1.0",
"log-symbols": "^4.0.0",
"micromatch": "^4.0.2",
"normalize-path": "^3.0.0",
@@ -7173,9 +7146,9 @@
}
},
"chalk": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
- "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+ "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
"dev": true,
"requires": {
"ansi-styles": "^4.1.0",
@@ -7294,25 +7267,19 @@
}
},
"listr2": {
- "version": "2.0.4",
- "resolved": "https://registry.npmjs.org/listr2/-/listr2-2.0.4.tgz",
- "integrity": "sha512-oJaAcplPsa72rKW0eg4P4LbEJjhH+UO2I8uqR/I2wzHrVg16ohSfUy0SlcHS21zfYXxtsUpL8YXGHjyfWMR0cg==",
+ "version": "2.1.3",
+ "resolved": "https://registry.npmjs.org/listr2/-/listr2-2.1.3.tgz",
+ "integrity": "sha512-6oy3QhrZAlJGrG8oPcRp1hix1zUpb5AvyvZ5je979HCyf48tIj3Hn1TG5+rfyhz30t7HfySH/OIaVbwrI2kruA==",
"dev": true,
"requires": {
- "@samverschueren/stream-to-observable": "^0.3.0",
"chalk": "^4.0.0",
- "cli-cursor": "^3.1.0",
"cli-truncate": "^2.1.0",
- "elegant-spinner": "^2.0.0",
- "enquirer": "^2.3.5",
"figures": "^3.2.0",
"indent-string": "^4.0.0",
"log-update": "^4.0.0",
"p-map": "^4.0.0",
- "pad": "^3.2.0",
"rxjs": "^6.5.5",
- "through": "^2.3.8",
- "uuid": "^7.0.2"
+ "through": "^2.3.8"
},
"dependencies": {
"ansi-styles": {
@@ -7326,9 +7293,9 @@
}
},
"chalk": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
- "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+ "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
"dev": true,
"requires": {
"ansi-styles": "^4.1.0",
@@ -7455,9 +7422,9 @@
}
},
"chalk": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.0.0.tgz",
- "integrity": "sha512-N9oWFcegS0sFr9oh1oz2d7Npos6vNoWW9HvtCg5N1KRFpUhaAhvTv5Y58g880fZaEYSNm3qDz8SU1UrGvp+n7A==",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+ "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
"dev": true,
"requires": {
"ansi-styles": "^4.1.0",
@@ -8023,9 +7990,9 @@
}
},
"node-releases": {
- "version": "1.1.57",
- "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.57.tgz",
- "integrity": "sha512-ZQmnWS7adi61A9JsllJ2gdj2PauElcjnOwTp2O011iGzoakTxUsDGSe+6vD7wXbKdqhSFymC0OSx35aAMhrSdw==",
+ "version": "1.1.58",
+ "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.58.tgz",
+ "integrity": "sha512-NxBudgVKiRh/2aPWMgPR7bPTX0VPmGx5QBwCtdHitnqFE5/O8DeBXuIMH1nwNnw/aMo6AjOrpsHzfY3UbUJ7yg==",
"dev": true
},
"normalize-package-data": {
@@ -8226,9 +8193,9 @@
}
},
"opencollective-postinstall": {
- "version": "2.0.2",
- "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.2.tgz",
- "integrity": "sha512-pVOEP16TrAO2/fjej1IdOyupJY8KDUM1CvsaScRbw6oddvpQoOfGk4ywha0HKKVAD6RkW4x6Q+tNBwhf3Bgpuw==",
+ "version": "2.0.3",
+ "resolved": "https://registry.npmjs.org/opencollective-postinstall/-/opencollective-postinstall-2.0.3.tgz",
+ "integrity": "sha512-8AV/sCtuzUeTo8gQK5qDZzARrulB3egtLzFgteqB2tcT4Mw7B8Kt7JcDHmltjz6FOAHsvTevk70gZEbhM4ZS9Q==",
"dev": true
},
"optionator": {
@@ -8315,15 +8282,6 @@
"integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
"dev": true
},
- "pad": {
- "version": "3.2.0",
- "resolved": "https://registry.npmjs.org/pad/-/pad-3.2.0.tgz",
- "integrity": "sha512-2u0TrjcGbOjBTJpyewEl4hBO3OeX5wWue7eIFPzQTg6wFSvoaHcBTTUY5m+n0hd04gmTCPuY0kCpVIVuw5etwg==",
- "dev": true,
- "requires": {
- "wcwidth": "^1.0.1"
- }
- },
"parent-module": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
@@ -8560,9 +8518,9 @@
"dev": true
},
"postcss": {
- "version": "7.0.31",
- "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.31.tgz",
- "integrity": "sha512-a937VDHE1ftkjk+8/7nj/mrjtmkn69xxzJgRETXdAUU+IgOYPQNJF17haGWbeDxSyk++HA14UA98FurvPyBJOA==",
+ "version": "7.0.32",
+ "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
+ "integrity": "sha512-03eXong5NLnNCD05xscnGKGDZ98CyzoqPSMjOe6SuoQY7Z2hIj0Ld1g/O/UQRuOle2aRtiIRDg9tDcTGAkLfKw==",
"dev": true,
"requires": {
"chalk": "^2.4.2",
@@ -9397,9 +9355,9 @@
"dev": true
},
"puppeteer": {
- "version": "3.1.0",
- "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-3.1.0.tgz",
- "integrity": "sha512-jLa9sqdVx0tPnr2FcwAq+8DSjGhSM4YpkwOf3JE22Ycyqm71SW7B5uGfTyMGFoLCmbCozbLZclCjasPb0flTRw==",
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/puppeteer/-/puppeteer-3.3.0.tgz",
+ "integrity": "sha512-23zNqRltZ1PPoK28uRefWJ/zKb5Jhnzbbwbpcna2o5+QMn17F0khq5s1bdH3vPlyj+J36pubccR8wiNA/VE0Vw==",
"dev": true,
"requires": {
"debug": "^4.1.0",
@@ -9552,9 +9510,9 @@
}
},
"regenerate": {
- "version": "1.4.0",
- "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.0.tgz",
- "integrity": "sha512-1G6jJVDWrt0rK99kBjvEtziZNCICAuvIPkSiUFIQxVP06RCVpq3dmDo2oi6ABpYaDYaTRr67BEhL8r1wgEZZKg==",
+ "version": "1.4.1",
+ "resolved": "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz",
+ "integrity": "sha512-j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A==",
"dev": true
},
"regenerate-unicode-properties": {
@@ -10339,9 +10297,9 @@
"dev": true
},
"serve": {
- "version": "11.3.1",
- "resolved": "https://registry.npmjs.org/serve/-/serve-11.3.1.tgz",
- "integrity": "sha512-+tcx5eybTZT0scsp1PCb7HYjzBSfRF9fQIwyEU8ZYLioVuhHwywRYBBTF5WYlTXvC62eumK2bloDXAd7+9blGQ==",
+ "version": "11.3.2",
+ "resolved": "https://registry.npmjs.org/serve/-/serve-11.3.2.tgz",
+ "integrity": "sha512-yKWQfI3xbj/f7X1lTBg91fXBP0FqjJ4TEi+ilES5yzH0iKJpN5LjNb1YzIfQg9Rqn4ECUS2SOf2+Kmepogoa5w==",
"dev": true,
"requires": {
"@zeit/schemas": "2.6.0",
@@ -10351,7 +10309,7 @@
"chalk": "2.4.1",
"clipboardy": "1.2.3",
"compression": "1.7.3",
- "serve-handler": "6.1.2",
+ "serve-handler": "6.1.3",
"update-check": "1.5.2"
},
"dependencies": {
@@ -10396,9 +10354,9 @@
}
},
"serve-handler": {
- "version": "6.1.2",
- "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.2.tgz",
- "integrity": "sha512-RFh49wX7zJmmOVDcIjiDSJnMH+ItQEvyuYLYuDBVoA/xmQSCuj+uRmk1cmBB5QQlI3qOiWKp6p4DUGY+Z5AB2A==",
+ "version": "6.1.3",
+ "resolved": "https://registry.npmjs.org/serve-handler/-/serve-handler-6.1.3.tgz",
+ "integrity": "sha512-FosMqFBNrLyeiIDvP1zgO6YoTzFYHxLDEIavhlmQ+knB2Z7l1t+kGLHkZIDN7UVWqQAmKI3D20A6F6jo3nDd4w==",
"dev": true,
"requires": {
"bytes": "3.0.0",
@@ -11414,9 +11372,9 @@
}
},
"typescript": {
- "version": "3.9.3",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.3.tgz",
- "integrity": "sha512-D/wqnB2xzNFIcoBG9FG8cXRDjiqSTbG2wd8DMZeQyJlP1vfTkIxH4GKveWaEBYySKIg+USu+E+EDIR47SqnaMQ==",
+ "version": "3.9.5",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.5.tgz",
+ "integrity": "sha512-hSAifV3k+i6lEoCJ2k6R2Z/rp/H3+8sdmcn5NrS3/3kE7+RyZXm9aqvxWqjEXHAd8b0pShatpcdMTvEdvAJltQ==",
"dev": true
},
"unbzip2-stream": {
@@ -11586,7 +11544,8 @@
"version": "7.0.3",
"resolved": "https://registry.npmjs.org/uuid/-/uuid-7.0.3.tgz",
"integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==",
- "dev": true
+ "dev": true,
+ "optional": true
},
"v8-to-istanbul": {
"version": "4.1.4",
@@ -11705,15 +11664,6 @@
"makeerror": "1.0.x"
}
},
- "wcwidth": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
- "integrity": "sha1-8LDc+RW8X/FSivrbLA4XtTLaL+g=",
- "dev": true,
- "requires": {
- "defaults": "^1.0.3"
- }
- },
"webidl-conversions": {
"version": "6.1.0",
"resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz",
diff --git a/package.json b/package.json
index cb211149..3f128a51 100644
--- a/package.json
+++ b/package.json
@@ -34,14 +34,14 @@
"jest": "26.0.1",
"jest-junit": "10.0.0",
"jest-puppeteer": "4.4.0",
- "lint-staged": "10.2.6",
+ "lint-staged": "10.2.10",
"microbundle": "^0.12.0",
"prettier": "2.0.5",
"prettier-package-json": "2.1.3",
- "puppeteer": "3.1.0",
+ "puppeteer": "3.3.0",
"rimraf": "3.0.2",
- "serve": "11.3.1",
- "typescript": "3.9.3"
+ "serve": "11.3.2",
+ "typescript": "3.9.5"
},
"keywords": [
"if-needed",
diff --git a/src/index.ts b/src/index.ts
index 09ca9824..7527bee7 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -49,14 +49,10 @@ interface CustomScrollAction {
}
// @TODO better shadowdom test, 11 = document fragment
-function isElement(el: any): el is Element {
+function isElement(el: any) {
return el != null && typeof el === 'object' && el.nodeType === 1
}
-function isDocument(el: any): el is Document {
- return el != null && typeof el === 'object' && el.nodeType === 9
-}
-
function canOverflow(
overflow: string | null,
skipOverflowHiddenElements?: boolean
@@ -245,35 +241,14 @@ function alignNearest(
return 0
}
-/**
- * Get rect considering iframe
- */
-function getRect(target: Element) {
- const clientRect = target.getBoundingClientRect()
- const rect = {
- height: clientRect.height,
- width: clientRect.width,
- top: clientRect.top,
- left: clientRect.left,
- bottom: clientRect.bottom,
- right: clientRect.right,
- }
+function computeScrollIntoOwnerDocumentDefaultView(target: Element, options: Options): CustomScrollAction[] {
const doc = target.ownerDocument
- let childWindow = doc?.defaultView
-
- while (childWindow && window.top !== childWindow) {
- const frameRect = childWindow.frameElement.getBoundingClientRect()
- rect.top += frameRect.top
- rect.bottom += frameRect.top
- rect.left += frameRect.left
- rect.right += frameRect.left
- childWindow = childWindow.parent
- }
+ const win = doc.defaultView
- return rect
-}
+ if (!doc || !win) {
+ return []
+ }
-export default (target: Element, options: Options): CustomScrollAction[] => {
const {
scrollMode,
block,
@@ -292,19 +267,14 @@ export default (target: Element, options: Options): CustomScrollAction[] => {
}
// Used to handle the top most element that can be scrolled
- const scrollingElement = document.scrollingElement || document.documentElement
+ const scrollingElement = doc.scrollingElement || doc.documentElement
// Collect all the scrolling boxes, as defined in the spec: https://drafts.csswg.org/cssom-view/#scrolling-box
const frames: Element[] = []
let cursor = target
- while ((isElement(cursor) || isDocument(cursor)) && checkBoundary(cursor)) {
- if (isDocument(cursor)) {
- const document = cursor
- cursor = document.defaultView?.frameElement as Element
- } else {
- // Move cursor to parent
- cursor = cursor.parentNode as Element
- }
+ while (isElement(cursor) && checkBoundary(cursor)) {
+ // Move cursor to parent
+ cursor = cursor.parentNode as Element
// Stop when we reach the viewport
if (cursor === scrollingElement) {
@@ -314,9 +284,9 @@ export default (target: Element, options: Options): CustomScrollAction[] => {
// Skip document.body if it's not the scrollingElement and documentElement isn't independently scrollable
if (
- cursor === document.body &&
+ cursor === doc.body &&
isScrollable(cursor) &&
- !isScrollable(document.documentElement as HTMLElement)
+ !isScrollable(doc.documentElement as HTMLElement)
) {
continue
}
@@ -332,16 +302,16 @@ export default (target: Element, options: Options): CustomScrollAction[] => {
// and viewport dimensions on window.innerWidth/Height
// https://www.quirksmode.org/mobile/viewports2.html
// https://bokand.github.io/viewport/index.html
- const viewportWidth = window.visualViewport
- ? visualViewport.width
- : innerWidth
- const viewportHeight = window.visualViewport
- ? visualViewport.height
- : innerHeight
+ const viewportWidth = win.visualViewport
+ ? win.visualViewport.width
+ : win.innerWidth
+ const viewportHeight = win.visualViewport
+ ? win.visualViewport.height
+ : win.innerHeight
// Newer browsers supports scroll[X|Y], page[X|Y]Offset is
- const viewportX = window.scrollX || pageXOffset
- const viewportY = window.scrollY || pageYOffset
+ const viewportX = win.scrollX || win.pageXOffset
+ const viewportY = win.scrollY || win.pageYOffset
const {
height: targetHeight,
@@ -350,7 +320,7 @@ export default (target: Element, options: Options): CustomScrollAction[] => {
right: targetRight,
bottom: targetBottom,
left: targetLeft,
- } = getRect(target)
+ } = target.getBoundingClientRect()
// These values mutate as we loop through and generate scroll coordinates
let targetBlock: number =
@@ -374,7 +344,14 @@ export default (target: Element, options: Options): CustomScrollAction[] => {
// @TODO add a shouldScroll hook here that allows userland code to take control
- const { height, width, top, right, bottom, left } = getRect(frame)
+ const {
+ height,
+ width,
+ top,
+ right,
+ bottom,
+ left,
+ } = frame.getBoundingClientRect()
// If the element is already visible we can end it here
// @TODO targetBlock and targetInline should be taken into account to be compliant with https://github.com/w3c/csswg-drafts/pull/1805/files#diff-3c17f0e43c20f8ecf89419d49e7ef5e0R1333
@@ -464,8 +441,20 @@ export default (target: Element, options: Options): CustomScrollAction[] => {
// Apply scroll position offsets and ensure they are within bounds
// @TODO add more test cases to cover this 100%
- blockScroll = Math.max(0, blockScroll + viewportY)
- inlineScroll = Math.max(0, inlineScroll + viewportX)
+ blockScroll = Math.max(
+ 0,
+ Math.min(
+ frame.scrollHeight - frame.clientHeight,
+ blockScroll + viewportY
+ )
+ )
+ inlineScroll = Math.max(
+ 0,
+ Math.min(
+ frame.scrollWidth - frame.clientWidth,
+ inlineScroll + viewportX
+ )
+ )
} else {
// Handle each scrolling frame that might exist between the target and the viewport
@@ -536,3 +525,20 @@ export default (target: Element, options: Options): CustomScrollAction[] => {
return computations
}
+
+export default (target: Element, options: Options): CustomScrollAction[] => {
+ const targets = []
+ let cursor: Element | undefined = target
+
+ while (cursor) {
+ targets.push(cursor)
+ if (cursor?.ownerDocument.defaultView === window) {
+ break
+ }
+ cursor = cursor.ownerDocument.defaultView?.frameElement
+ }
+
+ return targets.reduce((computations: CustomScrollAction[], target) => {
+ return computations.concat(computeScrollIntoOwnerDocumentDefaultView(target, options))
+ }, [])
+}
\ No newline at end of file