Fix scrollable bounds

Author: cemolcay

DragMenuPicker/Base.lproj/Main.storyboard

@@ -12,7 +12,7 @@
         <!--View Controller-->
         <scene sceneID="tne-QT-ifu">
             <objects>
-                <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="DragSwitchControl" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController id="BYZ-38-t0r" customClass="ViewController" customModule="DragMenuPicker" customModuleProvider="target" sceneMemberID="viewController">
                     <layoutGuides>
                         <viewControllerLayoutGuide type="top" id="y3c-jy-aDJ"/>
                         <viewControllerLayoutGuide type="bottom" id="wfy-db-euE"/>
@@ -24,12 +24,12 @@
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AYI-DX-rrd">
                                 <rect key="frame" x="0.0" y="20" width="375" height="647"/>
                                 <subviews>
-                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tIf-g9-hPg" customClass="DragMenuPicker" customModule="DragSwitchControl" customModuleProvider="target">
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="tIf-g9-hPg" customClass="DragMenuPicker" customModule="DragMenuPicker" customModuleProvider="target">
                                         <rect key="frame" x="24" y="171" width="134" height="45"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                     </view>
-                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jvk-lC-uRI" customClass="DragMenuPicker" customModule="DragSwitchControl" customModuleProvider="target">
+                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jvk-lC-uRI" customClass="DragMenuPicker" customModule="DragMenuPicker" customModuleProvider="target">
                                         <rect key="frame" x="24" y="301" width="134" height="45"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>

DragMenuPicker/DragMenuPicker.swift

@@ -118,6 +118,7 @@ public class DragMenuView: UIView {
   ///   - applyStyle: Style drag menu and its every item with this optional function.
   public init(items: [String], initalSelection: Int, estimatedItemSize: CGFloat, controlBounds: CGRect, direction: DragMenuDirection, margins: CGFloat, backgroundColor: UIColor, highlightedColor: UIColor, textColor: UIColor, highlightedTextColor: UIColor, font: UIFont, applyStyle: DragMenuApplyStyleAction? = nil) {
     self.direction = direction
+    print(controlBounds)
     super.init(frame: CGRect(
       x: direction == .horizontal ? -controlBounds.minX + margins : 0,
       y: direction == .horizontal ? 0 : -controlBounds.minY + margins,
@@ -134,7 +135,7 @@ public class DragMenuView: UIView {
     menuView.backgroundColor = backgroundColor
     menuView.frame = CGRect(
       x: direction == .horizontal ? -(CGFloat(initalSelection) * estimatedItemSize) + controlBounds.minX : 0,
-      y: direction == .horizontal ? 0 : -(CGFloat(initalSelection) * estimatedItemSize) + controlBounds.minY - (controlBounds.size.height / 2),
+      y: direction == .horizontal ? 0 : -(CGFloat(initalSelection) * estimatedItemSize) + controlBounds.minY - margins,
       width: direction == .horizontal ? CGFloat(items.count) * estimatedItemSize : controlBounds.width,
       height: direction == .horizontal ? controlBounds.height : CGFloat(items.count) * estimatedItemSize)
 
@@ -153,7 +154,7 @@ public class DragMenuView: UIView {
       itemView.font = font
       self.items.append(itemView)
       menuView.addSubview(itemView)
-
+      itemView.debugLayer(color: .green)
       applyStyle?(self, itemView)
     }
   }
@@ -174,7 +175,9 @@ public class DragMenuView: UIView {
   /// - Parameter location: Current position of touch on drag menu.
   public func updateMenu(for position: CGPoint) {
     // Check if menu is scrollable
-    if menuView.frame.width > frame.width || menuView.frame.height > frame.height {
+    let scrollable = (menuView.frame.minX < 0 || menuView.frame.maxX > frame.size.width) || // check horizontal scrollable bounds
+      (menuView.frame.minY < 0 || menuView.frame.maxY > frame.size.height) // check vertical scrollable bounds
+    if scrollable {
       // Update menu position
       switch direction {
       case .horizontal:
@@ -380,7 +383,8 @@ public class DragMenuView: UIView {
   public override func touchesMoved(_ touches: Set<UITouch>, with event: UIEvent?) {
     guard isOpen,
       let dragMenu = dragMenu,
-      let touchLocation = touches.first?.location(in: dragMenu) else { return }
+      let touchLocation = touches.first?.location(in: dragMenu)
+    else { return }
     dragMenu.updateMenu(for: touchLocation)
   }
 

DragMenuPicker/ViewController.swift

@@ -28,6 +28,7 @@ class ViewController: UIViewController, DragMenuViewDelegate {
     horizontalDragPicker?.didSelectItem = { item, index in
       print("\(item) selected at index \(index)")
     }
+    horizontalDragPicker?.debugLayer()
 
     // VerticalDragPicker
     verticalDragPicker?.title = "Vertical Picker"
@@ -38,6 +39,7 @@ class ViewController: UIViewController, DragMenuViewDelegate {
     verticalDragPicker?.didSelectItem = { item, index in
       print("\(item) selected at index \(index)")
     }
+    verticalDragPicker?.debugLayer()
   }
 
   // MARK: DragMenuViewDelegate