From 5c753878a54d6f7312380583ed57a1cde6d28c25 Mon Sep 17 00:00:00 2001
From: Serg <redetection@gmail.com>
Date: Fri, 2 Feb 2018 15:21:32 +0700
Subject: [PATCH 1/2] add test for content view in action sheet

---
 Example/Base.lproj/Main.storyboard            | 19 ++++++++++++++++++-
 Example/TestsViewController.swift             | 15 +++++++++++++++
 .../SDCAlertView_UI_Tests.swift               |  7 +++++++
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/Example/Base.lproj/Main.storyboard b/Example/Base.lproj/Main.storyboard
index 826e5410..9c4fe640 100644
--- a/Example/Base.lproj/Main.storyboard
+++ b/Example/Base.lproj/Main.storyboard
@@ -486,7 +486,24 @@ running Xcode 7's UI tests</string>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="1 button with accessibility identifier (actionSheet)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="gd0-3a-OKQ">
-                                                    <rect key="frame" x="16" y="0.0" width="289" height="43.5"/>
+                                                    <rect key="frame" x="16" y="0.0" width="288" height="43.5"/>
+                                                    <autoresizingMask key="autoresizingMask"/>
+                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                    <nil key="textColor"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
+                                            </subviews>
+                                        </tableViewCellContentView>
+                                    </tableViewCell>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" textLabel="F6m-rP-ePd" style="IBUITableViewCellStyleDefault" id="hv8-gm-oYG">
+                                        <rect key="frame" x="0.0" y="545" width="320" height="44"/>
+                                        <autoresizingMask key="autoresizingMask"/>
+                                        <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="hv8-gm-oYG" id="3Ix-Zc-CkQ">
+                                            <rect key="frame" x="0.0" y="0.0" width="320" height="43.5"/>
+                                            <autoresizingMask key="autoresizingMask"/>
+                                            <subviews>
+                                                <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="action sheet custom view" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="F6m-rP-ePd">
+                                                    <rect key="frame" x="16" y="0.0" width="288" height="43.5"/>
                                                     <autoresizingMask key="autoresizingMask"/>
                                                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
                                                     <nil key="textColor"/>
diff --git a/Example/TestsViewController.swift b/Example/TestsViewController.swift
index 04150f5c..0acd41f5 100644
--- a/Example/TestsViewController.swift
+++ b/Example/TestsViewController.swift
@@ -78,6 +78,21 @@ class TestsViewController: UITableViewController {
                 alert.addAction(action)
                 alert.present()
             
+            case 11:
+                let alert = AlertController(title: "Title", message: "Message", preferredStyle: .actionSheet)
+                let contentView = alert.contentView
+                let spinner = UIActivityIndicatorView(activityIndicatorStyle: .gray)
+                spinner.translatesAutoresizingMaskIntoConstraints = false
+                spinner.startAnimating()
+                contentView.addSubview(spinner)
+                spinner.centerXAnchor.constraint(equalTo: contentView.centerXAnchor).isActive = true
+                spinner.topAnchor.constraint(equalTo: contentView.topAnchor).isActive = true
+                spinner.bottomAnchor.constraint(equalTo: contentView.bottomAnchor).isActive = true
+                let action = AlertAction(title: "Cancel", style: .normal)
+                action.accessibilityIdentifier = "cancel"
+                alert.addAction(action)
+                alert.present()
+            
             default: break
         }
     }
diff --git a/SDCAlertView UI Tests/SDCAlertView_UI_Tests.swift b/SDCAlertView UI Tests/SDCAlertView_UI_Tests.swift
index 4b801d92..f4961892 100644
--- a/SDCAlertView UI Tests/SDCAlertView_UI_Tests.swift	
+++ b/SDCAlertView UI Tests/SDCAlertView_UI_Tests.swift	
@@ -138,4 +138,11 @@ class SDCAlertView_UI_Tests: XCTestCase {
         XCTAssertTrue(buttonWithIdentifier("button").exists)
         self.tapButtonWithIdentifier("button")
     }
+
+    func testActionSheetWithCustomView() {
+        self.showAlertAtIndex(11)
+        XCTAssertTrue(XCUIApplication().activityIndicators["In progress"].exists)
+        XCTAssertTrue(buttonWithIdentifier("button").exists)
+        self.tapButtonWithIdentifier("cancel")
+    }
 }

From 4434713eef6c193e69e4f9bfb3b97eefe23fae04 Mon Sep 17 00:00:00 2001
From: Serg <redetection@gmail.com>
Date: Fri, 2 Feb 2018 15:46:37 +0700
Subject: [PATCH 2/2] fix missing contentView

---
 Source/Views/ActionSheetView.swift | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Source/Views/ActionSheetView.swift b/Source/Views/ActionSheetView.swift
index 4c0b74dd..8652ed84 100644
--- a/Source/Views/ActionSheetView.swift
+++ b/Source/Views/ActionSheetView.swift
@@ -63,6 +63,7 @@ final class ActionSheetView: UIView, AlertControllerViewRepresentable {
         let noTextProvided = self.title?.string.isEmpty != false && self.message?.string.isEmpty != false
         let contentViewProvided = self.contentView.subviews.count > 0
         self.labelsContainer.isHidden = noTextProvided || contentViewProvided
+        self.contentView.isHidden = !contentViewProvided
     }
 
     func addDragTapBehavior() {