From bc67dfcd236661e5c3818508ad69290f3cc0cecb Mon Sep 17 00:00:00 2001 From: Allen Date: Tue, 17 Oct 2017 03:42:26 -0500 Subject: [PATCH] Refine the code base for cell edit --- .../src/{ => cell-edit}/editing-cell.js | 4 ++-- .../src/{ => cell-edit}/editor-indicator.js | 0 .../src/{ => cell-edit}/text-editor.js | 0 .../src/{cell-edit-wrapper.js => cell-edit/wrapper.js} | 2 +- packages/react-bootstrap-table2/src/row.js | 2 +- packages/react-bootstrap-table2/src/stateful-layer.js | 2 +- .../test/{ => cell-edit}/editing-cell.test.js | 8 ++++---- .../test/{ => cell-edit}/text-editor.test.js | 2 +- .../wrapper.test.js} | 6 +++--- packages/react-bootstrap-table2/test/row.test.js | 2 +- 10 files changed, 14 insertions(+), 14 deletions(-) rename packages/react-bootstrap-table2/src/{ => cell-edit}/editing-cell.js (98%) rename packages/react-bootstrap-table2/src/{ => cell-edit}/editor-indicator.js (100%) rename packages/react-bootstrap-table2/src/{ => cell-edit}/text-editor.js (100%) rename packages/react-bootstrap-table2/src/{cell-edit-wrapper.js => cell-edit/wrapper.js} (98%) rename packages/react-bootstrap-table2/test/{ => cell-edit}/editing-cell.test.js (95%) rename packages/react-bootstrap-table2/test/{ => cell-edit}/text-editor.test.js (94%) rename packages/react-bootstrap-table2/test/{cell-edit-wrapper.test.js => cell-edit/wrapper.test.js} (98%) diff --git a/packages/react-bootstrap-table2/src/editing-cell.js b/packages/react-bootstrap-table2/src/cell-edit/editing-cell.js similarity index 98% rename from packages/react-bootstrap-table2/src/editing-cell.js rename to packages/react-bootstrap-table2/src/cell-edit/editing-cell.js index 339426c..3102f58 100644 --- a/packages/react-bootstrap-table2/src/editing-cell.js +++ b/packages/react-bootstrap-table2/src/cell-edit/editing-cell.js @@ -5,8 +5,8 @@ import React, { Component } from 'react'; import cs from 'classnames'; import PropTypes from 'prop-types'; -import _ from './utils'; -import Const from './const'; +import _ from '../utils'; +import Const from '../const'; import TextEditor from './text-editor'; import EditorIndicator from './editor-indicator'; diff --git a/packages/react-bootstrap-table2/src/editor-indicator.js b/packages/react-bootstrap-table2/src/cell-edit/editor-indicator.js similarity index 100% rename from packages/react-bootstrap-table2/src/editor-indicator.js rename to packages/react-bootstrap-table2/src/cell-edit/editor-indicator.js diff --git a/packages/react-bootstrap-table2/src/text-editor.js b/packages/react-bootstrap-table2/src/cell-edit/text-editor.js similarity index 100% rename from packages/react-bootstrap-table2/src/text-editor.js rename to packages/react-bootstrap-table2/src/cell-edit/text-editor.js diff --git a/packages/react-bootstrap-table2/src/cell-edit-wrapper.js b/packages/react-bootstrap-table2/src/cell-edit/wrapper.js similarity index 98% rename from packages/react-bootstrap-table2/src/cell-edit-wrapper.js rename to packages/react-bootstrap-table2/src/cell-edit/wrapper.js index 404d796..20f68c0 100644 --- a/packages/react-bootstrap-table2/src/cell-edit-wrapper.js +++ b/packages/react-bootstrap-table2/src/cell-edit/wrapper.js @@ -2,7 +2,7 @@ /* eslint react/prop-types: 0 */ import React, { Component } from 'react'; import PropTypes from 'prop-types'; -import _ from './utils'; +import _ from '../utils'; class CellEditWrapper extends Component { constructor(props) { diff --git a/packages/react-bootstrap-table2/src/row.js b/packages/react-bootstrap-table2/src/row.js index 09d9d7b..fe894fc 100644 --- a/packages/react-bootstrap-table2/src/row.js +++ b/packages/react-bootstrap-table2/src/row.js @@ -5,7 +5,7 @@ import PropTypes from 'prop-types'; import _ from './utils'; import Cell from './cell'; import SelectionCell from './row-selection/selection-cell'; -import EditingCell from './editing-cell'; +import EditingCell from './cell-edit/editing-cell'; import Const from './const'; const Row = (props) => { diff --git a/packages/react-bootstrap-table2/src/stateful-layer.js b/packages/react-bootstrap-table2/src/stateful-layer.js index 8ddfa77..e7432fc 100644 --- a/packages/react-bootstrap-table2/src/stateful-layer.js +++ b/packages/react-bootstrap-table2/src/stateful-layer.js @@ -4,7 +4,7 @@ /* eslint react/prop-types: 0 */ import React, { Component } from 'react'; import Store from './store/base'; -import CellEditWrapper from './cell-edit-wrapper'; +import CellEditWrapper from './cell-edit/wrapper'; import _ from './utils'; const withStateful = (Base) => { diff --git a/packages/react-bootstrap-table2/test/editing-cell.test.js b/packages/react-bootstrap-table2/test/cell-edit/editing-cell.test.js similarity index 95% rename from packages/react-bootstrap-table2/test/editing-cell.test.js rename to packages/react-bootstrap-table2/test/cell-edit/editing-cell.test.js index 9523f60..c6157ab 100644 --- a/packages/react-bootstrap-table2/test/editing-cell.test.js +++ b/packages/react-bootstrap-table2/test/cell-edit/editing-cell.test.js @@ -3,10 +3,10 @@ import React from 'react'; import sinon from 'sinon'; import { shallow, mount } from 'enzyme'; -import { TableRowWrapper } from './test-helpers/table-wrapper'; -import EditingCell from '../src/editing-cell'; -import TextEditor from '../src/text-editor'; -import EditorIndicator from '../src/editor-indicator'; +import { TableRowWrapper } from '../test-helpers/table-wrapper'; +import EditingCell from '../../src/cell-edit/editing-cell'; +import TextEditor from '../../src/cell-edit/text-editor'; +import EditorIndicator from '../../src/cell-edit/editor-indicator'; describe('EditingCell', () => { let wrapper; diff --git a/packages/react-bootstrap-table2/test/text-editor.test.js b/packages/react-bootstrap-table2/test/cell-edit/text-editor.test.js similarity index 94% rename from packages/react-bootstrap-table2/test/text-editor.test.js rename to packages/react-bootstrap-table2/test/cell-edit/text-editor.test.js index 0150bc3..907e991 100644 --- a/packages/react-bootstrap-table2/test/text-editor.test.js +++ b/packages/react-bootstrap-table2/test/cell-edit/text-editor.test.js @@ -1,7 +1,7 @@ import React from 'react'; import { shallow } from 'enzyme'; -import TextEditor from '../src/text-editor'; +import TextEditor from '../../src/cell-edit/text-editor'; describe('TextEditor', () => { let wrapper; diff --git a/packages/react-bootstrap-table2/test/cell-edit-wrapper.test.js b/packages/react-bootstrap-table2/test/cell-edit/wrapper.test.js similarity index 98% rename from packages/react-bootstrap-table2/test/cell-edit-wrapper.test.js rename to packages/react-bootstrap-table2/test/cell-edit/wrapper.test.js index cfea0cf..ac504fa 100644 --- a/packages/react-bootstrap-table2/test/cell-edit-wrapper.test.js +++ b/packages/react-bootstrap-table2/test/cell-edit/wrapper.test.js @@ -2,9 +2,9 @@ import React from 'react'; import sinon from 'sinon'; import { shallow } from 'enzyme'; -import Store from '../src/store/base'; -import BootstrapTable from '../src/bootstrap-table'; -import CellEditWrapper from '../src/cell-edit-wrapper'; +import Store from '../../src/store/base'; +import BootstrapTable from '../../src/bootstrap-table'; +import CellEditWrapper from '../../src/cell-edit/wrapper'; describe('CellEditWrapper', () => { let wrapper; diff --git a/packages/react-bootstrap-table2/test/row.test.js b/packages/react-bootstrap-table2/test/row.test.js index c03848a..ea17158 100644 --- a/packages/react-bootstrap-table2/test/row.test.js +++ b/packages/react-bootstrap-table2/test/row.test.js @@ -5,7 +5,7 @@ import { shallow } from 'enzyme'; import Cell from '../src/cell'; import Row from '../src/row'; import Const from '../src/const'; -import EditingCell from '../src/editing-cell'; +import EditingCell from '../src/cell-edit/editing-cell'; import SelectionCell from '../src//row-selection/selection-cell'; import mockBodyResolvedProps from '../test/mock-data/body-resolved-props';