Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"type": "prerelease",
"comment": "[Fabric] Raising UIA Event if Toggle State Changes in Switch Component",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#include <Fabric/AbiViewProps.h>
#include "CompositionDynamicAutomationProvider.h"
#include "RootComponentView.h"
#include "UiaHelpers.h"

namespace winrt::Microsoft::ReactNative::Composition::implementation {

Expand Down Expand Up @@ -74,6 +75,7 @@ void SwitchComponentView::updateProps(
*std::static_pointer_cast<const facebook::react::SwitchProps>(oldProps ? oldProps : viewProps());
const auto &newViewProps = *std::static_pointer_cast<const facebook::react::SwitchProps>(props);

m_localToggleState = newViewProps.value;
if (oldViewProps.backgroundColor != newViewProps.backgroundColor ||
oldViewProps.thumbTintColor != newViewProps.thumbTintColor || oldViewProps.value != newViewProps.value ||
oldViewProps.disabled != newViewProps.disabled) {
Expand Down Expand Up @@ -319,10 +321,17 @@ bool SwitchComponentView::toggle() noexcept {
auto switchEventEmitter = std::static_pointer_cast<facebook::react::SwitchEventEmitter const>(m_eventEmitter);

facebook::react::SwitchEventEmitter::OnChange args;
args.value = !(switchProps().value);
m_localToggleState = args.value = !(switchProps().value);
args.target = Tag();

switchEventEmitter->onChange(args);
if (UiaClientsAreListening()) {
winrt::Microsoft::ReactNative::implementation::UpdateUiaProperty(
EnsureUiaProvider(),
UIA_ToggleToggleStatePropertyId,
m_localToggleState ? ToggleState_Off : ToggleState_On,
m_localToggleState ? ToggleState_On : ToggleState_Off);
}
return true;
}

Expand All @@ -341,7 +350,7 @@ const facebook::react::SwitchProps &SwitchComponentView::switchProps() const noe

// getToggleState method for IToggleProvider
ToggleState SwitchComponentView::getToggleState() noexcept {
if (switchProps().value) {
if (m_localToggleState) {
return ToggleState::ToggleState_On;
} else {
return ToggleState::ToggleState_Off;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ struct SwitchComponentView : SwitchComponentViewT<SwitchComponentView, ViewCompo
void updateVisuals() noexcept;

bool m_hovered{false};
bool m_localToggleState{false}; // Add this to track immediate toggle state
bool m_pressed{false};
bool m_supressAnimationForNextFrame{false};
bool m_visualUpdateRequired{true};
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,15 @@ void UpdateUiaProperty(winrt::IInspectable provider, PROPERTYID propId, bool old
UiaRaiseAutomationPropertyChangedEvent(spProviderSimple.get(), propId, CComVariant(oldValue), CComVariant(newValue));
}

void UpdateUiaProperty(winrt::IInspectable provider, PROPERTYID propId, int oldValue, int newValue) noexcept {
auto spProviderSimple = provider.try_as<IRawElementProviderSimple>();

if (spProviderSimple == nullptr || oldValue == newValue || !WasUiaPropertyAdvised(spProviderSimple, propId))
return;

UiaRaiseAutomationPropertyChangedEvent(spProviderSimple.get(), propId, CComVariant(oldValue), CComVariant(newValue));
}

void UpdateUiaProperty(
winrt::IInspectable provider,
PROPERTYID propId,
Expand Down
6 changes: 6 additions & 0 deletions vnext/Microsoft.ReactNative/Fabric/Composition/UiaHelpers.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,12 @@ void UpdateUiaProperty(
bool oldValue,
bool newValue) noexcept;

void UpdateUiaProperty(
winrt::Windows::Foundation::IInspectable provider,
PROPERTYID propId,
int oldValue,
int newValue) noexcept;

void UpdateUiaProperty(
winrt::Windows::Foundation::IInspectable provider,
PROPERTYID propId,
Expand Down
Loading