* fixed problem with default ordering of form fields

Author: torstenrudolf

README.md

@@ -16,12 +16,12 @@ flexibility of the form design.
 Currently it is available as a sonatype snapshot, add this to your build.sbt:
 
 ```
-libraryDependencies += "com.github.torstenrudolf.scalajs-react-form-binder" %%% "core" % "0.0.14-SNAPSHOT"
+libraryDependencies += "com.github.torstenrudolf.scalajs-react-form-binder" %%% "core" % "0.0.15-SNAPSHOT"
 ```
 
 If you want to use the materialui form-field descriptors, you'll need this as well:
 ```
-libraryDependencies += "com.github.torstenrudolf.scalajs-react-form-binder" %%% "extras" % "0.0.14-SNAPSHOT"
+libraryDependencies += "com.github.torstenrudolf.scalajs-react-form-binder" %%% "extras" % "0.0.15-SNAPSHOT"
 ```
 
 

build.sbt

@@ -3,7 +3,7 @@ def commonSettings: Project => Project =
   _.enablePlugins(ScalaJSPlugin)
     .settings(
       organization := "com.github.torstenrudolf.scalajs-react-form-binder",
-      version := "0.0.14-SNAPSHOT",
+      version := "0.0.15-SNAPSHOT",
       homepage := Some(url("https://github.com/torstenrudolf/scalajs-react-form-binder")),
       licenses += ("MIT", url("https://opensource.org/licenses/MIT")),
       scalaVersion := "2.11.8",

core/src/main/scala/torstenrudolf/scalajs/react/formbinder/Macros.scala

@@ -118,7 +118,15 @@ object Macros {
            $defaultFormValue.map((dmv: $dataModelTypeSymbol)=> Map[String, Any](..${dataModelFields.map(fn => (fn.asTerm.name.toString, q"dmv.${fn.asTerm.name}"))})).getOrElse(${getDefaultValuesFromCompanionObject(c)(dataModelCompanion)})
           """)
 
-    val formFieldDescriptors = formLayout.info.members.sorted
+    val preSortedFFDs = formLayout.info.members.sorted
+    val formFieldDescriptors = formLayout.info.members
+      .sorted  // sorts in order of declaration, but inherited members appear later
+      .sortBy(ffd => {
+        //resort by order of fields in DataModel, but keep decls of read-only-fields where they were declared
+        val i = targetFieldNames.indexOf(ffd.name.toString)
+        if (i != -1) i
+        else preSortedFFDs.indexOf(ffd) - 0.5  // keep it where it was
+      })
       .map(_.asTerm)
       .filter(_.isAccessor)
       .filter(_.asMethod.returnType.<:<(typeOf[FormFieldDescriptor[_]]))