From 2b59d44e06762b3ed05e264726fb40a65e909407 Mon Sep 17 00:00:00 2001
From: Andrew Kingston <aptkingston@ssl-mail.com>
Date: Wed, 10 Nov 2021 14:57:46 +0000
Subject: [PATCH] Change bindable properties order

---
 packages/builder/src/builderStore/dataBinding.js            | 6 +++---
 .../PropertiesPanel/PropertyControls/PropertyControl.svelte | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/builder/src/builderStore/dataBinding.js b/packages/builder/src/builderStore/dataBinding.js
index 165ed37fbb..0551997b7b 100644
--- a/packages/builder/src/builderStore/dataBinding.js
+++ b/packages/builder/src/builderStore/dataBinding.js
@@ -31,11 +31,11 @@ export const getBindableProperties = (asset, componentId) => {
   const deviceBindings = getDeviceBindings()
   const stateBindings = getStateBindings()
   return [
-    ...stateBindings,
-    ...deviceBindings,
-    ...urlBindings,
     ...contextBindings,
+    ...urlBindings,
+    ...stateBindings,
     ...userBindings,
+    ...deviceBindings,
   ]
 }
 
diff --git a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte
index a6086bbbc6..72b54f3b96 100644
--- a/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte
+++ b/packages/builder/src/components/design/PropertiesPanel/PropertyControls/PropertyControl.svelte
@@ -27,7 +27,7 @@
     if (!nested) {
       return bindings
     }
-    return [...(bindings || []), ...(componentBindings || [])]
+    return [...(componentBindings || []), ...(bindings || [])]
   }
 
   // Handle a value change of any type