This repository has been archived by the owner on Feb 17, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 266
Allow embedding layouts in a view hierarchy created from another layout #245
Open
crleona
wants to merge
1
commit into
LinkedInAttic:master
Choose a base branch
from
crleona:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
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 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 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 2016 LinkedIn Corp. | ||
| // 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. | ||
|
|
||
| import XCTest | ||
| @testable import LayoutKit | ||
|
|
||
| class EmbeddedLayoutTests: XCTestCase { | ||
|
|
||
| private let rootView = View() | ||
| private let singleViewArrangement = SizeLayout(minSize: .zero, config: { _ in }).arrangement() | ||
|
|
||
| override func setUp() { | ||
| super.setUp() | ||
|
|
||
| rootView.subviews.forEach { $0.removeFromSuperview() } | ||
| } | ||
|
|
||
| func testKeepsSubviewsForEmbeddedLayoutWithReuseId() { | ||
| var parentView: View? | ||
| let parentLayout = SizeLayout(minSize: .zero, viewReuseId: "test", config: { view in | ||
| parentView = view | ||
| }) | ||
|
|
||
| // Create Parent Layout | ||
| parentLayout.arrangement().makeViews(in: rootView) | ||
|
|
||
| // Create Embedded Layout | ||
| XCTAssertNotNil(parentView) | ||
| singleViewArrangement.makeViews(in: parentView) | ||
|
|
||
| // Re-create Parent Layout | ||
| parentLayout.arrangement().makeViews(in: rootView) | ||
|
|
||
| XCTAssertEqual(parentView?.subviews.count, 1) | ||
| } | ||
|
|
||
| func testRemovesSubviewsForEmbeddedLayoutWithoutReuseId() { | ||
| var parentView: View? | ||
| let parentLayout = SizeLayout(minSize: .zero, config: { view in | ||
| parentView = view | ||
| }) | ||
|
|
||
| // Create Parent Layout | ||
| parentLayout.arrangement().makeViews(in: rootView) | ||
|
|
||
| // Create Embedded Layout | ||
| XCTAssertNotNil(parentView) | ||
| singleViewArrangement.makeViews(in: parentView) | ||
| let originalParentView = parentView | ||
|
|
||
| // Re-create Parent Layout | ||
| parentLayout.arrangement().makeViews(in: rootView) | ||
|
|
||
| XCTAssertNotEqual(originalParentView, parentView) | ||
| XCTAssertEqual(parentView?.subviews.count, 0) | ||
| } | ||
|
|
||
| func testEmbeddedLayoutsAreRemoved() { | ||
| var originalHostView: View? | ||
| SizeLayout( | ||
| minSize: .zero, | ||
| viewReuseId: "foo", | ||
| sublayout: SizeLayout(minSize: .zero, viewReuseId: "bar", config: { view in | ||
| originalHostView = view | ||
| self.singleViewArrangement.makeViews(in: view) | ||
| }), | ||
| config: { _ in }).arrangement().makeViews(in: rootView) | ||
|
|
||
| XCTAssertEqual(rootView.subviews.count, 1) | ||
| XCTAssertNotNil(originalHostView) | ||
| XCTAssertEqual(originalHostView?.subviews.count, 1) | ||
|
|
||
| var updatedHostView: View? | ||
| SizeLayout( | ||
| minSize: .zero, | ||
| viewReuseId: "foo", | ||
| sublayout: SizeLayout(minSize: .zero, viewReuseId: "baz", config: { view in | ||
| updatedHostView = view | ||
| }), | ||
| config: { _ in }).arrangement().makeViews(in: rootView) | ||
|
|
||
| XCTAssertEqual(rootView.subviews.count, 1) | ||
| XCTAssertNotNil(updatedHostView) | ||
| XCTAssertEqual(updatedHostView?.subviews.count, 0) | ||
| XCTAssertNotEqual(originalHostView, updatedHostView) | ||
| } | ||
| } |
This file contains 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 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 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
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.
Is it necessary to walk unmanaged subviews? Won't the subviews of the subview be either unmanaged or root ones?
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.
This is a good point. Let's tackle it as a separate change.