Merge branch 'master' into rk/2356-skip-link

elastic · Mar 4, 2020 · 5f4d9d3 · 5f4d9d3
2 parents 6e731fa + 9f823ac
commit 5f4d9d3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@
 - Added `showOnFocus` prop to `EuiScreenReaderOnly` to force display on keyboard focus ([#2976](https://github.com/elastic/eui/pull/2976))
 - Added `EuiSkipLink` component ([#2976](https://github.com/elastic/eui/pull/2976))
 
+**Bug Fixes**
+
+- Fixed `EuiDataGrid`'s sort popover to behave properly on mobile screens ([#2979](https://github.com/elastic/eui/pull/2979))
+
 ## [`20.1.0`](https://github.com/elastic/eui/tree/v20.1.0)
 
 - Added `theme` prop to `EuiCodeEditor` in support of `AceEditor` themes ([#2970](https://github.com/elastic/eui/pull/2970))

diff --git a/src/components/datagrid/column_sorting.tsx b/src/components/datagrid/column_sorting.tsx
@@ -229,7 +229,8 @@ export const useColumnSorting = (
                             <EuiFlexGroup
                               alignItems="center"
                               gutterSize="s"
-                              component="span">
+                              component="span"
+                              responsive={false}>
                               <EuiFlexItem grow={false}>
                                 <EuiToken
                                   iconType={
@@ -251,9 +252,7 @@ export const useColumnSorting = (
                                 />
                               </EuiFlexItem>
                               <EuiFlexItem grow={false}>
-                                <EuiText size="xs">
-                                  <span>{id}</span>
-                                </EuiText>
+                                <EuiText size="xs">{id}</EuiText>
                               </EuiFlexItem>
                             </EuiFlexGroup>
                           </button>