From 5269b47edc3af409643b89f3af78213e802cb459 Mon Sep 17 00:00:00 2001
From: Rick Watson <rjwats@gmail.com>
Date: Mon, 8 Jun 2020 17:48:00 +0100
Subject: [PATCH] Reorder props to avoid TS error

---
 interface/src/components/RestController.tsx      | 4 ++--
 interface/src/components/WebSocketController.tsx | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/interface/src/components/RestController.tsx b/interface/src/components/RestController.tsx
index e4d7c08..4ed845c 100644
--- a/interface/src/components/RestController.tsx
+++ b/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}
         />;
       }
 
diff --git a/interface/src/components/WebSocketController.tsx b/interface/src/components/WebSocketController.tsx
index 6713e12..5fe9fa3 100644
--- a/interface/src/components/WebSocketController.tsx
+++ b/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}
         />;
       }