Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
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": "Implement ISelectionProvider and ISelectionItemProvider",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch"
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,28 @@ namespace winrt::Microsoft::ReactNative::implementation {

CompositionDynamicAutomationProvider::CompositionDynamicAutomationProvider(
const winrt::Microsoft::ReactNative::Composition::ComponentView &componentView) noexcept
: m_view{componentView} {}
: m_view{componentView} {
auto strongView = m_view.view();

if (!strongView)
return;

auto props = std::static_pointer_cast<const facebook::react::ViewProps>(
winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(strongView)->props());
if (!props)
return;

if (props->accessibilityState.has_value() && props->accessibilityState->selected.has_value()) {
AddSelectionItemsToContainer(this);
}
}

HRESULT __stdcall CompositionDynamicAutomationProvider::Navigate(
NavigateDirection direction,
IRawElementProviderFragment **pRetVal) {
if (pRetVal == nullptr)
return E_POINTER;

AddRef();
return UiaNavigateHelper(m_view.view(), direction, *pRetVal);
}

Expand Down Expand Up @@ -202,6 +216,18 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::GetPatternProvider(PATTE
AddRef();
}

if (patternId == UIA_SelectionPatternId && props->accessibilityState.has_value() &&
props->accessibilityState->multiselectable.has_value() && props->accessibilityState->required.has_value()) {
*pRetVal = static_cast<ISelectionProvider *>(this);
AddRef();
}

if (patternId == UIA_SelectionItemPatternId && props->accessibilityState.has_value() &&
props->accessibilityState->selected.has_value()) {
*pRetVal = static_cast<ISelectionItemProvider *>(this);
AddRef();
}

return S_OK;
}

Expand Down Expand Up @@ -345,6 +371,7 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::GetPropertyValue(PROPERT
case UIA_IsOffscreenPropertyId: {
pRetVal->vt = VT_BOOL;
pRetVal->boolVal = (compositionView->getClipState() == ClipState::FullyClipped) ? VARIANT_TRUE : VARIANT_FALSE;
break;
}
case UIA_HelpTextPropertyId: {
pRetVal->vt = VT_BSTR;
Expand Down Expand Up @@ -555,4 +582,175 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::Collapse() {
return S_OK;
}

HRESULT __stdcall CompositionDynamicAutomationProvider::get_CanSelectMultiple(BOOL *pRetVal) {
if (pRetVal == nullptr)
return E_POINTER;
auto strongView = m_view.view();

if (!strongView)
return UIA_E_ELEMENTNOTAVAILABLE;

auto props = std::static_pointer_cast<const facebook::react::ViewProps>(
winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(strongView)->props());

if (props == nullptr)
return UIA_E_ELEMENTNOTAVAILABLE;

*pRetVal = (props->accessibilityState.has_value() && props->accessibilityState->multiselectable.has_value())
? props->accessibilityState->multiselectable.value()
: false;

return S_OK;
}

HRESULT __stdcall CompositionDynamicAutomationProvider::get_IsSelectionRequired(BOOL *pRetVal) {
if (pRetVal == nullptr)
return E_POINTER;
auto strongView = m_view.view();

if (!strongView)
return UIA_E_ELEMENTNOTAVAILABLE;

auto props = std::static_pointer_cast<const facebook::react::ViewProps>(
winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(strongView)->props());

if (props == nullptr)
return UIA_E_ELEMENTNOTAVAILABLE;

*pRetVal = (props->accessibilityState.has_value() && props->accessibilityState->required.has_value())
? props->accessibilityState->required.value()
: false;

return S_OK;
}

HRESULT __stdcall CompositionDynamicAutomationProvider::GetSelection(SAFEARRAY **pRetVal) {
auto strongView = m_view.view();

if (!strongView)
return UIA_E_ELEMENTNOTAVAILABLE;

std::vector<int> m_selectedItems;
for (size_t i = 0; i < m_selectionItems.size(); i++) {
auto selectionItem = m_selectionItems.at(i);
auto provider = static_cast<CompositionDynamicAutomationProvider *>(selectionItem);
BOOL selected;
auto hr = provider->get_IsSelected(&selected);
if (hr == S_OK && selected) {
m_selectedItems.push_back(i);
}
}

*pRetVal = SafeArrayCreateVector(VT_UNKNOWN, 0, m_selectedItems.size());
if (*pRetVal == nullptr)
return E_OUTOFMEMORY;

for (size_t i = 0; i < m_selectedItems.size(); i++) {
auto pos = static_cast<long>(i);
SafeArrayPutElement(*pRetVal, &pos, m_selectionItems.at(m_selectedItems.at(i)));
AddRef();
}
return S_OK;
}

void CompositionDynamicAutomationProvider::AddToSelectionItems(IRawElementProviderSimple *item) {
for (size_t i = 0; i < m_selectionItems.size(); i++) {
if (m_selectionItems.at(i) == item) {
return;
}
}
m_selectionItems.push_back(item);
}

void CompositionDynamicAutomationProvider::RemoveFromSelectionItems(IRawElementProviderSimple *item) {
for (size_t i = 0; i < m_selectionItems.size(); i++) {
if (m_selectionItems.at(i) == item) {
m_selectionItems.erase(m_selectionItems.begin() + i);
return;
}
}
}

HRESULT __stdcall CompositionDynamicAutomationProvider::AddToSelection() {
auto strongView = m_view.view();

if (!strongView)
return UIA_E_ELEMENTNOTAVAILABLE;
DispatchAccessibilityAction(m_view, "addToSelection");
return S_OK;
}

HRESULT __stdcall CompositionDynamicAutomationProvider::get_IsSelected(BOOL *pRetVal) {
if (pRetVal == nullptr)
return E_POINTER;
auto strongView = m_view.view();

if (!strongView)
return UIA_E_ELEMENTNOTAVAILABLE;

auto props = std::static_pointer_cast<const facebook::react::ViewProps>(
winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(strongView)->props());

if (props == nullptr)
return UIA_E_ELEMENTNOTAVAILABLE;

*pRetVal = (props->accessibilityState.has_value() && props->accessibilityState->selected.has_value())
? props->accessibilityState->selected.value()
: false;

return S_OK;
}

IRawElementProviderSimple *findSelectionContainer(winrt::Microsoft::ReactNative::ComponentView current) {
if (!current)
return nullptr;

auto props = std::static_pointer_cast<const facebook::react::ViewProps>(
winrt::get_self<winrt::Microsoft::ReactNative::implementation::ComponentView>(current)->props());
if (props->accessibilityState.has_value() && props->accessibilityState->multiselectable.has_value() &&
props->accessibilityState->required.has_value()) {
auto uiaProvider =
current.as<winrt::Microsoft::ReactNative::Composition::implementation::ComponentView>()->EnsureUiaProvider();
if (uiaProvider != nullptr) {
auto spProviderSimple = uiaProvider.try_as<IRawElementProviderSimple>();
if (spProviderSimple != nullptr) {
return spProviderSimple.get();
}
}
} else {
return findSelectionContainer(current.Parent());
}
return nullptr;
}

HRESULT __stdcall CompositionDynamicAutomationProvider::get_SelectionContainer(IRawElementProviderSimple **pRetVal) {
if (pRetVal == nullptr)
return E_POINTER;
auto strongView = m_view.view();

if (!strongView)
return UIA_E_ELEMENTNOTAVAILABLE;

*pRetVal = findSelectionContainer(strongView.Parent());
return S_OK;
}

HRESULT __stdcall CompositionDynamicAutomationProvider::RemoveFromSelection() {
auto strongView = m_view.view();

if (!strongView)
return UIA_E_ELEMENTNOTAVAILABLE;
DispatchAccessibilityAction(m_view, "removeFromSelection");
return S_OK;
}

HRESULT __stdcall CompositionDynamicAutomationProvider::Select() {
auto strongView = m_view.view();

if (!strongView)
return UIA_E_ELEMENTNOTAVAILABLE;
DispatchAccessibilityAction(m_view, "select");
return S_OK;
}

} // namespace winrt::Microsoft::ReactNative::implementation
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ class CompositionDynamicAutomationProvider : public winrt::implements<
IScrollItemProvider,
IValueProvider,
IToggleProvider,
IExpandCollapseProvider> {
IExpandCollapseProvider,
ISelectionProvider,
ISelectionItemProvider> {
public:
CompositionDynamicAutomationProvider(
const winrt::Microsoft::ReactNative::Composition::ComponentView &componentView) noexcept;
Expand Down Expand Up @@ -57,8 +59,24 @@ class CompositionDynamicAutomationProvider : public winrt::implements<
virtual HRESULT __stdcall Expand() override;
virtual HRESULT __stdcall Collapse() override;

// inherited via ISelectionProvider
virtual HRESULT __stdcall get_CanSelectMultiple(BOOL *pRetVal) override;
virtual HRESULT __stdcall get_IsSelectionRequired(BOOL *pRetVal) override;
virtual HRESULT __stdcall GetSelection(SAFEARRAY **pRetVal) override;

// inherited via ISelectionItemProvider
virtual HRESULT __stdcall AddToSelection() override;
virtual HRESULT __stdcall get_IsSelected(BOOL *pRetVal) override;
virtual HRESULT __stdcall get_SelectionContainer(IRawElementProviderSimple **pRetVal) override;
virtual HRESULT __stdcall RemoveFromSelection() override;
virtual HRESULT __stdcall Select() override;

void AddToSelectionItems(IRawElementProviderSimple *item);
void RemoveFromSelectionItems(IRawElementProviderSimple *item);

private:
::Microsoft::ReactNative::ReactTaggedView m_view;
std::vector<IRawElementProviderSimple *> m_selectionItems;
};

} // namespace winrt::Microsoft::ReactNative::implementation
Original file line number Diff line number Diff line change
Expand Up @@ -1323,6 +1323,19 @@ void ComponentView::updateAccessibilityProps(
UIA_LiveSettingPropertyId,
oldViewProps.accessibilityLiveRegion,
newViewProps.accessibilityLiveRegion);

if ((oldViewProps.accessibilityState.has_value() && oldViewProps.accessibilityState->selected.has_value()) !=
((newViewProps.accessibilityState.has_value() && newViewProps.accessibilityState->selected.has_value()))) {
auto compProvider =
m_uiaProvider.try_as<winrt::Microsoft::ReactNative::implementation::CompositionDynamicAutomationProvider>();
if (compProvider) {
if ((newViewProps.accessibilityState.has_value() && newViewProps.accessibilityState->selected.has_value())) {
winrt::Microsoft::ReactNative::implementation::AddSelectionItemsToContainer(compProvider.get());
} else {
winrt::Microsoft::ReactNative::implementation::RemoveSelectionItemsFromContainer(compProvider.get());
}
}
}
}

std::optional<std::string> ComponentView::getAccessiblityValue() noexcept {
Expand Down
20 changes: 20 additions & 0 deletions vnext/Microsoft.ReactNative/Fabric/Composition/UiaHelpers.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -214,4 +214,24 @@ ExpandCollapseState GetExpandCollapseState(const bool &expanded) noexcept {
}
}

void AddSelectionItemsToContainer(CompositionDynamicAutomationProvider *provider) noexcept {
IRawElementProviderSimple *selectionContainer;
provider->get_SelectionContainer(&selectionContainer);
if (!selectionContainer)
return;
auto selectionContainerProvider = static_cast<CompositionDynamicAutomationProvider *>(selectionContainer);
auto simpleProvider = static_cast<IRawElementProviderSimple *>(provider);
selectionContainerProvider->AddToSelectionItems(simpleProvider);
}

void RemoveSelectionItemsFromContainer(CompositionDynamicAutomationProvider *provider) noexcept {
IRawElementProviderSimple *selectionContainer;
provider->get_SelectionContainer(&selectionContainer);
if (!selectionContainer)
return;
auto selectionContainerProvider = static_cast<CompositionDynamicAutomationProvider *>(selectionContainer);
auto simpleProvider = static_cast<IRawElementProviderSimple *>(provider);
selectionContainerProvider->RemoveFromSelectionItems(simpleProvider);
}

} // namespace winrt::Microsoft::ReactNative::implementation
6 changes: 6 additions & 0 deletions vnext/Microsoft.ReactNative/Fabric/Composition/UiaHelpers.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#pragma once

#include <Fabric/ComponentView.h>
#include <Fabric/Composition/CompositionDynamicAutomationProvider.h>
#include <Fabric/ReactTaggedView.h>
#include <UIAutomation.h>

Expand Down Expand Up @@ -36,4 +37,9 @@ std::string extractAccessibilityValue(const facebook::react::AccessibilityValue
void DispatchAccessibilityAction(::Microsoft::ReactNative::ReactTaggedView &view, const std::string &action) noexcept;

ExpandCollapseState GetExpandCollapseState(const bool &expanded) noexcept;

void AddSelectionItemsToContainer(CompositionDynamicAutomationProvider *provider) noexcept;

void RemoveSelectionItemsFromContainer(CompositionDynamicAutomationProvider *provider) noexcept;

} // namespace winrt::Microsoft::ReactNative::implementation
Loading