Merge branch 'release/2.0.0-beta.5'

studiometa · Dec 13, 2021 · d6ce051 · d6ce051
2 parents 867bbff + 3431f56
commit d6ce051
Show file tree

Hide file tree

Showing 9 changed files with 12,130 additions and 30,788 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -69,6 +69,8 @@ jobs:
           fi
           echo "is_prerelease=$PRERELEASE" >> $GITHUB_ENV
 
+          git show $GITHUB_REF
+
           CHANGELOG=$(git show $GITHUB_REF | tail -n+7)
 
           # Set markdown titles

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/js-toolkit-workspace",
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.5",
   "private": true,
   "workspaces": [
     "packages/*"
@@ -28,22 +28,22 @@
     "@babel/cli": "^7.16.0",
     "@babel/core": "^7.16.0",
     "@babel/plugin-proposal-class-properties": "^7.16.0",
-    "@babel/plugin-transform-runtime": "^7.16.0",
-    "@babel/preset-env": "^7.16.0",
+    "@babel/plugin-transform-runtime": "^7.16.4",
+    "@babel/preset-env": "^7.16.4",
     "@studiometa/browserslist-config": "^1.0.1",
     "@studiometa/eslint-config": "^2.1.3",
     "@studiometa/prettier-config": "^2.0.1",
     "@studiometa/stylelint-config": "^2.0.0",
     "@types/estree": "^0.0.50",
-    "@types/jest": "^27.0.1",
-    "@types/node": "^16.7.2",
+    "@types/jest": "^27.0.3",
+    "@types/node": "^16.11.11",
     "@typescript-eslint/eslint-plugin": "^4.29.3",
     "@typescript-eslint/parser": "^4.29.3",
     "babel-plugin-add-import-extension": "^1.6.0",
     "eslint": "^7.32.0",
     "eslint-plugin-jest": "^24.4.0",
     "microbundle": "^0.13.3",
-    "prettier": "^2.3.2",
-    "typescript": "^4.3.5"
+    "prettier": "^2.5.0",
+    "typescript": "^4.5.2"
   }
 }
diff --git a/packages/demo/package.json b/packages/demo/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/js-toolkit-demo",
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.5",
   "private": true,
   "type": "commonjs",
   "scripts": {

diff --git a/packages/docs/package.json b/packages/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/js-toolkit-docs",
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.5",
   "private": true,
   "scripts": {
     "dev": "vitepress dev .",

diff --git a/packages/js-toolkit/package.json b/packages/js-toolkit/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/js-toolkit",
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.5",
   "description": "A set of useful little bits of JavaScript to boost your project! 🚀",
   "publishConfig": {
     "access": "public"

diff --git a/packages/js-toolkit/utils/scrollTo.js b/packages/js-toolkit/utils/scrollTo.js
@@ -22,7 +22,7 @@ export default function scrollTo(selectorElement, { offset = 0, dampFactor = 0.2
 
   const sizes = targetElement.getBoundingClientRect();
   const scrollMargin = getComputedStyle(targetElement).scrollMarginTop || '0';
-  const max = document.body.offsetHeight - window.innerHeight;
+  const max = document.documentElement.scrollHeight - window.innerHeight;
   let scrollTarget = sizes.top + window.pageYOffset + parseInt(scrollMargin, 10) + offset;
 
   // Make sure to not scroll more than the max scroll allowed

diff --git a/packages/tests/package.json b/packages/tests/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@studiometa/js-toolkit-tests",
-  "version": "2.0.0-beta.4",
+  "version": "2.0.0-beta.5",
   "private": true,
   "type": "module",
   "scripts": {

diff --git a/packages/tests/utils/scrollTo.spec.js b/packages/tests/utils/scrollTo.spec.js
@@ -3,31 +3,33 @@ import scrollTo from '@studiometa/js-toolkit/utils/scrollTo';
 import wait from '../__utils__/wait';
 
 describe('The `scrollTo` function', () => {
-  const fn = jest.fn(({ top }) => { window.pageYOffset = top; });
+  const fn = jest.fn(({ top }) => {
+    window.pageYOffset = top;
+  });
   window.scrollTo = fn;
 
-  const bodyHeightSpy = jest.spyOn(document.body, 'offsetHeight', 'get');
-  bodyHeightSpy.mockImplementation(() => 10000);
+  const scrollHeightSpy = jest.spyOn(document.documentElement, 'scrollHeight', 'get');
+  scrollHeightSpy.mockImplementation(() => 10000);
 
   const element = document.createElement('div');
   const elementSpy = jest.spyOn(element, 'getBoundingClientRect');
   elementSpy.mockImplementation(() => ({
-    top: 5000
-  }))
+    top: 5000,
+  }));
 
   document.body.appendChild(element);
 
   afterAll(() => {
     delete window.scrollTo;
-    bodyHeightSpy.mockRestore();
+    scrollHeightSpy.mockRestore();
     elementSpy.mockRestore();
     document.body.innerHTML = '';
   });
 
   beforeEach(() => {
     fn.mockClear();
     window.pageYOffset = 0;
-  })
+  });
 
   it('should scroll to a selector', async () => {
     expect(fn).not.toHaveBeenCalled();
@@ -49,10 +51,10 @@ describe('The `scrollTo` function', () => {
 
   it('should be limited to the maximum scroll height', async () => {
     elementSpy.mockImplementation(() => ({
-      top: 11000
+      top: 11000,
     }));
     expect(fn).not.toHaveBeenCalled();
-    const maxScroll = document.body.offsetHeight - window.innerHeight;
+    const maxScroll = document.documentElement.scrollHeight - window.innerHeight;
     await scrollTo(element);
     expect(fn).toHaveBeenLastCalledWith({ top: maxScroll });
   });