diff --git a/package.json b/package.json index 2e30542f8f9..5ceeae99117 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,6 @@ "@storybook/addon-docs": "5.3.0-beta.31", "@storybook/addon-info": "5.3.0-beta.31", "@storybook/addon-knobs": "5.3.0-beta.31", - "@storybook/addon-options": "5.3.0-beta.31", "@storybook/addons": "5.3.0-beta.31", "@storybook/cli": "5.3.0-beta.31", "@storybook/react": "5.3.0-beta.31", diff --git a/packages/docs/.storybook/addons.js b/packages/docs/.storybook/addons.js index 894847cfa57..2efe80ebffa 100644 --- a/packages/docs/.storybook/addons.js +++ b/packages/docs/.storybook/addons.js @@ -1,3 +1,2 @@ import '@storybook/addon-knobs/register'; import '@storybook/addon-actions/register'; -import '@storybook/addon-options/register'; diff --git a/packages/docs/.storybook/presets.js b/packages/docs/.storybook/presets.js index b1d463490f6..a04174c7a33 100644 --- a/packages/docs/.storybook/presets.js +++ b/packages/docs/.storybook/presets.js @@ -1 +1 @@ -module.exports = ['@storybook/addon-docs/react/preset']; +module.exports = ['@storybook/addon-docs/preset']; diff --git a/packages/main/package.json b/packages/main/package.json index aed33b4ba0b..6be6223845a 100644 --- a/packages/main/package.json +++ b/packages/main/package.json @@ -29,7 +29,7 @@ "lodash.debounce": "^4.0.8", "react-content-loader": "^4.3.2", "react-jss": "10.0.0", - "react-table": "7.0.0-rc.12", + "react-table": "7.0.0-rc.15", "react-toastify": "^5.4.1", "react-window": "^1.8.5" }, diff --git a/packages/main/src/components/AnalyticalTable/hooks/useTableCellStyling.ts b/packages/main/src/components/AnalyticalTable/hooks/useTableCellStyling.ts index 3378a46bbfd..89f3fc0e55d 100644 --- a/packages/main/src/components/AnalyticalTable/hooks/useTableCellStyling.ts +++ b/packages/main/src/components/AnalyticalTable/hooks/useTableCellStyling.ts @@ -5,7 +5,7 @@ import { PluginHook } from 'react-table'; export const useTableCellStyling = (classes, rowHeight) => { const hook: PluginHook<{}> = (instance) => { - instance.getCellProps.push((cellProps, instance, { column }) => { + instance.getCellProps.push((cellProps, { cell: { column } }) => { const style: CSSProperties = {}; if (rowHeight) { diff --git a/packages/main/src/components/AnalyticalTable/hooks/useTableHeaderStyling.ts b/packages/main/src/components/AnalyticalTable/hooks/useTableHeaderStyling.ts index ffada872ca8..d59798a6c17 100644 --- a/packages/main/src/components/AnalyticalTable/hooks/useTableHeaderStyling.ts +++ b/packages/main/src/components/AnalyticalTable/hooks/useTableHeaderStyling.ts @@ -2,7 +2,7 @@ import { PluginHook } from 'react-table'; export const useTableHeaderStyling = (classes) => { const hook: PluginHook<{}> = (instance) => { - instance.getHeaderProps.push((columnProps, instance, column) => { + instance.getHeaderProps.push((columnProps, { column }) => { return { ...columnProps, className: classes.th, diff --git a/packages/main/src/components/AnalyticalTable/hooks/useTableRowStyling.ts b/packages/main/src/components/AnalyticalTable/hooks/useTableRowStyling.ts index 6c73c97c35c..501f024ef17 100644 --- a/packages/main/src/components/AnalyticalTable/hooks/useTableRowStyling.ts +++ b/packages/main/src/components/AnalyticalTable/hooks/useTableRowStyling.ts @@ -4,7 +4,7 @@ const ROW_SELECTION_ATTRIBUTE = 'data-is-selected'; export const useTableRowStyling = (classes, selectable, onRowSelected) => { const hook = (instance) => { - instance.getRowProps.push((passedRowProps, instance, row) => { + instance.getRowProps.push((passedRowProps, { row }) => { let className = classes.tr; if (row.isGrouped) { className += ` ${classes.tableGroupHeader}`; diff --git a/packages/main/src/components/AnalyticalTable/hooks/useToggleRowExpand.ts b/packages/main/src/components/AnalyticalTable/hooks/useToggleRowExpand.ts index f9f8264154d..466dd8ec707 100644 --- a/packages/main/src/components/AnalyticalTable/hooks/useToggleRowExpand.ts +++ b/packages/main/src/components/AnalyticalTable/hooks/useToggleRowExpand.ts @@ -3,7 +3,7 @@ import { PluginHook } from 'react-table'; export const useToggleRowExpand = (onRowExpandChange, isTreeTable) => { const hook: PluginHook = (instance) => { - instance.getExpandedToggleProps.push((rowProps, instance, row) => { + instance.getExpandedToggleProps.push((rowProps, { row }) => { return { ...rowProps, onClick: (e) => { diff --git a/scripts/rollup/results.json b/scripts/rollup/results.json index 00306feeabe..31aa9f42224 100644 --- a/scripts/rollup/results.json +++ b/scripts/rollup/results.json @@ -32,15 +32,15 @@ "filename": "main.development.js", "bundleType": "NODE_DEV", "packageName": "main", - "size": 131815, - "gzip": 34623 + "size": 131847, + "gzip": 34636 }, { "filename": "main.production.min.js", "bundleType": "NODE_PROD", "packageName": "main", - "size": 131815, - "gzip": 34623 + "size": 131847, + "gzip": 34636 } ] } \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index 678c8b6784f..9b7869b2b6e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3151,15 +3151,6 @@ react-lifecycles-compat "^3.0.4" react-select "^3.0.8" -"@storybook/addon-options@5.3.0-beta.31": - version "5.3.0-beta.31" - resolved "https://registry.yarnpkg.com/@storybook/addon-options/-/addon-options-5.3.0-beta.31.tgz#cf9c179e3821f5102ed4236e4e22d8d2a0116f07" - integrity sha512-euNLOXNfaGx2owEIZEoI+f0s0AWf0/q2OoHY3xajv3izKhWDAYlXJYA8wKbS/1dbw1oKWgtXfh3mL4eORlZ2ug== - dependencies: - "@storybook/addons" "5.3.0-beta.31" - core-js "^3.0.1" - util-deprecate "^1.0.2" - "@storybook/addons@5.3.0-beta.31": version "5.3.0-beta.31" resolved "https://registry.yarnpkg.com/@storybook/addons/-/addons-5.3.0-beta.31.tgz#70842b66fbd5a922a90e0a5d72ac362cf7b78a1c" @@ -15635,10 +15626,10 @@ react-syntax-highlighter@^11.0.2: prismjs "^1.8.4" refractor "^2.4.1" -react-table@7.0.0-rc.12: - version "7.0.0-rc.12" - resolved "https://registry.yarnpkg.com/react-table/-/react-table-7.0.0-rc.12.tgz#28230d9077042cac3afbdad8f1d7b8c8fbddca11" - integrity sha512-myMnYvWKUu63oUIcPaSJ8WaJuiAlus7JLDtbaXMCrGBFHObm/8eyyVzx1uQW1dYFEhKLzxlWQH7v2g01Ottlzg== +react-table@7.0.0-rc.15: + version "7.0.0-rc.15" + resolved "https://registry.yarnpkg.com/react-table/-/react-table-7.0.0-rc.15.tgz#bb855e4e2abbb4aaf0ed2334404a41f3ada8e13a" + integrity sha512-ofMOlgrioHhhvHjvjsQkxvfQzU98cqwy6BjPGNwhLN1vhgXeWi0mUGreaCPvRenEbTiXsQbMl4k3Xmx3Mut8Rw== react-test-renderer@^16.0.0-0: version "16.8.6"