-
Notifications
You must be signed in to change notification settings - Fork 47
[feat]: add ViewEnvironmentUI module #205
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
Merged
Merged
Changes from 5 commits
Commits
Show all changes
16 commits
Select commit
Hold shift + click to select a range
6eacf4a
Port ViewEnvironmentUI from Market and add to Development.podspec
n8chur 7b7c59f
Simplify protocol hierarchy
n8chur 593250d
Rename viewEnvironment to environment
n8chur b37dad6
Add environmentDidChange observation option
n8chur 3c9c384
Improve documentation
n8chur 6efa11a
Improve ViewEnvironmentUI README
n8chur 117963c
Fix typo in ViewEnvironmentUI/README.md
n8chur ceac6b7
Remove callouts to call applyEnvironmentIfNeeded in customize and app…
n8chur 7fdbe94
Improve documentation comments.
n8chur c1241f6
Fix SPM build
n8chur 2284751
Fix incorrect doc comments on ViewEnvironmentPropagating
n8chur 8d4478f
Add note about cusomtimzations applying to the node itself
n8chur 6802cb5
Clarify the that a node's ancestor may not match that nodes descendan…
n8chur f552eb5
Remove x-source-tag references and docc annotations
n8chur d918d9a
Refer to ancestor as environmentAncestor in comments
n8chur 8386ed7
Improve doc comments
n8chur File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
require_relative('version') | ||
|
||
Pod::Spec.new do |s| | ||
s.name = 'ViewEnvironmentUI' | ||
s.version = WORKFLOW_VERSION | ||
s.summary = 'Provides a way to propagate a ViewEnvironment through an imperative hierarchy' | ||
s.homepage = 'https://www.github.com/square/workflow-swift' | ||
s.license = 'Apache License, Version 2.0' | ||
s.author = 'Square' | ||
s.source = { :git => 'https://github.com/square/workflow-swift.git', :tag => "v#{s.version}" } | ||
|
||
# 1.7 is needed for `swift_versions` support | ||
s.cocoapods_version = '>= 1.7.0' | ||
|
||
s.swift_versions = [WORKFLOW_SWIFT_VERSION] | ||
s.ios.deployment_target = WORKFLOW_IOS_DEPLOYMENT_TARGET | ||
s.osx.deployment_target = WORKFLOW_MACOS_DEPLOYMENT_TARGET | ||
|
||
s.source_files = 'ViewEnvironmentUI/Sources/**/*.swift' | ||
|
||
s.dependency 'ViewEnvironment', "#{s.version}" | ||
|
||
s.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'YES' } | ||
|
||
s.test_spec 'Tests' do |test_spec| | ||
test_spec.source_files = 'ViewEnvironmentUI/Tests/**/*.swift' | ||
test_spec.framework = 'XCTest' | ||
test_spec.library = 'swiftos' | ||
|
||
# Create an app host so that we can host | ||
# view or view controller based tests in a real environment. | ||
test_spec.requires_app_host = true | ||
|
||
test_spec.pod_target_xcconfig = { 'APPLICATION_EXTENSION_API_ONLY' => 'NO' } | ||
end | ||
end |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
# ViewEnvironmentUI | ||
|
||
`ViewEnvironmentUI` provides a means to propagate a `ViewEnvironment` through the view controller hierarchy. | ||
|
||
> **_Note:_** This is currently considered an implementation detail of `MarketUI` and is intended to bridge `MarketContext` propagation between `MarketUI` and the Modals framework. Use the wrapper types declared in `MarketUI` to access the propagation of Market features. |
35 changes: 35 additions & 0 deletions
35
ViewEnvironmentUI/Sources/UIView+ViewEnvironmentPropagatingObject.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
/* | ||
* Copyright 2023 Square Inc. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
#if canImport(UIKit) | ||
|
||
import UIKit | ||
import ViewEnvironment | ||
|
||
extension UIView: ViewEnvironmentPropagatingObject { | ||
@_spi(ViewEnvironmentWiring) | ||
public var defaultEnvironmentAncestor: ViewEnvironmentPropagating? { superview } | ||
|
||
@_spi(ViewEnvironmentWiring) | ||
public var defaultEnvironmentDescendants: [ViewEnvironmentPropagating] { subviews } | ||
|
||
@_spi(ViewEnvironmentWiring) | ||
public func setNeedsApplyEnvironment() { | ||
setNeedsLayout() | ||
} | ||
} | ||
|
||
#endif |
43 changes: 43 additions & 0 deletions
43
ViewEnvironmentUI/Sources/UIViewController+ViewEnvironmentPropagatingObject.swift
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
/* | ||
* Copyright 2023 Square Inc. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
#if canImport(UIKit) | ||
|
||
import UIKit | ||
import ViewEnvironment | ||
|
||
extension UIViewController: ViewEnvironmentPropagatingObject { | ||
@_spi(ViewEnvironmentWiring) | ||
public var defaultEnvironmentAncestor: ViewEnvironmentPropagating? { parent ?? presentingViewController } | ||
|
||
@_spi(ViewEnvironmentWiring) | ||
public var defaultEnvironmentDescendants: [ViewEnvironmentPropagating] { | ||
var descendants = children | ||
|
||
if let presentedViewController = presentedViewController { | ||
descendants.append(presentedViewController) | ||
} | ||
|
||
return descendants | ||
} | ||
|
||
@_spi(ViewEnvironmentWiring) | ||
public func setNeedsApplyEnvironment() { | ||
viewIfLoaded?.setNeedsLayout() | ||
} | ||
} | ||
|
||
#endif |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,92 @@ | ||
/* | ||
* Copyright 2023 Square Inc. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
|
||
import ViewEnvironment | ||
|
||
/// `ViewEnvironmentObserving` allows an environment propagation node to observe updates to the | ||
/// `ViewEnvironment` as it flows through the node hierarchy and have | ||
/// the environment applied to the node. | ||
/// | ||
/// For example, for a `UIViewController` hierarchy observing `ViewEnvironment`: | ||
/// ```swift | ||
/// final class MyViewController: | ||
/// UIViewController, ViewEnvironmentObserving | ||
/// { | ||
/// override func viewWillLayoutSubviews() { | ||
/// super.viewWillLayoutSubviews() | ||
/// | ||
/// // You _must_ call this function in viewWillLayoutSubviews() | ||
/// applyEnvironmentIfNeeded() | ||
/// } | ||
/// | ||
/// func apply(environment: ViewEnvironment) { | ||
/// // Apply values from the environment to your view controller (e.g. a theme) | ||
/// } | ||
/// | ||
/// // If you'd like to override values in the environment you can provide them here. If you'd | ||
/// // like to just inherit the context from above there is no need to implement this function. | ||
/// func customize(environment: inout ViewEnvironment) { | ||
/// environment.traits.mode = .dark | ||
/// } | ||
/// } | ||
/// ``` | ||
/// | ||
/// - Important: `UIViewController` and `UIView` conformers _must_ call ``applyEnvironmentIfNeeded()-3bamq`` | ||
/// in `viewWillLayoutSubviews()` and `layoutSubviews()` respectively. | ||
/// | ||
public protocol ViewEnvironmentObserving: ViewEnvironmentPropagating { | ||
/// Customizes the `ViewEnvironment` as it flows through this propagation node to provide overrides to environment | ||
/// values. These changes will be propagated to all descendant nodes. | ||
/// | ||
/// If you'd like to just inherit the environment from above, leave this function body empty. | ||
/// | ||
/// - Important: `UIViewController` and `UIView` conformers _must_ call | ||
/// ``ViewEnvironmentObserving/applyEnvironmentIfNeeded()-8gr5k``in `viewWillLayoutSubviews()` and | ||
/// `layoutSubviews()` respectively. | ||
/// | ||
func customize(environment: inout ViewEnvironment) | ||
|
||
/// Consumers should apply the `ViewEnvironment` to their node when this function is called. | ||
/// | ||
/// - Important: `UIViewController` and `UIView` conformers _must_ call ``applyEnvironmentIfNeeded()-3bamq`` | ||
/// in `viewWillLayoutSubviews()` and `layoutSubviews()` respectively. | ||
n8chur marked this conversation as resolved.
Show resolved
Hide resolved
|
||
/// | ||
func apply(environment: ViewEnvironment) | ||
|
||
/// Consumers must call this function when environment updates should be applied. | ||
/// | ||
/// This will call ``apply(environment:)`` on the receiver if the node has been flagged for needing update. | ||
/// | ||
/// When working with `UIViewController` and `UIView` nodes, consumers _must_ call this function in | ||
/// `viewWillLayoutSubviews()` for `UIViewController`s and `layoutSubviews()` for `UIView`s. | ||
/// | ||
func applyEnvironmentIfNeeded() | ||
|
||
/// Called when the environment has been set for needing update, but before it has been applied. | ||
/// | ||
/// This may be called frequently when compared to ``apply(environment:)`` which should only be called | ||
/// when it's appropriate to apply the environment to the backing object (e.g. `viewWillLayoutSubviews`). | ||
/// | ||
func environmentDidChange() | ||
} | ||
|
||
extension ViewEnvironmentObserving { | ||
public func customize(environment: inout ViewEnvironment) {} | ||
|
||
public func apply(environment: ViewEnvironment) {} | ||
|
||
public func environmentDidChange() {} | ||
} |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit, orthogonal to this change: Do the customizations in
self.customize(environment:)
affect the value passed toself.apply(environment:)
, or only to decendants'apply(environment:)
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Customizations currently apply to the environment on the node itself. I'll clarify this in documentation.
Andrew mentioned that this was surprising during his review and I have a note to follow up on this. Which shape is most intuitive to you?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good question. I did guess correctly that customizations do apply to self, but I was on the fence about it.
Applying customizations to descendants only would be sensible in that the node can easily opt into applying the same customizations to itself within
self.apply(environment:)
. But if nodes almost always want that, then maybe it's annoying to have to startapply(environment:)
with