Skip to content

Commit

Permalink
v0.1.3
Browse files Browse the repository at this point in the history
  • Loading branch information
@nathantannar4
nathantannar4 committed Dec 8, 2022
1 parent 311ad56 commit 6dce58e
Show file tree
Hide file tree
Showing 6 changed files with 230 additions and 84 deletions.
2 changes: 1 addition & 1 deletion ...ces/DynamicProperty/WeakStateObject.swift → ...n/Sources/DynamicProperty/WeakState.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import Combine

@available(iOS 14.0, macOS 11.0, tvOS 14.0, watchOS 7.0, *)
@propertyWrapper
struct WeakStateObject<Value: AnyObject>: DynamicProperty {
struct WeakState<Value: AnyObject>: DynamicProperty {

@usableFromInline
class Storage: ObservableObject {
Expand Down
34 changes: 24 additions & 10 deletions Sources/Transmission/Sources/Hosting/HostingController.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,7 @@ open class HostingController<

public var tracksContentSize: Bool = false {
didSet {
if #available(iOS 16.0, macOS 13.0, tvOS 16.0, watchOS 9.0, *) {
if tracksContentSize {
sizingOptions.formUnion([.preferredContentSize, .intrinsicContentSize])
} else {
sizingOptions.subtract([.preferredContentSize, .intrinsicContentSize])
}
} else {
view.setNeedsLayout()
}
view.setNeedsLayout()
}
}

Expand Down Expand Up @@ -72,8 +64,30 @@ open class HostingController<
if #available(iOS 16.0, *) {
// Sync SwiftUI/UIKit animation
try? view?.unsafeSetValue(true, forKey: "allowUIKitAnimationsForNextUpdate")
if let popoverPresentationController = presentationController as? UIPopoverPresentationController,
let containerView = popoverPresentationController.containerView
{
var newSize = view.systemLayoutSizeFitting(
UIView.layoutFittingCompressedSize
)
newSize.height -= (view.safeAreaInsets.top + view.safeAreaInsets.bottom)
newSize.width -= (view.safeAreaInsets.left + view.safeAreaInsets.right)
let oldSize = preferredContentSize
if oldSize != newSize {
let dz = (newSize.width * newSize.height) - (oldSize.width * oldSize.height)
UIView.transition(
with: containerView,
duration: 0.35 + (dz > 0 ? 0.15 : -0.05),
options: [.beginFromCurrentState, .curveEaseInOut]
) {
self.preferredContentSize = newSize
}
}
}
} else {
var size = view.intrinsicContentSize
var size = view.systemLayoutSizeFitting(
UIView.layoutFittingCompressedSize
)
size.height -= (view.safeAreaInsets.top + view.safeAreaInsets.bottom)
size.width -= (view.safeAreaInsets.left + view.safeAreaInsets.right)
preferredContentSize = size
Expand Down
177 changes: 137 additions & 40 deletions Sources/Transmission/Sources/View/PresentationLinkAdapter.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -134,8 +134,8 @@ private struct PresentationLinkAdapterBody<
var isPresented: Binding<Bool>
var destination: Destination

@WeakStateObject var host: UIView?
@WeakStateObject var presentingViewController: UIViewController?
@WeakState var host: UIView?
@WeakState var presentingViewController: UIViewController?

typealias DestinationViewController = HostingController<ModifiedContent<Destination, PresentationBridgeAdapter>>

Expand Down Expand Up @@ -164,46 +164,43 @@ private struct PresentationLinkAdapterBody<

let isAnimated = context.transaction.isAnimated || (presentingViewController.transitionCoordinator?.isAnimated ?? false)
if let adapter = context.coordinator.adapter, !context.coordinator.isBeingReused {


switch (adapter.transition, transition.value) {
case (.sheet(let oldValue), .sheet(let newValue)):
adapter.transition = .sheet(newValue)

guard #available(iOS 15.0, *), let presentationController = adapter.viewController.presentationController as? UISheetPresentationController else {
guard #available(iOS 15.0, *), let presentationController = adapter.viewController.presentationController as? UISheetPresentationController
else {
break
}
let selectedDetentIdentifier = newValue.selected?.wrappedValue?.toUIKit()
let detents = newValue.detents.map { $0.resolve(in: presentationController) }
let hasChanges: Bool = {
if oldValue.preferredCornerRadius != newValue.preferredCornerRadius {
return true
} else if let selected = selectedDetentIdentifier,
presentationController.selectedDetentIdentifier != selected
PresentationLinkTransition.SheetTransitionOptions.update(
presentationController: presentationController,
animated: isAnimated,
from: oldValue,
to: newValue
)

case (.popover(let oldValue), .popover(let newValue)):
adapter.transition = .popover(newValue)

if let presentationController = adapter.viewController.presentationController as? UIPopoverPresentationController {
presentationController.permittedArrowDirections = newValue.permittedArrowDirections(
layoutDirection: traits.layoutDirection
)
} else if #available(iOS 15.0, *) {
if let newValue = newValue.adaptiveTransition,
let presentationController = adapter.viewController.presentationController as? UISheetPresentationController
{
return true
} else if oldValue.detents != detents {
return true
}
return false
}()
if hasChanges {
func applyConfiguration() {
presentationController.detents = detents.map { $0.toUIKit() }
presentationController.largestUndimmedDetentIdentifier = newValue.largestUndimmedDetent?.identifier.toUIKit()
if let selected = newValue.selected {
presentationController.selectedDetentIdentifier = selected.wrappedValue?.toUIKit()
}
presentationController.preferredCornerRadius = newValue.preferredCornerRadius
}
if isAnimated {
withCATransaction {
presentationController.animateChanges {
applyConfiguration()
}
}
} else {
applyConfiguration()
PresentationLinkTransition.SheetTransitionOptions.update(
presentationController: presentationController,
animated: isAnimated,
from: oldValue.adaptiveTransition ?? .init(),
to: newValue
)
}
}

default:
adapter.transition = transition.value
}
Expand Down Expand Up @@ -241,6 +238,7 @@ private struct PresentationLinkAdapterBody<
case .currentContext:
// transitioningDelegate + .custom breaks .overCurrentContext
adapter.viewController.modalPresentationStyle = .overCurrentContext
adapter.viewController.presentationController?.overrideTraitCollection = traits

case .fullscreen, .sheet, .popover, .`default`:
switch adapter.transition {
Expand All @@ -255,6 +253,7 @@ private struct PresentationLinkAdapterBody<

if let presentationController = adapter.viewController.presentationController {
presentationController.delegate = context.coordinator
presentationController.overrideTraitCollection = traits

if #available(iOS 15.0, *),
let sheetPresentationController = presentationController as? UISheetPresentationController
Expand All @@ -268,22 +267,36 @@ private struct PresentationLinkAdapterBody<
} else if let popoverPresentationController = presentationController as? UIPopoverPresentationController {
popoverPresentationController.delegate = context.coordinator
popoverPresentationController.sourceView = uiView
if case .popover(let options) = adapter.transition {
let permittedArrowDirections = options.permittedArrowDirections(
layoutDirection: traits.layoutDirection
)
popoverPresentationController.permittedArrowDirections = permittedArrowDirections
}
}
}

case .custom(_, let delegate):
assert(!isClassType(delegate), "PresentationLinkCustomTransition must be value types (either a struct or an enum); it was a class")
context.coordinator.sourceView = uiView
adapter.viewController.modalPresentationStyle = .custom
adapter.viewController.presentationController?.overrideTraitCollection = traits
}

adapter.viewController.presentationController?.overrideTraitCollection = traits

// Swizzle to hook up for programatic dismissal
adapter.viewController.presentationDelegate = context.coordinator
if let presentedViewController = presentingViewController.presentedViewController {
presentedViewController.dismiss(animated: isAnimated) {
presentingViewController.present(adapter.viewController, animated: isAnimated)
let shouldDismiss = presentedViewController.presentationController.map {
$0.delegate?.presentationControllerShouldDismiss?($0) ?? true
} ?? true
if shouldDismiss {
presentedViewController.dismiss(animated: isAnimated) {
presentingViewController.present(adapter.viewController, animated: isAnimated)
}
} else {
withCATransaction {
isPresented.wrappedValue = false
}
}
} else {
presentingViewController.present(adapter.viewController, animated: isAnimated)
Expand Down Expand Up @@ -364,6 +377,9 @@ private struct PresentationLinkAdapterBody<
case .sheet(let options):
return options.isInteractive

case .popover(let options):
return options.isInteractive

default:
return true
}
Expand Down Expand Up @@ -394,12 +410,43 @@ private struct PresentationLinkAdapterBody<
) -> UIModalPresentationStyle {
switch adapter?.transition {
case .popover(let options):
return options.isAdaptive && traitCollection.horizontalSizeClass == .compact ? .formSheet : .none
return options.adaptiveTransition != nil && traitCollection.horizontalSizeClass == .compact ? .pageSheet : .none

case .custom(_, let transition):
return transition.adaptivePresentationStyle(for: controller, traitCollection: traitCollection)

default:
return .none
}
}

func presentationController(
_ presentationController: UIPresentationController,
prepare adaptivePresentationController: UIPresentationController
) {
switch adapter?.transition {
case .popover(let options):
if #available(iOS 15.0, *) {
if let options = options.adaptiveTransition,
let presentationController = adaptivePresentationController as? UISheetPresentationController
{
PresentationLinkTransition.SheetTransitionOptions.update(
presentationController: presentationController,
animated: false,
from: .init(),
to: options
)
}
}

case .custom(_, let transition):
transition.presentationController(presentationController, prepare: adaptivePresentationController)

default:
break
}
}

// MARK: - UIViewControllerTransitioningDelegate

func animationController(
Expand All @@ -413,6 +460,7 @@ private struct PresentationLinkAdapterBody<
forPresented: presented,
presenting: presenting
)

default:
return nil
}
Expand All @@ -424,6 +472,7 @@ private struct PresentationLinkAdapterBody<
switch adapter?.transition {
case .custom(_, let transition):
return transition.animationController(forDismissed: dismissed)

default:
return nil
}
Expand All @@ -435,6 +484,7 @@ private struct PresentationLinkAdapterBody<
switch adapter?.transition {
case .custom(_, let transition):
return transition.interactionControllerForPresentation(using: animator)

default:
return nil
}
Expand All @@ -446,6 +496,7 @@ private struct PresentationLinkAdapterBody<
switch adapter?.transition {
case .custom(_, let transition):
return transition.interactionControllerForDismissal(using: animator)

default:
return nil
}
Expand Down Expand Up @@ -499,6 +550,9 @@ private struct PresentationLinkAdapterBody<
presenting: presenting
)
presentationController.canOverlapSourceViewRect = options.canOverlapSourceViewRect
presentationController.permittedArrowDirections = options.permittedArrowDirections(
layoutDirection: presentationController.traitCollection.layoutDirection
)
presentationController.delegate = self
return presentationController

Expand Down Expand Up @@ -556,8 +610,7 @@ private struct PresentationLinkAdapterBody<
// MARK: - UIPopoverPresentationControllerDelegate

func prepareForPopoverPresentation(_ popoverPresentationController: UIPopoverPresentationController) {
let size = popoverPresentationController.presentedViewController.view.intrinsicContentSize
popoverPresentationController.presentedViewController.preferredContentSize = size
popoverPresentationController.presentedViewController.view.layoutIfNeeded()
}
}

Expand All @@ -583,6 +636,50 @@ private class PopoverPresentationController: UIPopoverPresentationController {

}

@available(iOS 15.0, *)
extension PresentationLinkTransition.SheetTransitionOptions {
static func update(
presentationController: UISheetPresentationController,
animated isAnimated: Bool,
from oldValue: Self,
to newValue: Self
) {
let selectedDetentIdentifier = newValue.selected?.wrappedValue?.toUIKit()
let detents = newValue.detents.map { $0.resolve(in: presentationController) }
let hasChanges: Bool = {
if oldValue.preferredCornerRadius != newValue.preferredCornerRadius {
return true
} else if let selected = selectedDetentIdentifier,
presentationController.selectedDetentIdentifier != selected
{
return true
} else if oldValue.detents != detents {
return true
}
return false
}()
if hasChanges {
func applyConfiguration() {
presentationController.detents = detents.map { $0.toUIKit() }
presentationController.largestUndimmedDetentIdentifier = newValue.largestUndimmedDetent?.identifier.toUIKit()
if let selected = newValue.selected {
presentationController.selectedDetentIdentifier = selected.wrappedValue?.toUIKit()
}
presentationController.preferredCornerRadius = newValue.preferredCornerRadius
}
if isAnimated {
withCATransaction {
presentationController.animateChanges {
applyConfiguration()
}
}
} else {
applyConfiguration()
}
}
}
}

@available(iOS 14.0, *)
@available(macOS, unavailable)
@available(tvOS, unavailable)
Expand Down
Loading

0 comments on commit 6dce58e

Please sign in to comment.