react-native-windows 0.0.0-canary.595 → 0.0.0-canary.597

package/Libraries/Components/Pressable/Pressable.windows.js

@@ -289,22 +289,6 @@ function Pressable(props: Props, forwardedRef): React.Node {
   const viewRef = useRef<React.ElementRef<typeof View> | null>(null);
   useImperativeHandle(forwardedRef, () => viewRef.current);
 
-  // [Windows
-  const _onBlur = (event: BlurEvent) => {
-    TextInputState.blurInput(viewRef.current);
-    if (props.onBlur) {
-      props.onBlur(event);
-    }
-  };
-
-  const _onFocus = (event: FocusEvent) => {
-    TextInputState.focusInput(viewRef.current);
-    if (props.onFocus) {
-      props.onFocus(event);
-    }
-  };
-  // Windows]
-
   const android_rippleConfig = useAndroidRippleForView(android_ripple, viewRef);
 
   const [pressed, setPressed] = usePressState(testOnly_pressed === true);
@@ -418,10 +402,6 @@ function Pressable(props: Props, forwardedRef): React.Node {
     <View
       {...restPropsWithDefaults}
       {...eventHandlers}
-      // [Windows
-      onBlur={_onBlur}
-      onFocus={_onFocus}
-      // Windows]
       ref={viewRef}
       style={typeof style === 'function' ? style({pressed}) : style}>
       {typeof children === 'function' ? children({pressed}) : children}

package/Microsoft.ReactNative/Views/TextViewManager.cpp

@@ -69,7 +69,7 @@ class TextShadowNode final : public ShadowNodeBase {
       UpdateOptimizedText();
     } else if (wasOptimized) {
       // Remove optimized text and re-construct as Inline tree
-      UpdateOptimizedText();
+      UpdateOptimizedText(true);
       if (const auto uiManager = GetNativeUIManager(GetViewManager()->GetReactContext()).lock()) {
         for (size_t i = 0; i < m_children.size(); ++i) {
           if (const auto childNode =
@@ -88,8 +88,7 @@ class TextShadowNode final : public ShadowNodeBase {
 
   void removeAllChildren() override {
     if (m_isTextOptimized) {
-      auto textBlock = this->GetView().as<xaml::Controls::TextBlock>();
-      textBlock.ClearValue(xaml::Controls::TextBlock::TextProperty());
+      UpdateOptimizedText();
     } else {
       Super::removeAllChildren();
     }
@@ -107,7 +106,7 @@ class TextShadowNode final : public ShadowNodeBase {
     GetViewManager()->MarkDirty(m_tag);
   }
 
-  void UpdateOptimizedText() {
+  void UpdateOptimizedText(bool clearOptimizedText = false) {
     if (m_children.size() > 0 && m_isTextOptimized) {
       if (const auto uiManager = GetNativeUIManager(GetViewManager()->GetReactContext()).lock()) {
         winrt::hstring text = L"";
@@ -120,7 +119,7 @@ class TextShadowNode final : public ShadowNodeBase {
         auto textBlock = this->GetView().as<xaml::Controls::TextBlock>();
         textBlock.Text(text);
       }
-    } else {
+    } else if (m_isTextOptimized || clearOptimizedText) {
       auto textBlock = this->GetView().as<xaml::Controls::TextBlock>();
       textBlock.ClearValue(xaml::Controls::TextBlock::TextProperty());
     }

package/Microsoft.ReactNative/Views/TouchEventHandler.h

@@ -12,10 +12,6 @@
 #include "Utils/BatchingEventEmitter.h"
 #include "XamlView.h"
 
-#ifdef USE_FABRIC
-#include <react/renderer/components/view/Touch.h>
-#endif
-
 namespace winrt {
 using namespace Windows::UI;
 using namespace xaml;

package/PropertySheets/Generated/PackageVersion.g.props

@@ -10,7 +10,7 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.0.0-canary.595</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.0.0-canary.597</ReactNativeWindowsVersion>
     <ReactNativeWindowsMajor>0</ReactNativeWindowsMajor>
     <ReactNativeWindowsMinor>0</ReactNativeWindowsMinor>
     <ReactNativeWindowsPatch>0</ReactNativeWindowsPatch>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.0.0-canary.595",
+  "version": "0.0.0-canary.597",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -26,7 +26,7 @@
     "@react-native-community/cli": "10.0.0-alpha.5",
     "@react-native-community/cli-platform-android": "10.0.0-alpha.4",
     "@react-native-community/cli-platform-ios": "10.0.0-alpha.3",
-    "@react-native-windows/cli": "0.0.0-canary.155",
+    "@react-native-windows/cli": "0.0.0-canary.156",
     "@react-native/assets": "1.0.0",
     "@react-native/normalize-color": "2.1.0",
     "@react-native/polyfills": "2.0.0",
@@ -60,7 +60,7 @@
     "ws": "^6.2.2"
   },
   "devDependencies": {
-    "@react-native-windows/codegen": "0.0.0-canary.46",
+    "@react-native-windows/codegen": "0.0.0-canary.47",
     "@rnw-scripts/babel-react-native-config": "0.0.0",
     "@rnw-scripts/eslint-config": "1.1.15",
     "@rnw-scripts/jest-out-of-tree-snapshot-resolver": "^1.1.1",