Fix for CXTDT-586383, adding none style for line for Table component alone for testing
This commit is contained in:
parent
652d5aab22
commit
30f5a4d48c
@ -10,6 +10,23 @@ import VDS
|
|||||||
import UIKit
|
import UIKit
|
||||||
import VDSCoreTokens
|
import VDSCoreTokens
|
||||||
|
|
||||||
|
enum TableLineStyle: String, CaseIterable {
|
||||||
|
case none
|
||||||
|
case primary
|
||||||
|
case secondary
|
||||||
|
|
||||||
|
func lineStyle() -> Line.Style? {
|
||||||
|
switch self {
|
||||||
|
case .primary:
|
||||||
|
return Line.Style.primary
|
||||||
|
case .secondary:
|
||||||
|
return Line.Style.secondary
|
||||||
|
case .none:
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
class TableViewController: BaseViewController<Table> {
|
class TableViewController: BaseViewController<Table> {
|
||||||
|
|
||||||
var striped = Toggle()
|
var striped = Toggle()
|
||||||
@ -21,11 +38,11 @@ class TableViewController: BaseViewController<Table> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
lazy var headerLineStylePicker = {
|
lazy var headerLineStylePicker = {
|
||||||
PickerSelectorView(title: "primary", picker: self.picker, items: Line.Style.allCases)
|
PickerSelectorView(title: "primary", picker: self.picker, items: TableLineStyle.allCases)
|
||||||
}()
|
}()
|
||||||
|
|
||||||
lazy var rowLineStylePicker = {
|
lazy var rowLineStylePicker = {
|
||||||
PickerSelectorView(title: "secondary", picker: self.picker, items: Line.Style.allCases)
|
PickerSelectorView(title: "secondary", picker: self.picker, items: TableLineStyle.allCases)
|
||||||
}()
|
}()
|
||||||
|
|
||||||
lazy var paddingPicker = {
|
lazy var paddingPicker = {
|
||||||
@ -56,15 +73,15 @@ class TableViewController: BaseViewController<Table> {
|
|||||||
striped.onChange = { [weak self] sender in
|
striped.onChange = { [weak self] sender in
|
||||||
self?.component.striped = sender.isOn
|
self?.component.striped = sender.isOn
|
||||||
|
|
||||||
let headerStyle = sender.isOn ? nil : Line.Style(rawValue: self?.headerLineStylePicker.text ?? "")
|
let headerStyle = sender.isOn ? nil : TableLineStyle(rawValue: self?.headerLineStylePicker.text ?? "")
|
||||||
let rowStyle = sender.isOn ? nil : Line.Style(rawValue: self?.rowLineStylePicker.text ?? "")
|
let rowStyle = sender.isOn ? nil : TableLineStyle(rawValue: self?.rowLineStylePicker.text ?? "")
|
||||||
|
|
||||||
var headers = self?.component.tableHeader ?? [TableRowModel]()
|
var headers = self?.component.tableHeader ?? [TableRowModel]()
|
||||||
self?.updateBottomLineStyle(items:&headers, style: headerStyle)
|
self?.updateBottomLineStyle(items:&headers, style: headerStyle?.lineStyle())
|
||||||
self?.component.tableHeader = headers
|
self?.component.tableHeader = headers
|
||||||
|
|
||||||
var rows = self?.component.tableRows ?? [TableRowModel]()
|
var rows = self?.component.tableRows ?? [TableRowModel]()
|
||||||
self?.updateBottomLineStyle(items:&rows, style: rowStyle)
|
self?.updateBottomLineStyle(items:&rows, style: rowStyle?.lineStyle()CXTDT-586383)
|
||||||
self?.component.tableRows = rows
|
self?.component.tableRows = rows
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -93,14 +110,14 @@ class TableViewController: BaseViewController<Table> {
|
|||||||
|
|
||||||
headerLineStylePicker.onPickerDidSelect = { [weak self] item in
|
headerLineStylePicker.onPickerDidSelect = { [weak self] item in
|
||||||
var headers = self?.component.tableHeader ?? [TableRowModel]()
|
var headers = self?.component.tableHeader ?? [TableRowModel]()
|
||||||
self?.updateBottomLineStyle(items:&headers, style: item)
|
self?.updateBottomLineStyle(items:&headers, style: item.lineStyle())
|
||||||
self?.component.tableHeader = headers
|
self?.component.tableHeader = headers
|
||||||
}
|
}
|
||||||
|
|
||||||
rowLineStylePicker.onPickerDidSelect = { [weak self] item in
|
rowLineStylePicker.onPickerDidSelect = { [weak self] item in
|
||||||
|
|
||||||
var rows = self?.component.tableRows ?? [TableRowModel]()
|
var rows = self?.component.tableRows ?? [TableRowModel]()
|
||||||
self?.updateBottomLineStyle(items:&rows, style: item)
|
self?.updateBottomLineStyle(items:&rows, style: item.lineStyle())
|
||||||
self?.component.tableRows = rows
|
self?.component.tableRows = rows
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user