react-native-windows 0.0.0-canary.594 → 0.0.0-canary.596

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/Text/TextPropertyChangedParentVisitor.cpp

@@ -41,6 +41,7 @@ void TextPropertyChangedParentVisitor::VisitText(ShadowNodeBase *node) {
     }
 
     TextViewManager::UpdateOptimizedText(node);
+    node->GetViewManager()->MarkDirty(node->m_tag);
   }
 
   // Refresh text highlighters

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 =
@@ -83,16 +83,17 @@ class TextShadowNode final : public ShadowNodeBase {
     }
 
     RecalculateTextHighlighters();
+    GetViewManager()->MarkDirty(m_tag);
   }
 
   void removeAllChildren() override {
     if (m_isTextOptimized) {
-      auto textBlock = this->GetView().as<xaml::Controls::TextBlock>();
-      textBlock.ClearValue(xaml::Controls::TextBlock::TextProperty());
+      UpdateOptimizedText();
     } else {
       Super::removeAllChildren();
     }
     RecalculateTextHighlighters();
+    GetViewManager()->MarkDirty(m_tag);
   }
 
   void RemoveChildAt(int64_t indexToRemove) override {
@@ -102,9 +103,10 @@ class TextShadowNode final : public ShadowNodeBase {
       Super::RemoveChildAt(indexToRemove);
     }
     RecalculateTextHighlighters();
+    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"";
@@ -117,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/PropertySheets/Generated/PackageVersion.g.props

@@ -10,7 +10,7 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
-    <ReactNativeWindowsVersion>0.0.0-canary.594</ReactNativeWindowsVersion>
+    <ReactNativeWindowsVersion>0.0.0-canary.596</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.594",
+  "version": "0.0.0-canary.596",
   "license": "MIT",
   "repository": {
     "type": "git",