Merge branch 'b20.1.0' into master

This commit is contained in:
Sean Landsman
2019-02-22 15:05:14 +00:00
8 changed files with 186 additions and 29 deletions

View File

@@ -141,17 +141,8 @@ export default class RichGridDeclarativeExample extends Component {
</div>
<div style={{display: "inline-block", width: "100%", marginTop: 10, marginBottom: 10}}>
<div style={{float: "left"}}>
<label>
<input type="checkbox" onChange={this.onToggleSidebar} style={{marginRight: 5}}/>
Show Side Bar
</label>
</div>
<div style={{float: "left", marginLeft: 20}}>
<button onClick={this.onRefreshData} className="btn btn-primary">Refresh Data</button>
</div>
<div style={{float: "left", marginLeft: 20}}>
<input type="text" onChange={this.onQuickFilterText} placeholder="Type text to filter..."/>
</div>
<div style={{float: "right"}}>
Filter API:
<button onClick={this.invokeSkillsFilterMethod}
@@ -161,6 +152,17 @@ export default class RichGridDeclarativeExample extends Component {
</button>
</div>
</div>
<div style={{display: "inline-block", width: "100%", marginTop: 10, marginBottom: 10}}>
<div style={{float: "left"}}>
<label>
<input type="checkbox" onChange={this.onToggleSidebar} style={{marginRight: 5}}/>
Show Side Bar
</label>
</div>
<div style={{float: "left", marginLeft: 20}}>
<input type="text" onChange={this.onQuickFilterText} placeholder="Type text to filter..."/>
</div>
</div>
<div style={{height: 400, width: 900}} className="ag-theme-balham">
<AgGridReact
// listening for events