diff --git a/frontend/app/components/Session_/EventsBlock/Event.js b/frontend/app/components/Session_/EventsBlock/Event.js
index 197af20c7..bfae9fe5d 100644
--- a/frontend/app/components/Session_/EventsBlock/Event.js
+++ b/frontend/app/components/Session_/EventsBlock/Event.js
@@ -78,7 +78,7 @@ export default class Event extends React.PureComponent {
{ title }
{/* { body && !isLocation &&
{ body }
} */}
- { body && !isLocation &&
+ { body && !isLocation &&
}
@@ -96,7 +96,7 @@ export default class Event extends React.PureComponent {
{ isLocation &&
- { body }
+ { body }
}
@@ -105,18 +105,20 @@ export default class Event extends React.PureComponent {
render() {
const {
- event,
- selected,
- isCurrent,
- onClick,
- showSelection,
- onCheckboxClick,
+ event,
+ selected,
+ isCurrent,
+ onClick,
+ showSelection,
+ onCheckboxClick,
showLoadInfo,
toggleLoadInfo,
isRed,
extended,
highlight = false,
- presentInSearch=false
+ presentInSearch = false,
+ isLastInGroup,
+ whiteBg,
} = this.props;
const { menuOpen } = this.state;
return (
@@ -125,7 +127,7 @@ export default class Event extends React.PureComponent {
onMouseLeave={ this.onMouseLeave }
data-openreplay-label="Event"
data-type={event.type}
- className={ cn(cls.event, {
+ className={ cn(cls.event, {
[ cls.menuClosed ]: !menuOpen,
[ cls.highlighted ]: showSelection ? selected : isCurrent,
[ cls.selected ]: selected,
@@ -134,11 +136,12 @@ export default class Event extends React.PureComponent {
[ cls.clickType ]: event.type === TYPES.CLICK,
[ cls.inputType ]: event.type === TYPES.INPUT,
[ cls.clickrageType ]: event.type === TYPES.CLICKRAGE,
- [cls.highlight] : presentInSearch
+ [ cls.highlight ] : presentInSearch,
+ [ cls.lastInGroup ]: whiteBg,
}) }
onClick={ onClick }
>
- { menuOpen &&
+ { menuOpen &&
diff --git a/frontend/app/components/Session_/EventsBlock/EventGroupWrapper.js b/frontend/app/components/Session_/EventsBlock/EventGroupWrapper.js
index de03a17db..1a9814d74 100644
--- a/frontend/app/components/Session_/EventsBlock/EventGroupWrapper.js
+++ b/frontend/app/components/Session_/EventsBlock/EventGroupWrapper.js
@@ -26,7 +26,7 @@ class EventGroupWrapper extends React.PureComponent {
this.props.mesureHeight();
}
- onEventClick = (e) => this.props.onEventClick(e, this.props.event);
+ onEventClick = (e) => this.props.onEventClick(e, this.props.event);
onCheckboxClick = e => this.props.onCheckboxClick(e, this.props.event);
@@ -41,18 +41,19 @@ class EventGroupWrapper extends React.PureComponent {
showSelection,
showLoadInfo,
isFirst,
- presentInSearch
+ presentInSearch,
} = this.props;
- const isLocation = event.type === TYPES.LOCATION;
+ const isLocation = event.type === TYPES.LOCATION;
- return (
-
{ isFirst && isLocation && event.referrer &&
@@ -74,6 +75,8 @@ class EventGroupWrapper extends React.PureComponent {
toggleLoadInfo={ this.toggleLoadInfo }
isCurrent={ isCurrent }
presentInSearch={presentInSearch}
+ isLastInGroup={isLastInGroup}
+ whiteBg={whiteBg}
/>
:
}
diff --git a/frontend/app/components/Session_/EventsBlock/EventSearch/EventSearch.js b/frontend/app/components/Session_/EventsBlock/EventSearch/EventSearch.js
index 1cb1d7dca..ff0e71e46 100644
--- a/frontend/app/components/Session_/EventsBlock/EventSearch/EventSearch.js
+++ b/frontend/app/components/Session_/EventsBlock/EventSearch/EventSearch.js
@@ -32,7 +32,7 @@ export default function EventSearch(props) {
{({measure, registerChild}) => (
-
+
{
const { startDate, endDate, rangeValue } = e.toJSON();
setInsightsFilters({ ...insightsFilters, startDate, endDate, rangeValue })
}
- useEffect(() => {
+ useEffect(() => {
markTargets(insights.toJS());
return () => {
markTargets(null)
@@ -53,15 +53,15 @@ function PageInsightsPanel({
}
}, [insightsFilters])
- const onPageSelect = ({ value }: any) => {
- const event = events.find(item => item.url === value)
+ const onPageSelect = (e, { name, value }) => {
+ const event = events.find(item => item.url === value)
Player.jump(event.time + JUMP_OFFSET)
setInsightsFilters({ ...insightsFilters, url: host + value })
markTargets([])
};
return (
-
+
{/*
-
+
)
}
@@ -104,4 +104,4 @@ export default connect(state => {
urlOptions: events.map(({ url, host }: any) => ({ label: url, value: url, host })),
loading: state.getIn([ 'sessions', 'fetchInsightsRequest', 'loading' ]),
}
-}, { fetchInsights })(PageInsightsPanel);
\ No newline at end of file
+}, { fetchInsights })(PageInsightsPanel);