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.

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

Jump to bottom

Revert "Expose configuration to ignore EpoxySwiftUIHostingController safe area" #165

Merged
merged 2 commits into from
Mar 15, 2024
Merged

Revert "Expose configuration to ignore EpoxySwiftUIHostingController safe area" #165

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf47cde
Revert "Expose configuration to ignore EpoxySwiftUIHostingController …
bryankeller Mar 15, 2024
42683fb
Remove old comment
bryankeller Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 2 additions & 6 deletions Sources/EpoxyBars/BarModel/SwiftUI.View+BarModel.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,21 +11,17 @@ extension View {
/// - dataID: An ID that uniquely identifies this item relative to other items in the
/// same collection.
/// - reuseBehavior: The reuse behavior of the `EpoxySwiftUIHostingView`.
/// - ignoreSafeArea: Whether or not the underlying `EpoxySwiftUIHostingController` will ignore its safe area.
/// Only set this to `false` when installing this BarModel using `BarContainerInsetBehavior.barHeightContentInset` or `BarContainerInsetBehavior.none`.
public func barModel(
dataID: AnyHashable? = nil,
reuseBehavior: SwiftUIHostingViewReuseBehavior = .reusable,
ignoreSafeArea: Bool = true)
reuseBehavior: SwiftUIHostingViewReuseBehavior = .reusable)
-> BarModel<EpoxySwiftUIHostingView<Self>>
{
EpoxySwiftUIHostingView<Self>.barModel(
dataID: dataID,
content: .init(rootView: self, dataID: dataID),
style: .init(
reuseBehavior: reuseBehavior,
initialContent: .init(rootView: self, dataID: dataID),
ignoreSafeArea: ignoreSafeArea))
initialContent: .init(rootView: self, dataID: dataID)))
.linkDisplayLifecycle()
}
}
15 changes: 2 additions & 13 deletions Sources/EpoxyCore/SwiftUI/EpoxySwiftUIHostingView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public final class EpoxySwiftUIHostingView<RootView: View>: UIView, EpoxyableVie
epoxyContent = EpoxyHostingContent(rootView: style.initialContent.rootView)
viewController = EpoxySwiftUIHostingController(
rootView: .init(content: epoxyContent, environment: epoxyEnvironment),
ignoreSafeArea: style.ignoreSafeArea)
ignoreSafeArea: true)

dataID = style.initialContent.dataID ?? DefaultDataID.noneProvided as AnyHashable

Expand Down Expand Up @@ -97,24 +97,13 @@ public final class EpoxySwiftUIHostingView<RootView: View>: UIView, EpoxyableVie
// MARK: Public

public struct Style: Hashable {

// MARK: Lifecycle

public init(
reuseBehavior: SwiftUIHostingViewReuseBehavior,
initialContent: Content,
ignoreSafeArea: Bool = true)
{
public init(reuseBehavior: SwiftUIHostingViewReuseBehavior, initialContent: Content) {
self.reuseBehavior = reuseBehavior
self.initialContent = initialContent
self.ignoreSafeArea = ignoreSafeArea
}

// MARK: Public

public var reuseBehavior: SwiftUIHostingViewReuseBehavior
public var initialContent: Content
public var ignoreSafeArea: Bool

public static func == (lhs: Style, rhs: Style) -> Bool {
lhs.reuseBehavior == rhs.reuseBehavior
Expand Down