TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-22 02:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Drag-drop items into folders in list view

Browse Source
This commit is contained in:
Eike Kettner
2020-08-08 14:03:36 +02:00
parent 9c50a85363
commit d6d16e39bd
7 changed files with 189 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
modules/webapp/src/main/elm/Page/Home/Data.elm
View File

@ -16,14 +16,14 @@ import Api.Model.ItemLightList exposing (ItemLightList)
import Api.Model.ItemSearch
import Comp.FixedDropdown
import Comp.ItemCardList
import Comp.SearchMenu exposing (DragDropData)
import Comp.SearchMenu
import Data.Flags exposing (Flags)
import Data.Items
import Data.UiSettings exposing (UiSettings)
import Html5.DragDrop as DD
import Http
import Throttle exposing (Throttle)
import Util.Html exposing (KeyCode(..))
import Util.ItemDragDrop as DD
type alias Model =
@ -40,7 +40,7 @@ type alias Model =
, searchType : SearchType
, searchTypeForm : SearchType
, contentOnlySearch : Maybe String
, dragDropData : DragDropData
, dragDropData : DD.DragDropData
}
@ -70,8 +70,7 @@ init flags =
, searchTypeForm = defaultSearchType flags
, contentOnlySearch = Nothing
, dragDropData =
{ folderDrop = DD.init
}
DD.DragDropData DD.init Nothing
}

21
modules/webapp/src/main/elm/Page/Home/Update.elm
View File

@ -6,12 +6,12 @@ import Comp.ItemCardList
import Comp.SearchMenu
import Data.Flags exposing (Flags)
import Data.UiSettings exposing (UiSettings)
import Html5.DragDrop as DD
import Page exposing (Page(..))
import Page.Home.Data exposing (..)
import Throttle
import Time
import Util.Html exposing (KeyCode(..))
import Util.ItemDragDrop as DD
import Util.Maybe
import Util.String
import Util.Update
@ -41,12 +41,24 @@ update key flags settings msg model =
let
nextState =
Comp.SearchMenu.updateDrop
model.dragDropData
model.dragDropData.model
flags
settings
m
model.searchMenuModel
dropCmd =
case nextState.dragDrop.dropped of
Just dropped ->
let
_ =
Debug.log "item/folder" dropped
in
DD.makeUpdateCmd flags (\_ -> DoSearch) nextState.dragDrop.dropped
Nothing ->
Cmd.none
newModel =
{ model
| searchMenuModel = nextState.model
@ -64,6 +76,7 @@ update key flags settings msg model =
, Cmd.batch
[ c2
, Cmd.map SearchMenuMsg nextState.cmd
, dropCmd
]
, s2
)
@ -71,7 +84,7 @@ update key flags settings msg model =
ItemCardListMsg m ->
let
result =
Comp.ItemCardList.updateDrag model.dragDropData.folderDrop
Comp.ItemCardList.updateDrag model.dragDropData.model
flags
m
model.itemListModel
@ -87,7 +100,7 @@ update key flags settings msg model =
withSub
( { model
| itemListModel = result.model
, dragDropData = { folderDrop = result.dragModel }
, dragDropData = DD.DragDropData result.dragModel Nothing
}
, Cmd.batch [ Cmd.map ItemCardListMsg result.cmd, cmd ]
)