Update FilePicker with reordering functionality (Issue #13).

src/Client/Messages.fs

@@ -109,8 +109,9 @@ type PersistentStorageMsg =
     | UpdateAppVersion of string
 
 type FilePickerMsg =
-    | NewFilesLoaded            of string list
-    | RemoveFileFromFileList    of string
+    | LoadNewFiles              of string list
+    | UpdateFileNames           of newFileNames:(int*string) list
+    | UpdateDNDDropped          of isDropped:bool
 
 type AddBuildingBlockMsg =
     | NewBuildingBlockSelected  of AnnotationBuildingBlock

src/Client/Model.fs

@@ -210,10 +210,15 @@ type PageState = {
             }
 
 type FilePickerState = {
-    FileNames : string list
+    FileNames : (int*string) list
+    /// Used for drag and drop, to determine if something is currently dragged or not.
+    /// Necessary to deactivate pointer events on children during drag.
+    DNDDropped : bool
 } with
     static member init () = {
         FileNames = []
+        /// This is used to deactivate pointerevents of drag and drop childs during drag and drop
+        DNDDropped = true
     }
 
 

src/Client/OfficeInterop/OfficeInterop.fs

@@ -1140,6 +1140,7 @@ let insertFileNamesFromFilePicker (annotationTable, fileNameList:string list) =
             ])
 
             range.values <- newVals
+            range.format.autofitColumns()
             r.enableEvents <- true
             //sprintf "%s filled with %s; ExtraCols: %s" range.address v nextColsRange.address
 

src/Client/Update.fs

@@ -923,22 +923,24 @@ let handleStyleChangeMsg (styleChangeMsg:StyleChangeMsg) (currentState:SiteStyle
 
 let handleFilePickerMsg (filePickerMsg:FilePickerMsg) (currentState: FilePickerState) : FilePickerState * Cmd<Msg> =
     match filePickerMsg with
-    | NewFilesLoaded fileNames ->
+    | LoadNewFiles fileNames ->
+        let nextState = {
+            FilePickerState.init() with
+                FileNames = fileNames |> List.mapi (fun i x -> i+1,x)
+        }
+        let nextCmd = UpdatePageState (Some Routing.Route.FilePicker) |> Cmd.ofMsg
+        nextState, nextCmd
+    | UpdateFileNames newFileNames ->
         let nextState = {
             currentState with
-                FileNames = fileNames
+                FileNames = newFileNames
         }
-
         nextState, Cmd.none
-
-    | RemoveFileFromFileList fileName ->
+    | UpdateDNDDropped isDropped ->
         let nextState = {
             currentState with
-                FileNames =
-                    currentState.FileNames
-                    |> List.filter (fun fn -> not (fn = fileName))
+                DNDDropped = isDropped
         }
-
         nextState, Cmd.none
 
 let handleAddBuildingBlockMsg (addBuildingBlockMsg:AddBuildingBlockMsg) (currentState: AddBuildingBlockState) : AddBuildingBlockState * Cmd<Msg> =