Review Changes

Author: vineethkuttan

vnext/Microsoft.ReactNative/Fabric/Composition/CompositionAnnotationProvider.cpp

@@ -26,10 +26,10 @@ HRESULT __stdcall CompositionAnnotationProvider::get_AnnotationTypeId(int *retVa
   if (props == nullptr)
     return UIA_E_ELEMENTNOTAVAILABLE;
 
-  if (!props->accessibilityAnnotation.typeID.has_value() || props->accessibilityAnnotation.typeID.value().empty()) {
+  if (props->accessibilityAnnotation.value().typeID.empty()) {
     return E_FAIL;
   }
-  *retVal = static_cast<int>(GetAnnotationTypeId(props->accessibilityAnnotation.typeID.value()));
+  *retVal = static_cast<int>(GetAnnotationTypeId(props->accessibilityAnnotation.value().typeID));
   return S_OK;
 }
 HRESULT __stdcall CompositionAnnotationProvider::get_AnnotationTypeName(BSTR *retVal) {
@@ -45,10 +45,10 @@ HRESULT __stdcall CompositionAnnotationProvider::get_AnnotationTypeName(BSTR *re
   if (props == nullptr)
     return UIA_E_ELEMENTNOTAVAILABLE;
 
-  if (!props->accessibilityAnnotation.typeName.has_value() || props->accessibilityAnnotation.typeName.value().empty()) {
+  if (props->accessibilityAnnotation.value().typeName.empty()) {
     return E_FAIL;
   }
-  auto typeName = ::Microsoft::Common::Unicode::Utf8ToUtf16(props->accessibilityAnnotation.typeName.value());
+  auto typeName = ::Microsoft::Common::Unicode::Utf8ToUtf16(props->accessibilityAnnotation.value().typeName);
   *retVal = SysAllocString(typeName.c_str());
   return S_OK;
 }
@@ -65,10 +65,10 @@ HRESULT __stdcall CompositionAnnotationProvider::get_Author(BSTR *retVal) {
   if (props == nullptr)
     return UIA_E_ELEMENTNOTAVAILABLE;
 
-  if (!props->accessibilityAnnotation.author.has_value() || props->accessibilityAnnotation.author.value().empty()) {
+  if (props->accessibilityAnnotation.value().author.empty()) {
     return E_FAIL;
   }
-  auto author = ::Microsoft::Common::Unicode::Utf8ToUtf16(props->accessibilityAnnotation.author.value());
+  auto author = ::Microsoft::Common::Unicode::Utf8ToUtf16(props->accessibilityAnnotation.value().author);
   *retVal = SysAllocString(author.c_str());
   return S_OK;
 }
@@ -85,14 +85,16 @@ HRESULT __stdcall CompositionAnnotationProvider::get_DateTime(BSTR *retVal) {
   if (props == nullptr)
     return UIA_E_ELEMENTNOTAVAILABLE;
 
-  if (!props->accessibilityAnnotation.dateTime.has_value() || props->accessibilityAnnotation.author.value().empty()) {
+  if (props->accessibilityAnnotation.value().dateTime.empty()) {
     return E_FAIL;
   }
-  auto dateTime = ::Microsoft::Common::Unicode::Utf8ToUtf16(props->accessibilityAnnotation.dateTime.value());
+  auto dateTime = ::Microsoft::Common::Unicode::Utf8ToUtf16(props->accessibilityAnnotation.value().dateTime);
   *retVal = SysAllocString(dateTime.c_str());
   return S_OK;
 }
+
 HRESULT __stdcall CompositionAnnotationProvider::get_Target(IRawElementProviderSimple **retVal) {
+  // no-opt
   return E_NOTIMPL;
 }
 } // namespace winrt::Microsoft::ReactNative::implementation

vnext/Microsoft.ReactNative/Fabric/Composition/CompositionDynamicAutomationProvider.cpp

@@ -290,7 +290,8 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::GetPatternProvider(PATTE
     m_textProvider.as<IUnknown>().copy_to(pRetVal);
   }
   if (patternId == UIA_AnnotationPatternId &&
-      strongView.try_as<winrt::Microsoft::ReactNative::Composition::implementation::ViewComponentView>()) {
+      strongView.try_as<winrt::Microsoft::ReactNative::Composition::implementation::ViewComponentView>() &&
+      accessibilityAnnotationHasValue(props->accessibilityAnnotation)) {
     m_annotationProvider.as<IUnknown>().copy_to(pRetVal);
   }
 

vnext/Microsoft.ReactNative/Fabric/Composition/UiaHelpers.cpp

@@ -240,6 +240,13 @@ long GetAnnotationTypeId(const std::string &annotationType) noexcept {
   return AnnotationType_Unknown;
 }
 
+bool accessibilityAnnotationHasValue(
+    const std::optional<facebook::react::AccessibilityAnnotation> &annotation) noexcept {
+  return annotation.has_value() &&
+      !(annotation.value().typeID.empty() && annotation.value().typeName.empty() && annotation.value().author.empty() &&
+        annotation.value().dateTime.empty() && annotation.value().target.empty());
+}
+
 void DispatchAccessibilityAction(::Microsoft::ReactNative::ReactTaggedView &view, const std::string &action) noexcept {
   auto strongView = view.view();
 

vnext/Microsoft.ReactNative/Fabric/Composition/UiaHelpers.h

@@ -35,6 +35,9 @@ long GetLiveSetting(const std::string &liveRegion) noexcept;
 
 long GetAnnotationTypeId(const std::string &annotationType) noexcept;
 
+bool accessibilityAnnotationHasValue(
+    const std::optional<facebook::react::AccessibilityAnnotation> &annotation) noexcept;
+
 void DispatchAccessibilityAction(::Microsoft::ReactNative::ReactTaggedView &view, const std::string &action) noexcept;
 
 ExpandCollapseState GetExpandCollapseState(const bool &expanded) noexcept;

vnext/Microsoft.ReactNative/Fabric/platform/react/renderer/components/view/CompositionAccessibilityProps.h

@@ -10,11 +10,11 @@
 
 namespace facebook::react {
 struct AccessibilityAnnotation {
-  std::optional<std::string> typeID{};
-  std::optional<std::string> typeName{};
-  std::optional<std::string> author{};
-  std::optional<std::string> dateTime{};
-  std::optional<std::string> target{};
+  std::string typeID{};
+  std::string typeName{};
+  std::string author{};
+  std::string dateTime{};
+  std::string target{};
 };
 
 constexpr bool operator==(const AccessibilityAnnotation &lhs, const AccessibilityAnnotation &rhs) {

vnext/Microsoft.ReactNative/Fabric/platform/react/renderer/components/view/HostPlatformViewProps.h

@@ -29,7 +29,7 @@ class HostPlatformViewProps : public BaseViewProps {
   int accessibilitySetSize{0};
   std::string accessibilityLiveRegion{"none"};
   int accessibilityLevel{0};
-  AccessibilityAnnotation accessibilityAnnotation{};
+  std::optional<AccessibilityAnnotation> accessibilityAnnotation{};
 
   // std::optional<std::string> overflowAnchor{};
   std::optional<std::string> tooltip{};

vnext/src-win/Libraries/Components/View/View.windows.js

@@ -67,6 +67,7 @@ const View: component(
       accessibilityLabel,
       accessibilityLabelledBy,
       accessibilityLevel, // Windows
+      accessibilityAnnotation, //Windows
       accessibilityLiveRegion,
       accessibilityPosInSet, // Windows
       accessibilitySetSize, // Windows
@@ -250,6 +251,7 @@ const View: component(
         }
         accessibilityLabel={ariaLabel ?? accessibilityLabel}
         accessibilityLevel={ariaLevel ?? accessibilityLevel}
+        accessibilityAnnotation={accessibilityAnnotation}
         accessibilityPosInSet={ariaPosinset ?? accessibilityPosInSet}
         accessibilitySetSize={ariaSetsize ?? accessibilitySetSize}
         focusable={_focusable}
@@ -303,6 +305,7 @@ const View: component(
                 }
                 accessibilityLabel={ariaLabel ?? accessibilityLabel}
                 accessibilityLevel={ariaLevel ?? accessibilityLevel}
+                accessibilityAnnotation={accessibilityAnnotation}
                 accessibilityPosInSet={ariaPosinset ?? accessibilityPosInSet}
                 accessibilitySetSize={ariaSetsize ?? accessibilitySetSize}
                 focusable={_focusable}

vnext/src-win/Libraries/Components/View/ViewAccessibility.d.ts

@@ -288,11 +288,11 @@ export type AnnotationType =
 
 // [Windows]
 export type AccessibilityAnnotationInfo = Readonly<{
-  typeID: AnnotationType | undefined;
-  typeName?: string | undefined;
-  author?: string | undefined;
-  dateTime?: string | undefined;
-  target?: string | undefined;
+  typeID: AnnotationType;
+  typeName?: string;
+  author?: string;
+  dateTime?: string;
+  target?: string;
 }>;
 export interface AccessibilityPropsWindows {
   /**

vnext/src-win/Libraries/Components/View/ViewPropTypes.windows.js

@@ -28,6 +28,7 @@ import type {
   AccessibilityRole,
   AccessibilityState,
   AccessibilityValue,
+  AccessibilityAnnotationInfo, // [Windows]
   Role,
 } from './ViewAccessibility';
 import type {Node} from 'react';
@@ -529,6 +530,8 @@ type WindowsViewProps = $ReadOnly<{|
   onBlur?: ?(event: FocusEvent) => mixed,
   onMouseLeave?: ?(event: MouseEvent) => mixed,
   onMouseEnter?: ?(event: MouseEvent) => mixed,
+
+  accessibilityAnnotation?: ?AccessibilityAnnotationInfo,
 |}>;
 // Windows]