From f9a62731848f3d1c2e140cd385dbed124306dcf6 Mon Sep 17 00:00:00 2001 From: Tanner Linsley Date: Mon, 2 Dec 2019 16:12:23 -0700 Subject: [PATCH] Rename useMain and useBeforeDimensions hooks --- .size-snapshot.json | 12 ++++++------ CHANGELOG.md | 5 +++++ index.d.ts | 2 +- src/hooks/useTable.js | 16 ++++++++-------- src/plugin-hooks/useAbsoluteLayout.js | 4 ++-- src/plugin-hooks/useBlockLayout.js | 4 ++-- src/plugin-hooks/useColumnOrder.js | 4 ++-- src/plugin-hooks/useExpanded.js | 4 ++-- src/plugin-hooks/useFilters.js | 4 ++-- src/plugin-hooks/useGroupBy.js | 4 ++-- src/plugin-hooks/usePagination.js | 4 ++-- src/plugin-hooks/useResizeColumns.js | 4 ++-- src/plugin-hooks/useRowSelect.js | 4 ++-- src/plugin-hooks/useRowState.js | 4 ++-- src/plugin-hooks/useSortBy.js | 4 ++-- 15 files changed, 42 insertions(+), 37 deletions(-) diff --git a/.size-snapshot.json b/.size-snapshot.json index 949b600..c5256ab 100644 --- a/.size-snapshot.json +++ b/.size-snapshot.json @@ -1,13 +1,13 @@ { "dist/index.js": { - "bundled": 96393, - "minified": 46534, - "gzipped": 12272 + "bundled": 96601, + "minified": 46726, + "gzipped": 12271 }, "dist/index.es.js": { - "bundled": 95828, - "minified": 46042, - "gzipped": 12160, + "bundled": 96036, + "minified": 46234, + "gzipped": 12155, "treeshaked": { "rollup": { "code": 78, diff --git a/CHANGELOG.md b/CHANGELOG.md index e5aaf31..83a524d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,8 @@ +## 7.0.0-beta.23 + +- The internal `useMain` hook has been renamed to `useInstance` +- The internal `useBeforeDimensions` hook has been renamed to `useInstanceBeforeDimensions` + ## 7.0.0-beta.22 - Fixed an issue where `useRowState` would crash due to invalid initial state attempting to spread into the new state diff --git a/index.d.ts b/index.d.ts index 994bce6..4fa95eb 100644 --- a/index.d.ts +++ b/index.d.ts @@ -75,7 +75,7 @@ export interface UseTableHooks { columnsBeforeHeaderGroupsDeps: Array< (deps: any[], instance: TableInstance) => any[] > - useMain: Array<(instance: TableInstance) => TableInstance> + useInstance: Array<(instance: TableInstance) => TableInstance> useRows: Array< (rows: Array>, instance: TableInstance) => Array> > diff --git a/src/hooks/useTable.js b/src/hooks/useTable.js index 4a60c53..a0cf22a 100755 --- a/src/hooks/useTable.js +++ b/src/hooks/useTable.js @@ -84,8 +84,8 @@ export const useTable = (props, ...plugins) => { hooks: { columnsBeforeHeaderGroups: [], columnsBeforeHeaderGroupsDeps: [], - useBeforeDimensions: [], - useMain: [], + useInstanceBeforeDimensions: [], + useInstance: [], useRows: [], prepareRow: [], getTableProps: [], @@ -230,24 +230,24 @@ export const useTable = (props, ...plugins) => { ) if (process.env.NODE_ENV !== 'production' && debug) - console.time('hooks.useBeforeDimensions') + console.time('hooks.useInstanceBeforeDimensions') instanceRef.current = applyHooks( - instanceRef.current.hooks.useBeforeDimensions, + instanceRef.current.hooks.useInstanceBeforeDimensions, instanceRef.current ) if (process.env.NODE_ENV !== 'production' && debug) - console.timeEnd('hooks.useBeforeDimensions') + console.timeEnd('hooks.useInstanceBeforeDimensions') calculateDimensions(instanceRef.current) if (process.env.NODE_ENV !== 'production' && debug) - console.time('hooks.useMain') + console.time('hooks.useInstance') instanceRef.current = applyHooks( - instanceRef.current.hooks.useMain, + instanceRef.current.hooks.useInstance, instanceRef.current ) if (process.env.NODE_ENV !== 'production' && debug) - console.timeEnd('hooks.useMain') + console.timeEnd('hooks.useInstance') // Each materialized header needs to be assigned a render function and other // prop getter properties here. diff --git a/src/plugin-hooks/useAbsoluteLayout.js b/src/plugin-hooks/useAbsoluteLayout.js index fb7b58b..5b5e587 100644 --- a/src/plugin-hooks/useAbsoluteLayout.js +++ b/src/plugin-hooks/useAbsoluteLayout.js @@ -1,10 +1,10 @@ export const useAbsoluteLayout = hooks => { - hooks.useMain.push(useMain) + hooks.useInstance.push(useInstance) } useAbsoluteLayout.pluginName = 'useAbsoluteLayout' -const useMain = instance => { +const useInstance = instance => { const { totalColumnsWidth, hooks: { diff --git a/src/plugin-hooks/useBlockLayout.js b/src/plugin-hooks/useBlockLayout.js index 2e974d4..970aadd 100644 --- a/src/plugin-hooks/useBlockLayout.js +++ b/src/plugin-hooks/useBlockLayout.js @@ -1,10 +1,10 @@ export const useBlockLayout = hooks => { - hooks.useMain.push(useMain) + hooks.useInstance.push(useInstance) } useBlockLayout.pluginName = 'useBlockLayout' -const useMain = instance => { +const useInstance = instance => { const { totalColumnsWidth, hooks: { getRowProps, getHeaderGroupProps, getHeaderProps, getCellProps }, diff --git a/src/plugin-hooks/useColumnOrder.js b/src/plugin-hooks/useColumnOrder.js index 8676030..d61fbfc 100644 --- a/src/plugin-hooks/useColumnOrder.js +++ b/src/plugin-hooks/useColumnOrder.js @@ -38,7 +38,7 @@ export const useColumnOrder = hooks => { return [...deps, instance.state.columnOrder] }) hooks.columnsBeforeHeaderGroups.push(columnsBeforeHeaderGroups) - hooks.useMain.push(useMain) + hooks.useInstance.push(useInstance) } useColumnOrder.pluginName = pluginName @@ -74,7 +74,7 @@ function columnsBeforeHeaderGroups(columns, instance) { return [...columnsInOrder, ...columnsCopy] } -function useMain(instance) { +function useInstance(instance) { const { dispatch } = instance const setColumnOrder = React.useCallback( diff --git a/src/plugin-hooks/useExpanded.js b/src/plugin-hooks/useExpanded.js index c6feca4..4ccf245 100755 --- a/src/plugin-hooks/useExpanded.js +++ b/src/plugin-hooks/useExpanded.js @@ -54,14 +54,14 @@ reducerHandlers[pluginName] = (state, action) => { export const useExpanded = hooks => { hooks.getExpandedToggleProps = [] - hooks.useMain.push(useMain) + hooks.useInstance.push(useInstance) } useExpanded.pluginName = pluginName const defaultGetResetExpandedDeps = ({ data }) => [data] -function useMain(instance) { +function useInstance(instance) { const { debug, rows, diff --git a/src/plugin-hooks/useFilters.js b/src/plugin-hooks/useFilters.js index 8549833..e271f28 100755 --- a/src/plugin-hooks/useFilters.js +++ b/src/plugin-hooks/useFilters.js @@ -109,12 +109,12 @@ reducerHandlers[pluginName] = (state, action) => { } export const useFilters = hooks => { - hooks.useMain.push(useMain) + hooks.useInstance.push(useInstance) } useFilters.pluginName = pluginName -function useMain(instance) { +function useInstance(instance) { const { debug, rows, diff --git a/src/plugin-hooks/useGroupBy.js b/src/plugin-hooks/useGroupBy.js index 4f9ef19..b1f8121 100755 --- a/src/plugin-hooks/useGroupBy.js +++ b/src/plugin-hooks/useGroupBy.js @@ -58,7 +58,7 @@ export const useGroupBy = hooks => { deps.push(instance.state.groupBy) return deps }) - hooks.useMain.push(useMain) + hooks.useInstance.push(useInstance) } useGroupBy.pluginName = pluginName @@ -83,7 +83,7 @@ function columnsBeforeHeaderGroups(flatColumns, { state: { groupBy } }) { const defaultUserAggregations = {} -function useMain(instance) { +function useInstance(instance) { const { debug, rows, diff --git a/src/plugin-hooks/usePagination.js b/src/plugin-hooks/usePagination.js index e8d98ef..15338e2 100755 --- a/src/plugin-hooks/usePagination.js +++ b/src/plugin-hooks/usePagination.js @@ -61,7 +61,7 @@ reducerHandlers[pluginName] = (state, action) => { } export const usePagination = hooks => { - hooks.useMain.push(useMain) + hooks.useInstance.push(useInstance) } usePagination.pluginName = pluginName @@ -72,7 +72,7 @@ const defaultGetResetPageDeps = ({ state: { filters, groupBy, sortBy }, }) => [manualPagination ? null : data, filters, groupBy, sortBy] -function useMain(instance) { +function useInstance(instance) { const { rows, manualPagination, diff --git a/src/plugin-hooks/useResizeColumns.js b/src/plugin-hooks/useResizeColumns.js index 198852d..0cc953c 100644 --- a/src/plugin-hooks/useResizeColumns.js +++ b/src/plugin-hooks/useResizeColumns.js @@ -80,12 +80,12 @@ reducerHandlers[pluginName] = (state, action) => { } export const useResizeColumns = hooks => { - hooks.useBeforeDimensions.push(useBeforeDimensions) + hooks.useInstanceBeforeDimensions.push(useInstanceBeforeDimensions) } useResizeColumns.pluginName = pluginName -const useBeforeDimensions = instance => { +const useInstanceBeforeDimensions = instance => { instance.hooks.getResizerProps = [] const { diff --git a/src/plugin-hooks/useRowSelect.js b/src/plugin-hooks/useRowSelect.js index ccd049b..d05c18c 100644 --- a/src/plugin-hooks/useRowSelect.js +++ b/src/plugin-hooks/useRowSelect.js @@ -118,7 +118,7 @@ export const useRowSelect = hooks => { hooks.getToggleRowSelectedProps = [] hooks.getToggleAllRowsSelectedProps = [] hooks.useRows.push(useRows) - hooks.useMain.push(useMain) + hooks.useInstance.push(useInstance) } useRowSelect.pluginName = pluginName @@ -147,7 +147,7 @@ function useRows(rows, instance) { const defaultGetResetSelectedRowPathsDeps = ({ data }) => [data] -function useMain(instance) { +function useInstance(instance) { const { hooks, manualRowSelectedKey = 'isSelected', diff --git a/src/plugin-hooks/useRowState.js b/src/plugin-hooks/useRowState.js index bcc4f95..6f88037 100644 --- a/src/plugin-hooks/useRowState.js +++ b/src/plugin-hooks/useRowState.js @@ -43,14 +43,14 @@ reducerHandlers[pluginName] = (state, action) => { } export const useRowState = hooks => { - hooks.useMain.push(useMain) + hooks.useInstance.push(useInstance) } useRowState.pluginName = pluginName const defaultGetResetRowStateDeps = ({ data }) => [data] -function useMain(instance) { +function useInstance(instance) { const { hooks, initialRowStateAccessor, diff --git a/src/plugin-hooks/useSortBy.js b/src/plugin-hooks/useSortBy.js index d3e24cc..4d4f58c 100755 --- a/src/plugin-hooks/useSortBy.js +++ b/src/plugin-hooks/useSortBy.js @@ -149,12 +149,12 @@ defaultColumn.sortType = 'alphanumeric' defaultColumn.sortDescFirst = false export const useSortBy = hooks => { - hooks.useMain.push(useMain) + hooks.useInstance.push(useInstance) } useSortBy.pluginName = pluginName -function useMain(instance) { +function useInstance(instance) { const { debug, rows,