- Fixed bug: scroll event not being captured on window object using C…

…SS snaps with fitToSection: true

src/css/fullpage.css

@@ -1,5 +1,5 @@
 /*!
- * fullPage 4.0.11
+ * fullPage 4.0.10
  * https://github.com/alvarotrigo/fullPage.js
  *
  * @license GPLv3 for open source use only
@@ -269,20 +269,14 @@ html.fp-enabled,
 .fp-snaps{
     overflow-y: auto !important;
     height: 100% !important;
-}
-.fp-snaps body{
-    height: 100% !important;
     -ms-scroll-snap-type: y mandatory;
-        scroll-snap-type: y mandatory;
-        overflow-y: scroll !important;
-        scroll-behavior: smooth;
+    scroll-snap-type: y mandatory;
+    scroll-behavior: smooth;
 }
+
 .fp-snaps .fp-section{
     scroll-snap-align: start;
 }
-.fp-snaps .fullpage-wrapper{
-    height: auto !important;
-}
 
 /* Used for DragAndMove*/
 .fp-disable-snap body{

src/js/beyondFullpage/scrollBeyondFullPage.js

@@ -2,7 +2,7 @@ import * as utils from '../common/utils.js';
 import { getScrollSettings, isFullPageAbove } from '../common/utilsFP.js';
 import { getOptions } from '../common/options.js';
 import { doc, FP } from '../common/constants.js';
-import { $htmlBody } from '../common/cache.js';
+import { $html, $htmlBody } from '../common/cache.js';
 import { getState, setState } from '../common/state.js';
 import { scrollTo } from '../common/scrollTo.js';
 
@@ -11,7 +11,7 @@ export function scrollBeyondFullPage(){
     var scrollSettings = getScrollSettings(dtop);
     FP.test.top = -dtop + 'px';
 
-    utils.css(doc.body, {'scroll-snap-type': 'none'});
+    utils.css($html, {'scroll-snap-type': 'none'});
     utils.css($htmlBody, {'scroll-behavior': 'unset'});
 
     setState({canScroll: false});
@@ -46,5 +46,5 @@ function getDestinationOffset(){
     if(!getOptions().css3){
         return utils.getLast(getState().sections).item.offsetTop + utils.getLast(getState().sections).item.offsetHeight;
     }
-    return utils.getScrollTop(getOptions()) +  utils.getWindowHeight();
+    return utils.getScrollTop() +  utils.getWindowHeight();
 }

src/js/common/scrollTo.js

@@ -1,10 +1,11 @@
 //@ts-check
 import * as utils from './utils.js';
 import { setScrolling } from './utilsFP.js';
-import { state, setState } from "./state.js";
+import { state, setState, getState } from "./state.js";
 import { getOptions } from './options.js';
 import { SLIDES_WRAPPER } from './selectors.js';
 import { doc, win } from './constants.js';
+import { $html } from './cache.js';
 
 /**
 * Simulates the animated scrollTop of jQuery. Used when css3:false or scrollBar:true or autoScrolling:false
@@ -20,8 +21,9 @@ export function scrollTo(element, to, duration, callback) {
 
     // Making sure we can trigger a scroll animation
     // when css scroll snap is active. Temporally disabling it.
-    if(element === doc.body){
-        utils.css(doc.body, {'scroll-snap-type': 'none'});
+    var usingSnaps = getOptions().fitToSection && (!getOptions().autoScrolling || getOptions().scrollBar);
+    if(usingSnaps){
+        utils.css($html, {'scroll-snap-type': 'none'});
     }
 
     var animateScroll = function(timestamp){
@@ -70,7 +72,7 @@ function getScrolledPosition(element){
         position = element.scrollLeft;
     }
     else if(!getOptions().autoScrolling || getOptions().scrollBar){
-        position = utils.getScrollTop(getOptions());
+        position = utils.getScrollTop();
     }
     else{
         position = element.offsetTop;

src/js/common/utils.js

@@ -325,10 +325,7 @@ export function insertBefore(reference, beforeElement, el){
 }
 
 //http://stackoverflow.com/questions/3464876/javascript-get-window-x-y-position-for-scroll
-export function getScrollTop(options){
-    if(typeof options !== 'undefined' && options.fitToSection){
-        return doc.body.scrollTop;
-    }
+export function getScrollTop(){
     var docElement = doc.documentElement;
     return (win.pageYOffset || docElement.scrollTop)  - (docElement.clientTop || 0);
 }

src/js/common/utilsFP.js

@@ -38,11 +38,6 @@ export function getScrollSettings(top){
         element = utils.$(WRAPPER_SEL)[0];
     }
 
-    else if(options.fitToSection){
-        position = top;
-        element = doc.body;
-    }
-
     //window real scrolling
     else{
         position = top;

src/js/keyboard/index.js

@@ -32,9 +32,6 @@ function bindEvents(){
     //Sliding with arrow keys, both, vertical and horizontal
     utils.docAddEvent('keydown', keydownHandler);
 
-    // for fitToSection:true
-    $body.addEventListener('keydown', onBodyClick);
-
     //to prevent scrolling while zooming
     utils.docAddEvent('keyup', keyUpHandler);
 
@@ -64,7 +61,7 @@ function keydownHandler(e) {
 
     var keyCode = e.keyCode;
     var isPressingHorizontalArrows = [37,39].indexOf(keyCode) > -1;
-    var canScrollWithKeyboard = getOptions().autoScrolling || isPressingHorizontalArrows;
+    var canScrollWithKeyboard = getOptions().autoScrolling || getOptions().fitToSection || isPressingHorizontalArrows;
 
     //tab?
     if(keyCode === 9){
@@ -269,12 +266,6 @@ function shouldCancelKeyboardNavigation(e){
     return keyControls.indexOf(e.keyCode) > -1 && !state.isBeyondFullpage;
 }
 
-function onBodyClick(e){
-    if(!isInsideInput() && getOptions().fitToSection){
-        cancelDirectionKeyEvents(e);
-    }
-}
-
 //preventing the scroll with arrow keys & spacebar & Page Up & Down keys
 function cancelDirectionKeyEvents(e){
     if(shouldCancelKeyboardNavigation(e) && !utils.closest(e.target, OVERFLOW_SEL)){

src/js/scroll/scrollHandler.js

@@ -6,7 +6,7 @@ import { getState, setState, state } from '../common/state.js';
 import { lazyLoad } from '../lazyLoad/lazyLoad.js';
 import { setPageStatus } from '../anchors/setPageStatus.js';
 import { activateMenuAndNav } from '../menu/activateMenuAndNav.js';
-import { $body } from '../common/cache.js';
+import { $body, $html } from '../common/cache.js';
 import { getYmovement } from '../common/utilsFP.js';
 import { 
     COMPLETELY,
@@ -38,7 +38,7 @@ export function scrollHandler(e){
     }
 
     if(!getOptions().autoScrolling || getOptions().scrollBar){
-        var currentScroll = utils.getScrollTop(getOptions());
+        var currentScroll = utils.getScrollTop();
         var scrollDirection = getScrollDirection(currentScroll);
         var visibleSectionIndex = 0;
         var screen_mid = currentScroll + (utils.getWindowHeight() / 2.0);
@@ -163,7 +163,7 @@ export function scrollHandler(e){
 
                 // No section is fitting the viewport? Let's fix that!
                 if(!fixedSections.length){
-                    utils.css(doc.body, {'scroll-snap-type': 'y mandatory'});
+                    utils.css($html, {'scroll-snap-type': 'y mandatory'});
                 }
             }, 300);   
         }
@@ -199,7 +199,7 @@ function isCompletelyInViewPort(movement){
     var bottom = top + utils.getWindowHeight();
 
     if(movement == 'up'){
-        return bottom >= (utils.getScrollTop(getOptions()) + utils.getWindowHeight());
+        return bottom >= (utils.getScrollTop() + utils.getWindowHeight());
     }
-    return top <= utils.getScrollTop(getOptions());
+    return top <= utils.getScrollTop();
 }

src/js/scroll/scrollPage.js

@@ -2,7 +2,7 @@ import * as utils from '../common/utils.js';
 import { getOptions } from '../common/options.js';
 import { getState, setState, state } from '../common/state.js';
 import { doc, FP } from '../common/constants.js';
-import { $htmlBody } from '../common/cache.js';
+import { $html, $htmlBody } from '../common/cache.js';
 import { transformContainer } from '../common/transformContainer.js';
 import { scrollTo } from '../common/scrollTo.js';
 import { getScrollSettings, getYmovement } from '../common/utilsFP.js';
@@ -70,7 +70,7 @@ export function scrollPage(section, callback, isMovementUp){
     };
 
     //quiting when destination scroll is the same as the current one
-    if((getState().activeSection.item == element && !state.isResizing) || (getOptions().scrollBar && utils.getScrollTop(getOptions()) === v.dtop && !utils.hasClass(element, AUTO_HEIGHT) )){ 
+    if((getState().activeSection.item == element && !state.isResizing) || (getOptions().scrollBar && utils.getScrollTop() === v.dtop && !utils.hasClass(element, AUTO_HEIGHT) )){ 
         return; 
     }
 
@@ -265,7 +265,7 @@ function afterSectionLoads(v){
 
         // Removing CSS snaps for auto-scrolling sections
         if(utils.hasClass(utils.$(SECTION_ACTIVE_SEL)[0], AUTO_HEIGHT)){
-            utils.css(doc.body, {'scroll-snap-type': 'none'});
+            utils.css($html, {'scroll-snap-type': 'none'});
         }
     }