Merge branch 'master' into tsvb-drilldown-cursor

elastic · Oct 20, 2021 · af68653 · af68653
2 parents e2d3b8e + 4ff3cb4
commit af68653
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/src/plugins/discover/public/application/components/discover_grid/discover_grid_flyout.tsx b/src/plugins/discover/public/application/components/discover_grid/discover_grid_flyout.tsx
@@ -70,6 +70,8 @@ export function DiscoverGridFlyout({
   services,
   setExpandedDoc,
 }: Props) {
+  // Get actual hit with updated highlighted searches
+  const actualHit = useMemo(() => hits?.find(({ _id }) => _id === hit?._id) || hit, [hit, hits]);
   const pageCount = useMemo<number>(() => (hits ? hits.length : 0), [hits]);
   const activePage = useMemo<number>(() => {
     const id = getDocFingerprintId(hit);
@@ -188,7 +190,7 @@ export function DiscoverGridFlyout({
         </EuiFlyoutHeader>
         <EuiFlyoutBody>
           <DocViewer
-            hit={hit}
+            hit={actualHit}
             columns={columns}
             indexPattern={indexPattern}
             filter={(mapping, value, mode) => {

diff --git a/src/plugins/discover/public/application/components/doc_viewer/doc_viewer_tab.tsx b/src/plugins/discover/public/application/components/doc_viewer/doc_viewer_tab.tsx
@@ -45,6 +45,7 @@ export class DocViewerTab extends React.Component<Props, State> {
   shouldComponentUpdate(nextProps: Props, nextState: State) {
     return (
       nextProps.renderProps.hit._id !== this.props.renderProps.hit._id ||
+      !isEqual(nextProps.renderProps.hit.highlight, this.props.renderProps.hit.highlight) ||
       nextProps.id !== this.props.id ||
       !isEqual(nextProps.renderProps.columns, this.props.renderProps.columns) ||
       nextState.hasError