Skip to content

Feature rearrange storage #853

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Oct 13, 2017
Merged

Feature rearrange storage #853

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
77089a1
extracted folder list and item to separate components
PrimaMateria Sep 6, 2017
a58c191
used react-sortable-hoc on folderList and folderItem
PrimaMateria Sep 6, 2017
0fea85e
added drag handle to the folder item
PrimaMateria Sep 7, 2017
9141b1a
saving new order in the storage only for now
PrimaMateria Sep 7, 2017
c34dd46
made sortable item helper visible by setting proper zindex
PrimaMateria Sep 7, 2017
5c2d7e2
fixed typo in the useDragHandle attribute for the folder list
PrimaMateria Sep 7, 2017
3804a74
connected sortable folder list to data api
PrimaMateria Sep 8, 2017
94e6f89
fixed errors from lint
PrimaMateria Sep 8, 2017
5c2c992
added test for reorderFolder
PrimaMateria Sep 8, 2017
6b7132f
fixed style of dragged folder item for dark theme
PrimaMateria Sep 9, 2017
59985de
fixed test title
PrimaMateria Sep 9, 2017
a15dfff
used findStorage function in the reorderFolder
PrimaMateria Sep 11, 2017
43c49f5
used findStorage function in the updateFolder
PrimaMateria Sep 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
made sortable item helper visible by setting proper zindex
  • Loading branch information
@PrimaMateria
PrimaMateria committed Sep 7, 2017
commit c34dd462b66a86d5a0735a0786655576c9dff54f
3 changes: 3 additions & 0 deletions browser/main/global.styl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,3 +102,6 @@ body[data-theme="dark"]
background #B1D7FE
::selection
background #B1D7FE

.sortableItemHelper
z-index 1005
10 changes: 6 additions & 4 deletions browser/main/modals/PreferencesModal/FolderList.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,6 @@ FolderList.propTypes = {
})
}

const StyledFolderList = CSSModules(FolderList, styles)
const SortableFolderList = SortableContainer(StyledFolderList)

class SortableFolderListComponent extends React.Component {
constructor (props) {
Expand All @@ -65,10 +63,14 @@ class SortableFolderListComponent extends React.Component {
}

render() {

const StyledFolderList = CSSModules(FolderList, this.props.styles)
const SortableFolderList = SortableContainer(StyledFolderList)

return (
<SortableFolderList onSortEnd={this.onSortEnd} userDragHandle={true} {...this.props} />
<SortableFolderList helperClass='sortableItemHelper' onSortEnd={this.onSortEnd} userDragHandle={true} {...this.props} />
)
}
}

export default SortableFolderListComponent
export default CSSModules(SortableFolderListComponent, styles)