From d45345ed1012971694d8bc69ecfe63f01c762024 Mon Sep 17 00:00:00 2001 From: AllenFang Date: Sun, 30 Sep 2018 17:04:53 +0800 Subject: [PATCH] binder -> consumer --- packages/react-bootstrap-table2-editor/index.js | 2 +- .../{editing-cell-binder.js => editing-cell-consumer.js} | 0 ...ng-cell-binder.test.js => editing-cell-consumer.test.js} | 6 +++--- packages/react-bootstrap-table2/src/body.js | 4 ++-- packages/react-bootstrap-table2/src/header.js | 4 ++-- ...header-cell-binder.js => expand-header-cell-consumer.js} | 0 .../src/row-expand/{row-binder.js => row-consumer.js} | 0 .../react-bootstrap-table2/test/row/aggregate-row.test.js | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) rename packages/react-bootstrap-table2-editor/src/{editing-cell-binder.js => editing-cell-consumer.js} (100%) rename packages/react-bootstrap-table2-editor/test/{editing-cell-binder.test.js => editing-cell-consumer.test.js} (96%) rename packages/react-bootstrap-table2/src/row-expand/{expand-header-cell-binder.js => expand-header-cell-consumer.js} (100%) rename packages/react-bootstrap-table2/src/row-expand/{row-binder.js => row-consumer.js} (100%) diff --git a/packages/react-bootstrap-table2-editor/index.js b/packages/react-bootstrap-table2-editor/index.js index 04d5840..6a7af65 100644 --- a/packages/react-bootstrap-table2-editor/index.js +++ b/packages/react-bootstrap-table2-editor/index.js @@ -1,6 +1,6 @@ import createContext from './src/context'; import withRowLevelCellEdit from './src/row-consumer'; -import createEditingCell from './src/editing-cell-binder'; +import createEditingCell from './src/editing-cell-consumer'; import { EDITTYPE, DBCLICK_TO_CELL_EDIT, diff --git a/packages/react-bootstrap-table2-editor/src/editing-cell-binder.js b/packages/react-bootstrap-table2-editor/src/editing-cell-consumer.js similarity index 100% rename from packages/react-bootstrap-table2-editor/src/editing-cell-binder.js rename to packages/react-bootstrap-table2-editor/src/editing-cell-consumer.js diff --git a/packages/react-bootstrap-table2-editor/test/editing-cell-binder.test.js b/packages/react-bootstrap-table2-editor/test/editing-cell-consumer.test.js similarity index 96% rename from packages/react-bootstrap-table2-editor/test/editing-cell-binder.test.js rename to packages/react-bootstrap-table2-editor/test/editing-cell-consumer.test.js index fa8a392..bca2edb 100644 --- a/packages/react-bootstrap-table2-editor/test/editing-cell-binder.test.js +++ b/packages/react-bootstrap-table2-editor/test/editing-cell-consumer.test.js @@ -3,12 +3,12 @@ import React from 'react'; import { mount, shallow } from 'enzyme'; import _ from 'react-bootstrap-table-next/src/utils'; -import cellEditFactory from '../index'; +import cellEditFactory from '..'; import { CLICK_TO_CELL_EDIT } from '../src/const'; import createCellEditContext from '../src/context'; -import bindEditingCell from '../src/editing-cell-binder'; +import bindEditingCell from '../src/editing-cell-consumer'; -describe('Cell Binder', () => { +describe('Editing Cell Consumer', () => { let wrapper; let cellEdit; const data = [{ diff --git a/packages/react-bootstrap-table2/src/body.js b/packages/react-bootstrap-table2/src/body.js index 20620e5..7bcd373 100644 --- a/packages/react-bootstrap-table2/src/body.js +++ b/packages/react-bootstrap-table2/src/body.js @@ -10,7 +10,7 @@ import RowAggregator from './row/aggregate-row'; import RowSection from './row/row-section'; import Const from './const'; import withRowSelection from './row-selection/row-consumer'; -import bindExpansion from './row-expand/row-binder'; +import withRowExpansion from './row-expand/row-consumer'; class Body extends React.Component { constructor(props) { @@ -51,7 +51,7 @@ class Body extends React.Component { const additionalRowProps = {}; if (expandRowEnabled) { - RowComponent = bindExpansion(RowAggregator, visibleColumnSize); + RowComponent = withRowExpansion(RowAggregator, visibleColumnSize); } if (selectRowEnabled) { diff --git a/packages/react-bootstrap-table2/src/header.js b/packages/react-bootstrap-table2/src/header.js index c39ac89..3adf213 100644 --- a/packages/react-bootstrap-table2/src/header.js +++ b/packages/react-bootstrap-table2/src/header.js @@ -6,7 +6,7 @@ import HeaderCell from './header-cell'; import SelectionHeaderCell from './row-selection/selection-header-cell'; import ExpandHeaderCell from './row-expand/expand-header-cell'; import withHeaderSelection from './row-selection/selection-header-cell-consumer'; -import bindExpansion from './row-expand/expand-header-cell-binder'; +import withHeaderExpansion from './row-expand/expand-header-cell-consumer'; const Header = (props) => { const { @@ -26,7 +26,7 @@ const Header = (props) => { let ExpansionHeaderCellComp = () => null; if (expandRow.showExpandColumn) { - ExpansionHeaderCellComp = bindExpansion(ExpandHeaderCell); + ExpansionHeaderCellComp = withHeaderExpansion(ExpandHeaderCell); } if (selectRow) { diff --git a/packages/react-bootstrap-table2/src/row-expand/expand-header-cell-binder.js b/packages/react-bootstrap-table2/src/row-expand/expand-header-cell-consumer.js similarity index 100% rename from packages/react-bootstrap-table2/src/row-expand/expand-header-cell-binder.js rename to packages/react-bootstrap-table2/src/row-expand/expand-header-cell-consumer.js diff --git a/packages/react-bootstrap-table2/src/row-expand/row-binder.js b/packages/react-bootstrap-table2/src/row-expand/row-consumer.js similarity index 100% rename from packages/react-bootstrap-table2/src/row-expand/row-binder.js rename to packages/react-bootstrap-table2/src/row-expand/row-consumer.js diff --git a/packages/react-bootstrap-table2/test/row/aggregate-row.test.js b/packages/react-bootstrap-table2/test/row/aggregate-row.test.js index 6bda105..76aa625 100644 --- a/packages/react-bootstrap-table2/test/row/aggregate-row.test.js +++ b/packages/react-bootstrap-table2/test/row/aggregate-row.test.js @@ -5,7 +5,7 @@ import mockBodyResolvedProps from '../test-helpers/mock/body-resolved-props'; import SelectionContext from '../../src/contexts/selection-context'; import ExpansionContext from '../../src/contexts/row-expand-context'; import bindSelection from '../../src/row-selection/row-consumer'; -import bindExpansion from '../../src/row-expand/row-binder'; +import bindExpansion from '../../src/row-expand/row-consumer'; import ExpandCell from '../../src/row-expand/expand-cell'; import SelectionCell from '../../src/row-selection/selection-cell'; import RowAggregator from '../../src/row/aggregate-row';