Skip to content

Commit

Permalink
fix(AnalyticalTable): Update react-table and fix TreeTable selection …
Browse files Browse the repository at this point in the history
…columns (#344)

* Update react-table to 7.0.0
* fix selection column display for tree tables

Closes #333
Closes #336
  • Loading branch information
MarcusNotheis authored Mar 11, 2020
1 parent 5e8c32d commit 7a46d2d
Show file tree
Hide file tree
Showing 16 changed files with 1,704 additions and 1,911 deletions.
1 change: 1 addition & 0 deletions .storybook/preview.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import '@ui5/webcomponents-react-base/polyfill/IE11';
import { ContentDensity } from '@ui5/webcomponents-react/lib/ContentDensity';
import { ThemeProvider } from '@ui5/webcomponents-react/lib/ThemeProvider';
import { Themes } from '@ui5/webcomponents-react/lib/Themes';
import '@ui5/webcomponents/dist/json-imports/i18n';
import '@webcomponents/webcomponentsjs/webcomponents-bundle';
import { window } from 'global';
import 'highlight.js/styles/solarized-dark.css';
Expand Down
1 change: 1 addition & 0 deletions config/jestsetup.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import Enzyme from 'enzyme';
import Adapter from 'enzyme-adapter-react-16';
import { createSerializer } from 'enzyme-to-json';
import ResizeObserver from 'resize-observer-polyfill';
import '@ui5/webcomponents/dist/json-imports/i18n';

process.env.NODE_ENV = 'test';
process.env.BABEL_ENV = 'test';
Expand Down
1 change: 1 addition & 0 deletions packages/base/src/polyfill/IE11.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import 'core-js/modules/es.array.flat';
import 'core-js/modules/es.object.assign';
import 'core-js/modules/es.object.values';
import 'core-js/modules/es.array.from';
import ResizeObserver from 'resize-observer-polyfill';

// @ts-ignore
Expand Down
2 changes: 1 addition & 1 deletion packages/main/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"lodash.debounce": "^4.0.8",
"react-content-loader": "^5.0.2",
"react-jss": "10.0.4",
"react-table": "7.0.0-rc.15",
"react-table": "7.0.0",
"react-toastify": "^5.5.0",
"react-window": "^1.8.5"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@ describe('AnalyticalTable', () => {
/>
);

let colInst = wrapper
.find({ role: 'columnheader' })
const colInst = wrapper
.find('div[role="columnheader"]')
.at(0)
.instance();

Expand Down
Loading

0 comments on commit 7a46d2d

Please sign in to comment.