From 6f732e998b6e90a502b0753fcc21abc639ce7509 Mon Sep 17 00:00:00 2001
From: Greg Thompson <thompson.glowe@gmail.com>
Date: Wed, 12 Jun 2019 09:56:19 -0500
Subject: [PATCH 1/2] maintain sort values through external item updates

---
 src/components/basic_table/in_memory_table.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/components/basic_table/in_memory_table.js b/src/components/basic_table/in_memory_table.js
index a02252e8532..31456ee681f 100644
--- a/src/components/basic_table/in_memory_table.js
+++ b/src/components/basic_table/in_memory_table.js
@@ -164,6 +164,8 @@ export class EuiInMemoryTable extends Component {
       return {
         prevProps: {
           items: nextProps.items,
+          sortField: prevState.prevProps.sortField,
+          sortDirection: prevState.prevProps.sortDirection,
         },
         pageIndex: 0,
       };

From 2398dd1472cb66d97759a568a76a244a4303443e Mon Sep 17 00:00:00 2001
From: Greg Thompson <thompson.glowe@gmail.com>
Date: Wed, 12 Jun 2019 10:12:15 -0500
Subject: [PATCH 2/2] CL; better JS

---
 CHANGELOG.md                                  | 1 +
 src/components/basic_table/in_memory_table.js | 3 +--
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9526526e34a..4b4a0fd74e7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,7 @@
 **Bug fixes**
 
 - Fixed `EuiCallOut` header icon alignment ([#2006](https://github.com/elastic/eui/pull/2006))
+- Fixed `EuiInMemoryTable` sort value persistence through lifecycle updates ([#2035](https://github.com/elastic/eui/pull/2035))
 
 **Breaking changes**
 
diff --git a/src/components/basic_table/in_memory_table.js b/src/components/basic_table/in_memory_table.js
index 31456ee681f..ea0d9477880 100644
--- a/src/components/basic_table/in_memory_table.js
+++ b/src/components/basic_table/in_memory_table.js
@@ -163,9 +163,8 @@ export class EuiInMemoryTable extends Component {
       // We have new items because an external search has completed, so reset pagination state.
       return {
         prevProps: {
+          ...prevState.prevProps,
           items: nextProps.items,
-          sortField: prevState.prevProps.sortField,
-          sortDirection: prevState.prevProps.sortDirection,
         },
         pageIndex: 0,
       };