reorder control

BlueprintUILists/Sources/ListReorderGesture.swift

@@ -5,6 +5,7 @@
 //  Created by Kyle Van Essen on 11/14/19.
 //
 
+import Accessibility
 import BlueprintUI
 import ListableUI
 import UIKit
@@ -55,7 +56,7 @@ public struct ListReorderGesture : Element
     let actions : ReorderingActions
 
     /// The acccessibility Label of the item that will be reordered.
-    /// This will be set as the gesture's accessibilityValue to provide a richer VoiceOver utterance.
+    /// This will provide a richer VoiceOver utterance useful for disambiguation between items.
     public var reorderItemAccessibilityLabel : String? = nil
 
     /// Creates a new re-order gesture which wraps the provided element.
@@ -66,6 +67,7 @@ public struct ListReorderGesture : Element
         isEnabled : Bool = true,
         actions : ReorderingActions,
         begins: Begins = .onTap,
+        reorderItemAccessibilityLabel: String? = nil,
         wrapping element : Element
     ) {
         self.isEnabled =  isEnabled
@@ -74,6 +76,8 @@ public struct ListReorderGesture : Element
 
         self.begins = begins
 
+        self.reorderItemAccessibilityLabel = reorderItemAccessibilityLabel
+
         self.element = element
     }
 
@@ -88,24 +92,16 @@ public struct ListReorderGesture : Element
     public func backingViewDescription(with context: ViewDescriptionContext) -> ViewDescription?
     {
         return ViewDescription(View.self) { config in
+
             config.builder = {
                 View(frame: context.bounds, wrapping: self)
             }
+            config.contentView = { $0.containerView }
 
             config.apply { view in
-                view.isAccessibilityElement = true
-                view.accessibilityLabel = ListableLocalizedStrings.ReorderGesture.accessibilityLabel
-                view.accessibilityValue = reorderItemAccessibilityLabel
-                view.accessibilityHint = ListableLocalizedStrings.ReorderGesture.accessibilityHint
-                view.accessibilityTraits.formUnion(.button)
-                view.accessibilityCustomActions = accessibilityActions()
-
-                view.recognizer.isEnabled = self.isEnabled
-
-                view.recognizer.apply(actions: self.actions)
-
-                view.recognizer.minimumPressDuration = begins == .onLongPress ? 0.5 : 0.0
+                view.apply(self)
             }
+
         }
     }
 
@@ -118,9 +114,14 @@ public extension Element
     func listReorderGesture(
         with actions : ReorderingActions,
         isEnabled : Bool = true,
-        begins: ListReorderGesture.Begins = .onTap
+        begins: ListReorderGesture.Begins = .onTap,
+        reorderItemAccessibilityLabel: String? = nil
     ) -> Element {
-        ListReorderGesture(isEnabled: isEnabled, actions: actions, begins: begins, wrapping: self)
+        ListReorderGesture(isEnabled: isEnabled,
+                           actions: actions,
+                           begins: begins,
+                           reorderItemAccessibilityLabel: reorderItemAccessibilityLabel,
+                           wrapping: self)
     }
 }
 
@@ -129,25 +130,89 @@ fileprivate extension ListReorderGesture
 {
     private final class View : UIView
     {
+
+        let containerView = UIView()
         let recognizer : ItemReordering.GestureRecognizer
+        private lazy var proxyElement = UIAccessibilityElement(accessibilityContainer: self)
+        private var minimumPressDuration: TimeInterval = 0.0 {
+            didSet {
+                updateGesturePressDuration()
+            }
+        }
+
+        @objc private func updateGesturePressDuration() {
+            self.recognizer.minimumPressDuration = UIAccessibility.isVoiceOverRunning ? 0.0 : self.minimumPressDuration
+        }
 
         init(frame: CGRect, wrapping : ListReorderGesture)
         {
             self.recognizer = .init()
 
             super.init(frame: frame)
-
+            recognizer.accessibilityProxy = proxyElement
+            NotificationCenter.default.addObserver(self, selector: #selector(updateGesturePressDuration) , name: UIAccessibility.voiceOverStatusDidChangeNotification, object: nil)
+
             self.isOpaque = false
             self.clipsToBounds = false
             self.backgroundColor = .clear
 
             self.addGestureRecognizer(self.recognizer)
+
+            self.isAccessibilityElement = false
+
+            containerView.isOpaque = false
+            containerView.backgroundColor = .clear
+            addSubview(containerView)
         }
 
         @available(*, unavailable)
         required init?(coder aDecoder: NSCoder) {
             listableInternalFatal()
         }
+
+        func apply(_ model: ListReorderGesture) {
+            if let itemName = model.reorderItemAccessibilityLabel {
+                proxyElement.accessibilityLabel = String(format: ListableLocalizedStrings.ReorderGesture.accessibilityLabelFormat, itemName)
+            } else {
+                proxyElement.accessibilityLabel = ListableLocalizedStrings.ReorderGesture.accessibilityLabel
+            }
+
+            proxyElement.accessibilityHint = ListableLocalizedStrings.ReorderGesture.accessibilityHint
+            proxyElement.accessibilityTraits.formUnion(.button)
+            proxyElement.accessibilityCustomActions = model.accessibilityActions()
+
+            recognizer.isEnabled = model.isEnabled
+
+            recognizer.apply(actions: model.actions)
+            minimumPressDuration = model.begins == .onLongPress ? 0.5 : 0.0
+        }
+
+        override func layoutSubviews() {
+            super.layoutSubviews()
+            containerView.frame = bounds
+        }
+
+        override func hitTest(_ point: CGPoint, with event: UIEvent?) -> UIView? {
+            if UIAccessibility.isVoiceOverRunning,
+               UIAccessibility.focusedElement(using: .notificationVoiceOver) as? NSObject == proxyElement {
+                // Intercept touch events to avoid activating contained elements.
+                return self
+            }
+
+            return super.hitTest(point, with: event)
+        }
+
+        override var accessibilityElements: [Any]? {
+            get {
+                guard recognizer.isEnabled else { return super.accessibilityElements }
+                proxyElement.accessibilityFrame = self.accessibilityFrame
+                proxyElement.accessibilityActivationPoint = self.accessibilityActivationPoint
+                return [containerView, proxyElement]
+            }
+            set {
+                fatalError("Cannot set accessibility elements directly")
+            }
+        }
     }
 }
 

Demo/Demo.xcodeproj/project.pbxproj

@@ -684,7 +684,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 2HQ24J954F;
+				DEVELOPMENT_TEAM = Y4XC6NM5DD;
 				INFOPLIST_FILE = Demo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
@@ -703,7 +703,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CODE_SIGN_STYLE = Automatic;
-				DEVELOPMENT_TEAM = 2HQ24J954F;
+				DEVELOPMENT_TEAM = Y4XC6NM5DD;
 				INFOPLIST_FILE = Demo/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",

Demo/Sources/Demos/Demo Screens/CollectionViewAppearance.swift

@@ -119,6 +119,65 @@ struct DemoHeader2 : BlueprintHeaderFooterContent, Equatable
 }
 
 
+struct DemoTile : BlueprintItemContent, Equatable, LocalizedCollatableItemContent
+{
+    var text : String
+    var secondaryText: String
+
+    var identifierValue: String {
+        return "\(text) \(secondaryText)"
+    }
+
+    func element(with info : ApplyItemContentInfo) -> Element
+    {
+        Button(onTap:{
+            print("\(text) tapped!")
+        }, wrapping: Row { row in
+            row.verticalAlignment = .center
+
+            row.add(child:
+                Column { col in
+                    col.add(child: Label(text: text) {
+                        $0.font = .systemFont(ofSize: 17.0, weight: .medium)
+                        $0.color = info.state.isActive ? .white : .darkGray
+                    })
+                    col.add(child: Label(text: secondaryText) {
+                        $0.font = .systemFont(ofSize: 12.0, weight: .light)
+                        $0.color = info.state.isActive ? .white : .gray
+                    })
+                }
+                .inset(horizontal: 15.0, vertical: 24.0)
+            )
+        })
+        .accessibilityElement(label: text, value: secondaryText, traits: [.button])
+        .listReorderGesture(with: info.reorderingActions, begins: .onLongPress, reorderItemAccessibilityLabel: text)
+
+
+    }
+
+    func backgroundElement(with info: ApplyItemContentInfo) -> Element?
+    {
+        Box(
+            backgroundColor: info.state.isReordering ? .white(0.8) : .white,
+            cornerStyle: .rounded(radius: 8.0)
+        )
+    }
+
+    func selectedBackgroundElement(with info: ApplyItemContentInfo) -> Element?
+    {
+        Box(
+            backgroundColor: .white(0.2),
+            cornerStyle: .rounded(radius: 8.0),
+            shadowStyle: .simple(radius: 2.0, opacity: 0.15, offset: .init(width: 0.0, height: 1.0), color: .black)
+        )
+    }
+
+    var collationString: String {
+        return "\(text) \(secondaryText)"
+    }
+}
+
+
 struct DemoItem : BlueprintItemContent, Equatable, LocalizedCollatableItemContent
 {
     var text : String
@@ -142,10 +201,11 @@ struct DemoItem : BlueprintItemContent, Equatable, LocalizedCollatableItemConten
 
             if info.isReorderable {
                 row.addFixed(
-                    child: Image(
-                        image: UIImage(named: "ReorderControl"),
-                        contentMode: .center
-                    )
+                    child: 
+                        Image(
+                            image: UIImage(named: "ReorderControl"),
+                            contentMode: .center
+                        )
                         .listReorderGesture(with: info.reorderingActions, begins: requiresLongPress ? .onLongPress : .onTap)
                 )
             }

Demo/Sources/Demos/Demo Screens/ReorderingViewController.swift

@@ -108,5 +108,23 @@ final class ReorderingViewController : ListViewController
                 item.reordering = ItemReordering(sections: .current)
             }
         }
+
+        list += Section("5") { section in
+            section.header = DemoHeader(title: "Tile Section")
+            section.layouts.table.columns = .init(count: 2, spacing: 15.0)
+
+            section += Item(DemoTile(text: "Item 0", secondaryText: "Section 4")) { item in
+                item.reordering = ItemReordering(sections: .current)
+            }
+            section += Item(DemoTile(text: "Item 1", secondaryText: "Section 4")) { item in
+                item.reordering = ItemReordering(sections: .current)
+            }
+            section += Item(DemoTile(text: "Item 2", secondaryText: "Section 4")) { item in
+                item.reordering = ItemReordering(sections: .current)
+            }
+            section += Item(DemoTile(text: "Item 3", secondaryText: "Section 4")) { item in
+                item.reordering = ItemReordering(sections: .current)
+            }
+        }
     }
 }

ListableUI/Sources/Item/ItemReordering.swift

@@ -161,12 +161,16 @@ extension ItemReordering {
         private var onMove : OnMove? = nil
         private var onEnd : OnEnd? = nil
 
+        // If this is set the gesture recognizer will only fire when the accessibilityProxy is selected by voiceover.
+        public var accessibilityProxy: NSObject?
+
         /// Creates a gesture recognizer with the provided target and selector.
         public override init(target: Any?, action: Selector?)
         {
             super.init(target: target, action: action)
 
             self.addTarget(self, action: #selector(updated))
+
             self.minimumPressDuration = 0
         }
 
@@ -206,6 +210,10 @@ extension ItemReordering {
 
         @objc private func updated()
         {
+            guard accessibilityShouldContinue() else {
+                self.state = .cancelled
+                return
+            }
             switch self.state {
             case .possible: break
             case .began:
@@ -228,6 +236,13 @@ extension ItemReordering {
             @unknown default: listableInternalFatal()
             }
         }
+
+        private func accessibilityShouldContinue() -> Bool {
+            guard UIAccessibility.isVoiceOverRunning, let proxy = accessibilityProxy else {
+                return true
+            }
+            return UIAccessibility.focusedElement(using: .notificationVoiceOver) as? NSObject == proxy
+        }
     }
 }
 

ListableUI/Sources/ListableLocalizedStrings.swift

@@ -19,6 +19,12 @@ public struct ListableLocalizedStrings {
                                                                  value: "Reorder",
                                                                  comment: "Accessibility label for the reorder control on an item")
 
+        public static let accessibilityLabelFormat = NSLocalizedString("reorder.AccessibilityLabelFormat",
+                                                                 tableName: nil,
+                                                                 bundle:  .listableUIResources,
+                                                                 value: "Reorder %@",
+                                                                 comment: "Accessibility label for a reorder control with a provided name" )
+
         public static let accessibilityHint = NSLocalizedString("reorder.AccessibilityHint",
                                                                 tableName: nil,
                                                                 bundle:  .listableUIResources,