Skip to content

Fixing issue #115 #541

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
apalanki wants to merge 1 commit into
base: v0
Choose a base branch
from
Open

Fixing issue #115 #541

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
213 changes: 109 additions & 104 deletions modules/gridRowContainer.jsx.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,123 +1,128 @@
/*
See License / Disclaimer https://raw.githubusercontent.com/DynamicTyped/Griddle/master/LICENSE
*/
See License / Disclaimer https://raw.githubusercontent.com/DynamicTyped/Griddle/master/LICENSE
*/
'use strict';

var React = require('react');
var ColumnProperties = require('./columnProperties.js');
var pick = require('lodash/pick');

var GridRowContainer = React.createClass({
displayName: 'GridRowContainer',
displayName: 'GridRowContainer',

getDefaultProps: function getDefaultProps() {
return {
"useGriddleStyles": true,
"useGriddleIcons": true,
"isSubGriddle": false,
"columnSettings": null,
"rowSettings": null,
"paddingHeight": null,
"rowHeight": null,
"parentRowCollapsedClassName": "parent-row",
"parentRowExpandedClassName": "parent-row expanded",
"parentRowCollapsedComponent": "▶",
"parentRowExpandedComponent": "▼",
"onRowClick": null,
"multipleSelectionSettings": null
};
},
getInitialState: function getInitialState() {
return {
"data": {},
"showChildren": false
};
},
componentWillReceiveProps: function componentWillReceiveProps() {
this.setShowChildren(false);
},
toggleChildren: function toggleChildren() {
this.setShowChildren(this.state.showChildren === false);
},
setShowChildren: function setShowChildren(visible) {
this.setState({
showChildren: visible
});
},
verifyProps: function verifyProps() {
if (this.props.columnSettings === null) {
console.error("gridRowContainer: The columnSettings prop is null and it shouldn't be");
}
},
render: function render() {
this.verifyProps();
var that = this;
if (typeof this.props.data === "undefined") {
return React.createElement('tbody', null);
}
var arr = [];
getDefaultProps: function getDefaultProps() {
return {
"useGriddleStyles": true,
"useGriddleIcons": true,
"isSubGriddle": false,
"columnSettings": null,
"rowSettings": null,
"paddingHeight": null,
"rowHeight": null,
"parentRowCollapsedClassName": "parent-row",
"parentRowExpandedClassName": "parent-row expanded",
"parentRowCollapsedComponent": "▶",
"parentRowExpandedComponent": "▼",
"onRowClick": null,
"multipleSelectionSettings": null,
"resultsFromFilter": false
};
},
getInitialState: function getInitialState() {
return {
"data": {},
"showChildren": false
};
},
componentDidMount() {
this.setShowChildren(this.props.resultsFromFilter);
},
componentWillReceiveProps: function componentWillReceiveProps() {
this.setShowChildren(false);
},
toggleChildren: function toggleChildren() {
this.setShowChildren(this.state.showChildren === false);
},
setShowChildren: function setShowChildren(visible) {
this.setState({
showChildren: visible
});
},
verifyProps: function verifyProps() {
if (this.props.columnSettings === null) {
console.error("gridRowContainer: The columnSettings prop is null and it shouldn't be");
}
},
render: function render() {
this.verifyProps();
var that = this;
if (typeof this.props.data === "undefined") {
return React.createElement('tbody', null);
}
var arr = [];

var columns = this.props.columnSettings.getColumns();

var columns = this.props.columnSettings.getColumns();
arr.push(React.createElement(this.props.rowSettings.rowComponent, {
useGriddleStyles: this.props.useGriddleStyles,
isSubGriddle: this.props.isSubGriddle,
data: this.props.rowSettings.isCustom ? pick(this.props.data, columns) : this.props.data,
rowData: this.props.rowSettings.isCustom ? this.props.data : null,
columnSettings: this.props.columnSettings,
rowSettings: this.props.rowSettings,
hasChildren: that.props.hasChildren,
toggleChildren: that.toggleChildren,
showChildren: that.state.showChildren,
key: that.props.uniqueId + '_base_row',
useGriddleIcons: that.props.useGriddleIcons,
parentRowExpandedClassName: this.props.parentRowExpandedClassName,
parentRowCollapsedClassName: this.props.parentRowCollapsedClassName,
parentRowExpandedComponent: this.props.parentRowExpandedComponent,
parentRowCollapsedComponent: this.props.parentRowCollapsedComponent,
paddingHeight: that.props.paddingHeight,
rowHeight: that.props.rowHeight,
onRowClick: that.props.onRowClick,
multipleSelectionSettings: this.props.multipleSelectionSettings
}));

arr.push(React.createElement(this.props.rowSettings.rowComponent, {
useGriddleStyles: this.props.useGriddleStyles,
isSubGriddle: this.props.isSubGriddle,
data: this.props.rowSettings.isCustom ? pick(this.props.data, columns) : this.props.data,
rowData: this.props.rowSettings.isCustom ? this.props.data : null,
columnSettings: this.props.columnSettings,
rowSettings: this.props.rowSettings,
hasChildren: that.props.hasChildren,
toggleChildren: that.toggleChildren,
showChildren: that.state.showChildren,
key: that.props.uniqueId + '_base_row',
useGriddleIcons: that.props.useGriddleIcons,
parentRowExpandedClassName: this.props.parentRowExpandedClassName,
parentRowCollapsedClassName: this.props.parentRowCollapsedClassName,
parentRowExpandedComponent: this.props.parentRowExpandedComponent,
parentRowCollapsedComponent: this.props.parentRowCollapsedComponent,
paddingHeight: that.props.paddingHeight,
rowHeight: that.props.rowHeight,
onRowClick: that.props.onRowClick,
multipleSelectionSettings: this.props.multipleSelectionSettings }));
var children = null;

var children = null;
if (that.state.showChildren) {
children = that.props.hasChildren && this.props.data["children"].map(function (row, index) {
var key = that.props.rowSettings.getRowKey(row, index);

if (that.state.showChildren) {
children = that.props.hasChildren && this.props.data["children"].map(function (row, index) {
var key = that.props.rowSettings.getRowKey(row, index);
if (typeof row["children"] !== "undefined") {
var Griddle = that.constructor.Griddle;
return React.createElement('tr', {key: key, style: {paddingLeft: 5}}, React.createElement('td', {colSpan: that.props.columnSettings.getVisibleColumnCount(), className: 'griddle-parent', style: that.props.useGriddleStyles ? {border: "none", "padding": "0 0 0 5px"} : null}, React.createElement(Griddle, {
rowMetadata: {key: 'id'},
isSubGriddle: true,
results: [row],
columns: that.props.columnSettings.getColumns(),
tableClassName: that.props.tableClassName,
parentRowExpandedClassName: that.props.parentRowExpandedClassName,
parentRowCollapsedClassName: that.props.parentRowCollapsedClassName,
showTableHeading: false,
showPager: false,
columnMetadata: that.props.columnSettings.columnMetadata,
parentRowExpandedComponent: that.props.parentRowExpandedComponent,
parentRowCollapsedComponent: that.props.parentRowCollapsedComponent,
paddingHeight: that.props.paddingHeight,
rowHeight: that.props.rowHeight
})));
}

if (typeof row["children"] !== "undefined") {
var Griddle = that.constructor.Griddle;
return React.createElement('tr', { key: key, style: { paddingLeft: 5 } }, React.createElement('td', { colSpan: that.props.columnSettings.getVisibleColumnCount(), className: 'griddle-parent', style: that.props.useGriddleStyles ? { border: "none", "padding": "0 0 0 5px" } : null }, React.createElement(Griddle, {
rowMetadata: { key: 'id' },
isSubGriddle: true,
results: [row],
columns: that.props.columnSettings.getColumns(),
tableClassName: that.props.tableClassName,
parentRowExpandedClassName: that.props.parentRowExpandedClassName,
parentRowCollapsedClassName: that.props.parentRowCollapsedClassName,
showTableHeading: false,
showPager: false,
columnMetadata: that.props.columnSettings.columnMetadata,
parentRowExpandedComponent: that.props.parentRowExpandedComponent,
parentRowCollapsedComponent: that.props.parentRowCollapsedComponent,
paddingHeight: that.props.paddingHeight,
rowHeight: that.props.rowHeight
})));
return React.createElement(that.props.rowSettings.rowComponent, {
useGriddleStyles: that.props.useGriddleStyles,
isSubGriddle: that.props.isSubGriddle,
data: row,
columnSettings: that.props.columnSettings,
isChildRow: true,
columnMetadata: that.props.columnSettings.columnMetadata,
key: key
});
});
}

return React.createElement(that.props.rowSettings.rowComponent, {
useGriddleStyles: that.props.useGriddleStyles,
isSubGriddle: that.props.isSubGriddle,
data: row,
columnSettings: that.props.columnSettings,
isChildRow: true,
columnMetadata: that.props.columnSettings.columnMetadata,
key: key
});
});
}

return that.props.hasChildren === false ? arr[0] : React.createElement('tbody', null, that.state.showChildren ? arr.concat(children) : arr);
}
});
Expand Down
4 changes: 3 additions & 1 deletion modules/gridTable.jsx.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ var GridTable = React.createClass({
"nextPage": null,
"hasMorePages": false,
"useFixedHeader": false,
"resultsFromFilter": false,
"useFixedLayout": true,
"paddingHeight": null,
"rowHeight": null,
Expand Down Expand Up @@ -159,7 +160,8 @@ var GridTable = React.createClass({
rowHeight: that.props.rowHeight,
hasChildren: hasChildren,
tableClassName: that.props.className,
onRowClick: that.props.onRowClick
onRowClick: that.props.onRowClick,
resultsFromFilter: that.props.resultsFromFilter
});
});

Expand Down
1 change: 1 addition & 0 deletions modules/griddle.jsx.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -834,6 +834,7 @@ var Griddle = React.createClass({
useFixedLayout: this.props.useFixedLayout,
showPager: this.props.showPager,
pagingContent: pagingContent,
resultsFromFilter: !this.isNullOrUndefined(this.state.filteredResults),
data: data,
className: this.props.tableClassName,
enableInfiniteScroll: this.isInfiniteScrollEnabled(),
Expand Down