Revert "prototype(FastText): Add option to use TextBlock for simple t…

…ext (#1256)" (#1939) Reverts #1256. We need to update Text.windows.js to be in sync with the latest from react-native first.
microsoft · Aug 14, 2018 · adb4539 · adb4539
1 parent 7fa57fc
commit adb4539
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 733 deletions.
diff --git a/Libraries/Text/Text.windows.js b/Libraries/Text/Text.windows.js
diff --git a/ReactWindows/ReactNative.Net46/ReactNative.Net46.csproj b/ReactWindows/ReactNative.Net46/ReactNative.Net46.csproj
@@ -172,7 +172,6 @@
     <Compile Include="Views\Scroll\ScrollView.cs" />
     <Compile Include="Views\Slider\ReactSliderManager.cs" />
     <Compile Include="Views\TextInput\PlaceholderAdorner.cs" />
-    <Compile Include="Views\Text\ReactSimpleTextViewManager.cs" />
     <Compile Include="Views\Text\ReactTextCompoundView.cs" />
     <Compile Include="Views\Text\ReactTextShadowNode.cs" />
     <Compile Include="Views\Text\ReactTextViewManager.cs" />

diff --git a/ReactWindows/ReactNative.Net46/Shell/MainReactPackage.cs b/ReactWindows/ReactNative.Net46/Shell/MainReactPackage.cs
@@ -75,7 +75,6 @@ public IReadOnlyList<IViewManager> CreateViewManagers(
         {
             return new List<IViewManager>
             {
-                new ReactSimpleTextViewManager(),
                 //new ReactFlipViewManager(),
                 new ReactImageManager(),
                 new ReactProgressBarViewManager(),

diff --git a/ReactWindows/ReactNative.Net46/Views/Text/ReactSimpleTextViewManager.cs b/ReactWindows/ReactNative.Net46/Views/Text/ReactSimpleTextViewManager.cs
diff --git a/ReactWindows/ReactNative.Net46/Views/Text/ReactTextCompoundView.cs b/ReactWindows/ReactNative.Net46/Views/Text/ReactTextCompoundView.cs
@@ -1,8 +1,7 @@
-// Copyright (c) Microsoft Corporation. All rights reserved.
+// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
 using ReactNative.UIManager;
-using System.Linq;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -14,8 +13,7 @@ public int GetReactTagAtPoint(UIElement reactView, Point point)
         {
             var richTextBlock = reactView.As<TextBlock>();
             var textPointer = richTextBlock.GetPositionFromPoint(point, true);
-            var parentView = RootViewHelper.GetReactViewHierarchy(textPointer.Parent).First();
-            return parentView.GetTag();
+            return textPointer.Parent.GetTag();
         }
     }
 }
diff --git a/ReactWindows/ReactNative.Net46/Views/Text/ReactTextShadowNode.cs b/ReactWindows/ReactNative.Net46/Views/Text/ReactTextShadowNode.cs
@@ -30,8 +30,6 @@ public class ReactTextShadowNode : LayoutShadowNode
 
         private string _fontFamily;
 
-        private string _text;
-
         /// <summary>
         /// Instantiates a <see cref="ReactTextShadowNode"/>.
         /// </summary>
@@ -41,21 +39,6 @@ public ReactTextShadowNode()
                 MeasureText(this, node, width, widthMode, height, heightMode);
         }
 
-        /// <summary>
-        /// Sets the text for the node.
-        /// </summary>
-        /// <param name="text">The text.</param>
-        [ReactProp("text")]
-        public void SetText(string text)
-        {
-            var nonNullText = text ?? "";
-            if (_text != nonNullText)
-            {
-                _text = nonNullText;
-                MarkUpdated();
-            }
-        }
-
         /// <summary>
         /// Sets the font size for the node.
         /// </summary>
@@ -242,11 +225,8 @@ public void UpdateTextBlock(TextBlock textBlock)
 
         private void UpdateTextBlockCore(TextBlock textBlock, bool measureOnly)
         {
-            if (ChildCount == 0 && _text != null)
-            {
-                textBlock.Text = _text;
-            }
-
+            //textBlock.CharacterSpacing = _letterSpacing;
+            //textBlock.MaxLines = _numberOfLines;
             textBlock.LineHeight = _lineHeight != 0 ? _lineHeight : double.NaN;
             textBlock.TextAlignment = _textAlignment;
             textBlock.FontSize = _fontSize ?? 15;