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

fix(data-table): ensure cleaning-up events #5743

Merged
merged 5 commits into from
Apr 1, 2020
Merged

fix(data-table): ensure cleaning-up events #5743

Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8dcd08d
fix(data-table): ensure cleaning-up events
asudoh Mar 30, 2020
341cf35
Merge branch 'master' into data-table-events
tw15egan Mar 30, 2020
09677d6
Merge branch 'master' into data-table-events
tw15egan Apr 1, 2020
61d4629
Merge branch 'master' into data-table-events
asudoh Apr 1, 2020
e0edfcb
Merge branch 'master' into data-table-events
asudoh Apr 1, 2020
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
70 changes: 35 additions & 35 deletions packages/components/src/components/data-table/data-table.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,17 @@ import mixin from '../../globals/js/misc/mixin';
import createComponent from '../../globals/js/mixins/create-component';
import initComponentBySearch from '../../globals/js/mixins/init-component-by-search';
import eventedState from '../../globals/js/mixins/evented-state';
import handles from '../../globals/js/mixins/handles';
import eventMatches from '../../globals/js/misc/event-matches';
import on from '../../globals/js/misc/on';

const toArray = arrayLike => Array.prototype.slice.call(arrayLike);

class DataTable extends mixin(
createComponent,
initComponentBySearch,
eventedState
eventedState,
handles
) {
/**
* Data Table
Expand Down Expand Up @@ -54,30 +57,27 @@ class DataTable extends mixin(

this.refreshRows();

this.element.addEventListener('mouseover', evt => {
const eventElement = eventMatches(evt, this.options.selectorChildRow);
this.manage(on(this.element, 'mouseover', this._expandableHoverToggle));
this.manage(on(this.element, 'mouseout', this._expandableHoverToggle));

if (eventElement) {
this._expandableHoverToggle(eventElement, true);
}
});

this.element.addEventListener('click', evt => {
const eventElement = eventMatches(evt, this.options.eventTrigger);
const searchContainer = this.element.querySelector(
this.options.selectorToolbarSearchContainer
);
this.manage(
on(this.element, 'click', evt => {
const eventElement = eventMatches(evt, this.options.eventTrigger);
const searchContainer = this.element.querySelector(
this.options.selectorToolbarSearchContainer
);

if (eventElement) {
this._toggleState(eventElement, evt);
}
if (eventElement) {
this._toggleState(eventElement, evt);
}

if (searchContainer) {
this._handleDocumentClick(evt);
}
});
if (searchContainer) {
this._handleDocumentClick(evt);
}
})
);

this.element.addEventListener('keydown', this._keydownHandler);
this.manage(on(this.element, 'keydown', this._keydownHandler));

this.state = {
checkboxCount: 0,
Expand Down Expand Up @@ -225,8 +225,11 @@ class DataTable extends mixin(
};

_actionBarToggle = toggleOn => {
let handleTransitionEnd;
const transition = evt => {
this.batchActionEl.removeEventListener('transitionend', transition);
if (handleTransitionEnd) {
handleTransitionEnd = this.unmanage(handleTransitionEnd).release();
}

if (evt.target.matches(this.options.selectorActions)) {
if (this.batchActionEl.dataset.active === 'false') {
Expand All @@ -245,7 +248,9 @@ class DataTable extends mixin(
this.batchActionEl.classList.remove(this.options.classActionBarActive);
}
if (this.batchActionEl) {
this.batchActionEl.addEventListener('transitionend', transition);
handleTransitionEnd = this.manage(
on(this.batchActionEl, 'transitionend', transition)
);
}
};

Expand Down Expand Up @@ -288,19 +293,14 @@ class DataTable extends mixin(
});
};

_expandableHoverToggle = element => {
element.previousElementSibling.classList.add(
this.options.classExpandableRowHover
);

const mouseout = () => {
element.previousElementSibling.classList.remove(
this.options.classExpandableRowHover
_expandableHoverToggle = evt => {
const element = eventMatches(evt, this.options.selectorChildRow);
if (element) {
element.previousElementSibling.classList.toggle(
this.options.classExpandableRowHover,
evt.type === 'mouseover'
);
element.removeEventListener('mouseout', mouseout);
};

element.addEventListener('mouseout', mouseout);
}
};

_toggleState = (element, evt) => {
Expand Down