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.

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

[7.x] [SIEM] Start of deprecated lifecycle refactor (#46293) #47151

Merged
merged 1 commit into from
Oct 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ describe('timeline data providers', () => {
cy.get(TIMELINE_DATA_PROVIDERS).should(
'have.css',
'background',
'rgba(125, 226, 209, 0.1) none repeat scroll 0% 0% / auto padding-box border-box'
'rgba(1, 125, 115, 0.1) none repeat scroll 0% 0% / auto padding-box border-box'
);
});

Expand All @@ -81,7 +81,7 @@ describe('timeline data providers', () => {
cy.get(TIMELINE_DATA_PROVIDERS_EMPTY).should(
'have.css',
'background',
'rgba(125, 226, 209, 0.2) none repeat scroll 0% 0% / auto padding-box border-box'
'rgba(1, 125, 115, 0.2) none repeat scroll 0% 0% / auto padding-box border-box'
);
});

Expand All @@ -101,7 +101,7 @@ describe('timeline data providers', () => {
cy.get(TIMELINE_DATA_PROVIDERS).should(
'have.css',
'border',
'3.1875px dashed rgb(125, 226, 209)'
'3.1875px dashed rgb(1, 125, 115)'
);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ describe('timeline flyout button', () => {
cy.get(TIMELINE_NOT_READY_TO_DROP_BUTTON).should(
'have.css',
'background',
'rgba(125, 226, 209, 0.1) none repeat scroll 0% 0% / auto padding-box border-box'
'rgba(1, 125, 115, 0.1) none repeat scroll 0% 0% / auto padding-box border-box'
);
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,8 @@ interface SuggestionItemProps {
suggestion: AutocompleteSuggestion;
}

export class SuggestionItem extends React.PureComponent<SuggestionItemProps> {
public static defaultProps: Partial<SuggestionItemProps> = {
isSelected: false,
};

public render() {
const { isSelected, onClick, onMouseEnter, suggestion } = this.props;
export const SuggestionItem = React.memo<SuggestionItemProps>(
({ isSelected = false, onClick, onMouseEnter, suggestion }) => {
return (
<SuggestionItemContainer
isSelected={isSelected}
Expand All @@ -40,7 +35,9 @@ export class SuggestionItem extends React.PureComponent<SuggestionItemProps> {
</SuggestionItemContainer>
);
}
}
);

SuggestionItem.displayName = 'SuggestionItem';

const SuggestionItemContainer = euiStyled.div<{
isSelected?: boolean;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

import { defaultTo, noop } from 'lodash/fp';
import * as React from 'react';
import { DragDropContext, DropResult, ResponderProvided, DragStart } from 'react-beautiful-dnd';
import { DragDropContext, DropResult, DragStart } from 'react-beautiful-dnd';
import { connect } from 'react-redux';
import { Dispatch } from 'redux';

Expand Down Expand Up @@ -57,43 +57,39 @@ const onDragEndHandler = ({
/**
* DragDropContextWrapperComponent handles all drag end events
*/
export class DragDropContextWrapperComponent extends React.Component<Props> {
public shouldComponentUpdate = ({ children, dataProviders }: Props) =>
children === this.props.children && dataProviders !== this.props.dataProviders // prevent re-renders when data providers are added or removed, but all other props are the same
? false
: true;

public render() {
const { children } = this.props;

export const DragDropContextWrapperComponent = React.memo<Props>(
({ browserFields, children, dataProviders, dispatch }) => {
function onDragEnd(result: DropResult) {
enableScrolling();

if (dataProviders != null) {
onDragEndHandler({
browserFields,
result,
dataProviders,
dispatch,
});
}

if (!draggableIsField(result)) {
document.body.classList.remove(IS_DRAGGING_CLASS_NAME);
}
}
return (
<DragDropContext onDragEnd={this.onDragEnd} onDragStart={onDragStart}>
<DragDropContext onDragEnd={onDragEnd} onDragStart={onDragStart}>
{children}
</DragDropContext>
);
},
(prevProps, nextProps) => {
return (
prevProps.children === nextProps.children &&
prevProps.dataProviders === nextProps.dataProviders
); // prevent re-renders when data providers are added or removed, but all other props are the same
}
);

private onDragEnd: (result: DropResult, provided: ResponderProvided) => void = (
result: DropResult
) => {
const { browserFields, dataProviders, dispatch } = this.props;

enableScrolling();

if (dataProviders != null) {
onDragEndHandler({
browserFields,
result,
dataProviders,
dispatch,
});
}

if (!draggableIsField(result)) {
document.body.classList.remove(IS_DRAGGING_CLASS_NAME);
}
};
}
DragDropContextWrapperComponent.displayName = 'DragDropContextWrapperComponent';

const emptyDataProviders: dragAndDropModel.IdToDataProvider = {}; // stable reference

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

import { isEqual } from 'lodash/fp';
import * as React from 'react';
import React, { useEffect } from 'react';
import {
Draggable,
DraggableProvided,
Expand Down Expand Up @@ -161,28 +161,15 @@ type Props = OwnProps & DispatchProps;
* Wraps a draggable component to handle registration / unregistration of the
* data provider associated with the item being dropped
*/
class DraggableWrapperComponent extends React.Component<Props> {
public shouldComponentUpdate = ({ dataProvider, render, truncate }: Props) =>
isEqual(dataProvider, this.props.dataProvider) &&
render !== this.props.render &&
truncate === this.props.truncate
? false
: true;

public componentDidMount() {
const { dataProvider, registerProvider } = this.props;

registerProvider!({ provider: dataProvider });
}

public componentWillUnmount() {
const { dataProvider, unRegisterProvider } = this.props;

unRegisterProvider!({ id: dataProvider.id });
}

public render() {
const { dataProvider, render, truncate } = this.props;
const DraggableWrapperComponent = React.memo<Props>(
({ dataProvider, registerProvider, render, truncate, unRegisterProvider }) => {
useEffect(() => {
registerProvider!({ provider: dataProvider });
return () => {
unRegisterProvider!({ id: dataProvider.id });
};
}, []);

return (
<Wrapper data-test-subj="draggableWrapperDiv">
Expand Down Expand Up @@ -223,8 +210,17 @@ class DraggableWrapperComponent extends React.Component<Props> {
</Droppable>
</Wrapper>
);
},
(prevProps, nextProps) => {
return (
isEqual(prevProps.dataProvider, nextProps.dataProvider) &&
prevProps.render !== nextProps.render &&
prevProps.truncate === nextProps.truncate
);
}
}
);

DraggableWrapperComponent.displayName = 'DraggableWrapperComponent';

export const DraggableWrapper = connect(
null,
Expand Down
Loading