Fix merge conflicts

AsyncDisplayKit/ASButtonNode.mm

@@ -21,16 +21,19 @@
   NSAttributedString *_normalAttributedTitle;
   NSAttributedString *_highlightedAttributedTitle;
   NSAttributedString *_selectedAttributedTitle;
+  NSAttributedString *_selectedHighlightedAttributedTitle;
   NSAttributedString *_disabledAttributedTitle;
   
   UIImage *_normalImage;
   UIImage *_highlightedImage;
   UIImage *_selectedImage;
+  UIImage *_selectedHighlightedImage;
   UIImage *_disabledImage;
 
   UIImage *_normalBackgroundImage;
   UIImage *_highlightedBackgroundImage;
   UIImage *_selectedBackgroundImage;
+  UIImage *_selectedHighlightedBackgroundImage;
   UIImage *_disabledBackgroundImage;
 }
 
@@ -54,9 +57,10 @@
     
     _contentSpacing = 8.0;
     _laysOutHorizontally = YES;
-    _contentHorizontalAlignment = ASAlignmentMiddle;
-    _contentVerticalAlignment = ASAlignmentCenter;
+    _contentHorizontalAlignment = ASHorizontalAlignmentMiddle;
+    _contentVerticalAlignment = ASVerticalAlignmentCenter;
     _contentEdgeInsets = UIEdgeInsetsZero;
+    self.accessibilityTraits = UIAccessibilityTraitButton;
   }
   return self;
 }
@@ -66,6 +70,7 @@
   if (!_titleNode) {
     _titleNode = [[ASTextNode alloc] init];
     [_titleNode setLayerBacked:YES];
+    [_titleNode setFlexShrink:YES];
   }
   return _titleNode;
 }
@@ -75,7 +80,6 @@
   if (!_imageNode) {
     _imageNode = [[ASImageNode alloc] init];
     [_imageNode setLayerBacked:YES];
-    [_titleNode setFlexShrink:YES];
   }
   return _imageNode;
 }
@@ -99,6 +103,11 @@
 - (void)setEnabled:(BOOL)enabled
 {
   [super setEnabled:enabled];
+  if (enabled) {
+    self.accessibilityTraits = UIAccessibilityTraitButton;
+  } else {
+    self.accessibilityTraits = UIAccessibilityTraitButton | UIAccessibilityTraitNotEnabled;
+  }
   [self updateButtonContent];
 }
 
@@ -132,10 +141,12 @@
 - (void)updateImage
 {
   ASDN::MutexLocker l(_propertyLock);
-  
+
   UIImage *newImage;
   if (self.enabled == NO && _disabledImage) {
     newImage = _disabledImage;
+  } else if (self.highlighted && self.selected && _selectedHighlightedImage) {
+    newImage = _selectedHighlightedImage;
   } else if (self.highlighted && _highlightedImage) {
     newImage = _highlightedImage;
   } else if (self.selected && _selectedImage) {
@@ -156,6 +167,8 @@
   NSAttributedString *newTitle;
   if (self.enabled == NO && _disabledAttributedTitle) {
     newTitle = _disabledAttributedTitle;
+  } else if (self.highlighted && self.selected && _selectedHighlightedAttributedTitle) {
+    newTitle = _selectedHighlightedAttributedTitle;
   } else if (self.highlighted && _highlightedAttributedTitle) {
     newTitle = _highlightedAttributedTitle;
   } else if (self.selected && _selectedAttributedTitle) {
@@ -163,9 +176,10 @@
   } else {
     newTitle = _normalAttributedTitle;
   }
-  
+
   if ((_titleNode != nil || newTitle.length > 0) && newTitle != self.titleNode.attributedString) {
     _titleNode.attributedString = newTitle;
+    self.accessibilityLabel = _titleNode.accessibilityLabel;
     [self setNeedsLayout];
   }
 }
@@ -177,6 +191,8 @@
   UIImage *newImage;
   if (self.enabled == NO && _disabledBackgroundImage) {
     newImage = _disabledBackgroundImage;
+  } else if (self.highlighted && self.selected && _selectedHighlightedBackgroundImage) {
+    newImage = _selectedHighlightedBackgroundImage;
   } else if (self.highlighted && _highlightedBackgroundImage) {
     newImage = _highlightedBackgroundImage;
   } else if (self.selected && _selectedBackgroundImage) {
@@ -264,8 +280,8 @@
 - (void)setTitle:(NSString *)title withFont:(UIFont *)font withColor:(UIColor *)color forState:(ASControlState)state
 {
   NSDictionary *attributes = @{
-                               NSFontAttributeName: font ? font :[UIFont systemFontOfSize:[UIFont buttonFontSize]],
-                               NSForegroundColorAttributeName : color ? color : [UIColor blackColor]
+                               NSFontAttributeName: font ? : [UIFont systemFontOfSize:[UIFont buttonFontSize]],
+                               NSForegroundColorAttributeName : color ? : [UIColor blackColor]
                                };
     
   NSAttributedString *string = [[NSAttributedString alloc] initWithString:title
@@ -286,6 +302,9 @@
       
     case ASControlStateSelected:
       return _selectedAttributedTitle;
+        
+    case ASControlStateSelected | ASControlStateHighlighted:
+      return _selectedHighlightedAttributedTitle;
       
     case ASControlStateDisabled:
       return _disabledAttributedTitle;
@@ -310,6 +329,10 @@
     case ASControlStateSelected:
       _selectedAttributedTitle = [title copy];
       break;
+          
+    case ASControlStateSelected | ASControlStateHighlighted:
+      _selectedHighlightedAttributedTitle = [title copy];
+      break;
       
     case ASControlStateDisabled:
       _disabledAttributedTitle = [title copy];
@@ -318,6 +341,7 @@
     default:
       break;
   }
+
   [self updateTitle];
 }
 
@@ -334,6 +358,9 @@
     case ASControlStateSelected:
       return _selectedImage;
       
+    case ASControlStateSelected | ASControlStateHighlighted:
+      return _selectedHighlightedImage;
+          
     case ASControlStateDisabled:
       return _disabledImage;
       
@@ -357,7 +384,11 @@
     case ASControlStateSelected:
       _selectedImage = image;
       break;
-      
+    
+    case ASControlStateSelected | ASControlStateHighlighted:
+      _selectedHighlightedImage = image;
+      break;
+          
     case ASControlStateDisabled:
       _disabledImage = image;
       break;
@@ -368,6 +399,30 @@
   [self updateImage];
 }
 
+- (UIImage *)backgroundImageForState:(ASControlState)state
+{
+  ASDN::MutexLocker l(_propertyLock);
+  switch (state) {
+    case ASControlStateNormal:
+      return _normalBackgroundImage;
+    
+    case ASControlStateHighlighted:
+      return _highlightedBackgroundImage;
+    
+    case ASControlStateSelected:
+      return _selectedBackgroundImage;
+    
+    case ASControlStateSelected | ASControlStateHighlighted:
+      return _selectedHighlightedBackgroundImage;
+    
+    case ASControlStateDisabled:
+      return _disabledBackgroundImage;
+    
+    default:
+      return _normalBackgroundImage;
+  }
+}
+
 - (void)setBackgroundImage:(UIImage *)image forState:(ASControlState)state
 {
   ASDN::MutexLocker l(_propertyLock);
@@ -383,6 +438,10 @@
     case ASControlStateSelected:
       _selectedBackgroundImage = image;
       break;
+          
+    case ASControlStateSelected | ASControlStateHighlighted:
+      _selectedHighlightedBackgroundImage = image;
+      break;
       
     case ASControlStateDisabled:
       _disabledBackgroundImage = image;
@@ -394,28 +453,6 @@
   [self updateBackgroundImage];
 }
 
-- (UIImage *)backgroundImageForState:(ASControlState)state
-{
-  ASDN::MutexLocker l(_propertyLock);
-  switch (state) {
-    case ASControlStateNormal:
-      return _normalBackgroundImage;
-      
-    case ASControlStateHighlighted:
-      return _highlightedBackgroundImage;
-      
-    case ASControlStateSelected:
-      return _selectedBackgroundImage;
-      
-    case ASControlStateDisabled:
-      return _disabledBackgroundImage;
-      
-    default:
-      return _normalBackgroundImage;
-  }
-
-}
-
 - (ASLayoutSpec *)layoutSpecThatFits:(ASSizeRange)constrainedSize
 {
   UIEdgeInsets contentEdgeInsets;