Fix iOS 9 finish editing of cell
This commit is contained in:
@@ -288,7 +288,7 @@ extension GroupedDomainEditRow {
|
|||||||
// MARK: Extensions
|
// MARK: Extensions
|
||||||
extension TVCDomains : GroupedDomainEditRow {
|
extension TVCDomains : GroupedDomainEditRow {
|
||||||
override func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
|
override func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
|
||||||
getRowActionsIOS9(indexPath)
|
getRowActionsIOS9(indexPath, tableView)
|
||||||
}
|
}
|
||||||
@available(iOS 11.0, *)
|
@available(iOS 11.0, *)
|
||||||
override func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
|
override func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
|
||||||
@@ -298,7 +298,7 @@ extension TVCDomains : GroupedDomainEditRow {
|
|||||||
|
|
||||||
extension TVCHosts : GroupedDomainEditRow {
|
extension TVCHosts : GroupedDomainEditRow {
|
||||||
override func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
|
override func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
|
||||||
getRowActionsIOS9(indexPath)
|
getRowActionsIOS9(indexPath, tableView)
|
||||||
}
|
}
|
||||||
@available(iOS 11.0, *)
|
@available(iOS 11.0, *)
|
||||||
override func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
|
override func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
|
||||||
|
|||||||
@@ -43,19 +43,6 @@ extension UITableView {
|
|||||||
func safeMoveRow(_ from: Int, to: Int) {
|
func safeMoveRow(_ from: Int, to: Int) {
|
||||||
isFrontmost ? moveRow(at: IndexPath(row: from), to: IndexPath(row: to)) : reloadData()
|
isFrontmost ? moveRow(at: IndexPath(row: from), to: IndexPath(row: to)) : reloadData()
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Scroll table to top (while respecting `contentInset`)
|
|
||||||
func scrollToTop(animated: Bool) {
|
|
||||||
let top: CGFloat
|
|
||||||
if #available(iOS 11.0, *) {
|
|
||||||
top = adjustedContentInset.top
|
|
||||||
} else {
|
|
||||||
top = contentInset.top
|
|
||||||
}
|
|
||||||
if contentOffset.y != -top {
|
|
||||||
setContentOffset(.init(x: 0, y: -top), animated: animated)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -73,10 +60,13 @@ protocol EditableRows {
|
|||||||
}
|
}
|
||||||
|
|
||||||
extension EditableRows where Self: UITableViewDelegate {
|
extension EditableRows where Self: UITableViewDelegate {
|
||||||
func getRowActionsIOS9(_ index: IndexPath) -> [UITableViewRowAction]? {
|
func getRowActionsIOS9(_ index: IndexPath, _ table: UITableView) -> [UITableViewRowAction]? {
|
||||||
let userInfo = editableRowUserInfo(index)
|
let userInfo = editableRowUserInfo(index)
|
||||||
return editableRowActions(index).compactMap { a,t in
|
return editableRowActions(index).compactMap { a,t in
|
||||||
let x = UITableViewRowAction(style: a == .delete ? .destructive : .normal, title: t) { self.editableRowCallback($1, a, userInfo) }
|
let x = UITableViewRowAction(style: a == .delete ? .destructive : .normal, title: t) {
|
||||||
|
self.editableRowCallback($1, a, userInfo)
|
||||||
|
table.isEditing = false
|
||||||
|
}
|
||||||
if let color = editableRowActionColor(index, a) {
|
if let color = editableRowActionColor(index, a) {
|
||||||
x.backgroundColor = color
|
x.backgroundColor = color
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -77,7 +77,7 @@ class TVCPreviousRecords: UITableViewController, EditActionsRemove {
|
|||||||
// MARK: - Editing
|
// MARK: - Editing
|
||||||
|
|
||||||
override func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
|
override func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
|
||||||
getRowActionsIOS9(indexPath)
|
getRowActionsIOS9(indexPath, tableView)
|
||||||
}
|
}
|
||||||
@available(iOS 11.0, *)
|
@available(iOS 11.0, *)
|
||||||
override func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
|
override func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
|
||||||
|
|||||||
@@ -26,7 +26,7 @@ class TVCRecordingDetails: UITableViewController, EditActionsRemove {
|
|||||||
// MARK: - Editing
|
// MARK: - Editing
|
||||||
|
|
||||||
override func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
|
override func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
|
||||||
getRowActionsIOS9(indexPath)
|
getRowActionsIOS9(indexPath, tableView)
|
||||||
}
|
}
|
||||||
@available(iOS 11.0, *)
|
@available(iOS 11.0, *)
|
||||||
override func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
|
override func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
|
||||||
|
|||||||
@@ -64,7 +64,7 @@ class TVCFilter: UITableViewController, EditActionsRemove {
|
|||||||
// MARK: - Editing
|
// MARK: - Editing
|
||||||
|
|
||||||
override func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
|
override func tableView(_ tableView: UITableView, editActionsForRowAt indexPath: IndexPath) -> [UITableViewRowAction]? {
|
||||||
getRowActionsIOS9(indexPath)
|
getRowActionsIOS9(indexPath, tableView)
|
||||||
}
|
}
|
||||||
@available(iOS 11.0, *)
|
@available(iOS 11.0, *)
|
||||||
override func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
|
override func tableView(_ tableView: UITableView, trailingSwipeActionsConfigurationForRowAt indexPath: IndexPath) -> UISwipeActionsConfiguration? {
|
||||||
|
|||||||
Reference in New Issue
Block a user