react-native-windows 0.80.0-preview.1 → 0.80.0-preview.10

package/Directory.Build.props

@@ -19,6 +19,12 @@
     -->
     <EnableSourceLink Condition="'$(EnableSourceLink)' == '' AND '$(BuildingInRnwRepo)' == 'true'">true</EnableSourceLink>
     <EnableSourceLink Condition="'$(EnableSourceLink)' == ''">false</EnableSourceLink>
+    
+    <!-- Symbol Publishing Compliance (Work Item 59264834) - Generate PDB files for Release builds -->
+    <DebugSymbols Condition="'$(Configuration)' == 'Release'">true</DebugSymbols>
+    <DebugType Condition="'$(Configuration)' == 'Release'">pdbonly</DebugType>
+    <IncludeSymbols Condition="'$(Configuration)' == 'Release'">true</IncludeSymbols>
+    <IncludeSource Condition="'$(Configuration)' == 'Release'">false</IncludeSource>
     <!-- When bumping the Folly version, be sure to bump the git hash of that version's commit, find the matching fastfloat dependency and build Folly.vcxproj (to update its cgmanifest.json) too. -->
     <FollyVersion>2024.10.14.00</FollyVersion>
     <FastFloatVersion>6.1.4</FastFloatVersion>

package/Folly/TEMP_UntilFollyUpdate/json/json.cpp

@@ -908,7 +908,7 @@ void escapeStringImpl(
 
     if (encodeUnicode) {
       // note that this if condition captures utf8 chars
-      // with value > 127, so size > 1 byte (or they are whitelisted for
+      // with value > 127, so size > 1 byte (or they are allowlisted for
       // Unicode encoding).
       // NOTE: char32_t / char16_t are both unsigned.
       char32_t cp = utf8ToCodePoint(p, e, opts.skip_invalid_utf8);

package/Microsoft.ReactNative/CompositionSwitcher.idl

@@ -31,13 +31,6 @@ namespace Microsoft.ReactNative.Composition.Experimental
     SwitchThumb,
   };
 
-  enum SnapAlignment
-  {
-    Start,
-    Center,
-    End,
-  };
-
   [webhosthidden]
   [uuid("172def51-9e1a-4e3c-841a-e5a470065acc")] // uuid needed for empty interfaces
   [version(0)]
@@ -118,6 +111,8 @@ namespace Microsoft.ReactNative.Composition.Experimental
     event Windows.Foundation.EventHandler<IScrollPositionChangedArgs> ScrollPositionChanged;
     event Windows.Foundation.EventHandler<IScrollPositionChangedArgs> ScrollBeginDrag;
 	  event Windows.Foundation.EventHandler<IScrollPositionChangedArgs> ScrollEndDrag;
+    event Windows.Foundation.EventHandler<IScrollPositionChangedArgs> ScrollMomentumBegin;
+    event Windows.Foundation.EventHandler<IScrollPositionChangedArgs> ScrollMomentumEnd;
     void ContentSize(Windows.Foundation.Numerics.Vector2 size);
     Windows.Foundation.Numerics.Vector3 ScrollPosition { get; };
     void ScrollBy(Windows.Foundation.Numerics.Vector3 offset, Boolean animate);
@@ -127,7 +122,7 @@ namespace Microsoft.ReactNative.Composition.Experimental
     void SetMaximumZoomScale(Single maximumZoomScale);
     void SetMinimumZoomScale(Single minimumZoomScale);
     Boolean Horizontal;
-    void SetSnapPoints(Boolean snapToStart, Boolean snapToEnd, Windows.Foundation.Collections.IVectorView<Single> offsets, SnapAlignment snapToAlignment);
+    void SetSnapPoints(Boolean snapToStart, Boolean snapToEnd, Windows.Foundation.Collections.IVectorView<Single> offsets);
   }
 
   [webhosthidden]

package/Microsoft.ReactNative/Fabric/Composition/CompositionContextHelper.cpp

@@ -27,8 +27,6 @@
 
 namespace Microsoft::ReactNative::Composition::Experimental {
 
-using namespace winrt::Microsoft::ReactNative::Composition::Experimental;
-
 template <typename TSpriteVisual>
 struct CompositionTypeTraits {};
 
@@ -711,8 +709,23 @@ struct CompScrollerVisual : winrt::implements<
     void IdleStateEntered(
         typename TTypeRedirects::InteractionTracker sender,
         typename TTypeRedirects::InteractionTrackerIdleStateEnteredArgs args) noexcept {
+      // If we were in inertia and are now idle, momentum has ended
+      if (m_outer->m_inertia) {
+        m_outer->FireScrollMomentumEnd({sender.Position().x, sender.Position().y});
+      }
+
+      // If we were interacting but never entered inertia (Interacting -> Idle),
+      // and the interaction was user-driven (requestId == 0), fire end-drag here.
+      // Note: if the interactionRequestId was non-zero it was caused by a Try* call
+      // (programmatic), so we should not fire onScrollEndDrag.
+      if (m_outer->m_interacting && args.RequestId() == 0) {
+        m_outer->FireScrollEndDrag({sender.Position().x, sender.Position().y});
+      }
+
+      // Clear state flags
       m_outer->m_custom = false;
       m_outer->m_inertia = false;
+      m_outer->m_interacting = false;
     }
     void InertiaStateEntered(
         typename TTypeRedirects::InteractionTracker sender,
@@ -720,15 +733,26 @@ struct CompScrollerVisual : winrt::implements<
       m_outer->m_custom = false;
       m_outer->m_inertia = true;
       m_outer->m_currentPosition = args.NaturalRestingPosition();
-      // When the user stops interacting with the object, tracker can go into two paths:
-      // 1. tracker goes into idle state immediately
-      // 2. tracker has just started gliding into Inertia state
-      // Fire ScrollEndDrag
-      m_outer->FireScrollEndDrag({args.NaturalRestingPosition().x, args.NaturalRestingPosition().y});
+
+      if (!m_outer->m_interacting && args.RequestId() == 0) {
+        m_outer->FireScrollBeginDrag({args.NaturalRestingPosition().x, args.NaturalRestingPosition().y});
+      }
+
+      // If interaction was user-driven (requestId == 0),
+      // fire ScrollEndDrag here (Interacting -> Inertia caused by user lift).
+      if (m_outer->m_interacting && args.RequestId() == 0) {
+        m_outer->FireScrollEndDrag({args.NaturalRestingPosition().x, args.NaturalRestingPosition().y});
+      }
+
+      // Fire momentum scroll begin when we enter inertia (user or programmatic)
+      m_outer->FireScrollMomentumBegin({args.NaturalRestingPosition().x, args.NaturalRestingPosition().y});
     }
     void InteractingStateEntered(
         typename TTypeRedirects::InteractionTracker sender,
         typename TTypeRedirects::InteractionTrackerInteractingStateEnteredArgs args) noexcept {
+      // Mark that we're now interacting and remember the requestId (user manipulations => 0)
+      m_outer->m_interacting = true;
+
       // Fire when the user starts dragging the object
       m_outer->FireScrollBeginDrag({sender.Position().x, sender.Position().y});
     }
@@ -738,6 +762,10 @@ struct CompScrollerVisual : winrt::implements<
     void ValuesChanged(
         typename TTypeRedirects::InteractionTracker sender,
         typename TTypeRedirects::InteractionTrackerValuesChangedArgs args) noexcept {
+      if (!m_outer->m_interacting && args.RequestId() == 0) {
+        m_outer->FireScrollBeginDrag({args.Position().x, args.Position().y});
+      }
+      m_outer->m_interacting = true;
       m_outer->m_currentPosition = args.Position();
       m_outer->FireScrollPositionChanged({args.Position().x, args.Position().y});
     }
@@ -873,11 +901,9 @@ struct CompScrollerVisual : winrt::implements<
   void SetSnapPoints(
       bool snapToStart,
       bool snapToEnd,
-      winrt::Windows::Foundation::Collections::IVectorView<float> const &offsets,
-      SnapAlignment snapToAlignment) noexcept {
+      winrt::Windows::Foundation::Collections::IVectorView<float> const &offsets) noexcept {
     m_snapToStart = snapToStart;
     m_snapToEnd = snapToEnd;
-    m_snapToAlignment = snapToAlignment;
     m_snapToOffsets.clear();
     if (offsets) {
       for (auto const &offset : offsets) {
@@ -985,6 +1011,20 @@ struct CompScrollerVisual : winrt::implements<
     return m_scrollEndDragEvent.add(handler);
   }
 
+  winrt::event_token ScrollMomentumBegin(
+      winrt::Windows::Foundation::EventHandler<
+          winrt::Microsoft::ReactNative::Composition::Experimental::IScrollPositionChangedArgs> const
+          &handler) noexcept {
+    return m_scrollMomentumBeginEvent.add(handler);
+  }
+
+  winrt::event_token ScrollMomentumEnd(
+      winrt::Windows::Foundation::EventHandler<
+          winrt::Microsoft::ReactNative::Composition::Experimental::IScrollPositionChangedArgs> const
+          &handler) noexcept {
+    return m_scrollMomentumEndEvent.add(handler);
+  }
+
   void ScrollPositionChanged(winrt::event_token const &token) noexcept {
     m_scrollPositionChangedEvent.remove(token);
   }
@@ -997,6 +1037,14 @@ struct CompScrollerVisual : winrt::implements<
     m_scrollEndDragEvent.remove(token);
   }
 
+  void ScrollMomentumBegin(winrt::event_token const &token) noexcept {
+    m_scrollMomentumBeginEvent.remove(token);
+  }
+
+  void ScrollMomentumEnd(winrt::event_token const &token) noexcept {
+    m_scrollMomentumEndEvent.remove(token);
+  }
+
   void ContentSize(winrt::Windows::Foundation::Numerics::float2 const &size) noexcept {
     m_contentSize = size;
     m_contentVisual.Size(size);
@@ -1075,6 +1123,14 @@ struct CompScrollerVisual : winrt::implements<
     m_scrollEndDragEvent(*this, winrt::make<CompScrollPositionChangedArgs>(position));
   }
 
+  void FireScrollMomentumBegin(winrt::Windows::Foundation::Numerics::float2 position) noexcept {
+    m_scrollMomentumBeginEvent(*this, winrt::make<CompScrollPositionChangedArgs>(position));
+  }
+
+  void FireScrollMomentumEnd(winrt::Windows::Foundation::Numerics::float2 position) noexcept {
+    m_scrollMomentumEndEvent(*this, winrt::make<CompScrollPositionChangedArgs>(position));
+  }
+
   void UpdateMaxPosition() noexcept {
     m_interactionTracker.MaxPosition(
         {std::max<float>(m_contentSize.x - m_visualSize.x, 0),
@@ -1104,22 +1160,6 @@ struct CompScrollerVisual : winrt::implements<
     }
 
     snapPositions.insert(snapPositions.end(), m_snapToOffsets.begin(), m_snapToOffsets.end());
-
-    // Adjust snap positions based on alignment
-    const float viewportSize = m_horizontal ? visualSize.x : visualSize.y;
-    if (m_snapToAlignment == SnapAlignment::Center) {
-      // For center alignment, offset snap positions by half the viewport size
-      for (auto &position : snapPositions) {
-        position = std::max(0.0f, position - viewportSize / 2.0f);
-      }
-    } else if (m_snapToAlignment == SnapAlignment::End) {
-      // For end alignment, offset snap positions by the full viewport size
-      for (auto &position : snapPositions) {
-        position = std::max(0.0f, position - viewportSize);
-      }
-    }
-    // For Start alignment, no adjustment needed
-
     std::sort(snapPositions.begin(), snapPositions.end());
     snapPositions.erase(std::unique(snapPositions.begin(), snapPositions.end()), snapPositions.end());
 
@@ -1247,9 +1287,9 @@ struct CompScrollerVisual : winrt::implements<
   bool m_snapToStart{true};
   bool m_snapToEnd{true};
   std::vector<float> m_snapToOffsets;
-  SnapAlignment m_snapToAlignment{SnapAlignment::Start};
   bool m_inertia{false};
   bool m_custom{false};
+  bool m_interacting{false};
   winrt::Windows::Foundation::Numerics::float3 m_targetPosition;
   winrt::Windows::Foundation::Numerics::float3 m_currentPosition;
   winrt::Windows::Foundation::Numerics::float2 m_contentSize{0};
@@ -1263,6 +1303,12 @@ struct CompScrollerVisual : winrt::implements<
   winrt::event<winrt::Windows::Foundation::EventHandler<
       winrt::Microsoft::ReactNative::Composition::Experimental::IScrollPositionChangedArgs>>
       m_scrollEndDragEvent;
+  winrt::event<winrt::Windows::Foundation::EventHandler<
+      winrt::Microsoft::ReactNative::Composition::Experimental::IScrollPositionChangedArgs>>
+      m_scrollMomentumBeginEvent;
+  winrt::event<winrt::Windows::Foundation::EventHandler<
+      winrt::Microsoft::ReactNative::Composition::Experimental::IScrollPositionChangedArgs>>
+      m_scrollMomentumEndEvent;
   typename TTypeRedirects::SpriteVisual m_visual{nullptr};
   typename TTypeRedirects::SpriteVisual m_contentVisual{nullptr};
   typename TTypeRedirects::InteractionTracker m_interactionTracker{nullptr};

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

@@ -313,161 +313,6 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::GetPatternProvider(PATTE
   return S_OK;
 }
 
-long GetControlTypeFromString(const std::string &role) noexcept {
-  if (role == "adjustable") {
-    return UIA_SliderControlTypeId;
-  } else if (role == "group" || role == "search" || role == "radiogroup" || role == "timer" || role.empty()) {
-    return UIA_GroupControlTypeId;
-  } else if (role == "button" || role == "imagebutton" || role == "switch" || role == "togglebutton") {
-    return UIA_ButtonControlTypeId;
-  } else if (role == "checkbox") {
-    return UIA_CheckBoxControlTypeId;
-  } else if (role == "combobox") {
-    return UIA_ComboBoxControlTypeId;
-  } else if (role == "alert" || role == "header" || role == "summary" || role == "text") {
-    return UIA_TextControlTypeId;
-  } else if (role == "image") {
-    return UIA_ImageControlTypeId;
-  } else if (role == "keyboardkey") {
-    return UIA_CustomControlTypeId;
-  } else if (role == "link") {
-    return UIA_HyperlinkControlTypeId;
-  }
-  // list and listitem were added by RNW to better support UIA Control Types
-  else if (role == "list") {
-    return UIA_ListControlTypeId;
-  } else if (role == "listitem") {
-    return UIA_ListItemControlTypeId;
-  } else if (role == "menu") {
-    return UIA_MenuControlTypeId;
-  } else if (role == "menubar") {
-    return UIA_MenuBarControlTypeId;
-  } else if (role == "menuitem") {
-    return UIA_MenuItemControlTypeId;
-  }
-  // If role is "none", remove the element from the control tree
-  // and expose it as a plain element would in the raw tree.
-  else if (role == "none") {
-    return UIA_GroupControlTypeId;
-  } else if (role == "progressbar") {
-    return UIA_ProgressBarControlTypeId;
-  } else if (role == "radio") {
-    return UIA_RadioButtonControlTypeId;
-  } else if (role == "scrollbar") {
-    return UIA_ScrollBarControlTypeId;
-  } else if (role == "spinbutton") {
-    return UIA_SpinnerControlTypeId;
-  } else if (role == "splitbutton") {
-    return UIA_SplitButtonControlTypeId;
-  } else if (role == "tab") {
-    return UIA_TabItemControlTypeId;
-  } else if (role == "tablist") {
-    return UIA_TabControlTypeId;
-  } else if (role == "textinput" || role == "searchbox") {
-    return UIA_EditControlTypeId;
-  } else if (role == "toolbar") {
-    return UIA_ToolBarControlTypeId;
-  } else if (role == "tree") {
-    return UIA_TreeControlTypeId;
-  } else if (role == "treeitem") {
-    return UIA_TreeItemControlTypeId;
-  } else if (role == "pane") {
-    return UIA_PaneControlTypeId;
-  }
-  assert(false);
-  return UIA_GroupControlTypeId;
-}
-
-long GetControlTypeFromRole(const facebook::react::Role &role) noexcept {
-  switch (role) {
-    case facebook::react::Role::Alert:
-      return UIA_TextControlTypeId;
-    case facebook::react::Role::Application:
-      return UIA_WindowControlTypeId;
-    case facebook::react::Role::Button:
-      return UIA_ButtonControlTypeId;
-    case facebook::react::Role::Checkbox:
-      return UIA_CheckBoxControlTypeId;
-    case facebook::react::Role::Columnheader:
-      return UIA_HeaderControlTypeId;
-    case facebook::react::Role::Combobox:
-      return UIA_ComboBoxControlTypeId;
-    case facebook::react::Role::Document:
-      return UIA_DocumentControlTypeId;
-    case facebook::react::Role::Grid:
-      return UIA_GroupControlTypeId;
-    case facebook::react::Role::Group:
-      return UIA_GroupControlTypeId;
-    case facebook::react::Role::Heading:
-      return UIA_TextControlTypeId;
-    case facebook::react::Role::Img:
-      return UIA_ImageControlTypeId;
-    case facebook::react::Role::Link:
-      return UIA_HyperlinkControlTypeId;
-    case facebook::react::Role::List:
-      return UIA_ListControlTypeId;
-    case facebook::react::Role::Listitem:
-      return UIA_ListItemControlTypeId;
-    case facebook::react::Role::Menu:
-      return UIA_MenuControlTypeId;
-    case facebook::react::Role::Menubar:
-      return UIA_MenuBarControlTypeId;
-    case facebook::react::Role::Menuitem:
-      return UIA_MenuItemControlTypeId;
-    case facebook::react::Role::None:
-      return UIA_GroupControlTypeId;
-    case facebook::react::Role::Presentation:
-      return UIA_GroupControlTypeId;
-    case facebook::react::Role::Progressbar:
-      return UIA_ProgressBarControlTypeId;
-    case facebook::react::Role::Radio:
-      return UIA_RadioButtonControlTypeId;
-    case facebook::react::Role::Radiogroup:
-      return UIA_GroupControlTypeId;
-    case facebook::react::Role::Rowgroup:
-      return UIA_GroupControlTypeId;
-    case facebook::react::Role::Rowheader:
-      return UIA_HeaderControlTypeId;
-    case facebook::react::Role::Scrollbar:
-      return UIA_ScrollBarControlTypeId;
-    case facebook::react::Role::Searchbox:
-      return UIA_EditControlTypeId;
-    case facebook::react::Role::Separator:
-      return UIA_SeparatorControlTypeId;
-    case facebook::react::Role::Slider:
-      return UIA_SliderControlTypeId;
-    case facebook::react::Role::Spinbutton:
-      return UIA_SpinnerControlTypeId;
-    case facebook::react::Role::Status:
-      return UIA_StatusBarControlTypeId;
-    case facebook::react::Role::Summary:
-      return UIA_GroupControlTypeId;
-    case facebook::react::Role::Switch:
-      return UIA_ButtonControlTypeId;
-    case facebook::react::Role::Tab:
-      return UIA_TabItemControlTypeId;
-    case facebook::react::Role::Table:
-      return UIA_TableControlTypeId;
-    case facebook::react::Role::Tablist:
-      return UIA_TabControlTypeId;
-    case facebook::react::Role::Tabpanel:
-      return UIA_TabControlTypeId;
-    case facebook::react::Role::Timer:
-      return UIA_ButtonControlTypeId;
-    case facebook::react::Role::Toolbar:
-      return UIA_ToolBarControlTypeId;
-    case facebook::react::Role::Tooltip:
-      return UIA_ToolTipControlTypeId;
-    case facebook::react::Role::Tree:
-      return UIA_TreeControlTypeId;
-    case facebook::react::Role::Treegrid:
-      return UIA_TreeControlTypeId;
-    case facebook::react::Role::Treeitem:
-      return UIA_TreeItemControlTypeId;
-  }
-  return UIA_GroupControlTypeId;
-}
-
 HRESULT __stdcall CompositionDynamicAutomationProvider::GetPropertyValue(PROPERTYID propertyId, VARIANT *pRetVal) {
   if (pRetVal == nullptr)
     return E_POINTER;
@@ -561,7 +406,18 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::GetPropertyValue(PROPERT
     }
     case UIA_IsOffscreenPropertyId: {
       pRetVal->vt = VT_BOOL;
-      pRetVal->boolVal = (compositionView->getClipState() == ClipState::FullyClipped) ? VARIANT_TRUE : VARIANT_FALSE;
+
+      // Check if element is offscreen - consider modal content special case
+      bool isOffscreen = (compositionView->getClipState() == ClipState::FullyClipped);
+
+      // Modal content may appear clipped but is visible in its own window
+      if (isOffscreen) {
+        if (const auto hwnd = compositionView->GetHwndForParenting()) {
+          isOffscreen = !(IsWindowVisible(hwnd) && !IsIconic(hwnd));
+        }
+      }
+
+      pRetVal->boolVal = isOffscreen ? VARIANT_TRUE : VARIANT_FALSE;
       break;
     }
     case UIA_HelpTextPropertyId: {
@@ -618,6 +474,11 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::GetPropertyValue(PROPERT
       pRetVal->bstrVal = SysAllocString(desc.c_str());
       break;
     }
+    case UIA_HeadingLevelPropertyId: {
+      pRetVal->vt = VT_I4;
+      pRetVal->lVal = GetHeadingLevel(props->accessibilityLevel, props->accessibilityRole, props->role);
+      break;
+    }
   }
   return hr;
 }
@@ -1009,7 +870,9 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::Expand() {
 
   if (!strongView)
     return UIA_E_ELEMENTNOTAVAILABLE;
+
   DispatchAccessibilityAction(m_view, "expand");
+
   return S_OK;
 }
 
@@ -1018,7 +881,9 @@ HRESULT __stdcall CompositionDynamicAutomationProvider::Collapse() {
 
   if (!strongView)
     return UIA_E_ELEMENTNOTAVAILABLE;
+
   DispatchAccessibilityAction(m_view, "collapse");
+
   return S_OK;
 }
 

package/Microsoft.ReactNative/Fabric/Composition/CompositionTextRangeProvider.cpp

@@ -18,14 +18,30 @@ CompositionTextRangeProvider::CompositionTextRangeProvider(
 }
 
 HRESULT __stdcall CompositionTextRangeProvider::Clone(ITextRangeProvider **pRetVal) {
-  // no-op
-  *pRetVal = nullptr;
+  if (pRetVal == nullptr)
+    return E_POINTER;
+
+  auto clone = winrt::make<winrt::Microsoft::ReactNative::implementation::CompositionTextRangeProvider>(
+      m_view.view().as<winrt::Microsoft::ReactNative::Composition::ComponentView>(), m_parentProvider.get());
+  *pRetVal = clone.detach();
   return S_OK;
 }
 
 HRESULT __stdcall CompositionTextRangeProvider::Compare(ITextRangeProvider *range, BOOL *pRetVal) {
-  // no-op
-  *pRetVal = false;
+  if (pRetVal == nullptr)
+    return E_POINTER;
+  if (range == nullptr) {
+    *pRetVal = FALSE;
+    return S_OK;
+  }
+
+  // Try to cast to our type , considering provider only supports a single range per view
+  auto other = dynamic_cast<CompositionTextRangeProvider *>(range);
+  if (other && other->m_view.view() == m_view.view()) {
+    *pRetVal = TRUE;
+  } else {
+    *pRetVal = FALSE;
+  }
   return S_OK;
 }
 
@@ -34,7 +50,10 @@ HRESULT __stdcall CompositionTextRangeProvider::CompareEndpoints(
     ITextRangeProvider *targetRange,
     TextPatternRangeEndpoint targetEndpoint,
     int *pRetVal) {
-  // no-op
+  if (pRetVal == nullptr)
+    return E_POINTER;
+
+  // For a single-range provider, always equal:
   *pRetVal = 0;
   return S_OK;
 }
@@ -98,13 +117,13 @@ HRESULT __stdcall CompositionTextRangeProvider::GetAttributeValue(TEXTATTRIBUTEI
       textTransform = props->textAttributes.textTransform.value();
     }
     if (fontVariant == facebook::react::FontVariant::SmallCaps) {
-      return CapStyle_SmallCap;
+      pRetVal->lVal = CapStyle_SmallCap;
     } else if (textTransform == facebook::react::TextTransform::Capitalize) {
-      return CapStyle_Titling;
+      pRetVal->lVal = CapStyle_Titling;
     } else if (textTransform == facebook::react::TextTransform::Lowercase) {
-      return CapStyle_None;
+      pRetVal->lVal = CapStyle_None;
     } else if (textTransform == facebook::react::TextTransform::Uppercase) {
-      return CapStyle_AllCap;
+      pRetVal->lVal = CapStyle_AllCap;
     }
   } else if (attributeId == UIA_FontNameAttributeId) {
     pRetVal->vt = VT_BSTR;
@@ -282,6 +301,8 @@ HRESULT __stdcall CompositionTextRangeProvider::ScrollIntoView(BOOL alignToTop)
   return S_OK;
 }
 
+// All the below methods should be implemented once the selection comes for paragraph and TextInput
+
 HRESULT __stdcall CompositionTextRangeProvider::AddToSelection() {
   // no-op
   return S_OK;

package/Microsoft.ReactNative/Fabric/Composition/CompositionViewComponentView.cpp

@@ -831,6 +831,30 @@ void ComponentView::updateAccessibilityProps(
       oldViewProps.accessibilityValue.text,
       newViewProps.accessibilityValue.text);
 
+  // Handle annotation properties with single call
+  winrt::Microsoft::ReactNative::implementation::UpdateUiaPropertiesForAnnotation(
+      EnsureUiaProvider(), oldViewProps.accessibilityAnnotation, newViewProps.accessibilityAnnotation);
+
+  // Handle expand/collapse state changes
+  if (oldViewProps.accessibilityState.has_value() != newViewProps.accessibilityState.has_value() ||
+      (oldViewProps.accessibilityState.has_value() && newViewProps.accessibilityState.has_value() &&
+       oldViewProps.accessibilityState->expanded != newViewProps.accessibilityState->expanded)) {
+    auto oldExpanded =
+        oldViewProps.accessibilityState.has_value() && oldViewProps.accessibilityState->expanded.has_value()
+        ? oldViewProps.accessibilityState->expanded.value()
+        : false;
+    auto newExpanded =
+        newViewProps.accessibilityState.has_value() && newViewProps.accessibilityState->expanded.has_value()
+        ? newViewProps.accessibilityState->expanded.value()
+        : false;
+
+    winrt::Microsoft::ReactNative::implementation::UpdateUiaProperty(
+        EnsureUiaProvider(),
+        UIA_ExpandCollapseExpandCollapseStatePropertyId,
+        static_cast<int>(winrt::Microsoft::ReactNative::implementation::GetExpandCollapseState(oldExpanded)),
+        static_cast<int>(winrt::Microsoft::ReactNative::implementation::GetExpandCollapseState(newExpanded)));
+  }
+
   if ((oldViewProps.accessibilityState.has_value() && oldViewProps.accessibilityState->selected.has_value()) !=
       ((newViewProps.accessibilityState.has_value() && newViewProps.accessibilityState->selected.has_value()))) {
     auto compProvider =

package/Microsoft.ReactNative/Fabric/Composition/ReactNativeIsland.cpp

@@ -40,6 +40,14 @@
 
 namespace winrt::Microsoft::ReactNative::implementation {
 
+ReactPropertyId<winrt::Microsoft::ReactNative::ReactNonAbiValue<
+    winrt::weak_ref<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>>>
+ReactNativeIsland::LastFocusedReactNativeIslandProperty() noexcept {
+  static const ReactPropertyId<winrt::Microsoft::ReactNative::ReactNonAbiValue<
+      winrt::weak_ref<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>>>
+      prop{L"ReactNative.Composition", L"ReactNativeIsland"};
+  return prop;
+}
 constexpr float loadingActivitySize = 12.0f;
 constexpr float loadingActivityHorizontalOffset = 16.0f;
 constexpr float loadingBarHeight = 36.0f;
@@ -861,6 +869,20 @@ winrt::Microsoft::UI::Content::ContentIsland ReactNativeIsland::Island() {
             }
           }
         });
+    focusController.GotFocus(
+        [weakThis = get_weak()](const auto &sender, const winrt::Microsoft::UI::Input::FocusChangedEventArgs &args) {
+          if (auto pThis = weakThis.get()) {
+            // Set the island to React context so it can be accessed by native modules
+            if (pThis->m_context && pThis->m_island) {
+              auto properties = pThis->m_context.Properties();
+              properties.Set(
+                  ReactNativeIsland::LastFocusedReactNativeIslandProperty(),
+                  winrt::Microsoft::ReactNative::ReactNonAbiValue<
+                      winrt::weak_ref<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>>{
+                      std::in_place, weakThis});
+            }
+          }
+        });
 
     // ContentIsland does not support weak_ref, so we cannot use auto_revoke for these events
     m_islandAutomationProviderRequestedToken = m_island.AutomationProviderRequested(

package/Microsoft.ReactNative/Fabric/Composition/ReactNativeIsland.h

@@ -49,6 +49,9 @@ struct ReactNativeIsland
   ~ReactNativeIsland() noexcept;
 
   ReactNativeIsland(const winrt::Microsoft::UI::Composition::Compositor &compositor) noexcept;
+  static ReactPropertyId<winrt::Microsoft::ReactNative::ReactNonAbiValue<
+      winrt::weak_ref<winrt::Microsoft::ReactNative::implementation::ReactNativeIsland>>>
+  LastFocusedReactNativeIslandProperty() noexcept;
   ReactNativeIsland(const winrt::Microsoft::ReactNative::Composition::PortalComponentView &portal) noexcept;
 
   static winrt::Microsoft::ReactNative::ReactNativeIsland CreatePortal(