Merge pull request #147 from rjwats/ts-fixes

Reorder props to avoid TS error

Author: rjwats

interface/src/components/RestController.tsx

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

interface/src/components/WebSocketController.tsx

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