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

[ML] Remove DragSelect event handlers and selectors on the swim lane unmount #72250

Merged
merged 3 commits into from
Jul 17, 2020
Merged

[ML] Remove DragSelect event handlers and selectors on the swim lane unmount #72250

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bcf13a3
[ML] remove selector element on unmount
darnautov Jul 16, 2020
dec9d6c
[ML] stop handler on mount
darnautov Jul 17, 2020
1d8decd
[ML] remove throttling
darnautov Jul 17, 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
20 changes: 12 additions & 8 deletions x-pack/plugins/ml/public/application/explorer/explorer_swimlane.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import React from 'react';
import './_explorer.scss';
import _, { isEqual } from 'lodash';
import _, { isEqual, throttle } from 'lodash';
import d3 from 'd3';
import moment from 'moment';
import DragSelect from 'dragselect';
Expand Down Expand Up @@ -204,18 +204,20 @@ export class ExplorerSwimlane extends React.Component<ExplorerSwimlaneProps> {
});

this.renderSwimlane();

this.dragSelect.stop();
}

componentDidUpdate() {
this.renderSwimlane();
}

componentWillUnmount() {
if (this.dragSelectSubscriber !== null) {
this.dragSelectSubscriber.unsubscribe();
}
const element = d3.select(this.rootNode.current!);
element.html('');
this.dragSelectSubscriber!.unsubscribe();
// Remove selector element from DOM
this.dragSelect.selector.remove();
// removes all mousedown event handlers
this.dragSelect.stop(true);
}

selectCell(cellsToSelect: any[], { laneLabels, bucketScore, times }: SelectedData) {
Expand Down Expand Up @@ -735,14 +737,16 @@ export class ExplorerSwimlane extends React.Component<ExplorerSwimlaneProps> {
}
}

throttledSetSwimLaneActive = throttle(this.setSwimlaneSelectActive, 500);

render() {
const { swimlaneType } = this.props;

return (
<div
className="mlExplorerSwimlane"
onMouseEnter={this.setSwimlaneSelectActive.bind(this, true)}
onMouseLeave={this.setSwimlaneSelectActive.bind(this, false)}
onMouseEnter={this.throttledSetSwimLaneActive.bind(this, true)}
onMouseLeave={this.throttledSetSwimLaneActive.bind(this, false)}
data-test-subj={this.props['data-test-subj'] ?? null}
>
<div
Expand Down