mbrucedogs/vds_ios
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

removed isUserInteractive to control

Browse Source 
Signed-off-by: Matt Bruce <matt.bruce@verizon.com>
This commit is contained in:
Matt Bruce 2022-08-31 09:06:01 -05:00
parent 126b094178
commit c6ae09f730
5 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
VDS/Components/Checkbox/Checkbox.swift
View File

@ -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()
} }

8
VDS/Components/RadioBox/RadioBox.swift
View File

@ -230,13 +230,6 @@ open class RadioBoxBase<ModelType: RadioBoxModel>: 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 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()
} }

8
VDS/Components/RadioButton/RadioButton.swift
View File

@ -232,13 +232,6 @@ open class RadioButtonBase<ModelType: RadioButtonModel>: Control<ModelType>, Cha
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()
} }

9
VDS/Components/RadioSwatch/RadioSwatch.swift
View File

@ -144,13 +144,6 @@ open class RadioSwatchBase<ModelType: RadioSwatchModel>: Control<ModelType>, Cha
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,12 +161,10 @@ 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
//-------------------------------------------------- //--------------------------------------------------

8
VDS/Components/Toggle/Toggle.swift
View File

@ -333,13 +333,6 @@ open class ToggleBase<ModelType: ToggleModel>: Control<ModelType>, Changable {
} }
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()
} }