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

Fix History and Bookmarks and ShieldsPanel and 3-Dot menu URL-Eliding #26226

Merged
merged 5 commits into from
Oct 25, 2024

Conversation

Brandon-T
Copy link
Contributor

@Brandon-T Brandon-T commented Oct 25, 2024

Resolves https://github.com/brave/internal/issues/1217
Resolves brave/brave-browser#41954

Submitter Checklist:

  • I confirm that no security/privacy review is needed and no other type of reviews are needed, or that I have requested them
  • There is a ticket for my issue
  • Used Github auto-closing keywords in the PR description above
  • Wrote a good PR/commit description
  • Squashed any review feedback or "fixup" commits before merge, so that history is a record of what happened in the repo, not your PR
  • Added appropriate labels (QA/Yes or QA/No; release-notes/include or release-notes/exclude; OS/...) to the associated issue
  • Checked the PR locally:
    • npm run test -- brave_browser_tests, npm run test -- brave_unit_tests wiki
    • npm run presubmit wiki, npm run gn_check, npm run tslint
  • Ran git rebase master (if needed)

Reviewer Checklist:

  • A security review is not needed, or a link to one is included in the PR description
  • New files have MPL-2.0 license header
  • Adequate test coverage exists to prevent regressions
  • Major classes, functions and non-trivial code blocks are well-commented
  • Changes in component dependencies are properly reflected in gn
  • Code follows the style guide
  • Test plan is specified in PR before merging

After-merge Checklist:

Test Plan:

@Brandon-T Brandon-T added CI/skip-android Do not run CI builds for Android CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-windows-x64 Do not run CI builds for Windows x64 unused-CI/skip-linux-x64 Do not run CI builds for Linux x64 CI/skip-macos-arm64 Do not run CI builds for macOS arm64 CI/skip-teamcity Do not run builds in TeamCity labels Oct 25, 2024
@Brandon-T Brandon-T self-assigned this Oct 25, 2024
@Brandon-T Brandon-T requested a review from a team as a code owner October 25, 2024 14:41
@Brandon-T Brandon-T changed the title Fix History and Bookmarks and ShieldsPanel and 3-dot menu Fix History and Bookmarks and ShieldsPanel and 3-Dot menu URL-Eliding Oct 25, 2024
import UIKit

extension URLFormatter {
public static func createAttributedString(
Copy link
Collaborator

@kylehickinson kylehickinson Oct 25, 2024

Choose a reason for hiding this comment

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

I think you're better off creating a custom Text view for this instead btw. something like:

struct URLElidedText: View {
  var content: String

  @Environment(\.font) private var font: Font

  private var paragraphStyle: NSParagraphStyle {
    ...
  }

  var body: some View {
    Text(AttributedString("\u{200E}\(content)", attributes: [.font: font, paragraphStyle: paragraphStyle]))
  }
}```

Copy link
Collaborator

Choose a reason for hiding this comment

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

Didn't address this ☝️

Copy link
Contributor Author

@Brandon-T Brandon-T Oct 25, 2024

Choose a reason for hiding this comment

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

I only saw this after. Just pushed a commit to address it: 59cad1f

// License, v. 2.0. If a copy of the MPL was not distributed with this
// file, You can obtain one at https://mozilla.org/MPL/2.0/.

import BraveCore
Copy link
Collaborator

Choose a reason for hiding this comment

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

BraveUI doesn't have a dependency on BraveCore and probably shouldn't, maybe better to keep this in BraveShared despite it being UI

Comment on lines 39 to 40
.font(font ?? .body)
.truncationMode(truncationMode)
Copy link
Collaborator

Choose a reason for hiding this comment

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

These are not needed, they're already part of the environment

@Brandon-T Brandon-T merged commit 9964975 into master Oct 25, 2024
17 checks passed
@Brandon-T Brandon-T deleted the bugfix/Eliding-iOS-v2 branch October 25, 2024 21:47
@github-actions github-actions bot added this to the 1.73.x - Nightly milestone Oct 25, 2024
brave-builds added a commit that referenced this pull request Oct 25, 2024
brave-builds added a commit that referenced this pull request Oct 25, 2024
@brave-builds
Copy link
Collaborator

Released in v1.73.51

@kjozwiak
Copy link
Member

Verification PASSED on iPhone 11 running iOS 18 using the following build(s):

Brave | 1.73.52 Chromium: 131.0.6778.14 (Official Build) nightly (64-bit) 
--- | ---
Revision | 6996738c6195...
OS | iOS

Verification notes can be found via https://github.com/brave/internal/issues/1217#issuecomment-2443047245.

kjozwiak pushed a commit that referenced this pull request Oct 29, 2024
… (uplift to 1.72.x) (#26248)

Uplift of #26226 (squashed) to beta
kjozwiak pushed a commit that referenced this pull request Oct 29, 2024
… (uplift to 1.71.x) (#26249)

Uplift of #26226 (squashed) to release
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CI/skip-android Do not run CI builds for Android CI/skip-macos-arm64 Do not run CI builds for macOS arm64 CI/skip-macos-x64 Do not run CI builds for macOS x64 CI/skip-teamcity Do not run builds in TeamCity CI/skip-windows-x64 Do not run CI builds for Windows x64 unused-CI/skip-linux-x64 Do not run CI builds for Linux x64
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Hackerone] History and Bookmarks and ShieldsPanel and 3-Dot menu URL-Eliding
5 participants