From 1de755ab2b8bfd62b492e5a35727f6569e2a7fc7 Mon Sep 17 00:00:00 2001
From: Alex Drimbe <alex@paymoapp.com>
Date: Fri, 1 Apr 2022 12:07:38 +0300
Subject: [PATCH 1/2] chore: update react peerDependencies to support React 18

---
 package-lock.json | 8 ++++----
 package.json      | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 66da265..c1ce6b2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "react-scroll",
-  "version": "1.8.5",
+  "version": "1.8.6",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "react-scroll",
-      "version": "1.8.5",
+      "version": "1.8.6",
       "license": "MIT",
       "dependencies": {
         "lodash.throttle": "^4.1.1",
@@ -41,8 +41,8 @@
         "webpack-dev-server": "^2.11.5"
       },
       "peerDependencies": {
-        "react": "^15.5.4 || ^16.0.0 || ^17.0.0",
-        "react-dom": "^15.5.4 || ^16.0.0 || ^17.0.0"
+        "react": "^15.5.4 || ^16.0.0 || ^17.0.0 || ^18.0.0",
+        "react-dom": "^15.5.4 || ^16.0.0 || ^17.0.0 || ^18.0.0"
       }
     },
     "node_modules/@sinonjs/commons": {
diff --git a/package.json b/package.json
index 7d8f8f8..4c87a2c 100644
--- a/package.json
+++ b/package.json
@@ -66,8 +66,8 @@
     "webpack-dev-server": "^2.11.5"
   },
   "peerDependencies": {
-    "react": "^15.5.4 || ^16.0.0 || ^17.0.0",
-    "react-dom": "^15.5.4 || ^16.0.0 || ^17.0.0"
+    "react": "^15.5.4 || ^16.0.0 || ^17.0.0 || ^18.0.0",
+    "react-dom": "^15.5.4 || ^16.0.0 || ^17.0.0 || ^18.0.0"
   },
   "babel": {
     "presets": [

From 08d73900f8d412074d1903dd810b06f534a915a6 Mon Sep 17 00:00:00 2001
From: Alex Drimbe <alex@paymoapp.com>
Date: Fri, 1 Apr 2022 12:11:06 +0300
Subject: [PATCH 2/2] fix: fix keydown scroll in React 18

---
 examples/basic-keydown/app.js                 | 6 +++++-
 modules/__tests__/scroll-cancellation-test.js | 6 ++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/examples/basic-keydown/app.js b/examples/basic-keydown/app.js
index fa392c3..c90f1bb 100644
--- a/examples/basic-keydown/app.js
+++ b/examples/basic-keydown/app.js
@@ -49,7 +49,11 @@ class Section extends React.Component{
           <div className="container-fluid">
             <div className="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
               <ul className="nav navbar-nav">
-                <li>  <input onKeyDown={e => {() => console.log("keydown"), scroll.scrollMore(500) }}/>
+                <li>  <input onKeyDown={e => {
+                    console.log("keydown");
+                    scroll.scrollMore(500);
+                    e.stopPropagation();
+                }}/>
                   <a onClick={() => scroll.scrollTo(100)}>Scroll To 100!</a>
                 </li>
               </ul>
diff --git a/modules/__tests__/scroll-cancellation-test.js b/modules/__tests__/scroll-cancellation-test.js
index 440cc07..6e57a63 100644
--- a/modules/__tests__/scroll-cancellation-test.js
+++ b/modules/__tests__/scroll-cancellation-test.js
@@ -23,8 +23,9 @@ describe('Scroll cancelation', () => {
       const distance = 100;
 
       class TestComponent extends React.Component {
-        handleKeyDown = () => {
+        handleKeyDown = (e) => {
           scroll.scrollMore(distance, { smooth: true, duration });
+          e.stopPropagation();
         }
         render() {
           return (
@@ -65,8 +66,9 @@ describe('Scroll cancelation', () => {
       const distance = 100;
 
       class TestComponent extends React.Component {
-        handleKeyDown = () => {
+        handleKeyDown = (e) => {
           scroll.scrollMore(distance, { smooth: true, duration, horizontal: true });
+          e.stopPropagation();
         }
         render() {
           return (