mbrucedogs/vds_ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

reverted back to original MVA code for getting the location of links and such.

Browse Source 
refactored

Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2024-06-21 13:19:15 -05:00
parent 31b9704163
commit 8b37986b40
2 changed files with 32 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
VDS/Components/Label/Label.swift
View File

@ -389,82 +389,59 @@ open class Label: UILabel, ViewProtocol, UserInfoable {
} }
} }
//--------------------------------------------------
// MARK: - Touch Events
//--------------------------------------------------
@objc private func textLinkTapped(_ gesture: UITapGestureRecognizer) { @objc private func textLinkTapped(_ gesture: UITapGestureRecognizer) {
for actionable in actions { let location = gesture.location(in: self)
// This determines if we tapped on the desired range of text. if let action = actions.first(where: { isAction(for: location, inRange: $0.range) }) {
let location = gesture.location(in: self) action.performAction()
if didTapActionInLabel(location, inRange: actionable.range) {
actionable.performAction()
return
}
} }
} }
public func isAction(for location: CGPoint) -> Bool { public func isAction(for location: CGPoint) -> Bool {
for actionable in actions { actions.contains(where: {isAction(for: location, inRange: $0.range)})
if didTapActionInLabel(location, inRange: actionable.range) {
return true
}
}
return false
} }
private func didTapActionInLabel(_ location: CGPoint, inRange targetRange: NSRange) -> Bool { public func isAction(for location: CGPoint, inRange targetRange: NSRange) -> Bool {
guard let attributedText = attributedText, let abstractContainer = abstractTextContainer() else { return false }
let textContainer = abstractContainer.textContainer
let layoutManager = abstractContainer.layoutManager
// guard let attributedText else { return false } let indexOfGlyph = layoutManager.glyphIndex(for: location, in: textContainer)
// let layoutManager = NSLayoutManager()
// let textContainer = NSTextContainer(size: bounds.size)
// let textStorage = NSTextStorage(attributedString: attributedText)
// layoutManager.addTextContainer(textContainer)
// textStorage.addLayoutManager(layoutManager)
//
// let characterIndex = layoutManager.characterIndex(for: location, in: textContainer, fractionOfDistanceBetweenInsertionPoints: nil)
//
// guard let _ = attributedText.attribute(NSAttributedString.Key.action, at: characterIndex, effectiveRange: nil) as? String,
// characterIndex < attributedText.length else {
// return false
// }
// return true
// There would only ever be one clause to act on.
guard let abstractContainer = abstractTextContainer() else { return false }
let textContainer = abstractContainer.0
let layoutManager = abstractContainer.1
let tapLocation = location
let indexOfGlyph = layoutManager.glyphIndex(for: tapLocation, in: textContainer)
let intrinsicWidth = intrinsicContentSize.width let intrinsicWidth = intrinsicContentSize.width
// Assert that tapped occured within acceptable bounds based on alignment. // Assert that tapped occured within acceptable bounds based on alignment.
switch textAlignment { switch textAlignment {
case .right: case .right:
if tapLocation.x < bounds.width - intrinsicWidth { if location.x < bounds.width - intrinsicWidth {
return false return false
} }
case .center: case .center:
let halfBounds = bounds.width / 2 let halfBounds = bounds.width / 2
let halfIntrinsicWidth = intrinsicWidth / 2 let halfIntrinsicWidth = intrinsicWidth / 2
if tapLocation.x > halfBounds + halfIntrinsicWidth { if location.x > halfBounds + halfIntrinsicWidth {
return false return false
} else if tapLocation.x < halfBounds - halfIntrinsicWidth { } else if location.x < halfBounds - halfIntrinsicWidth {
return false return false
} }
default: // Left align default: // Left align
if tapLocation.x > intrinsicWidth { if location.x > intrinsicWidth {
return false return false
} }
} }
// Affirms that the tap occured in the desired rect of provided by the target range. // Affirms that the tap occured in the desired rect of provided by the target range.
return layoutManager.boundingRect(forGlyphRange: targetRange, in: textContainer).contains(tapLocation) && NSLocationInRange(indexOfGlyph, targetRange) return layoutManager.boundingRect(forGlyphRange: targetRange, in: textContainer).contains(location)
&& NSLocationInRange(indexOfGlyph, targetRange)
} }
/** /**
Provides a text container and layout manager of how the text would appear on screen. Provides a text container and layout manager of how the text would appear on screen.
They are used in tandem to derive low-level TextKit results of the label. They are used in tandem to derive low-level TextKit results of the label.
*/ */
public func abstractTextContainer() -> (NSTextContainer, NSLayoutManager, NSTextStorage)? { public func abstractTextContainer() -> (textContainer: NSTextContainer, layoutManager: NSLayoutManager, textStorage: NSTextStorage)? {
// Must configure the attributed string to translate what would appear on screen to accurately analyze. // Must configure the attributed string to translate what would appear on screen to accurately analyze.
guard let attributedText = attributedText else { return nil } guard let attributedText = attributedText else { return nil }
@ -489,25 +466,23 @@ open class Label: UILabel, ViewProtocol, UserInfoable {
return (textContainer, layoutManager, textStorage) return (textContainer, layoutManager, textStorage)
} }
//--------------------------------------------------
// MARK: - Accessibility
//--------------------------------------------------
private func customAccessibilityElement(text: String?, range: NSRange, accessibleText: String? = nil) -> AccessibilityActionElement? { private func customAccessibilityElement(text: String?, range: NSRange, accessibleText: String? = nil) -> AccessibilityActionElement? {
guard let text = text, let attributedText else { return nil } guard let text = text, let attributedText, let abstractContainer = abstractTextContainer() else { return nil }
let textContainer = abstractContainer.textContainer
let layoutManager = abstractContainer.layoutManager
let actionText = accessibleText ?? (text.isValid(range: range) ? NSString(string:text).substring(with: range) : text) let actionText = accessibleText ?? (text.isValid(range: range) ? NSString(string:text).substring(with: range) : text)
// Calculate the frame of the substring
let layoutManager = NSLayoutManager()
let textContainer = NSTextContainer(size: bounds.size)
let textStorage = NSTextStorage(attributedString: attributedText)
layoutManager.addTextContainer(textContainer)
textStorage.addLayoutManager(layoutManager)
var glyphRange = NSRange() var glyphRange = NSRange()
// Convert the range for the substring into a range of glyphs // Convert the range for the substring into a range of glyphs
layoutManager.characterRange(forGlyphRange: range, actualGlyphRange: &glyphRange) layoutManager.characterRange(forGlyphRange: range, actualGlyphRange: &glyphRange)
let substringBounds = layoutManager.boundingRect(forGlyphRange: glyphRange, in: textContainer) let substringBounds = layoutManager.boundingRect(forGlyphRange: glyphRange, in: textContainer)
// Create custom accessibility element // Create custom accessibility element
@ -520,11 +495,8 @@ open class Label: UILabel, ViewProtocol, UserInfoable {
accessibilityElements?.append(element) accessibilityElements?.append(element)
return element return element
} }
//--------------------------------------------------
// MARK: - Accessibility
//--------------------------------------------------
open var accessibilityAction: ((Label) -> Void)? open var accessibilityAction: ((Label) -> Void)?
private var _isAccessibilityElement: Bool = false private var _isAccessibilityElement: Bool = false

20
VDS/Extensions/UITapGestureRecognizer.swift
View File

@ -12,23 +12,11 @@ extension UITapGestureRecognizer {
/// Determines if the touch event has a action attribute within the range given /// Determines if the touch event has a action attribute within the range given
/// - Parameters: /// - Parameters:
/// - label: UILabel in question /// - label: Label in question
/// - targetRange: Range to look within /// - targetRange: Range to look within
/// - Returns: Wether the range in the label has an action /// - Returns: Wether the range in the label has an action
public func didTapActionInLabel(_ label: UILabel, inRange targetRange: NSRange) -> Bool { public func didTapActionInLabel(_ label: Label, inRange targetRange: NSRange) -> Bool {
let tapLocation = location(in: label)
guard let attributedText = label.attributedText else { return false } return label.isAction(for: tapLocation, inRange: targetRange)
let layoutManager = NSLayoutManager()
let textContainer = NSTextContainer(size: label.bounds.size)
let textStorage = NSTextStorage(attributedString: attributedText)
layoutManager.addTextContainer(textContainer)
textStorage.addLayoutManager(layoutManager)
let location = location(in: label)
let characterIndex = layoutManager.characterIndex(for: location, in: textContainer, fractionOfDistanceBetweenInsertionPoints: nil)
guard let _ = attributedText.attribute(NSAttributedString.Key.action, at: characterIndex, effectiveRange: nil) as? String, characterIndex < attributedText.length else { return false }
return true
} }
} }