Skip to content

columnId added to cell config/factory for macOS target #22

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

columnId added to cell config/factory for macOS target #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82c8683
RxTableViewRealmSource +columnId
serg-vinnie Apr 23, 2018
68b9f4c
columnId fixes
serg-vinnie Apr 23, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Example/RxRealmDataSources_MacExample/TableViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class TableViewController: NSViewController {
super.viewDidLoad()

// create data source
let dataSource = RxTableViewRealmDataSource<Lap>(cellIdentifier: "Cell", cellType: NSTableCellView.self) {cell, row, lap in
let dataSource = RxTableViewRealmDataSource<Lap>(cellIdentifier: "Cell", cellType: NSTableCellView.self) {cell, row, columnId, lap in
cell.textField!.stringValue = "\(lap.text)"
}
dataSource.delegate = self
Expand Down
11 changes: 6 additions & 5 deletions Pod/Classes/RxTableViewRealmDataSource.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,8 +121,8 @@ import RxRealm

import Cocoa

public typealias TableCellFactory<E: Object> = (RxTableViewRealmDataSource<E>, NSTableView, Int, E) -> NSTableCellView
public typealias TableCellConfig<E: Object, CellType: NSTableCellView> = (CellType, Int, E) -> Void
public typealias TableCellFactory<E: Object> = (RxTableViewRealmDataSource<E>, NSTableView, Int, String?, E) -> NSTableCellView
public typealias TableCellConfig<E: Object, CellType: NSTableCellView> = (CellType, Int, String?, E) -> Void

open class RxTableViewRealmDataSource<E: Object>: NSObject, NSTableViewDataSource, NSTableViewDelegate {

Expand Down Expand Up @@ -151,9 +151,9 @@ import RxRealm

public init<CellType>(cellIdentifier: String, cellType: CellType.Type, cellConfig: @escaping TableCellConfig<E, CellType>) where CellType: NSTableCellView {
self.cellIdentifier = cellIdentifier
self.cellFactory = { ds, tv, row, model in
self.cellFactory = { ds, tv, row, columnId, model in
let cell = tv.makeView(withIdentifier: NSUserInterfaceItemIdentifier(rawValue: cellIdentifier), owner: tv) as! CellType
cellConfig(cell, row, model)
cellConfig(cell, row, columnId, model)
return cell
}
}
Expand All @@ -164,7 +164,8 @@ import RxRealm
}

public func tableView(_ tableView: NSTableView, viewFor tableColumn: NSTableColumn?, row: Int) -> NSView? {
return cellFactory(self, tableView, row, items![row])
let columnId = tableColumn?.identifier.rawValue
return cellFactory(self, tableView, row, columnId, items![row])
}

// MARK: - Proxy unimplemented data source and delegate methods
Expand Down