Skip to content

Commit 7ba5eb0

Browse files
committed
Merge pull request #3 from KamranAsif/master
Updating files to match new name
2 parents 4553ae2 + 6534288 commit 7ba5eb0

31 files changed

+79
-82
lines changed

Diff for: README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ This version of FixedDataTable is maintained by Schrödinger, Inc. It is a forke
2626
Getting started
2727
---------------
2828

29-
Install `fixed-data-table` using npm.
29+
Install `fixed-data-table-2` using npm.
3030

3131
```shell
32-
npm install fixed-data-table
32+
npm install fixed-data-table-2
3333
```
3434
Add the default stylesheet `dist/fixed-data-table.css`, then import it into any module.
3535

@@ -38,7 +38,7 @@ Add the default stylesheet `dist/fixed-data-table.css`, then import it into any
3838
```javascript
3939
import React from 'react';
4040
import ReactDOM from 'react-dom';
41-
import {Table, Column, Cell} from 'fixed-data-table';
41+
import {Table, Column, Cell} from 'fixed-data-table-2';
4242

4343
// Table data as a list of array.
4444
const rows = [
@@ -84,19 +84,19 @@ ReactDOM.render(
8484
Contributions
8585
------------
8686

87-
Use [GitHub issues](https://github.com/schrodinger/fixed-data-table/issues) for requests.
87+
Use [GitHub issues](https://github.com/schrodinger/fixed-data-table-2/issues) for requests.
8888

89-
We actively welcome pull requests; learn how to [contribute](https://github.com/schrodinger/fixed-data-table/blob/master/CONTRIBUTING.md).
89+
We actively welcome pull requests; learn how to [contribute](https://github.com/schrodinger/fixed-data-table-2/blob/master/CONTRIBUTING.md).
9090

91-
**BY CONTRIBUTING TO FIXEDDATATABLE, YOU AGREE THAT YOUR CONTRIBUTIONS WILL BE LICENSED UNDER THE BSD LICENSE [(see here)](https://github.com/schrodinger/fixed-data-table/blob/master/LICENSE)**. Furthermore, by contributing to FixedDataTable, you hereby grant to Schrödinger and any recipients of your contributions, including but not limited to users of this site, a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, use, make and distribute your contributions and any derivative works under all intellectual property rights including but not limited to copyright and patent. **BY CONTRIBUTING TO FIXEDDATATABLE, YOU REPRESENT AND WARRANT THAT YOU ARE LEGALLY ENTITLED TO GRANT THE FOREGOING LICENSE**.
91+
**BY CONTRIBUTING TO FIXEDDATATABLE, YOU AGREE THAT YOUR CONTRIBUTIONS WILL BE LICENSED UNDER THE BSD LICENSE [(see here)](https://github.com/schrodinger/fixed-data-table-2/blob/master/LICENSE)**. Furthermore, by contributing to FixedDataTable, you hereby grant to Schrödinger and any recipients of your contributions, including but not limited to users of this site, a perpetual, worldwide, non-exclusive, no-charge, royalty-free, irrevocable license to reproduce, prepare derivative works of, publicly display, publicly perform, sublicense, use, make and distribute your contributions and any derivative works under all intellectual property rights including but not limited to copyright and patent. **BY CONTRIBUTING TO FIXEDDATATABLE, YOU REPRESENT AND WARRANT THAT YOU ARE LEGALLY ENTITLED TO GRANT THE FOREGOING LICENSE**.
9292

9393
Changelog
9494
---------
9595

96-
Changes are tracked as [GitHub releases](https://github.com/schrodinger/fixed-data-table/releases).
96+
Changes are tracked as [GitHub releases](https://github.com/schrodinger/fixed-data-table-2/releases).
9797

9898

9999
License
100100
-------
101101

102-
`FixedDataTable` is [BSD-licensed](https://github.com/schrodinger/fixed-data-table/blob/master/LICENSE). We also provide an additional [patent grant](https://github.com/schrodinger/fixed-data-table/blob/master/PATENTS).
102+
`FixedDataTable` is [BSD-licensed](https://github.com/schrodinger/fixed-data-table-2/blob/master/LICENSE). We also provide an additional [patent grant](https://github.com/schrodinger/fixed-data-table-2/blob/master/PATENTS).

Diff for: build_helpers/publishStaticSite.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ set -e
33

44
PROJECT_DIRECTORY="fixed-data-table"
55
SITE_DIRECTORY="$PROJECT_DIRECTORY-site"
6-
GITHUB_REPO="[email protected]:schrodinger/fixed-data-table.git"
7-
GH_PAGES_SITE="http://schrodinger.github.io/fixed-data-table/"
6+
GITHUB_REPO="[email protected]:schrodinger/fixed-data-table-2.git"
7+
GH_PAGES_SITE="http://schrodinger.github.io/fixed-data-table-2/"
88

99
# Move to parent dir
1010
cd ../

Diff for: dist/fixed-data-table.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6510,4 +6510,4 @@ return /******/ (function(modules) { // webpackBootstrap
65106510
/***/ }
65116511
/******/ ])
65126512
});
6513-
;
6513+
;

Diff for: dist/fixed-data-table.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: docs/README.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -5,23 +5,23 @@ The easiest way to start using FixedDataTable is to install it via npm:
55

66
```shell
77
npm install react --save
8-
npm install fixed-data-table --save
8+
npm install fixed-data-table-2 --save
99
```
1010

1111
If you're using a standard build system such as [`browserify`](http://browserify.org/) or [`webpack`](https://webpack.github.io/) it can then be required directly:
1212
```
1313
const React = require('react');
14-
const {Table, Column, Cell} = require('fixed-data-table');
14+
const {Table, Column, Cell} = require('fixed-data-table-2');
1515
```
1616

17-
For layout and styling the default stylesheet needs to be added: `fixed-data-table/dist/fixed-data-table.min.css`.
17+
For layout and styling the default stylesheet needs to be added: `fixed-data-table-2/dist/fixed-data-table.min.css`.
1818

1919
## Create your `Table`
2020
Setting up your table can be done via the `Table` component. To be able to handle large amounts of data, the table only renders the parts that are visible to the user, in order to calculate this, static `width`, `height`, `rowsCount` and `rowHeight` are required:
2121

2222
```javascript
2323
const React = require('react');
24-
const {Table} = require('fixed-data-table');
24+
const {Table} = require('fixed-data-table-2');
2525

2626
class MyTable extends React.Component {
2727
render() {
@@ -43,7 +43,7 @@ For each column that needs to be displayed, a `Column` config with 2 important p
4343

4444
```javascript
4545
const React = require('react');
46-
const {Table, Column, Cell} = require('fixed-data-table');
46+
const {Table, Column, Cell} = require('fixed-data-table-2');
4747

4848
class MyTable extends React.Component {
4949
render() {
@@ -68,7 +68,7 @@ Typically you will want to render custom data per row, let's add some data to ou
6868

6969
```javascript
7070
const React = require('react');
71-
const {Table, Column, Cell} = require('fixed-data-table');
71+
const {Table, Column, Cell} = require('fixed-data-table-2');
7272

7373
class MyTable extends React.Component {
7474
constructor(props) {
@@ -116,7 +116,7 @@ With larger table setups you will want to reuse the `cell` render functions. To
116116

117117
```javascript
118118
const React = require('react');
119-
const {Table, Column, Cell} = require('fixed-data-table');
119+
const {Table, Column, Cell} = require('fixed-data-table-2');
120120

121121
class MyTextCell extends React.Component {
122122
render() {
@@ -192,4 +192,4 @@ class MyTable extends React.Component {
192192

193193
## Next Steps
194194

195-
The FixedDataTable has many more options, for more information see the [examples section](http://schrodinger.github.io/fixed-data-table/example-object-data.html) or the [API docs](http://schrodinger.github.io/fixed-data-table/api-table.html).
195+
The FixedDataTable has many more options, for more information see the [examples section](http://schrodinger.github.io/fixed-data-table-2/example-object-data.html) or the [API docs](http://schrodinger.github.io/fixed-data-table-2/api-table.html).

Diff for: docs/v6-migration.md

+6-6
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ Customizable Cell Rendering
3535
In previous versions of FixedDataTable, it was possible to customize what was rendered into a cell via the `cellRenderer` prop but it was very limited at what could changed as the `cellRenderer` would always wrap the content with a default cell and this default cell could only be customizable in limited ways via column props like `cellClassName`. A typical `Column` config would look like:
3636

3737
```javascript
38-
const {Column} = require('fixed-data-table');
38+
const {Column} = require('fixed-data-table-2');
3939

4040
function renderLink(cellData) {
4141
return <a href="#">{cellData}</a>;
@@ -56,7 +56,7 @@ The current FixedDataTable version provides the new API's `cell`, `header` and `
5656

5757
To render static content provide a React Element. FixedDataTable will pass through any positional props needed to render the cell:
5858
```javascript
59-
const {Column, Cell} = require('fixed-data-table');
59+
const {Column, Cell} = require('fixed-data-table-2');
6060

6161
const MyColumn = (
6262
<Column
@@ -69,7 +69,7 @@ const MyColumn = (
6969

7070
More likely you will want to provide different content per row in a column, this is possible via creating a React Component and handling any necessary logic to get data based on the `rowIndex`. When rendered the `Cell` will receive the props `rowIndex`, `width`, `height` plus any other props provided when initializing the `Cell` component in the `Column` config:
7171
```javascript
72-
const {Column, Cell} = require('fixed-data-table');
72+
const {Column, Cell} = require('fixed-data-table-2');
7373

7474
class MyDataFetchingCell extends React.Component {
7575
render() {
@@ -97,7 +97,7 @@ const MyColumn = (
9797

9898
The `cell` prop can also accept render functions. This works well a simple `Cell` that renders based on the parents `state` or `props` is needed:
9999
```javascript
100-
const {Column, Cell} = require('fixed-data-table');
100+
const {Column, Cell} = require('fixed-data-table-2');
101101

102102
const MyColumn = (
103103
<Column
@@ -116,7 +116,7 @@ Flexible Data Sources
116116
---------------------
117117
Previously FixedDataTable needed to own the data required to render the table, this data was provided via the `rowGetter` prop. `Cell`s would then be given the relevant data based on the `dataKey` and would render the cell only if the data changed. A typical setup would look like this:
118118
```javascript
119-
const {Table, Column} = require('fixed-data-table');
119+
const {Table, Column} = require('fixed-data-table-2');
120120

121121
const rows = [
122122
{name: 'Sally', email: '[email protected]'},
@@ -149,7 +149,7 @@ There are a number of options to consume data depending on the application. For
149149

150150
Example basic usage:
151151
```javascript
152-
const {Table, Column, Cell} = require('fixed-data-table');
152+
const {Table, Column, Cell} = require('fixed-data-table-2');
153153

154154
const rows = [
155155
{name: 'Sally', email: '[email protected]'},

Diff for: examples/CollapseExample.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"use strict";
66

77
let FakeObjectDataListStore = require('./helpers/FakeObjectDataListStore');
8-
let FixedDataTable = require('fixed-data-table');
8+
let FixedDataTable = require('fixed-data-table-2');
99
let React = require('react');
1010

1111
const {Table, Column, Cell} = FixedDataTable;

Diff for: examples/ColumnGroupsExample.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
var ExampleImage = require('./helpers/ExampleImage');
88
var FakeObjectDataListStore = require('./helpers/FakeObjectDataListStore');
9-
var FixedDataTable = require('fixed-data-table');
9+
var FixedDataTable = require('fixed-data-table-2');
1010
var React = require('react');
1111

1212
const {Table, Column, ColumnGroup, Cell} = FixedDataTable;

Diff for: examples/FilterExample.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
var ExampleImage = require('./helpers/ExampleImage');
88
var FakeObjectDataListStore = require('./helpers/FakeObjectDataListStore');
9-
var FixedDataTable = require('fixed-data-table');
9+
var FixedDataTable = require('fixed-data-table-2');
1010
var React = require('react');
1111

1212
const {Table, Column, Cell} = FixedDataTable;

Diff for: examples/FlexGrowExample.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"use strict";
66

77
var FakeObjectDataListStore = require('./helpers/FakeObjectDataListStore');
8-
var FixedDataTable = require('fixed-data-table');
8+
var FixedDataTable = require('fixed-data-table-2');
99
var React = require('react');
1010

1111
const {Table, Column, Cell} = FixedDataTable;

Diff for: examples/HideColumnExample.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"use strict";
66

77
let FakeObjectDataListStore = require('./helpers/FakeObjectDataListStore');
8-
let FixedDataTable = require('fixed-data-table');
8+
let FixedDataTable = require('fixed-data-table-2');
99
let React = require('react');
1010

1111
const {Table, Column, Cell} = FixedDataTable;

Diff for: examples/ObjectDataExample.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
var ExampleImage = require('./helpers/ExampleImage');
88
var FakeObjectDataListStore = require('./helpers/FakeObjectDataListStore');
9-
var FixedDataTable = require('fixed-data-table');
9+
var FixedDataTable = require('fixed-data-table-2');
1010
var React = require('react');
1111

1212
const {Table, Column, Cell} = FixedDataTable;

Diff for: examples/PaginationExample.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"use strict";
66

77
var FakeObjectDataListStore = require('./helpers/FakeObjectDataListStore');
8-
var FixedDataTable = require('fixed-data-table');
8+
var FixedDataTable = require('fixed-data-table-2');
99
var React = require('react');
1010

1111
const {Table, Column, Cell} = FixedDataTable;

Diff for: examples/ReorderExample.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"use strict";
66

77
var FakeObjectDataListStore = require('./helpers/FakeObjectDataListStore');
8-
var FixedDataTable = require('fixed-data-table');
8+
var FixedDataTable = require('fixed-data-table-2');
99
var React = require('react');
1010
var ReactShallowCompare = require('react-addons-shallow-compare');
1111

Diff for: examples/ResizeExample.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"use strict";
66

77
var FakeObjectDataListStore = require('./helpers/FakeObjectDataListStore');
8-
var FixedDataTable = require('fixed-data-table');
8+
var FixedDataTable = require('fixed-data-table-2');
99
var React = require('react');
1010

1111
const {Table, Column, Cell} = FixedDataTable;

Diff for: examples/ScrollToExample.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
var ExampleImage = require('./helpers/ExampleImage');
88
var FakeObjectDataListStore = require('./helpers/FakeObjectDataListStore');
9-
var FixedDataTable = require('fixed-data-table');
9+
var FixedDataTable = require('fixed-data-table-2');
1010
var React = require('react');
1111

1212
const {Table, Column, Cell} = FixedDataTable;

Diff for: examples/SortExample.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"use strict";
66

77
var FakeObjectDataListStore = require('./helpers/FakeObjectDataListStore');
8-
var FixedDataTable = require('fixed-data-table');
8+
var FixedDataTable = require('fixed-data-table-2');
99
var React = require('react');
1010

1111
const {Table, Column, Cell} = FixedDataTable;

Diff for: examples/old/ColumnGroupsExample.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"use strict";
66

77
var FakeObjectDataListStore = require('../helpers/FakeObjectDataListStore');
8-
var FixedDataTable = require('fixed-data-table');
8+
var FixedDataTable = require('fixed-data-table-2');
99
var React = require('react');
1010

1111
var Column = FixedDataTable.Column;

Diff for: examples/old/FilterExample.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
var ExampleImage = require('../helpers/ExampleImage');
88
var FakeObjectDataListStore = require('../helpers/FakeObjectDataListStore');
9-
var FixedDataTable = require('fixed-data-table');
9+
var FixedDataTable = require('fixed-data-table-2');
1010
var React = require('react');
1111

1212
var Column = FixedDataTable.Column;

Diff for: examples/old/FlexGrowExample.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"use strict";
66

77
var FakeObjectDataListStore = require('../helpers/FakeObjectDataListStore');
8-
var FixedDataTable = require('fixed-data-table');
8+
var FixedDataTable = require('fixed-data-table-2');
99
var React = require('react');
1010

1111
var Column = FixedDataTable.Column;

Diff for: examples/old/ObjectDataExample.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
var ExampleImage = require('../helpers/ExampleImage');
88
var FakeObjectDataListStore = require('../helpers/FakeObjectDataListStore');
9-
var FixedDataTable = require('fixed-data-table');
9+
var FixedDataTable = require('fixed-data-table-2');
1010
var React = require('react');
1111

1212
var Column = FixedDataTable.Column;

Diff for: examples/old/ResizeExample.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"use strict";
66

77
var FakeObjectDataListStore = require('../helpers/FakeObjectDataListStore');
8-
var FixedDataTable = require('fixed-data-table');
8+
var FixedDataTable = require('fixed-data-table-2');
99
var React = require('react');
1010

1111
var Column = FixedDataTable.Column;

Diff for: examples/old/SortExample.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
"use strict";
66

77
var FakeObjectDataListStore = require('../helpers/FakeObjectDataListStore');
8-
var FixedDataTable = require('fixed-data-table');
8+
var FixedDataTable = require('fixed-data-table-2');
99
var React = require('react');
1010

1111
var Column = FixedDataTable.Column;

Diff for: package.json

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"name": "fixed-data-table",
2+
"name": "fixed-data-table-2",
33
"version": "0.6.1",
44
"description": "A React table component designed to allow presenting thousands of rows of data.",
55
"main": "main.js",
@@ -43,13 +43,13 @@
4343
},
4444
"repository": {
4545
"type": "git",
46-
"url": "https://github.com/schrodinger/fixed-data-table.git"
46+
"url": "https://github.com/schrodinger/fixed-data-table-2.git"
4747
},
4848
"license": "BSD-3-Clause",
4949
"bugs": {
50-
"url": "https://github.com/schrodinger/fixed-data-table/issues"
50+
"url": "https://github.com/schrodinger/fixed-data-table-2/issues"
5151
},
52-
"homepage": "http://schrodinger.github.io/fixed-data-table",
52+
"homepage": "http://schrodinger.github.io/fixed-data-table-2",
5353
"tags": [
5454
"react",
5555
"table"
@@ -60,8 +60,5 @@
6060
"table",
6161
"data-table",
6262
"fixed-table"
63-
],
64-
"dependencies": {
65-
"react-addons-shallow-compare": "^15.1.0"
66-
}
63+
]
6764
}

Diff for: site/Constants.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"use strict";
22

3-
var EXAMPLES_LOCATION_BASE = 'https://github.com/schrodinger/fixed-data-table/blob/master/examples/';
3+
var EXAMPLES_LOCATION_BASE = 'https://github.com/schrodinger/fixed-data-table-2/blob/master/examples/';
44

55
exports.OtherPages = {
66
HOME: {location: 'index.html', title: 'Home'},

Diff for: site/MiniHeader.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ var Constants = require('./Constants');
55

66
require('./miniHeader.less');
77

8-
var GITHUB_URL = 'https://github.com/schrodinger/fixed-data-table';
8+
var GITHUB_URL = 'https://github.com/schrodinger/fixed-data-table-2';
99
var DOCS_DEFAULT_LOCATION = Constants.DOCS_DEFAULT.location;
1010
var EXAMPLES_DEFAULT_LOCATION = Constants.EXAMPLES_DEFAULT.location;
1111

0 commit comments

Comments
 (0)