Skip to content

Temp Fix for Deprecation and Removes Scary Warnings #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
viktries wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Temp Fix for Deprecation and Removes Scary Warnings #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
64 changes: 34 additions & 30 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,30 +1,34 @@
{
"name": "react-json-table",
"version": "0.1.1",
"description": "A simple but reactive table react component to display JSON data.",
"main": "rjt.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "https://github.com/arqex/react-json-table.git"
},
"keywords": [
"react",
"table",
"json"
],
"author": "Javier Marquez",
"license": "MIT",
"bugs": {
"url": "https://github.com/arqex/react-json-table/issues"
},
"homepage": "https://github.com/arqex/react-json-table",
"devDependencies": {
"gulp": "^3.9.0",
"gulp-insert": "^0.4.0",
"gulp-uglify": "^1.2.0",
"gulp-webpack": "^1.4.0"
}
}
{
"name": "react-json-table",
"version": "0.1.1",
"description": "A simple but reactive table react component to display JSON data.",
"main": "rjt.js",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "https://github.com/arqex/react-json-table.git"
},
"keywords": [
"react",
"table",
"json"
],
"author": "Javier Marquez",
"license": "MIT",
"bugs": {
"url": "https://github.com/arqex/react-json-table/issues"
},
"homepage": "https://github.com/arqex/react-json-table",
"devDependencies": {
"gulp": "^3.9.0",
"gulp-insert": "^0.4.0",
"gulp-uglify": "^1.2.0",
"gulp-webpack": "^1.4.0"
},
"dependencies": {
"create-react-class": "^15.6.0",
"react-dom-factories": "^1.0.1"
}
}
138 changes: 69 additions & 69 deletions rjt.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
var React = require('react');

var $ = React.DOM;
import DOM from 'react-dom-factories';
var createReactClass = require('create-react-class');

// Some shared attrs for JsonTable and JsonRow
var defaultSettings = {
Expand All @@ -11,14 +11,70 @@ var defaultSettings = {
getSetting = function( name ){
var settings = this.props.settings;

if( !settings || typeof settings[ name ] == 'undefined' )
if( !settings || typeof settings[ name ] === 'undefined' )
return defaultSettings[ name ];

return settings[ name ];
}
;

var JsonTable = React.createClass({
var Row = createReactClass({
getSetting: getSetting,

render: function() {
var me = this,
props = this.props,
cellClass = this.getSetting('cellClass'),
rowClass = this.getSetting('rowClass'),
prefix = this.getSetting('classPrefix'),
cells = props.columns.map( function( col ){
var content = col.cell,
key = col.key,
className = prefix + 'Cell ' + prefix + 'Cell_' + key
;

if( cellClass )
className = cellClass( className, key, props.item );

if( typeof content === 'function' )
content = content( props.item, key );

return DOM.td( {
className: className,
key: key,
"data-key": key,
onClick: me.onClickCell
}, content );
})
;

var className = prefix + 'Row ' + prefix +
(props.i % 2 ? 'Odd' : 'Even')
;

if( props.reactKey )
className += ' ' + prefix + 'Row_' + props.reactKey;

if( rowClass )
className = rowClass( className, props.item );

return DOM.tr({
className: className,
onClick: me.onClickRow,
key: this.props.reactKey
}, cells );
},

onClickCell: function( e ){
this.props.onClickCell( e, e.target.dataset.key, this.props.item );
},

onClickRow: function( e ){
this.props.onClickRow( e, this.props.item );
}
});

var JsonTable = createReactClass({
getSetting: getSetting,

render: function(){
Expand All @@ -31,7 +87,7 @@ var JsonTable = React.createClass({

var tableClass = this.props.className || this.getSetting( 'classPrefix' ) + 'Table';

return $.table({ className: tableClass }, contents );
return DOM.table({ className: tableClass }, contents );
},

renderHeader: function( cols ){
Expand All @@ -43,15 +99,15 @@ var JsonTable = React.createClass({
if( headerClass )
className = headerClass( className, col.key );

return $.th(
return DOM.th(
{ className: className, key: col.key, onClick: me.onClickHeader, "data-key": col.key },
col.label
);
})
;

return $.thead({ key: 'th' },
$.tr({ className: prefix + 'Header' }, cells )
return DOM.thead({ key: 'th' },
DOM.tr({ className: prefix + 'Header' }, cells )
);
},

Expand All @@ -63,7 +119,7 @@ var JsonTable = React.createClass({
;

if( !items || !items.length )
return $.tbody({key:'body'}, [$.tr({key:'row'}, $.td({key:'column'}, this.getSetting('noRowsMessage') ))]);
return DOM.tbody({key:'body'}, [DOM.tr({key:'row'}, DOM.td({key:'column'}, this.getSetting('noRowsMessage') ))]);

var rows = items.map( function( item ){
var key = me.getKey( item, i );
Expand All @@ -79,7 +135,7 @@ var JsonTable = React.createClass({
});
});

return $.tbody({key:'body'}, rows);
return DOM.tbody({key:'body'}, rows);
},

getItemField: function( item, field ){
Expand All @@ -103,15 +159,15 @@ var JsonTable = React.createClass({

return cols.map( function( col ){
var key;
if( typeof col == 'string' ){
if( typeof col === 'string' ){
return {
key: col,
label: col,
cell: getItemField
};
}

if( typeof col == 'object' ){
if( typeof col === 'object' ){
key = col.key || col.label;

// This is about get default column definition
Expand Down Expand Up @@ -170,60 +226,4 @@ var JsonTable = React.createClass({
}
});

var Row = React.createClass({
getSetting: getSetting,

render: function() {
var me = this,
props = this.props,
cellClass = this.getSetting('cellClass'),
rowClass = this.getSetting('rowClass'),
prefix = this.getSetting('classPrefix'),
cells = props.columns.map( function( col ){
var content = col.cell,
key = col.key,
className = prefix + 'Cell ' + prefix + 'Cell_' + key
;

if( cellClass )
className = cellClass( className, key, props.item );

if( typeof content == 'function' )
content = content( props.item, key );

return $.td( {
className: className,
key: key,
"data-key": key,
onClick: me.onClickCell
}, content );
})
;

var className = prefix + 'Row ' + prefix +
(props.i % 2 ? 'Odd' : 'Even')
;

if( props.reactKey )
className += ' ' + prefix + 'Row_' + props.reactKey;

if( rowClass )
className = rowClass( className, props.item );

return $.tr({
className: className,
onClick: me.onClickRow,
key: this.props.reactKey
}, cells );
},

onClickCell: function( e ){
this.props.onClickCell( e, e.target.dataset.key, this.props.item );
},

onClickRow: function( e ){
this.props.onClickRow( e, this.props.item );
}
});

module.exports = JsonTable;
module.exports = JsonTable;