Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

No jquery fixes #1

Merged
merged 6 commits into from
Feb 8, 2018
Merged

No jquery fixes #1

Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a6fa8fd
fix removing handler
latata Feb 7, 2018
6f3df06
fix removing _setViewportEntered event
latata Feb 7, 2018
2b1ed3d
test without debounce
latata Feb 7, 2018
58a56f5
isDestroyed check
latata Feb 7, 2018
8b47602
sensitivity fix
latata Feb 8, 2018
31a97b7
isDestroying check added
latata Feb 8, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 28 additions & 24 deletions addon/mixins/in-viewport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ export default Mixin.create({
}, this._buildOptions());

setProperties(this, options);
this._triggerDidScrollDirectionHandler = this._triggerDidScrollDirectionHandler.bind(this);
this._setViewportEnteredHandler = this._setViewportEnteredHandler.bind(this);
},

didInsertElement() {
Expand Down Expand Up @@ -71,7 +73,7 @@ export default Mixin.create({
_startListening() {
this._setInitialViewport();
this._addObserverIfNotSpying();
this._bindScrollDirectionListener(get(this, 'viewportScrollSensitivity'));
this._bindScrollDirectionListener();

if (!get(this, 'viewportUseRAF')) {
get(this, 'viewportListeners').forEach((listener) => {
Expand Down Expand Up @@ -139,14 +141,16 @@ export default Mixin.create({
* @param {Array} - entries
*/
_onIntersection(entries) {
const entry = entries[0];

if (entry.isIntersecting) {
set(this, 'viewportEntered', true);
this.trigger('didEnterViewport');
} else if (entry.intersectionRatio <= 0) { // exiting viewport
set(this, 'viewportEntered', false);
this.trigger('didExitViewport');
if (!this.isDestroyed) {
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think we should also check for this.isDestroying

const entry = entries[0];

if (entry.isIntersecting) {
set(this, 'viewportEntered', true);
this.trigger('didEnterViewport');
} else if (entry.intersectionRatio <= 0) { // exiting viewport
set(this, 'viewportEntered', false);
this.trigger('didExitViewport');
}
}
},

Expand Down Expand Up @@ -208,22 +212,28 @@ export default Mixin.create({
});
},

_triggerDidScrollDirectionHandler(event) {
const sensitivity = get(this, 'viewportScrollSensitivity') || 1;

this._debouncedEventHandler('_triggerDidScrollDirection', event.currentTarget, sensitivity);
},

_setViewportEnteredHandler() {
this._debouncedEventHandler('_setViewportEntered');
},

_debouncedEventHandler(methodName, ...args) {
assert('You must pass a methodName to _debouncedEventHandler', methodName);
assert('methodName must be a string', typeOf(methodName) === 'string');

debounce(this, () => this[methodName](...args), get(this, 'viewportRefreshRate'));
},

_bindScrollDirectionListener(sensitivity = 1) {
assert('sensitivity cannot be 0', sensitivity);

_bindScrollDirectionListener() {
const contextEl = get(this, 'scrollableArea') || window;
let elem = findElem(contextEl);

elem.addEventListener('scroll', () => {
this._debouncedEventHandler('_triggerDidScrollDirection', elem, sensitivity);
});
elem.addEventListener('scroll', this._triggerDidScrollDirectionHandler);
},

_unbindScrollDirectionListener() {
Expand All @@ -232,9 +242,7 @@ export default Mixin.create({
const context = get(this, 'scrollableArea') || window;
let elem = findElem(context);

elem.removeEventListener('scroll', () => {
this._debouncedEventHandler('_triggerDidScrollDirection', elem, get(this, 'viewportScrollSensitivity'));
});
elem.removeEventListener('scroll', this._triggerDidScrollDirectionHandler);
delete lastPosition[elementId];
delete lastDirection[elementId];
},
Expand All @@ -245,9 +253,7 @@ export default Mixin.create({

let elem = findElem(context);

elem.addEventListener(event, () => {
this._debouncedEventHandler('_setViewportEntered');
});
elem.addEventListener(event, this._setViewportEnteredHandler);
},

_unbindListeners() {
Expand All @@ -265,9 +271,7 @@ export default Mixin.create({
context = get(this, 'scrollableArea') || context;

let elem = findElem(context);
elem.removeEventListener(event, () => {
this._debouncedEventHandler('_setViewportEntered');
});
elem.removeEventListener(event, this._setViewportEnteredHandler);
});

this._unbindScrollDirectionListener();
Expand Down