react-native-windows 0.74.10 → 0.75.0-preview.1

package/Libraries/Utilities/HMRClient.js

@@ -26,6 +26,7 @@ let hmrUnavailableReason: string | null = null;
 let currentCompileErrorMessage: string | null = null;
 let didConnect: boolean = false;
 let pendingLogs: Array<[LogLevel, $ReadOnlyArray<mixed>]> = [];
+let pendingFuseboxConsoleNotification = false;
 
 type LogLevel =
   | 'trace'
@@ -51,6 +52,7 @@ export type HMRClientNativeInterface = {|
     isEnabled: boolean,
     scheme?: string,
   ): void,
+  unstable_notifyFuseboxConsoleEnabled(): void,
 |};
 
 /**
@@ -68,7 +70,7 @@ const HMRClient: HMRClientNativeInterface = {
     }
 
     invariant(hmrClient, 'Expected HMRClient.setup() call at startup.');
-    const LoadingView = require('./LoadingView');
+    const DevLoadingView = require('./DevLoadingView');
 
     // We use this for internal logging only.
     // It doesn't affect the logic.
@@ -79,13 +81,13 @@ const HMRClient: HMRClientNativeInterface = {
     const hasUpdates = hmrClient.hasPendingUpdates();
 
     if (hasUpdates) {
-      LoadingView.showMessage('Refreshing...', 'refresh');
+      DevLoadingView.showMessage('Refreshing...', 'refresh');
     }
     try {
       hmrClient.enable();
     } finally {
       if (hasUpdates) {
-        LoadingView.hide();
+        DevLoadingView.hide();
       }
     }
 
@@ -140,6 +142,29 @@ const HMRClient: HMRClientNativeInterface = {
     }
   },
 
+  unstable_notifyFuseboxConsoleEnabled() {
+    if (!hmrClient) {
+      pendingFuseboxConsoleNotification = true;
+      return;
+    }
+    hmrClient.send(
+      JSON.stringify({
+        type: 'log',
+        level: 'info',
+        data: [
+          '\n' +
+            '\x1b[7m' +
+            ' \x1b[1mJavaScript logs have moved!\x1b[22m They will now appear in the debugger console. ' +
+            'Tip: Type \x1b[1mj\x1b[22m in the terminal to open the debugger (requires Google Chrome ' +
+            'or Microsoft Edge).' +
+            '\x1b[27m' +
+            '\n',
+        ],
+      }),
+    );
+    pendingFuseboxConsoleNotification = false;
+  },
+
   // Called once by the bridge on startup, even if Fast Refresh is off.
   // It creates the HMR client but doesn't actually set up the socket yet.
   setup(
@@ -156,7 +181,7 @@ const HMRClient: HMRClientNativeInterface = {
     invariant(!hmrClient, 'Cannot initialize hmrClient twice');
 
     // Moving to top gives errors due to NativeModules not being initialized
-    const LoadingView = require('./LoadingView');
+    const DevLoadingView = require('./DevLoadingView');
 
     const serverHost = port !== null && port !== '' ? `${host}:${port}` : host;
 
@@ -205,7 +230,7 @@ Error: ${e.message}`;
       didConnect = true;
 
       if (client.isEnabled() && !isInitialUpdate) {
-        LoadingView.showMessage('Refreshing...', 'refresh');
+        DevLoadingView.showMessage('Refreshing...', 'refresh');
       }
     });
 
@@ -217,11 +242,11 @@ Error: ${e.message}`;
     });
 
     client.on('update-done', () => {
-      LoadingView.hide();
+      DevLoadingView.hide();
     });
 
     client.on('error', data => {
-      LoadingView.hide();
+      DevLoadingView.hide();
 
       if (data.type === 'GraphNotFoundError') {
         client.close();
@@ -242,7 +267,7 @@ Error: ${e.message}`;
     });
 
     client.on('close', closeEvent => {
-      LoadingView.hide();
+      DevLoadingView.hide();
 
       // https://www.rfc-editor.org/rfc/rfc6455.html#section-7.4.1
       // https://www.rfc-editor.org/rfc/rfc6455.html#section-7.1.5
@@ -316,6 +341,9 @@ function flushEarlyLogs(client: MetroHMRClient) {
     pendingLogs.forEach(([level, data]) => {
       HMRClient.log(level, data);
     });
+    if (pendingFuseboxConsoleNotification) {
+      HMRClient.unstable_notifyFuseboxConsoleEnabled();
+    }
   } finally {
     pendingLogs.length = 0;
   }

package/Libraries/Utilities/HMRClientProdShim.js

@@ -25,6 +25,7 @@ const HMRClientProdShim: HMRClientNativeInterface = {
   disable() {},
   registerBundle() {},
   log() {},
+  unstable_notifyFuseboxConsoleEnabled() {},
 };
 
 module.exports = HMRClientProdShim;

package/Libraries/Utilities/NativePlatformConstantsWin.js

@@ -6,6 +6,6 @@
  * @flow strict
  */
 
-export * from '../../src/private/specs/modules/NativePlatformConstantsWin';
-import NativePlatformConstantsWin from '../../src/private/specs/modules/NativePlatformConstantsWin';
+export * from '../../src/private/specs/modules/NativePlatformConstantsWindows';
+import NativePlatformConstantsWin from '../../src/private/specs/modules/NativePlatformConstantsWindows';
 export default NativePlatformConstantsWin;

package/Libraries/Utilities/Platform.android.js

@@ -78,10 +78,10 @@ const Platform: PlatformType = {
       ? // $FlowFixMe[incompatible-return]
         spec.android
       : 'native' in spec
-      ? // $FlowFixMe[incompatible-return]
-        spec.native
-      : // $FlowFixMe[incompatible-return]
-        spec.default,
+        ? // $FlowFixMe[incompatible-return]
+          spec.native
+        : // $FlowFixMe[incompatible-return]
+          spec.default,
 };
 
 module.exports = Platform;

package/Libraries/Utilities/RCTLog.js

@@ -38,6 +38,7 @@ const RCTLog = {
 
   // Log to console regardless of nativeLoggingHook
   logToConsole(level: string, ...args: Array<mixed>): void {
+    // $FlowFixMe[invalid-computed-prop]
     const logFn = levelsMap[level];
     invariant(
       logFn,

package/Libraries/Utilities/ReactNativeTestTools.js

@@ -12,20 +12,16 @@
 
 import type {ReactTestRenderer as ReactTestRendererType} from 'react-test-renderer';
 
+import TouchableWithoutFeedback from '../Components/Touchable/TouchableWithoutFeedback';
+
 const Switch = require('../Components/Switch/Switch').default;
 const TextInput = require('../Components/TextInput/TextInput');
 const View = require('../Components/View/View');
 const Text = require('../Text/Text');
 const {VirtualizedList} = require('@react-native/virtualized-lists');
 const React = require('react');
-const ShallowRenderer = require('react-shallow-renderer');
 const ReactTestRenderer = require('react-test-renderer');
 
-/* $FlowFixMe[not-a-function] (>=0.125.1 site=react_native_fb) This comment
- * suppresses an error found when Flow v0.125.1 was deployed. To see the error,
- * delete this comment and run Flow. */
-// $FlowFixMe[invalid-constructor]
-const shallowRenderer = new ShallowRenderer();
 export type ReactTestInstance = $PropertyType<ReactTestRendererType, 'root'>;
 export type Predicate = (node: ReactTestInstance) => boolean;
 /* $FlowFixMe[value-as-type] (>=0.125.1 site=react_native_fb) This comment
@@ -49,6 +45,9 @@ function byClickable(): Predicate {
       (node.type === Switch && node.props && node.props.disabled !== true) ||
       (node.type === View &&
         node?.props?.onStartShouldSetResponder?.testOnly_pressabilityConfig) ||
+      (node.type === TouchableWithoutFeedback &&
+        node.props &&
+        typeof node.props.onPress === 'function') ||
       // HACK: Find components that use `Pressability`.
       node.instance?.state?.pressability != null ||
       // TODO: Remove this after deleting `Touchable`.
@@ -114,7 +113,7 @@ function expectNoConsoleError() {
   });
 }
 
-function expectRendersMatchingSnapshot(
+async function expectRendersMatchingSnapshot(
   name: string,
   ComponentProvider: () => React.Element<any>,
   unmockComponent: () => mixed,
@@ -123,7 +122,9 @@ function expectRendersMatchingSnapshot(
 
   jest.resetAllMocks();
 
-  instance = ReactTestRenderer.create(<ComponentProvider />);
+  await ReactTestRenderer.act(() => {
+    instance = ReactTestRenderer.create(<ComponentProvider />);
+  });
   expect(instance).toMatchSnapshot(
     'should deep render when mocked (please verify output manually)',
   );
@@ -131,22 +132,9 @@ function expectRendersMatchingSnapshot(
   jest.resetAllMocks();
   unmockComponent();
 
-  instance = shallowRenderer.render(<ComponentProvider />);
-  expect(instance).toMatchSnapshot(
-    `should shallow render as <${name} /> when not mocked`,
-  );
-
-  jest.resetAllMocks();
-
-  instance = shallowRenderer.render(<ComponentProvider />);
-  expect(instance).toMatchSnapshot(
-    `should shallow render as <${name} /> when mocked`,
-  );
-
-  jest.resetAllMocks();
-  unmockComponent();
-
-  instance = ReactTestRenderer.create(<ComponentProvider />);
+  await ReactTestRenderer.act(() => {
+    instance = ReactTestRenderer.create(<ComponentProvider />);
+  });
   expect(instance).toMatchSnapshot(
     'should deep render when not mocked (please verify output manually)',
   );

package/Libraries/Utilities/verifyComponentAttributeEquivalence.js

@@ -104,16 +104,21 @@ export function getConfigWithoutViewProps(
   viewConfig: ViewConfig,
   propName: string,
 ): {...} {
+  // $FlowFixMe[invalid-computed-prop]
   if (!viewConfig[propName]) {
     return {};
   }
 
-  return Object.keys(viewConfig[propName])
-    .filter(prop => !PlatformBaseViewConfig[propName][prop])
-    .reduce<{[string]: any}>((obj, prop) => {
-      obj[prop] = viewConfig[propName][prop];
-      return obj;
-    }, {});
+  return (
+    Object.keys(viewConfig[propName])
+      // $FlowFixMe[invalid-computed-prop]
+      .filter(prop => !PlatformBaseViewConfig[propName][prop])
+      .reduce<{[string]: any}>((obj, prop) => {
+        // $FlowFixMe[invalid-computed-prop]
+        obj[prop] = viewConfig[propName][prop];
+        return obj;
+      }, {})
+  );
 }
 
 export function stringifyViewConfig(viewConfig: any): string {

package/Libraries/__tests__/ViewWindows-test.js

@@ -2,15 +2,15 @@
 'use strict';
 
 const React = require('react');
-const ReactTestRenderer = require('react-test-renderer');
-
+const renderer = require('react-native/jest/renderer');
 const View = require('../Components/View/View');
 
 describe('View', () => {
-  it('renders basic view', () => {
-    const component = ReactTestRenderer.create(
+  it('renders basic view', async () => {
+    expect(
+      await renderer.create(
       <View/>
-    );
-    expect(component).toMatchSnapshot();
+    ),
+  ).toMatchSnapshot();
   });
 });

package/Libraries/promiseRejectionTrackingOptions.js

@@ -52,6 +52,7 @@ let rejectionTrackingOptions: $NonMaybeType<Parameters<enable>[0]> = {
           substitutions: [],
         },
         componentStack: [],
+        componentStackType: null,
         stack,
         category: 'possible_unhandled_promise_rejection',
       });

package/Microsoft.ReactNative/Base/FollyIncludes.h

@@ -17,7 +17,7 @@
 
 #pragma warning(push)
 #pragma warning(disable : 4127) // conditional expression is constant
-#include <folly/container/detail/F14table.h>
+#include <folly/container/detail/F14Table.h>
 #pragma warning(pop)
 
 #include <folly/Memory.h>

package/Microsoft.ReactNative/ComponentView.idl

@@ -20,21 +20,6 @@ namespace Microsoft.ReactNative
   [experimental]
   delegate Object StateUpdateMutation(Object props);
 
-  [webhosthidden]
-  [experimental]
-  enum EventPriority
-  {
-    SynchronousUnbatched,
-    SynchronousBatched,
-    AsynchronousUnbatched,
-    AsynchronousBatched,
-
-    Sync = SynchronousUnbatched,
-    Work = SynchronousBatched,
-    Interactive = AsynchronousUnbatched,
-    Deferred = AsynchronousBatched
-  };
-
   [flags]
   [webhosthidden]
   [experimental]
@@ -55,9 +40,7 @@ namespace Microsoft.ReactNative
   {
     Object Data { get; };
     void UpdateState(Object data);
-    void UpdateStateWithPriority(Object data, EventPriority priority);
     void UpdateStateWithMutation(StateUpdateMutation mutation);
-    void UpdateStateWithMutationAndPriority(StateUpdateMutation mutation, EventPriority priority);
   };
 
   [experimental]

package/Microsoft.ReactNative/Fabric/AbiState.cpp

@@ -19,53 +19,11 @@ void AbiComponentState::UpdateState(const winrt::Windows::Foundation::IInspectab
   m_state->updateState(std::move(state));
 }
 
-// Verify winrt::Microsoft::ReactNative::EventPriority and facebook::react::EventPriority are in sync
-static_assert(
-    winrt::Microsoft::ReactNative::EventPriority::SynchronousUnbatched ==
-    static_cast<winrt::Microsoft::ReactNative::EventPriority>(facebook::react::EventPriority::SynchronousUnbatched));
-static_assert(
-    winrt::Microsoft::ReactNative::EventPriority::SynchronousBatched ==
-    static_cast<winrt::Microsoft::ReactNative::EventPriority>(facebook::react::EventPriority::SynchronousBatched));
-static_assert(
-    winrt::Microsoft::ReactNative::EventPriority::AsynchronousUnbatched ==
-    static_cast<winrt::Microsoft::ReactNative::EventPriority>(facebook::react::EventPriority::AsynchronousUnbatched));
-static_assert(
-    winrt::Microsoft::ReactNative::EventPriority::AsynchronousBatched ==
-    static_cast<winrt::Microsoft::ReactNative::EventPriority>(facebook::react::EventPriority::AsynchronousBatched));
-static_assert(
-    winrt::Microsoft::ReactNative::EventPriority::Sync ==
-    static_cast<winrt::Microsoft::ReactNative::EventPriority>(facebook::react::EventPriority::Sync));
-static_assert(
-    winrt::Microsoft::ReactNative::EventPriority::Work ==
-    static_cast<winrt::Microsoft::ReactNative::EventPriority>(facebook::react::EventPriority::Work));
-static_assert(
-    winrt::Microsoft::ReactNative::EventPriority::Interactive ==
-    static_cast<winrt::Microsoft::ReactNative::EventPriority>(facebook::react::EventPriority::Interactive));
-static_assert(
-    winrt::Microsoft::ReactNative::EventPriority::Deferred ==
-    static_cast<winrt::Microsoft::ReactNative::EventPriority>(facebook::react::EventPriority::Deferred));
-
-void AbiComponentState::UpdateStateWithPriority(
-    const winrt::Windows::Foundation::IInspectable &data,
-    winrt::Microsoft::ReactNative::EventPriority priority) noexcept {
-  AbiStateData state;
-  state.userdata = data;
-  m_state->updateState(std::move(state), static_cast<facebook::react::EventPriority>(priority));
-}
-
 void AbiComponentState::UpdateStateWithMutation(
     const winrt::Microsoft::ReactNative::StateUpdateMutation &mutation) noexcept {
-  UpdateStateWithMutationAndPriority(mutation, winrt::Microsoft::ReactNative::EventPriority::AsynchronousUnbatched);
-}
-
-void AbiComponentState::UpdateStateWithMutationAndPriority(
-    const winrt::Microsoft::ReactNative::StateUpdateMutation &mutation,
-    winrt::Microsoft::ReactNative::EventPriority priority) noexcept {
-  m_state->updateState(
-      [mutation](const AbiStateData &oldData) {
-        return std::make_shared<AbiStateData const>(mutation(oldData.userdata));
-      },
-      static_cast<facebook::react::EventPriority>(priority));
+  m_state->updateState([mutation](const AbiStateData &oldData) {
+    return std::make_shared<AbiStateData const>(mutation(oldData.userdata));
+  });
 }
 
 } // namespace Microsoft::ReactNative

package/Microsoft.ReactNative/Fabric/AbiState.h

@@ -23,13 +23,7 @@ struct AbiComponentState : winrt::implements<AbiComponentState, winrt::Microsoft
 
   winrt::Windows::Foundation::IInspectable Data() noexcept;
   void UpdateState(const winrt::Windows::Foundation::IInspectable &data) noexcept;
-  void UpdateStateWithPriority(
-      const winrt::Windows::Foundation::IInspectable &data,
-      winrt::Microsoft::ReactNative::EventPriority priority) noexcept;
   void UpdateStateWithMutation(const winrt::Microsoft::ReactNative::StateUpdateMutation &mutation) noexcept;
-  void UpdateStateWithMutationAndPriority(
-      const winrt::Microsoft::ReactNative::StateUpdateMutation &mutation,
-      winrt::Microsoft::ReactNative::EventPriority priority) noexcept;
 
  private:
   std::shared_ptr<facebook::react::ConcreteState<AbiStateData> const> m_state;

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

@@ -34,7 +34,8 @@ ImageComponentView::WindowsImageResponseObserver::WindowsImageResponseObserver(I
   m_image.copy_from(&image);
 }
 
-void ImageComponentView::WindowsImageResponseObserver::didReceiveProgress(float progress) const {
+void ImageComponentView::WindowsImageResponseObserver::didReceiveProgress(float progress, int64_t loaded, int64_t total)
+    const {
   // TODO progress?
 }
 
@@ -45,8 +46,9 @@ void ImageComponentView::WindowsImageResponseObserver::didReceiveImage(
       [imageResponseImage, image = m_image]() { image->didReceiveImage(imageResponseImage); });
 }
 
-void ImageComponentView::WindowsImageResponseObserver::didReceiveFailure() const {
-  m_image->didReceiveFailureFromObserver();
+void ImageComponentView::WindowsImageResponseObserver::didReceiveFailure(
+    facebook::react::ImageLoadError const &error) const {
+  m_image->didReceiveFailureFromObserver(error);
 }
 
 facebook::react::SharedViewProps ImageComponentView::defaultProps() noexcept {
@@ -92,7 +94,7 @@ void ImageComponentView::didReceiveImage(const std::shared_ptr<ImageResponseImag
 
   auto imageEventEmitter = std::static_pointer_cast<facebook::react::ImageEventEmitter const>(m_eventEmitter);
   if (imageEventEmitter) {
-    imageEventEmitter->onLoad();
+    imageEventEmitter->onLoad(m_state->getData().getImageSource());
     imageEventEmitter->onLoadEnd();
   }
 
@@ -107,10 +109,12 @@ void ImageComponentView::didReceiveImage(const std::shared_ptr<ImageResponseImag
   ensureDrawingSurface();
 }
 
-void ImageComponentView::didReceiveFailureFromObserver() noexcept {
+void ImageComponentView::didReceiveFailureFromObserver(const facebook::react::ImageLoadError &error) noexcept {
   auto imageEventEmitter = std::static_pointer_cast<facebook::react::ImageEventEmitter const>(m_eventEmitter);
   if (imageEventEmitter) {
-    imageEventEmitter->onError();
+    std::shared_ptr<facebook::react::ImageErrorInfo> errorInfo =
+        std::static_pointer_cast<facebook::react::ImageErrorInfo>(error.getError());
+    imageEventEmitter->onError(*errorInfo);
     imageEventEmitter->onLoadEnd();
   }
 }

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

@@ -70,9 +70,9 @@ struct ImageComponentView : ImageComponentViewT<ImageComponentView, ViewComponen
   struct WindowsImageResponseObserver : facebook::react::ImageResponseObserver {
    public:
     WindowsImageResponseObserver(ImageComponentView &image);
-    void didReceiveProgress(float progress) const override;
-    void didReceiveImage(facebook::react::ImageResponse const &imageResponse) const override;
-    void didReceiveFailure() const override;
+    void didReceiveProgress(float progress, int64_t loaded, int64_t total) const override;
+    void didReceiveImage(const facebook::react::ImageResponse &imageResponse) const override;
+    void didReceiveFailure(const facebook::react::ImageLoadError &error) const override;
 
    private:
     winrt::com_ptr<ImageComponentView> m_image;
@@ -84,7 +84,7 @@ struct ImageComponentView : ImageComponentViewT<ImageComponentView, ViewComponen
   void ImageLoadStart() noexcept;
   void ImageLoaded() noexcept;
   void didReceiveImage(const std::shared_ptr<ImageResponseImage> &wicbmp) noexcept;
-  void didReceiveFailureFromObserver() noexcept;
+  void didReceiveFailureFromObserver(const facebook::react::ImageLoadError &error) noexcept;
   void setStateAndResubscribeImageResponseObserver(
       facebook::react::ImageShadowNode::ConcreteState::Shared const &state) noexcept;
   bool themeEffectsImage() const noexcept;

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

@@ -415,6 +415,13 @@ void ReactNativeIsland::UpdateRootViewInternal() noexcept {
   }
 }
 
+struct AutoMRE {
+  ~AutoMRE() {
+    mre.Set();
+  }
+  Mso::ManualResetEvent mre;
+};
+
 void ReactNativeIsland::UninitRootView() noexcept {
   if (!m_isInitialized) {
     return;
@@ -431,8 +438,10 @@ void ReactNativeIsland::UninitRootView() noexcept {
     // This is needed to ensure that the unmount JS logic is completed before the the instance is shutdown during
     // instance destruction. Aligns with similar code in ReactInstanceWin::DetachRootView for paper Future: Instead this
     // method should return a Promise, which should be resolved when the JS logic is complete.
+    // The task will auto set the event on destruction to ensure that the event is set if the JS Queue has already been
+    // shutdown
     Mso::ManualResetEvent mre;
-    m_context.JSDispatcher().Post([&]() { mre.Set(); });
+    m_context.JSDispatcher().Post([autoMRE = std::make_unique<AutoMRE>(AutoMRE{mre})]() {});
     mre.Wait();
 
     // Paper version gives the JS thread time to finish executing - Is this needed?
@@ -498,7 +507,7 @@ facebook::react::Size MeasureLoading(const facebook::react::LayoutConstraints &l
       attributedStringBox, {} /*paragraphAttributes*/, layoutConstraints, textLayout);
 
   DWRITE_TEXT_METRICS tm;
-  textLayout->GetMetrics(&tm);
+  winrt::check_hresult(textLayout->GetMetrics(&tm));
 
   return layoutConstraints.clamp(
       {loadingActivityHorizontalOffset * scaleFactor + tm.width, loadingBarHeight * scaleFactor});
@@ -515,7 +524,7 @@ void ReactNativeIsland::SizeChanged(winrt::event_token const &token) noexcept {
 }
 
 struct RootViewSizeChangedEventArgs : RootViewSizeChangedEventArgsT<RootViewSizeChangedEventArgs> {
-  RootViewSizeChangedEventArgs(winrt::Windows::Foundation::Size size) : m_size(size) {}
+  RootViewSizeChangedEventArgs(const winrt::Windows::Foundation::Size &size) : m_size(size) {}
   winrt::Windows::Foundation::Size Size() const noexcept {
     return m_size;
   }

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

@@ -1138,7 +1138,7 @@ winrt::Microsoft::ReactNative::Composition::Experimental::IVisual ScrollViewComp
         updateStateWithContentOffset();
         auto eventEmitter = GetEventEmitter();
         if (eventEmitter) {
-          facebook::react::ScrollViewMetrics scrollMetrics;
+          facebook::react::ScrollViewEventEmitter::Metrics scrollMetrics;
           scrollMetrics.containerSize.height = m_layoutMetrics.frame.size.height;
           scrollMetrics.containerSize.width = m_layoutMetrics.frame.size.width;
           scrollMetrics.contentOffset.x = args.Position().x / m_layoutMetrics.pointScaleFactor;

package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputComponentView.cpp

@@ -947,6 +947,10 @@ void WindowsTextInputComponentView::onGotFocus(
     LRESULT lresult;
     DrawBlock db(*this);
     m_textServices->TxSendMessage(WM_SETFOCUS, 0, 0, &lresult);
+
+    if (windowsTextInputProps().clearTextOnFocus) {
+      m_textServices->TxSetText(L"");
+    }
   }
 }
 
@@ -1112,8 +1116,6 @@ void WindowsTextInputComponentView::updateState(
     return;
   }
 
-  auto data = m_state->getData();
-
   if (!oldState) {
     m_mostRecentEventCount = m_state->getData().mostRecentEventCount;
   }
@@ -1122,19 +1124,11 @@ void WindowsTextInputComponentView::updateState(
     m_comingFromState = true;
     // Only handle single/empty fragments right now -- ignore the other fragments
 
-    LRESULT res;
-    CHARRANGE cr;
-    cr.cpMin = cr.cpMax = 0;
-    winrt::check_hresult(m_textServices->TxSendMessage(EM_EXGETSEL, 0, reinterpret_cast<LPARAM>(&cr), &res));
-
     UpdateText(
         m_state->getData().attributedString.getFragments().size()
             ? m_state->getData().attributedString.getFragments()[0].string
             : "");
 
-    winrt::check_hresult(
-        m_textServices->TxSendMessage(EM_SETSEL, static_cast<WPARAM>(cr.cpMin), static_cast<LPARAM>(cr.cpMax), &res));
-
     m_comingFromState = false;
   }
 }
@@ -1153,7 +1147,8 @@ void WindowsTextInputComponentView::UpdateText(const std::string &str) noexcept
   winrt::check_hresult(m_textServices->TxSendMessage(
       EM_SETTEXTEX, reinterpret_cast<WPARAM>(&stt), reinterpret_cast<LPARAM>(str.c_str()), &res));
 
-  winrt::check_hresult(m_textServices->TxSendMessage(EM_EXGETSEL, 0, reinterpret_cast<LPARAM>(&cr), &res));
+  winrt::check_hresult(
+      m_textServices->TxSendMessage(EM_SETSEL, static_cast<WPARAM>(cr.cpMin), static_cast<LPARAM>(cr.cpMax), &res));
 
   // enable colored emojis
   winrt::check_hresult(
@@ -1216,7 +1211,7 @@ void WindowsTextInputComponentView::OnTextUpdated() noexcept {
 }
 
 void WindowsTextInputComponentView::OnSelectionChanged(LONG start, LONG end) noexcept {
-  if (m_eventEmitter /* && !m_comingFromJS ?? */) {
+  if (m_eventEmitter && !m_comingFromState /* && !m_comingFromJS ?? */) {
     auto emitter = std::static_pointer_cast<const facebook::react::WindowsTextInputEventEmitter>(m_eventEmitter);
     facebook::react::WindowsTextInputEventEmitter::OnSelectionChange onSelectionChangeArgs;
     onSelectionChangeArgs.selection.start = start;

package/Microsoft.ReactNative/Fabric/Composition/TextInput/WindowsTextInputShadowNode.cpp

@@ -185,8 +185,7 @@ Size WindowsTextInputShadowNode::measureContent(
           AttributedStringBox{attributedString},
           {}, // TODO getConcreteProps().paragraphAttributes,
           textLayoutContext,
-          layoutConstraints,
-          nullptr)
+          layoutConstraints)
       .size;
 }
 

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

@@ -285,9 +285,15 @@ ImageResponseOrImageErrorInfo ImageResponse::ResolveImage() {
 
 ImageResponseOrImageErrorInfo ImageFailedResponse::ResolveImage() {
   ImageResponseOrImageErrorInfo imageOrError;
-  imageOrError.errorInfo = winrt::to_string(m_errorMessage);
-  if (imageOrError.errorInfo.empty()) {
-    imageOrError.errorInfo = "Failed to load image.";
+  imageOrError.errorInfo = std::make_shared<facebook::react::ImageErrorInfo>();
+  imageOrError.errorInfo->responseCode = static_cast<int>(m_statusCode);
+  imageOrError.errorInfo->error = winrt::to_string(m_errorMessage);
+  if (imageOrError.errorInfo->error.empty()) {
+    imageOrError.errorInfo->error = "Failed to load image.";
+  }
+  for (auto &&[header, value] : m_responseHeaders) {
+    imageOrError.errorInfo->httpResponseHeaders.push_back(
+        std::make_pair<std::string, std::string>(winrt::to_string(header), winrt::to_string(value)));
   }
   return imageOrError;
 }

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

@@ -41,7 +41,7 @@ winrt::Microsoft::ReactNative::Composition::ImageSource MakeImageSource(
 
 struct ImageResponseOrImageErrorInfo {
   std::shared_ptr<winrt::Microsoft::ReactNative::Composition::implementation::ImageResponseImage> image;
-  std::string errorInfo;
+  std::shared_ptr<facebook::react::ImageErrorInfo> errorInfo;
 };
 
 struct ImageResponse : ImageResponseT<ImageResponse /*, IResolveImage*/> {