Skip to content

Commit 3c9cd22

Browse files
authored
merge 0.1.0 code base
Develop -> Master (Not Version Bump)
2 parents badce54 + d84b614 commit 3c9cd22

File tree

209 files changed

+27660
-27
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

209 files changed

+27660
-27
lines changed

.babelrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"presets": ["react", "es2015", "stage-0"]
3+
}

.eslintrc

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
{
2+
"extends": "airbnb",
3+
"parser": "babel-eslint",
4+
"env": {
5+
"browser": true,
6+
"jest": true,
7+
"node": true
8+
},
9+
"plugins": [
10+
"react"
11+
],
12+
"rules": {
13+
"comma-dangle": ["error", "never"],
14+
"react/jsx-curly-spacing": [2, "always"],
15+
"react/forbid-prop-types": 0,
16+
"react/jsx-filename-extension": 0,
17+
"react/jsx-space-before-closing": 0,
18+
"react/jsx-tag-spacing": ["error", { "beforeSelfClosing": "always" }],
19+
"import/extensions": 0, // skip import extensions
20+
"import/no-unresolved": [0, { "ignore": ["^react-bootstrap-table"] }], // monorepo setup
21+
"import/prefer-default-export": 0,
22+
"import/no-extraneous-dependencies": 0
23+
},
24+
"globals": {
25+
"jest": false
26+
}
27+
}

.gitignore

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,24 @@
1-
node_modules
1+
# node
2+
node_modules
3+
package-lock.json
4+
5+
# testing
6+
coverage
7+
.eslintcache
8+
9+
# misc
10+
.DS_Store
11+
.vscode
12+
13+
# logs
14+
lerna-debug.log
15+
npm-debug.log*
16+
yarn-debug.log*
17+
yarn-error.log*
18+
19+
# gh-pages
20+
storybook-static
21+
22+
# build
23+
lib
24+
dist

.npmignore

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
node_modules
2+
.DS_Store
3+
*~
4+
*.sublime-project
5+
*.sublime-workspace
6+
*.idea
7+
*.iml

.travis.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
language: node_js
2+
3+
node_js:
4+
- "7"
5+
- "6"
6+
7+
cache:
8+
yarn: true
9+
10+
branches:
11+
only:
12+
# skip master branch when it's under development phase
13+
# - master
14+
- develop
15+
16+
before_install:
17+
- curl -o- -L https://yarnpkg.com/install.sh | bash -s
18+
- export PATH="$HOME/.yarn/bin:$PATH"
19+
20+
install: yarn install

CONTRIBUTING.md

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
# Contributing
2+
3+
# Issues
4+
Before opening an issue, please make sure your problem or request doesn't exist. When opening an issue, please provide the following information if possible:
5+
6+
* Example code or repo (please keep it simple and minimal)
7+
* Steps to reproduce.
8+
* `react-bootstrap-table2` version.
9+
10+
Additionally, asking questions and requesting new features are welcomed via [issue tracker](https://github.com/react-bootstrap-table/react-bootstrap-table2/issues).
11+
12+
# Pull Requests
13+
Check [here](./docs/development.md) for getting started with development.
14+
15+
* We recommend filing an [issue](https://github.com/react-bootstrap-table/react-bootstrap-table2/issues) before you implement any new features.
16+
* Please ensure that all the test suites have passed before submitting a PR. Besides, always test the actual business logic.
17+
* If your PR is trying to fix a bug, please describe the details as much as you could and tag the bug number with hashtag.
18+
19+
# For the members of react-bootstrap-table2 org
20+
* Please convert the ticket to issue when the ticket has moved from `Backlog` to `Ready`.
21+
* Please update the docs if any API, feature or component props was changed or added. The code and docs should always be in sync.
22+
* Please add a story example if any new feature was implemented.

README.md

Lines changed: 43 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,46 @@
11
# react-bootstrap-table2
22
Rebuilt [react-bootstrap-table](https://github.com/AllenFang/react-bootstrap-table)
33

4-
## The problems/features I want to solve
5-
* Performance
6-
* Fully compatiable with bootstrap 3 and 4(`react-bootstrap-table@4.0.0` already done)
7-
* Clean Code and Testing
8-
* Decrease the size of bundled file
9-
* **Split module/functionality from core module, make core module more lightweight**
10-
* Use [`storybook`](https://github.com/storybooks/storybook) to build examples
11-
* Support the aggregation(summary) view
12-
* Support the table footer
13-
* Support column/row span on header and body
14-
* Support sticky header
15-
* Support table section([react-bootstrap-table#721](https://github.com/AllenFang/react-bootstrap-table/pull/721))
16-
* Handle events well
17-
* Fix unalign issues
18-
* Make **stateless** table more easy to use(`react-bootstrap-table` alread have `remote` mode but have some bugs)
19-
* Customizable table
20-
* Support the nested data([react-bootstrap-table#50](https://github.com/AllenFang/react-bootstrap-table/issues/50◊))
21-
* Consider to support column resize
22-
* Consider to make animation on `react-bootstrap-table2` more easy
23-
24-
## The feature may lost on react-bootstrap-table
25-
* Have a great chance that I don't support the vertical scrollbar on table
4+
> `react-bootstrap-table2`'s npm module name is [**`react-bootstrap-table-next`**](https://www.npmjs.com/package/react-bootstrap-table-next) due to some guys already used it ;(
5+
6+
`react-bootstrap-table2` separate some functionalities from core modules to other modules like following:
7+
8+
* [`react-bootstrap-table2-next`](https://www.npmjs.com/package/react-bootstrap-table-next)
9+
* Core table module, include sorting and row selection
10+
* [`react-bootstrap-table2-filter`](https://www.npmjs.com/package/react-bootstrap-table2-filter)
11+
* Column filter Addons
12+
* [`react-bootstrap-table2-editor`](https://www.npmjs.com/package/react-bootstrap-table2-editor)
13+
* Cell Editing Addons
14+
* [`react-bootstrap-table2-paginator`](https://www.npmjs.com/package/react-bootstrap-table2-paginator)
15+
* Pagination Addons
16+
* [`react-bootstrap-z-overlay`](https://www.npmjs.com/package/react-bootstrap-table2-overlay)
17+
* Overlay/Loading Addons
18+
19+
This can help your application with less bundled size and also help us have clean design to avoid handling to much logic in kernal module(SRP).
20+
21+
## Migration
22+
If you are the user from legacy [`react-bootstrap-table`](https://github.com/AllenFang/react-bootstrap-table/), please have a look on [this](./docs/migration.md).
23+
24+
## Usage
25+
See [getting started](https://react-bootstrap-table.github.io/react-bootstrap-table2/docs/getting-started.html).
26+
27+
## Online Demo
28+
See `react-bootstrap-table2` [storybook](https://react-bootstrap-table.github.io/react-bootstrap-table2/storybook/index.html).
29+
30+
## Roadmap
31+
See [release plans](https://react-bootstrap-table.github.io/react-bootstrap-table2/blog/2018/01/24/release-plan.html).
32+
33+
## Development
34+
Please check [development guide](./docs/development.md).
35+
36+
## How should I run storybook example in my local?
37+
38+
```sh
39+
$ git clone https://github.com/react-bootstrap-table/react-bootstrap-table2.git
40+
$ cd react-bootstrap-table2
41+
$ yarn install
42+
$ yarn storybook
43+
$ Go to localhost:6006
44+
```
45+
46+
**Storybook examples: [`packages/react-bootstrap-table2-example/examples`](https://github.com/react-bootstrap-table/react-bootstrap-table2/tree/master/packages/react-bootstrap-table2-example/examples)**

0 commit comments

Comments
 (0)