Skip to content

Commit 7a46d2d

Browse files
fix(AnalyticalTable): Update react-table and fix TreeTable selection columns (#344)
* Update react-table to 7.0.0 * fix selection column display for tree tables Closes #333 Closes #336
1 parent 5e8c32d commit 7a46d2d

File tree

16 files changed

+1704
-1911
lines changed

16 files changed

+1704
-1911
lines changed

.storybook/preview.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ import '@ui5/webcomponents-react-base/polyfill/IE11';
66
import { ContentDensity } from '@ui5/webcomponents-react/lib/ContentDensity';
77
import { ThemeProvider } from '@ui5/webcomponents-react/lib/ThemeProvider';
88
import { Themes } from '@ui5/webcomponents-react/lib/Themes';
9+
import '@ui5/webcomponents/dist/json-imports/i18n';
910
import '@webcomponents/webcomponentsjs/webcomponents-bundle';
1011
import { window } from 'global';
1112
import 'highlight.js/styles/solarized-dark.css';

config/jestsetup.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import Enzyme from 'enzyme';
44
import Adapter from 'enzyme-adapter-react-16';
55
import { createSerializer } from 'enzyme-to-json';
66
import ResizeObserver from 'resize-observer-polyfill';
7+
import '@ui5/webcomponents/dist/json-imports/i18n';
78

89
process.env.NODE_ENV = 'test';
910
process.env.BABEL_ENV = 'test';

packages/base/src/polyfill/IE11.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import 'core-js/modules/es.array.flat';
22
import 'core-js/modules/es.object.assign';
33
import 'core-js/modules/es.object.values';
4+
import 'core-js/modules/es.array.from';
45
import ResizeObserver from 'resize-observer-polyfill';
56

67
// @ts-ignore

packages/main/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"lodash.debounce": "^4.0.8",
3030
"react-content-loader": "^5.0.2",
3131
"react-jss": "10.0.4",
32-
"react-table": "7.0.0-rc.15",
32+
"react-table": "7.0.0",
3333
"react-toastify": "^5.5.0",
3434
"react-window": "^1.8.5"
3535
},

packages/main/src/components/AnalyticalTable/AnalyticalTable.test.tsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,8 @@ describe('AnalyticalTable', () => {
182182
/>
183183
);
184184

185-
let colInst = wrapper
186-
.find({ role: 'columnheader' })
185+
const colInst = wrapper
186+
.find('div[role="columnheader"]')
187187
.at(0)
188188
.instance();
189189

0 commit comments

Comments
 (0)