Merge pull request #4515 from alvarotrigo/dev

alvarotrigo · web-flow · commit 0d45ac151566 · 2023-02-16T14:16:46.000+01:00
Merging dev branch 4.0.17
diff --git a/README.md b/README.md
@@ -18,7 +18,7 @@
 
 ---
 
-![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.16-brightgreen.svg)
+![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.17-brightgreen.svg)
 [![License](https://img.shields.io/badge/License-GPL-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
 [![PayPal Donate](https://img.shields.io/badge/donate-PayPal.me-ff69b4.svg)](https://www.paypal.me/alvarotrigo/9.95)
 [![jsDelivr Hits](https://data.jsdelivr.com/v1/package/npm/fullpage.js/badge?style=rounded)](https://www.jsdelivr.com/package/npm/fullpage.js)
diff --git a/dist/fullpage.css b/dist/fullpage.css
@@ -1,5 +1,5 @@
 /*!
- * fullPage 4.0.16
+ * fullPage 4.0.17
  * https://github.com/alvarotrigo/fullPage.js
  *
  * @license GPLv3 for open source use only
diff --git a/dist/fullpage.extensions.min.js b/dist/fullpage.extensions.min.js
diff --git a/dist/fullpage.js b/dist/fullpage.js
@@ -1,5 +1,5 @@
 /*!
-* fullPage 4.0.16
+* fullPage 4.0.17
 * https://github.com/alvarotrigo/fullPage.js
 *
 * @license GPLv3 for open source use only
@@ -777,6 +777,10 @@
       } while (!matches(item, topParentSelector));
 
       return parents;
+    }
+    function isInsideInput() {
+      var activeElement = doc.activeElement;
+      return matches(activeElement, 'textarea') || matches(activeElement, 'input') || matches(activeElement, 'select') || getAttr(activeElement, 'contentEditable') == "true" || getAttr(activeElement, 'contentEditable') == '';
     } //utils are public, so we can use it wherever we want
     // @ts-ignore
 
@@ -871,7 +875,8 @@
         getLast: getLast,
         getAverage: getAverage,
         setSrc: setSrc,
-        getParentsUntil: getParentsUntil
+        getParentsUntil: getParentsUntil,
+        isInsideInput: isInsideInput
     });
 
     function _typeof(obj) {
@@ -2863,9 +2868,13 @@
         }
       },
       preventScrollWithKeyboard: function preventScrollWithKeyboard(e) {
-        if (!scrollOverflowHandler.isInnerScrollAllowed) {
-          preventDefault(e);
-          return false;
+        if (!isInsideInput() && getOptions().keyboardScrolling) {
+          var directionKeys = [38, 33, 32, 40, 34, 36, 35];
+
+          if (directionKeys.indexOf(e.keyCode) > -1 && !scrollOverflowHandler.isInnerScrollAllowed) {
+            preventDefault(e);
+            return false;
+          }
         }
       },
       keyUpHandler: function keyUpHandler() {
@@ -4221,11 +4230,6 @@
       clearTimeout(g_keydownId);
       docRemoveEvent('keydown', keydownHandler);
       docRemoveEvent('keyup', keyUpHandler);
-    }
-
-    function isInsideInput() {
-      var activeElement = doc.activeElement;
-      return matches(activeElement, 'textarea') || matches(activeElement, 'input') || matches(activeElement, 'select') || getAttr(activeElement, 'contentEditable') == "true" || getAttr(activeElement, 'contentEditable') == '';
     } //Sliding with arrow keys, both, vertical and horizontal
 
 
@@ -5466,7 +5470,7 @@
         });
       });
       var t = ["-"];
-      var n = "\x32\x30\x32\x33\x2d\x31\x2d\x32".split("-"),
+      var n = "\x32\x30\x32\x33\x2d\x31\x2d\x31\x36".split("-"),
           e = new Date(n[0], n[1], n[2]),
           r = ["se", "licen", "-", "v3", "l", "gp"];
 
@@ -5890,7 +5894,7 @@
       }; //public functions
 
 
-      FP.version = '4.0.16';
+      FP.version = '4.0.17';
       FP.test = Object.assign(FP.test, {
         top: '0px',
         translate3d: 'translate3d(0px, 0px, 0px)',
diff --git a/dist/fullpage.min.css b/dist/fullpage.min.css
diff --git a/dist/fullpage.min.css.map b/dist/fullpage.min.css.map
diff --git a/dist/fullpage.min.js b/dist/fullpage.min.js
diff --git a/lang/brazilian-portuguese/README.md b/lang/brazilian-portuguese/README.md
@@ -18,7 +18,7 @@
 
 ---
 
-![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.16-brightgreen.svg)
+![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.17-brightgreen.svg)
 [![License](https://img.shields.io/badge/License-GPL-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
 [![PayPal Donate](https://img.shields.io/badge/donate-PayPal.me-ff69b4.svg)](https://www.paypal.me/alvarotrigo/9.95)
 [![jsDelivr Hits](https://data.jsdelivr.com/v1/package/npm/fullpage.js/badge?style=rounded)](https://www.jsdelivr.com/package/npm/fullpage.js)
diff --git a/lang/chinese/README.md b/lang/chinese/README.md
@@ -17,7 +17,7 @@
 
 ---
 
-![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.16,2-brightgreen.svg)
+![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.17,2-brightgreen.svg)
 [![License](https://img.shields.io/badge/License-GPL-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
 [![PayPal Donate](https://img.shields.io/badge/donate-PayPal.me-ff69b4.svg)](https://www.paypal.me/alvarotrigo/9.95)
 [![jsDelivr Hits](https://data.jsdelivr.com/v1/package/npm/fullpage.js/badge?style=rounded)](https://www.jsdelivr.com/package/npm/fullpage.js)
diff --git a/lang/french/README.md b/lang/french/README.md
@@ -18,7 +18,7 @@
 
 ---
 
-![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.16-brightgreen.svg)
+![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.17-brightgreen.svg)
 [![License](https://img.shields.io/badge/License-GPL-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
 [![PayPal Donate](https://img.shields.io/badge/donate-PayPal.me-ff69b4.svg)](https://www.paypal.me/alvarotrigo/9.95)
 [![jsDelivr Hits](https://data.jsdelivr.com/v1/package/npm/fullpage.js/badge?style=rounded)](https://www.jsdelivr.com/package/npm/fullpage.js)
diff --git a/lang/korean/README.md b/lang/korean/README.md
@@ -17,7 +17,7 @@
 </p>
 ---
 
-![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.16-brightgreen.svg)
+![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.17-brightgreen.svg)
 [![License](https://img.shields.io/badge/License-GPL-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
 [![PayPal](https://img.shields.io/badge/donate-PayPal.me-ff69b4.svg)](https://www.paypal.me/alvarotrigo/9.95)
 [![jsDelivr Hits](https://data.jsdelivr.com/v1/package/npm/fullpage.js/badge?style=rounded)](https://www.jsdelivr.com/package/npm/fullpage.js)
diff --git a/lang/russian/README.md b/lang/russian/README.md
@@ -18,7 +18,7 @@
 
 ---
 
-![Версия fullPage.js](https://img.shields.io/badge/fullPage.js-v4.0.16-brightgreen.svg)
+![Версия fullPage.js](https://img.shields.io/badge/fullPage.js-v4.0.17-brightgreen.svg)
 [![Лицензия](https://img.shields.io/badge/License-GPL-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
 [![Перечисление на PayPal](https://img.shields.io/badge/donate-PayPal.me-ff69b4.svg)](https://www.paypal.me/alvarotrigo/9.95)
 [![jsDelivr Hits](https://data.jsdelivr.com/v1/package/npm/fullpage.js/badge?style=rounded)](https://www.jsdelivr.com/package/npm/fullpage.js)
diff --git a/lang/spanish/README.md b/lang/spanish/README.md
@@ -19,7 +19,7 @@
 
 ---
 
-![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.16-brightgreen.svg)
+![fullPage.js version](https://img.shields.io/badge/fullPage.js-v4.0.17-brightgreen.svg)
 [![License](https://img.shields.io/badge/License-GPL-blue.svg)](https://www.gnu.org/licenses/gpl-3.0.html)
 [![PayPal Donate](https://img.shields.io/badge/donate-PayPal.me-ff69b4.svg)](https://www.paypal.me/alvarotrigo/9.95)
 [![jsDelivr Hits](https://data.jsdelivr.com/v1/package/npm/fullpage.js/badge?style=rounded)](https://www.jsdelivr.com/package/npm/fullpage.js)
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fullpage.js",
-  "version": "4.0.16",
+  "version": "4.0.17",
   "description": "Create beautiful fullscreen snap scrolling websites",
   "main": "dist/fullpage.js",
   "scripts": {
diff --git a/rollup.config.js b/rollup.config.js
@@ -3,7 +3,7 @@ import resolve from "@rollup/plugin-node-resolve";
 import babel from "@rollup/plugin-babel";
 
 const licenseContent = `/*!
-* fullPage 4.0.16
+* fullPage 4.0.17
 * https://github.com/alvarotrigo/fullPage.js
 *
 * @license GPLv3 for open source use only
diff --git a/src/css/fullpage.css b/src/css/fullpage.css
@@ -1,5 +1,5 @@
 /*!
- * fullPage 4.0.16
+ * fullPage 4.0.17
  * https://github.com/alvarotrigo/fullPage.js
  *
  * @license GPLv3 for open source use only
diff --git a/src/js/common/utils.js b/src/js/common/utils.js
@@ -533,6 +533,16 @@ export function getParentsUntil(item, topParentSelector){
     return parents;
 }
 
+export function isInsideInput(){
+    var activeElement = doc.activeElement;
+
+    return matches(activeElement, 'textarea') || 
+        matches(activeElement, 'input') || 
+        matches(activeElement, 'select') ||
+        getAttr(activeElement, 'contentEditable') == "true" || 
+        getAttr(activeElement, 'contentEditable') == '';
+}
+
 //utils are public, so we can use it wherever we want
 // @ts-ignore
 window["fp_utils"] = {
diff --git a/src/js/fullpage.js b/src/js/fullpage.js
@@ -61,7 +61,7 @@ function setAPI(){
     };
 
     //public functions
-    FP.version = '4.0.16';
+    FP.version = '4.0.17';
 
     FP.test = Object.assign(FP.test, {
         top: '0px',
diff --git a/src/js/keyboard/index.js b/src/js/keyboard/index.js
@@ -19,6 +19,7 @@ import { moveSectionUp } from '../scroll/moveSectionUp.js';
 import { moveSectionDown } from '../scroll/moveSectionDown.js';
 import { moveTo } from '../scroll/moveTo.js';
 import { events } from '../common/events.js';
+import { isInsideInput } from '../common/utils.js';
 
 let g_controlPressed;
 let g_keydownId;
@@ -49,16 +50,6 @@ function onDestroy(){
     utils.docRemoveEvent('keyup', keyUpHandler);
 }
 
-function isInsideInput(){
-    var activeElement = doc.activeElement;
-
-    return utils.matches(activeElement, 'textarea') || 
-        utils.matches(activeElement, 'input') || 
-        utils.matches(activeElement, 'select') ||
-        utils.getAttr(activeElement, 'contentEditable') == "true" || 
-        utils.getAttr(activeElement, 'contentEditable') == '';
-}
-
 //Sliding with arrow keys, both, vertical and horizontal
 function keydownHandler(e) {
     clearTimeout(g_keydownId);
diff --git a/src/js/mixed/index.min.js b/src/js/mixed/index.min.js
diff --git a/src/js/scrolloverflow.js b/src/js/scrolloverflow.js
@@ -15,6 +15,7 @@ import { EventEmitter } from './common/eventEmitter.js';
 import { getSlideOrSection } from './common/utilsFP.js';
 import { getSectionFromPanel } from './sections.js';
 import { events } from './common/events.js';
+import { isInsideInput } from './common/utils.js';
 
 let g_focusScrollableId;
 
@@ -64,9 +65,12 @@ export const scrollOverflowHandler = {
     },
 
     preventScrollWithKeyboard: function(e){
-        if(!scrollOverflowHandler.isInnerScrollAllowed){
-            utils.preventDefault(e);
-            return false;
+        if( !isInsideInput() && getOptions().keyboardScrolling ){
+            var directionKeys = [38, 33, 32, 40, 34, 36, 35];
+            if( directionKeys.indexOf(e.keyCode) > -1 && !scrollOverflowHandler.isInnerScrollAllowed){
+                utils.preventDefault(e);
+                return false;
+            }
         }
     },
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`/*!`
`2`		`- * fullPage 4.0.16`
	`2`	`+ * fullPage 4.0.17`
`3`	`3`	`* https://github.com/alvarotrigo/fullPage.js`
`4`	`4`	`*`
`5`	`5`	`* @license GPLv3 for open source use only`