Merge pull request #147 from rjwats/ts-fixes

Reorder props to avoid TS error
This commit is contained in:
rjwats 2020-06-08 18:16:55 +01:00 committed by GitHub
commit 88748ac30d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions

View File

@ -100,12 +100,12 @@ export function restController<D, P extends RestControllerProps<D>>(endpointUrl:
render() { render() {
return <RestController return <RestController
{...this.props as P}
{...this.state}
handleValueChange={this.handleValueChange} handleValueChange={this.handleValueChange}
setData={this.setData} setData={this.setData}
saveData={this.saveData} saveData={this.saveData}
loadData={this.loadData} loadData={this.loadData}
{...this.state}
{...this.props as P}
/>; />;
} }

View File

@ -119,13 +119,13 @@ export function webSocketController<D, P extends WebSocketControllerProps<D>>(ws
render() { render() {
return <WebSocketController return <WebSocketController
{...this.props as P}
handleValueChange={this.handleValueChange} handleValueChange={this.handleValueChange}
setData={this.setData} setData={this.setData}
saveData={this.saveData} saveData={this.saveData}
saveDataAndClear={this.saveDataAndClear} saveDataAndClear={this.saveDataAndClear}
connected={this.state.connected} connected={this.state.connected}
data={this.state.data} data={this.state.data}
{...this.props as P}
/>; />;
} }