Merge commit '7621e2f8dec938cf48181c8b10afc9b01f444e68' into beta

submodules/Components/Forms/CreditCardInputComponent/BUILD

@@ -0,0 +1,20 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "CreditCardInputComponent",
+    module_name = "CreditCardInputComponent",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    copts = [
+        "-warnings-as-errors",
+    ],
+    deps = [
+        "//submodules/Display:Display",
+        "//submodules/ComponentFlow:ComponentFlow",
+        "//submodules/Stripe:Stripe",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)

submodules/Components/Forms/CreditCardInputComponent/Sources/CreditCardInputComponent.swift

@@ -0,0 +1,172 @@
+import Foundation
+import UIKit
+import ComponentFlow
+import Display
+import Stripe
+
+public final class CreditCardInputComponent: Component {
+    public enum DataType {
+        case cardNumber
+        case expirationDate
+    }
+    
+    public let dataType: DataType
+    public let text: String
+    public let textColor: UIColor
+    public let errorTextColor: UIColor
+    public let placeholder: String
+    public let placeholderColor: UIColor
+    public let updated: (String) -> Void
+    
+    public init(
+        dataType: DataType,
+        text: String,
+        textColor: UIColor,
+        errorTextColor: UIColor,
+        placeholder: String,
+        placeholderColor: UIColor,
+        updated: @escaping (String) -> Void
+    ) {
+        self.dataType = dataType
+        self.text = text
+        self.textColor = textColor
+        self.errorTextColor = errorTextColor
+        self.placeholder = placeholder
+        self.placeholderColor = placeholderColor
+        self.updated = updated
+    }
+    
+    public static func ==(lhs: CreditCardInputComponent, rhs: CreditCardInputComponent) -> Bool {
+        if lhs.dataType != rhs.dataType {
+            return false
+        }
+        if lhs.text != rhs.text {
+            return false
+        }
+        if lhs.textColor != rhs.textColor {
+            return false
+        }
+        if lhs.errorTextColor != rhs.errorTextColor {
+            return false
+        }
+        if lhs.placeholder != rhs.placeholder {
+            return false
+        }
+        if lhs.placeholderColor != rhs.placeholderColor {
+            return false
+        }
+        return true
+    }
+    
+    public final class View: UIView, STPFormTextFieldDelegate, UITextFieldDelegate {
+        private let textField: STPFormTextField
+        
+        private var component: CreditCardInputComponent?
+        private let viewModel: STPPaymentCardTextFieldViewModel
+        
+        override init(frame: CGRect) {
+            self.textField = STPFormTextField(frame: CGRect())
+            
+            self.viewModel = STPPaymentCardTextFieldViewModel()
+            
+            super.init(frame: frame)
+            
+            self.textField.backgroundColor = .clear
+            self.textField.keyboardType = .phonePad
+            
+            self.textField.formDelegate = self
+            self.textField.validText = true
+            
+            self.addSubview(self.textField)
+        }
+        
+        required init?(coder: NSCoder) {
+            fatalError("init(coder:) has not been implemented")
+        }
+        
+        @objc private func textFieldChanged(_ textField: UITextField) {
+            self.component?.updated(self.textField.text ?? "")
+        }
+        
+        public func formTextFieldDidBackspace(onEmpty formTextField: STPFormTextField) {
+        }
+        
+        public func formTextField(_ formTextField: STPFormTextField, modifyIncomingTextChange input: NSAttributedString) -> NSAttributedString {
+            guard let component = self.component else {
+                return input
+            }
+            
+            switch component.dataType {
+            case .cardNumber:
+                self.viewModel.cardNumber = input.string
+                return NSAttributedString(string: self.viewModel.cardNumber ?? "", attributes: self.textField.defaultTextAttributes)
+            case .expirationDate:
+                self.viewModel.rawExpiration = input.string
+                return NSAttributedString(string: self.viewModel.rawExpiration ?? "", attributes: self.textField.defaultTextAttributes)
+            }
+        }
+        
+        public func formTextFieldTextDidChange(_ textField: STPFormTextField) {
+            guard let component = self.component else {
+                return
+            }
+            
+            component.updated(self.textField.text ?? "")
+            
+            let state: STPCardValidationState
+            switch component.dataType {
+            case .cardNumber:
+                state = self.viewModel.validationState(for: .number)
+            case .expirationDate:
+                state = self.viewModel.validationState(for: .expiration)
+            }
+            self.textField.validText = true
+            switch state {
+            case .invalid:
+                self.textField.validText = false
+            case .incomplete:
+                break
+            case .valid:
+                break
+            @unknown default:
+                break
+            }
+        }
+        
+        func update(component: CreditCardInputComponent, availableSize: CGSize, state: EmptyComponentState, environment: Environment<Empty>, transition: ComponentTransition) -> CGSize {
+            switch component.dataType {
+            case .cardNumber:
+                self.textField.autoFormattingBehavior = .cardNumbers
+            case .expirationDate:
+                self.textField.autoFormattingBehavior = .expiration
+            }
+            
+            self.textField.font = UIFont.systemFont(ofSize: 17.0)
+            self.textField.defaultColor = component.textColor
+            self.textField.errorColor = .red
+            self.textField.placeholderColor = component.placeholderColor
+            
+            if self.textField.text != component.text {
+                self.textField.text = component.text
+            }
+            
+            self.textField.attributedPlaceholder = NSAttributedString(string: component.placeholder, font: self.textField.font, textColor: component.placeholderColor)
+            
+            let size = CGSize(width: availableSize.width, height: 44.0)
+            
+            transition.setFrame(view: self.textField, frame: CGRect(origin: CGPoint(), size: size), completion: nil)
+            
+            self.component = component
+            
+            return size
+        }
+    }
+    
+    public func makeView() -> View {
+        return View(frame: CGRect())
+    }
+    
+    public func update(view: View, availableSize: CGSize, state: EmptyComponentState, environment: Environment<Empty>, transition: ComponentTransition) -> CGSize {
+        return view.update(component: self, availableSize: availableSize, state: state, environment: environment, transition: transition)
+    }
+}

submodules/Components/Forms/PrefixSectionGroupComponent/BUILD

@@ -0,0 +1,19 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "PrefixSectionGroupComponent",
+    module_name = "PrefixSectionGroupComponent",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    copts = [
+        "-warnings-as-errors",
+    ],
+    deps = [
+        "//submodules/Display:Display",
+        "//submodules/ComponentFlow:ComponentFlow",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)

submodules/Components/Forms/PrefixSectionGroupComponent/Sources/PrefixSectionGroupComponent.swift

@@ -0,0 +1,194 @@
+import Foundation
+import UIKit
+import ComponentFlow
+import Display
+
+public final class PrefixSectionGroupComponent: Component {
+    public final class Item: Equatable {
+        public let prefix: AnyComponentWithIdentity<Empty>
+        public let content: AnyComponentWithIdentity<Empty>
+        
+        public init(prefix: AnyComponentWithIdentity<Empty>, content: AnyComponentWithIdentity<Empty>) {
+            self.prefix = prefix
+            self.content = content
+        }
+        
+        public static func ==(lhs: Item, rhs: Item) -> Bool {
+            if lhs.prefix != rhs.prefix {
+                return false
+            }
+            if lhs.content != rhs.content {
+                return false
+            }
+            
+            return true
+        }
+    }
+    
+    public let items: [Item]
+    public let backgroundColor: UIColor
+    public let separatorColor: UIColor
+    
+    public init(
+        items: [Item],
+        backgroundColor: UIColor,
+        separatorColor: UIColor
+    ) {
+        self.items = items
+        self.backgroundColor = backgroundColor
+        self.separatorColor = separatorColor
+    }
+    
+    public static func ==(lhs: PrefixSectionGroupComponent, rhs: PrefixSectionGroupComponent) -> Bool {
+        if lhs.items != rhs.items {
+            return false
+        }
+        if lhs.backgroundColor != rhs.backgroundColor {
+            return false
+        }
+        if lhs.separatorColor != rhs.separatorColor {
+            return false
+        }
+        return true
+    }
+    
+    public final class View: UIView {
+        private let backgroundView: UIView
+        private var itemViews: [AnyHashable: ComponentHostView<Empty>] = [:]
+        private var separatorViews: [UIView] = []
+        
+        override init(frame: CGRect) {
+            self.backgroundView = UIView()
+            
+            super.init(frame: frame)
+            
+            self.addSubview(self.backgroundView)
+            self.backgroundView.layer.cornerRadius = 10.0
+            self.backgroundView.layer.masksToBounds = true
+        }
+        
+        required init?(coder: NSCoder) {
+            fatalError("init(coder:) has not been implemented")
+        }
+        
+        func update(component: PrefixSectionGroupComponent, availableSize: CGSize, state: EmptyComponentState, environment: Environment<Empty>, transition: ComponentTransition) -> CGSize {
+            let spacing: CGFloat = 16.0
+            let sideInset: CGFloat = 16.0
+            
+            self.backgroundView.backgroundColor = component.backgroundColor
+            
+            var size = CGSize(width: availableSize.width, height: 0.0)
+            
+            var validIds: [AnyHashable] = []
+            
+            var maxPrefixSize = CGSize()
+            var prefixItemSizes: [CGSize] = []
+            for item in component.items {
+                validIds.append(item.prefix.id)
+                
+                let itemView: ComponentHostView<Empty>
+                var itemTransition = transition
+                if let current = self.itemViews[item.prefix.id] {
+                    itemView = current
+                } else {
+                    itemTransition = transition.withAnimation(.none)
+                    itemView = ComponentHostView<Empty>()
+                    self.itemViews[item.prefix.id] = itemView
+                    self.addSubview(itemView)
+                }
+                let itemSize = itemView.update(
+                    transition: itemTransition,
+                    component: item.prefix.component,
+                    environment: {},
+                    containerSize: CGSize(width: size.width, height: .greatestFiniteMagnitude)
+                )
+                prefixItemSizes.append(itemSize)
+                maxPrefixSize.width = max(maxPrefixSize.width, itemSize.width)
+                maxPrefixSize.height = max(maxPrefixSize.height, itemSize.height)
+            }
+            
+            var maxContentSize = CGSize()
+            var contentItemSizes: [CGSize] = []
+            for item in component.items {
+                validIds.append(item.content.id)
+                
+                let itemView: ComponentHostView<Empty>
+                var itemTransition = transition
+                if let current = self.itemViews[item.content.id] {
+                    itemView = current
+                } else {
+                    itemTransition = transition.withAnimation(.none)
+                    itemView = ComponentHostView<Empty>()
+                    self.itemViews[item.content.id] = itemView
+                    self.addSubview(itemView)
+                }
+                let itemSize = itemView.update(
+                    transition: itemTransition,
+                    component: item.content.component,
+                    environment: {},
+                    containerSize: CGSize(width: size.width - maxPrefixSize.width - sideInset - spacing, height: .greatestFiniteMagnitude)
+                )
+                contentItemSizes.append(itemSize)
+                maxContentSize.width = max(maxContentSize.width, itemSize.width)
+                maxContentSize.height = max(maxContentSize.height, itemSize.height)
+            }
+            
+            for i in 0 ..< component.items.count {
+                let itemSize = CGSize(width: size.width, height: max(prefixItemSizes[i].height, contentItemSizes[i].height))
+                let itemFrame = CGRect(origin: CGPoint(x: 0.0, y: size.height), size: itemSize)
+                
+                let prefixView = itemViews[component.items[i].prefix.id]!
+                let contentView = itemViews[component.items[i].content.id]!
+                
+                prefixView.frame = CGRect(origin: CGPoint(x: sideInset, y: itemFrame.minY + floor((itemFrame.height - prefixItemSizes[i].height) / 2.0)), size: prefixItemSizes[i])
+                
+                contentView.frame = CGRect(origin: CGPoint(x: itemFrame.minX + sideInset + maxPrefixSize.width + spacing, y: itemFrame.minY + floor((itemFrame.height - contentItemSizes[i].height) / 2.0)), size: contentItemSizes[i])
+                
+                size.height += itemSize.height
+                
+                if i != component.items.count - 1 {
+                    let separatorView: UIView
+                    if self.separatorViews.count > i {
+                        separatorView = self.separatorViews[i]
+                    } else {
+                        separatorView = UIView()
+                        self.separatorViews.append(separatorView)
+                        self.addSubview(separatorView)
+                    }
+                    separatorView.backgroundColor = component.separatorColor
+                    separatorView.frame = CGRect(origin: CGPoint(x: itemFrame.minX + sideInset, y: itemFrame.maxY), size: CGSize(width: itemFrame.width - sideInset, height: UIScreenPixel))
+                }
+            }
+            
+            var removeIds: [AnyHashable] = []
+            for (id, itemView) in self.itemViews {
+                if !validIds.contains(id) {
+                    removeIds.append(id)
+                    itemView.removeFromSuperview()
+                }
+            }
+            for id in removeIds {
+                self.itemViews.removeValue(forKey: id)
+            }
+            
+            if self.separatorViews.count > component.items.count - 1 {
+                for i in (component.items.count - 1) ..< self.separatorViews.count {
+                    self.separatorViews[i].removeFromSuperview()
+                }
+                self.separatorViews.removeSubrange((component.items.count - 1) ..< self.separatorViews.count)
+            }
+            
+            transition.setFrame(view: self.backgroundView, frame: CGRect(origin: CGPoint(), size: size), completion: nil)
+            
+            return size
+        }
+    }
+    
+    public func makeView() -> View {
+        return View(frame: CGRect())
+    }
+    
+    public func update(view: View, availableSize: CGSize, state: EmptyComponentState, environment: Environment<Empty>, transition: ComponentTransition) -> CGSize {
+        return view.update(component: self, availableSize: availableSize, state: state, environment: environment, transition: transition)
+    }
+}

submodules/Components/Forms/TextInputComponent/BUILD

@@ -0,0 +1,19 @@
+load("@build_bazel_rules_swift//swift:swift.bzl", "swift_library")
+
+swift_library(
+    name = "TextInputComponent",
+    module_name = "TextInputComponent",
+    srcs = glob([
+        "Sources/**/*.swift",
+    ]),
+    copts = [
+        "-warnings-as-errors",
+    ],
+    deps = [
+        "//submodules/Display:Display",
+        "//submodules/ComponentFlow:ComponentFlow",
+    ],
+    visibility = [
+        "//visibility:public",
+    ],
+)

submodules/Components/Forms/TextInputComponent/Sources/TextInputComponent.swift

@@ -0,0 +1,86 @@
+import Foundation
+import UIKit
+import ComponentFlow
+import Display
+
+public final class TextInputComponent: Component {
+    public let text: String
+    public let textColor: UIColor
+    public let placeholder: String
+    public let placeholderColor: UIColor
+    public let updated: (String) -> Void
+    
+    public init(
+        text: String,
+        textColor: UIColor,
+        placeholder: String,
+        placeholderColor: UIColor,
+        updated: @escaping (String) -> Void
+    ) {
+        self.text = text
+        self.textColor = textColor
+        self.placeholder = placeholder
+        self.placeholderColor = placeholderColor
+        self.updated = updated
+    }
+    
+    public static func ==(lhs: TextInputComponent, rhs: TextInputComponent) -> Bool {
+        if lhs.text != rhs.text {
+            return false
+        }
+        if lhs.textColor != rhs.textColor {
+            return false
+        }
+        if lhs.placeholder != rhs.placeholder {
+            return false
+        }
+        if lhs.placeholderColor != rhs.placeholderColor {
+            return false
+        }
+        return true
+    }
+    
+    public final class View: UITextField, UITextFieldDelegate {
+        private var component: TextInputComponent?
+        
+        override init(frame: CGRect) {
+            super.init(frame: frame)
+            
+            self.delegate = self
+            self.addTarget(self, action: #selector(self.textFieldChanged(_:)), for: .editingChanged)
+        }
+        
+        required init?(coder: NSCoder) {
+            fatalError("init(coder:) has not been implemented")
+        }
+        
+        @objc private func textFieldChanged(_ textField: UITextField) {
+            self.component?.updated(self.text ?? "")
+        }
+        
+        func update(component: TextInputComponent, availableSize: CGSize, state: EmptyComponentState, environment: Environment<Empty>, transition: ComponentTransition) -> CGSize {
+            self.font = UIFont.systemFont(ofSize: 17.0)
+            self.textColor = component.textColor
+            
+            if self.text != component.text {
+                self.text = component.text
+            }
+            
+            self.attributedPlaceholder = NSAttributedString(string: component.placeholder, font: self.font, textColor: component.placeholderColor)
+            
+            let size = CGSize(width: availableSize.width, height: 44.0)
+            
+            self.component = component
+            
+            return size
+        }
+    }
+    
+    public func makeView() -> View {
+        return View(frame: CGRect())
+    }
+    
+    public func update(view: View, availableSize: CGSize, state: EmptyComponentState, environment: Environment<Empty>, transition: ComponentTransition) -> CGSize {
+        return view.update(component: self, availableSize: availableSize, state: state, environment: environment, transition: transition)
+    }
+}