TouchInstinct
/
TableKit
312
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TableRowActionData -> TableRowActionOptions

This commit is contained in:
Max Sokolov 2016-10-15 12:16:25 +03:00
parent b449e05edc
commit c3d6f0af60
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Demo/Classes/Presentation/Controllers/MainController.swift
View File

@ -23,9 +23,9 @@ class MainController: UIViewController {
title = "TableKit"
let clickAction = TableRowAction<ConfigurableTableViewCell>(.click) { [weak self] (data) in
let clickAction = TableRowAction<ConfigurableTableViewCell>(.click) { [weak self] (options) in
switch data.indexPath.row {
switch options.indexPath.row {
case 0:
self?.performSegue(withIdentifier: "autolayoutcells", sender: nil)
case 1:
@ -35,9 +35,9 @@ class MainController: UIViewController {
}
}
let printClickAction = TableRowAction<ConfigurableTableViewCell>(.click) { (data) in
let printClickAction = TableRowAction<ConfigurableTableViewCell>(.click) { (options) in
print("click", data.indexPath)
print("click", options.indexPath)
}
let rows = [

4
Sources/TableRow.swift
View File

@ -94,7 +94,7 @@ open class TableRow<CellType: ConfigurableCell>: Row where CellType: UITableView
}
@discardableResult
open func on<T>(_ type: TableRowActionType, handler: @escaping (_ data: TableRowActionData<CellType>) -> T) -> Self {
open func on<T>(_ type: TableRowActionType, handler: @escaping (_ options: TableRowActionOptions<CellType>) -> T) -> Self {
return on(TableRowAction<CellType>(type, handler: handler))
}
@ -124,7 +124,7 @@ open class TableRow<CellType: ConfigurableCell>: Row where CellType: UITableView
@available(*, deprecated, message: "Use 'on' method instead")
@discardableResult
open func action<T>(_ type: TableRowActionType, handler: @escaping (_ data: TableRowActionData<CellType>) -> T) -> Self {
open func action<T>(_ type: TableRowActionType, handler: @escaping (_ options: TableRowActionOptions<CellType>) -> T) -> Self {
return on(TableRowAction<CellType>(type, handler: handler))
}

18
Sources/TableRowAction.swift
View File

@ -20,7 +20,7 @@
import UIKit
open class TableRowActionData<CellType: ConfigurableCell> where CellType: UITableViewCell {
open class TableRowActionOptions<CellType: ConfigurableCell> where CellType: UITableViewCell {
open let item: CellType.T
open let cell: CellType?
@ -38,17 +38,17 @@ open class TableRowActionData<CellType: ConfigurableCell> where CellType: UITabl
private enum TableRowActionHandler<CellType: ConfigurableCell> where CellType: UITableViewCell {
case voidAction((TableRowActionData<CellType>) -> Void)
case action((TableRowActionData<CellType>) -> Any?)
case voidAction((TableRowActionOptions<CellType>) -> Void)
case action((TableRowActionOptions<CellType>) -> Any?)
func invoke(withActionData actionData: TableRowActionData<CellType>) -> Any? {
func invoke(withOptions options: TableRowActionOptions<CellType>) -> Any? {
switch self {
case .voidAction(let handler):
handler(actionData)
handler(options)
return nil
case .action(let handler):
return handler(actionData)
return handler(options)
}
}
}
@ -59,13 +59,13 @@ open class TableRowAction<CellType: ConfigurableCell>: RowAction where CellType:
open let type: TableRowActionType
private let handler: TableRowActionHandler<CellType>
public init(_ type: TableRowActionType, handler: @escaping (_ data: TableRowActionData<CellType>) -> Void) {
public init(_ type: TableRowActionType, handler: @escaping (_ options: TableRowActionOptions<CellType>) -> Void) {
self.type = type
self.handler = .voidAction(handler)
}
public init<T>(_ type: TableRowActionType, handler: @escaping (_ data: TableRowActionData<CellType>) -> T) {
public init<T>(_ type: TableRowActionType, handler: @escaping (_ options: TableRowActionOptions<CellType>) -> T) {
self.type = type
self.handler = .action(handler)
@ -74,6 +74,6 @@ open class TableRowAction<CellType: ConfigurableCell>: RowAction where CellType:
public func invokeActionOn(cell: UITableViewCell?, item: Any, path: IndexPath) -> Any? {
guard let item = item as? CellType.T else { return nil }
return handler.invoke(withActionData: TableRowActionData(item: item, cell: cell as? CellType, path: path, userInfo: nil))
return handler.invoke(withOptions: TableRowActionOptions(item: item, cell: cell as? CellType, path: path, userInfo: nil))
}
}