Skip to content

Fix issues #2009 #2010

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 1 commit into
base: master
Choose a base branch
from
Open

Fix issues #2009 #2010

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions Source/ASCellNode.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,11 @@ typedef NS_ENUM(NSUInteger, ASCellNodeVisibilityEvent) {
*/
@property UIEdgeInsets separatorInset;

/* @abstract The inset of the cell background color
* ASTableView uses these properties when configuring UITableViewCells that host ASCellNodes.
*/
@property UIColor *cellBackgroundColor;

@end

@interface ASCellNode (Unavailable)
Expand Down
21 changes: 12 additions & 9 deletions Source/ASTableView.mm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,24 +107,27 @@ - (void)setElement:(ASCollectionElement *)element
ASCellNode *node = element.node;

if (node) {
self.backgroundColor = node.backgroundColor;
self.selectedBackgroundView = node.selectedBackgroundView;
self.backgroundView = node.backgroundView;
if (node.cellBackgroundColor != nil) {
self.backgroundColor = node.cellBackgroundColor;
}
if (node.selectedBackgroundView != nil) {
self.selectedBackgroundView = node.selectedBackgroundView;
}
#if TARGET_OS_IOS
self.separatorInset = node.separatorInset;
#endif
self.selectionStyle = node.selectionStyle;
self.selectionStyle = node.selectionStyle;
self.focusStyle = node.focusStyle;
self.accessoryType = node.accessoryType;
self.isAccessibilityElement = node.isAccessibilityElement;
self.accessibilityElementsHidden = node.accessibilityElementsHidden;

if (node.tintColor != nil) {
self.tintColor = node.tintColor;
}

// the following ensures that we clip the entire cell to it's bounds if node.clipsToBounds is set (the default)
// This is actually a workaround for a bug we are seeing in some rare cases (selected background view
// overlaps other cells if size of ASCellNode has changed.)
self.clipsToBounds = node.clipsToBounds;

// If the cell node has been explicitly configured with a tint color, we can apply that directly to the cell view to preserve the previous behavior
self.tintColor = node->_tintColor;
}

[node __setSelectedFromUIKit:self.selected];
Expand Down