-
Notifications
You must be signed in to change notification settings - Fork 1.3k
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.
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
Fix collection editing #1081
Merged
maicki
merged 27 commits into
TextureGroup:master
from
wsdwsd0829:fix-collection-editting
Sep 5, 2018
Merged
Fix collection editing #1081
Changes from 25 commits
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
929d118
fix SIMULATE_WEB_RESPONSE not imported #449
wsdwsd0829 dd24d8f
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 b8eaffa
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 2918ea0
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 9c42266
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 329f35f
Fix to make rangeMode update in right time
wsdwsd0829 5f8b7ec
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 d87bb11
merge master from upstream
wsdwsd0829 269c2ab
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 24c1ce8
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 233169e
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 b19f90d
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 b50cec4
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 b75a5f3
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 64b46e0
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 5fabc1e
remove uncessary assert
wsdwsd0829 3d5b84b
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 098b978
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 77eefd6
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 0310ed7
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 0b886de
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 a63d438
Merge branch 'master' of github.com:TextureGroup/Texture
wsdwsd0829 a015a7c
Fix collection cell editing bug for iOS 9 & 10
wsdwsd0829 87bae2f
Rename to reordering.
wsdwsd0829 ca74b44
Adjust _reordering more acuratedly
wsdwsd0829 230e37d
Add change log
wsdwsd0829 b7bbe97
Merge branch 'master' into fix-collection-editting
wsdwsd0829 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should performBatchUpdates itself change behavior when interactiveMovement is in progress?
Imagine a reorder starts at the same time that a new page of content comes in, creating an insertion. I'm not sure what's actually supposed to happen there, but maybe we would want to just have performBatchUpdates internally run the batch operations without actually calling performBatchUpdates on the parent view?
That said, doing this only for moves right now seems reasonable if there is not a clear answer to this other question. Ideally in the case of the insertion, we at least know the UI will end up in a good state and not crash, even if it forces the user out of interactive mode.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think this method is called on main thread and should not be happening at same time? One case should be blocked waiting to the other to finish?