Make ScrollView and ActivityIndicator not focusable by default (#11675)…

… (#11863) * Make ScrollView and ActivityIndicator not focusable by default * Change files Co-authored-by: Jon Thysell <jthysell@microsoft.com> Co-authored-by: Chiara Mooney <34109996+chiaramooney@users.noreply.github.com> Co-authored-by: Andrew Coates <30809111+acoates-ms@users.noreply.github.com>
microsoft · Aug 7, 2023 · 6c35c44 · 6c35c44
1 parent 31f5192
commit 6c35c44
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 0 deletions.
diff --git a/change/react-native-windows-6dfacc4e-2515-4030-9e63-9ed1789f5f8c.json b/change/react-native-windows-6dfacc4e-2515-4030-9e63-9ed1789f5f8c.json
@@ -0,0 +1,7 @@
+{
+  "type": "prerelease",
+  "comment": "Make ScrollView and ActivityIndicator not focusable by default",
+  "packageName": "react-native-windows",
+  "email": "lyahdav@users.noreply.github.com",
+  "dependentChangeType": "patch"
+}
diff --git a/vnext/Microsoft.ReactNative/Views/ActivityIndicatorViewManager.cpp b/vnext/Microsoft.ReactNative/Views/ActivityIndicatorViewManager.cpp
@@ -25,6 +25,13 @@ void ActivityIndicatorViewManager::GetNativeProps(const winrt::Microsoft::ReactN
   winrt::Microsoft::ReactNative::WriteProperty(writer, L"color", L"Color");
 }
 
+ShadowNode *Microsoft::ReactNative::ActivityIndicatorViewManager::createShadow() const {
+  ShadowNode *shadowNode = Super::createShadow();
+  ShadowNodeBase *shadowNodeBase = static_cast<ShadowNodeBase *>(shadowNode);
+  shadowNodeBase->IsFocusable(false);
+  return shadowNode;
+}
+
 XamlView ActivityIndicatorViewManager::CreateViewCore(
     int64_t /*tag*/,
     const winrt::Microsoft::ReactNative::JSValueObject &) {

diff --git a/vnext/Microsoft.ReactNative/Views/ActivityIndicatorViewManager.h b/vnext/Microsoft.ReactNative/Views/ActivityIndicatorViewManager.h
@@ -15,6 +15,7 @@ class ActivityIndicatorViewManager : public ControlViewManager {
 
   const wchar_t *GetName() const override;
   void GetNativeProps(const winrt::Microsoft::ReactNative::IJSValueWriter &writer) const override;
+  ShadowNode *createShadow() const override;
 
  protected:
   bool UpdateProperty(

diff --git a/vnext/Microsoft.ReactNative/Views/ScrollViewManager.cpp b/vnext/Microsoft.ReactNative/Views/ScrollViewManager.cpp
@@ -100,6 +100,8 @@ void ScrollViewShadowNode::dispatchCommand(
 void ScrollViewShadowNode::createView(const winrt::Microsoft::ReactNative::JSValueObject &props) {
   Super::createView(props);
 
+  IsFocusable(false);
+
   const auto scrollViewer = GetView().as<winrt::ScrollViewer>();
   const auto scrollViewUWPImplementation = ScrollViewUWPImplementation(scrollViewer);
   scrollViewUWPImplementation.ScrollViewerSnapPointManager();