Skip to content

Fix test bulid #64

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix test bulid #64

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07d82d0
Fix test Build
Oct 22, 2021
763c2be
fix optional casting syntax
Oct 22, 2021
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
4 changes: 2 additions & 2 deletions Example/ExampleTests/UIScrollViewTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@ class UIScrollViewTests: XCTestCase {
.store(in: &subscriptions)

let givenVelocity: CGPoint = .init(x: 42, y: 42)
let givenTargetContentOffset: UnsafeMutablePointer<CGPoint> = UnsafeMutablePointer<CGPoint> .allocate(capacity: 1)
let givenTargetContentOffset: UnsafeMutablePointer<CGPoint> = UnsafeMutablePointer<CGPoint>.allocate(capacity: 1)

defer { givenTargetContentOffset.deallocate(capacity: 1) }
defer { givenTargetContentOffset.deallocate() }

scrollView.delegate!.scrollViewWillEndDragging!(scrollView, withVelocity: givenVelocity, targetContentOffset: givenTargetContentOffset)

Expand Down
4 changes: 2 additions & 2 deletions Sources/CombineCocoa/Controls/UIScrollView+Combine.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,15 +120,15 @@ public extension UIScrollView {
var willBeginZoomingPublisher: AnyPublisher<UIView?, Never> {
let selector = #selector(UIScrollViewDelegate.scrollViewWillBeginZooming(_:with:))
return delegateProxy.interceptSelectorPublisher(selector)
.map { $0[1] as! UIView? }
.map { $0[1] as? UIView }
.eraseToAnyPublisher()
}

/// Combine wrapper for `scrollViewDidEndZooming(_:with:atScale:)`
var didEndZooming: AnyPublisher<(view: UIView?, scale: CGFloat), Never> {
let selector = #selector(UIScrollViewDelegate.scrollViewDidEndZooming(_:with:atScale:))
return delegateProxy.interceptSelectorPublisher(selector)
.map { ($0[1] as! UIView?, $0[2] as! CGFloat) }
.map { ($0[1] as? UIView, $0[2] as! CGFloat) }
.eraseToAnyPublisher()
}

Expand Down