First implementation of ResizableGrid and DockablePanel components#1835
Merged
MV88 merged 4 commits intogeosolutions-it:masterfrom May 19, 2017
Merged
First implementation of ResizableGrid and DockablePanel components#1835MV88 merged 4 commits intogeosolutions-it:masterfrom
MV88 merged 4 commits intogeosolutions-it:masterfrom
Conversation
mbarto
suggested changes
May 17, 2017
| const DockedGrid = React.createClass({ | ||
| propTypes: { | ||
| dockSize: React.PropTypes.number, | ||
| featureDockedGrid: React.PropTypes.oneOfType([React.PropTypes.object, React.PropTypes.func]), |
| > | ||
| <div id="feature-grid-container"> | ||
| <FeatureDockedGrid id="feature-docked-grid" | ||
| toolbar={{ |
Contributor
There was a problem hiding this comment.
Can we configure this externally. We could have a grid without a toolbar
| onSizeChange={this.limitDockHeight} | ||
| fluid={true} | ||
| dimStyle={{ background: 'rgba(0, 0, 100, 0.2)' }} | ||
| dockStyle={null} |
| fluid={true} | ||
| dimStyle={{ background: 'rgba(0, 0, 100, 0.2)' }} | ||
| dockStyle={null} | ||
| dockHiddenStyle={null} |
| * @prop {object} [tools] The tools of the grid | ||
| * | ||
| */ | ||
| const FeatureDockedGrid = React.createClass({ |
Contributor
There was a problem hiding this comment.
I don't see any Feature here
offtherailz
requested changes
May 17, 2017
| getDefaultProps() { | ||
| return { | ||
| dockSize: 0.35, | ||
| featureDockedGrid: {}, |
| componentWillReceiveProps(newProps) { | ||
| if (this.props.size !== newProps.size) { | ||
| const pos = newProps.position; | ||
| if (pos === "right" || pos === "left") { |
Member
There was a problem hiding this comment.
props.autoWidth = true if pos === right or left
props.autoHeight idem
| * @prop {object} [tools] The tools of the grid | ||
| * | ||
| */ | ||
| const FeatureDockedGrid = React.createClass({ |
| tools = [...tools, this.props.tools]; | ||
|
|
||
| return ( | ||
| <div style={{ |
| bottom: 2}}> | ||
| <span>{rowsSelected} {rowText} selected</span> | ||
| </div> | ||
| <ButtonToolbar className="featuregrid-tools" style={{marginLeft: "0px", flex: "none", marginBottom: "2px", marginRight: "2px"}} bsSize="sm"> |
Member
There was a problem hiding this comment.
Add the toolbar in the container.
| flexDirection: "column", | ||
| height: "100%" | ||
| }}> | ||
| <div fluid={false} style={this.props.style} className="ag-fresh"> |
Member
There was a problem hiding this comment.
Why this change? is related to the DockableGrid?
Contributor
Author
There was a problem hiding this comment.
because fluid is not a parameter of the div tag
|
|
||
| .react-grid-Main, .react-grid-Container, #feature-grid-container { | ||
| height: 100%; | ||
| width: 100% !important; |
Member
There was a problem hiding this comment.
avoid !important when possible. Try to provide instead inline style
| width: 100% !important; | ||
| } | ||
| .react-grid-Container { | ||
| width: 100% !important; |
| height: 100% !important; | ||
| }*/ | ||
| .react-grid-Grid{ | ||
| min-height: 100% !important; |
offtherailz
requested changes
May 18, 2017
| }, | ||
| render() { | ||
| return <ToggleButton {...this.getButtonProperties()} pressed={this.props.active} tooltip={<Tooltip><Message msgId={this.props.active ? this.props.activeTooltip : this.props.notActiveTooltip}/></Tooltip>} />; | ||
| return <ToggleButton {...this.getButtonProperties()} pressed={this.props.active} tooltip={<Tooltip id="globeViewSwitcher"><Message msgId={this.props.active ? this.props.activeTooltip : this.props.notActiveTooltip}/></Tooltip>} />; |
| flexDirection: "column", | ||
| height: "100%" | ||
| }}> | ||
| <div fluid={false} style={this.props.style} className="ag-fresh"> |
| <div id="container-wrapped-component" style={{height: "calc(100% - " + this.props.toolbarHeight + "px)"}}> | ||
| {this.props.wrappedComponent !== null ? (<WrappedComponent | ||
| size={{ | ||
| width: this.getAutoWidth(this.props.position), |
Member
There was a problem hiding this comment.
use values instead of booleans and avoid the additional size parameter
| }, { | ||
| id: "3", | ||
| name: "Edifici" | ||
| }, { |
| fluid={this.props.fluid} | ||
| dimStyle={{ background: 'rgba(0, 0, 100, 0.2)' }} | ||
| > | ||
| <div id="container-wrapped-component" style={{height: "calc(100% - " + this.props.toolbarHeight + "px)"}}> |
| } | ||
| /* feauture grid */ | ||
| /* feature grid made by react-data-grid */ | ||
| #container-wrapped-component .react-grid-Header{ |
Member
There was a problem hiding this comment.
.container-wrapped-component (same below)
use a better name like dockpanel-wrapped-component or something like this
| }, | ||
| getDefaultProps() { | ||
| return { | ||
| id: "dock", |
| rowGetter={this.rowGetter} | ||
| rowHeight={this.props.rowHeight} | ||
| rowKey={this.props.rowKey} | ||
| rowSelection={{ |
offtherailz
approved these changes
May 19, 2017
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR is for adding to the feature grid components two new elements.
The DockablePanel components wrap any the ResizableGrid
Added tests and documentation