removed isUserInteractive to control
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
parent
126b094178
commit
c6ae09f730
@ -231,13 +231,6 @@ open class CheckboxBase<ModelType: CheckboxModel>: Control<ModelType>, Changable
|
|||||||
onChange?()
|
onChange?()
|
||||||
}
|
}
|
||||||
|
|
||||||
override open func accessibilityActivate() -> Bool {
|
|
||||||
// Hold state in case User wanted isAnimated to remain off.
|
|
||||||
guard isUserInteractionEnabled else { return false }
|
|
||||||
sendActions(for: .touchUpInside)
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - State
|
// MARK: - State
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
@ -261,7 +254,6 @@ open class CheckboxBase<ModelType: CheckboxModel>: Control<ModelType>, Changable
|
|||||||
setAccessibilityHint(enabled)
|
setAccessibilityHint(enabled)
|
||||||
setAccessibilityValue(viewModel.selected)
|
setAccessibilityValue(viewModel.selected)
|
||||||
setAccessibilityLabel(viewModel.selected)
|
setAccessibilityLabel(viewModel.selected)
|
||||||
isUserInteractionEnabled = !viewModel.disabled
|
|
||||||
setNeedsLayout()
|
setNeedsLayout()
|
||||||
layoutIfNeeded()
|
layoutIfNeeded()
|
||||||
}
|
}
|
||||||
|
|||||||
@ -229,13 +229,6 @@ open class RadioBoxBase<ModelType: RadioBoxModel>: Control<ModelType>, Changable
|
|||||||
sendActions(for: .valueChanged)
|
sendActions(for: .valueChanged)
|
||||||
onChange?()
|
onChange?()
|
||||||
}
|
}
|
||||||
|
|
||||||
override open func accessibilityActivate() -> Bool {
|
|
||||||
// Hold state in case User wanted isAnimated to remain off.
|
|
||||||
guard isUserInteractionEnabled else { return false }
|
|
||||||
sendActions(for: .touchUpInside)
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - State
|
// MARK: - State
|
||||||
@ -261,7 +254,6 @@ open class RadioBoxBase<ModelType: RadioBoxModel>: Control<ModelType>, Changable
|
|||||||
setAccessibilityHint(enabled)
|
setAccessibilityHint(enabled)
|
||||||
setAccessibilityValue(viewModel.selected)
|
setAccessibilityValue(viewModel.selected)
|
||||||
setAccessibilityLabel(viewModel.selected)
|
setAccessibilityLabel(viewModel.selected)
|
||||||
isUserInteractionEnabled = !viewModel.disabled
|
|
||||||
setNeedsLayout()
|
setNeedsLayout()
|
||||||
layoutIfNeeded()
|
layoutIfNeeded()
|
||||||
}
|
}
|
||||||
|
|||||||
@ -231,14 +231,7 @@ open class RadioButtonBase<ModelType: RadioButtonModel>: Control<ModelType>, Cha
|
|||||||
sendActions(for: .valueChanged)
|
sendActions(for: .valueChanged)
|
||||||
onChange?()
|
onChange?()
|
||||||
}
|
}
|
||||||
|
|
||||||
override open func accessibilityActivate() -> Bool {
|
|
||||||
// Hold state in case User wanted isAnimated to remain off.
|
|
||||||
guard isUserInteractionEnabled else { return false }
|
|
||||||
sendActions(for: .touchUpInside)
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - State
|
// MARK: - State
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
@ -262,7 +255,6 @@ open class RadioButtonBase<ModelType: RadioButtonModel>: Control<ModelType>, Cha
|
|||||||
setAccessibilityHint(enabled)
|
setAccessibilityHint(enabled)
|
||||||
setAccessibilityValue(viewModel.selected)
|
setAccessibilityValue(viewModel.selected)
|
||||||
setAccessibilityLabel(viewModel.selected)
|
setAccessibilityLabel(viewModel.selected)
|
||||||
isUserInteractionEnabled = !viewModel.disabled
|
|
||||||
setNeedsLayout()
|
setNeedsLayout()
|
||||||
layoutIfNeeded()
|
layoutIfNeeded()
|
||||||
}
|
}
|
||||||
|
|||||||
@ -143,13 +143,6 @@ open class RadioSwatchBase<ModelType: RadioSwatchModel>: Control<ModelType>, Cha
|
|||||||
sendActions(for: .valueChanged)
|
sendActions(for: .valueChanged)
|
||||||
onChange?()
|
onChange?()
|
||||||
}
|
}
|
||||||
|
|
||||||
override open func accessibilityActivate() -> Bool {
|
|
||||||
// Hold state in case User wanted isAnimated to remain off.
|
|
||||||
guard isUserInteractionEnabled else { return false }
|
|
||||||
sendActions(for: .touchUpInside)
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - State
|
// MARK: - State
|
||||||
@ -168,11 +161,9 @@ open class RadioSwatchBase<ModelType: RadioSwatchModel>: Control<ModelType>, Cha
|
|||||||
setAccessibilityHint(enabled)
|
setAccessibilityHint(enabled)
|
||||||
setAccessibilityValue(viewModel.selected)
|
setAccessibilityValue(viewModel.selected)
|
||||||
setAccessibilityLabel(viewModel.selected)
|
setAccessibilityLabel(viewModel.selected)
|
||||||
//isUserInteractionEnabled = !viewModel.disabled
|
|
||||||
setNeedsLayout()
|
setNeedsLayout()
|
||||||
layoutIfNeeded()
|
layoutIfNeeded()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - Configuration Properties
|
// MARK: - Configuration Properties
|
||||||
|
|||||||
@ -332,14 +332,7 @@ open class ToggleBase<ModelType: ToggleModel>: Control<ModelType>, Changable {
|
|||||||
sendActions(for: .touchUpInside)
|
sendActions(for: .touchUpInside)
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override open func accessibilityActivate() -> Bool {
|
|
||||||
// Hold state in case User wanted isAnimated to remain off.
|
|
||||||
guard isUserInteractionEnabled else { return false }
|
|
||||||
sendActions(for: .touchUpInside)
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
// MARK: - State
|
// MARK: - State
|
||||||
//--------------------------------------------------
|
//--------------------------------------------------
|
||||||
@ -357,7 +350,6 @@ open class ToggleBase<ModelType: ToggleModel>: Control<ModelType>, Changable {
|
|||||||
setAccessibilityValue(viewModel.on)
|
setAccessibilityValue(viewModel.on)
|
||||||
setAccessibilityLabel(viewModel.on)
|
setAccessibilityLabel(viewModel.on)
|
||||||
backgroundColor = viewModel.surface.color
|
backgroundColor = viewModel.surface.color
|
||||||
isUserInteractionEnabled = !viewModel.disabled
|
|
||||||
setNeedsLayout()
|
setNeedsLayout()
|
||||||
layoutIfNeeded()
|
layoutIfNeeded()
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user