Skip to content
Merged
Show file tree
Hide file tree
Changes from 4 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
43 changes: 23 additions & 20 deletions src-docs/src/views/datagrid/basics/datagrid.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import { Link } from 'react-router-dom';
import { fake } from 'faker';

import {
EuiAccordion,
EuiButton,
EuiButtonEmpty,
EuiButtonIcon,
Expand Down Expand Up @@ -411,25 +412,27 @@ export default () => {
});

return (
<DataContext.Provider value={raw_data}>
<EuiDataGrid
aria-label="Data grid demo"
columns={columns}
columnVisibility={{ visibleColumns, setVisibleColumns }}
trailingControlColumns={trailingControlColumns}
rowCount={raw_data.length}
renderCellValue={RenderCellValue}
inMemory={{ level: 'sorting' }}
sorting={{ columns: sortingColumns, onSort }}
pagination={{
...pagination,
pageSizeOptions: [10, 50, 100],
onChangeItemsPerPage: onChangeItemsPerPage,
onChangePage: onChangePage,
}}
onColumnResize={onColumnResize.current}
ref={gridRef}
/>
</DataContext.Provider>
<EuiAccordion id="fdsfasdf" buttonContent="fullscreen testing">
<DataContext.Provider value={raw_data}>
<EuiDataGrid
aria-label="Data grid demo"
columns={columns}
columnVisibility={{ visibleColumns, setVisibleColumns }}
trailingControlColumns={trailingControlColumns}
rowCount={raw_data.length}
renderCellValue={RenderCellValue}
inMemory={{ level: 'sorting' }}
sorting={{ columns: sortingColumns, onSort }}
pagination={{
...pagination,
pageSizeOptions: [10, 50, 100],
onChangeItemsPerPage: onChangeItemsPerPage,
onChangePage: onChangePage,
}}
onColumnResize={onColumnResize.current}
ref={gridRef}
/>
</DataContext.Provider>
</EuiAccordion>
);
};
1 change: 0 additions & 1 deletion src/components/accordion/accordion.styles.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,6 @@ export const euiAccordionChildWrapperStyles = ({ euiTheme }: UseEuiTheme) => ({
${euiTheme.animation.resistance},
opacity ${euiTheme.animation.normal} ${euiTheme.animation.resistance};
visibility: hidden;
will-change: opacity, visibility, ${logicals.height};

&:focus {
outline: none; // Hide focus ring because of tabindex=-1 on Safari
Expand Down
3 changes: 3 additions & 0 deletions upcoming_changelogs/6235.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
**Bug fixes**

- Fixed `EuiDataGrid`'s broken fullscreen mode when nested within an `EuiAccordion`