Skip to content
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

Bug: Disable boomark reordering when searching #3188

Merged

Conversation

jotaemepereira
Copy link
Collaborator

@jotaemepereira jotaemepereira commented Sep 2, 2024

Task/Issue URL: https://app.asana.com/0/1204006570077678/1208204239267626/f
Tech Design URL:
CC:

Description:

  • Fix a bug where bookmark reordering was possible during search (both in the panel and the manager)
  • Fix a bug where the folder was not correctly highlighted after being tapped in the bookmarks panel

Steps to test this PR:

  1. Start a search (either in the bookmarks manager o panel)
  2. Check that you cannot reorder items
  3. You should be able to drop items in a folder

Definition of Done:

Internal references:

Pull Request Review Checklist
Software Engineering Expectations
Technical Design Template
Pull Request Documentation

Copy link
Collaborator

@ayoy ayoy left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Works great, thanks @jotaemepereira!

@@ -264,6 +264,13 @@ final class BookmarkOutlineViewDataSource: NSObject, BookmarksOutlineViewDataSou
}

let destination = destinationNode.isRoot ? PseudoFolder.bookmarks : destinationNode.representedObject

if isSearching {
let result = dragDropManager.validateDropWhileInSearchMode(info, to: destination)
Copy link
Collaborator

@mallexxx mallexxx Sep 3, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should we just keep the change in scope of the BookmarkOutlineViewDataSource? It seems it‘s overcomplicating things and spreading the responsibilities to the class not really meant to deal with search – BookmarkDragDropManager.
Maybe let‘s just convert it to guard !isSearching || destination is BookmarkFolder else { return .none } (with a comment explaining why it is so), WDYT?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree 👍🏼 . Addressed

@jotaemepereira jotaemepereira force-pushed the juan/disable-reordering-when-searching branch from 055fcfd to eeff9bc Compare September 3, 2024 12:40
@jotaemepereira jotaemepereira force-pushed the juan/disable-reordering-when-searching branch from eeff9bc to 0d6e37b Compare September 3, 2024 12:41
@jotaemepereira jotaemepereira merged commit 4e6c672 into release/1.105.0 Sep 3, 2024
19 of 21 checks passed
@jotaemepereira jotaemepereira deleted the juan/disable-reordering-when-searching branch September 3, 2024 13:11
samsymons added a commit that referenced this pull request Sep 6, 2024
* main: (28 commits)
  Fix bookmark sort UI tests failure (#3219)
  Add tests for DuckPlayer pixel calculation (#3216)
  Implement checkbox VPN exclusions UI (#3207)
  fix zoom updated (#3140)
  Bump version to 1.105.0 (255)
  Add DuckPlayer enrollment pixels (#3190)
  Update PeopleFinders to address broker changes (#3208)
  Bump BSK with C-S-S to 6.14.0 (#3209)
  Zoom PDF controls (#3204)
  Fix exception on Copy in Save dialog (#3205)
  Remove DuckPlayer onboarding animation (#3198)
  Fix wrong URL displayed for auth dialog (#3191)
  Bump version to 1.105.0 (254)
  UI Ship review feedback for Duck Player onboarding (#3186)
  Implement bookmarks sort UI tests (#3162)
  Add bookmarks search UI tests (#3161)
  Bug: Disable boomark reordering when searching (#3188)
  Bump version to 1.105.0 (253)
  Remote feature flag for New Tab Page Improvements (#3176)
  Fix bookmarks bar issues (#3187)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants