Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(AnalyticalTable): Update react-table and fix TreeTable selection columns #344

Merged
merged 7 commits into from
Mar 11, 2020
Merged

fix(AnalyticalTable): Update react-table and fix TreeTable selection columns #344

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
dd98ee6
chore(AnalyticalTable): Update to react-table rc16
MarcusNotheis Mar 10, 2020
60f46f8
fix selection column display for tree tables
MarcusNotheis Mar 10, 2020
40eab73
Update react-table to 7.0.0
MarcusNotheis Mar 11, 2020
93a9e3b
Updated snapshots
MarcusNotheis Mar 11, 2020
a7ed2db
Updated Tree Table Snapshot
MarcusNotheis Mar 11, 2020
d4c0a1f
Import i18n bundles in storybook and jest tests
MarcusNotheis Mar 11, 2020
d6de96a
fix(AnalyticalTable): change tree-table demo data
Lukas742 Mar 11, 2020
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
1 change: 1 addition & 0 deletions .storybook/preview.js
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
4 changes: 2 additions & 2 deletions packages/main/src/components/AnalyticalTable/AnalyticalTable.test.tsx
View file
Open in desktop
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