cleanup

Author: iyegoroff

TextGradientExample/App.js

@@ -28,8 +28,9 @@ export default class App extends Component<Props> {
           colors={['blue', 'red']}
           start={{ x: 0, y: 0 }}
           end={{ x: 1, y: 0 }}
+          // useViewFrame={true}
         >
-          Welcome to React Native!
+          Welcome to React Native!Welcome to React Native
         </LinearTextGradient>
         <Text style={styles.instructions}>To get started, edit App.js</Text>
         <Text style={styles.instructions}>{instructions}</Text>
@@ -47,7 +48,9 @@ const styles = StyleSheet.create({
   },
   welcome: {
     fontSize: 20,
-    textAlign: 'center',
+    // width: '100%',
+    // textAlign: 'right',
+    // backgroundColor: 'lightgray',
     margin: 10,
   },
   instructions: {

TextGradientExample/ios/TextGradientExample-tvOS/Info.plist

@@ -29,8 +29,7 @@ public class RNLinearTextGradientSpan extends CharacterStyle implements UpdateAp
     int textEnd,
     float maxWidth,
     float maxHeight,
-    String text,
-    boolean useAbsoluteSizes
+    String text
   ) {
     if (
       start != null &&
@@ -48,12 +47,23 @@ public class RNLinearTextGradientSpan extends CharacterStyle implements UpdateAp
       layout.getSelectionPath(textStart, textEnd, path);
       path.computeBounds(bounds, true);
 
+      if (layout.getLineForOffset(textEnd - 1) != layout.getLineForOffset(textEnd)) {
+        RectF lastSymbolBounds = new RectF();
+        layout.getSelectionPath(textEnd - 1, textEnd, path);
+        path.computeBounds(lastSymbolBounds, true);
+
+        if (lastSymbolBounds.contains(bounds) && bounds.contains(lastSymbolBounds)) {
+          layout.getSelectionPath(textStart, textEnd - 1, path);
+          path.computeBounds(bounds, true);
+        }
+      }
+
       float width = useViewFrame ? maxWidth : bounds.width();
       float height = useViewFrame ? maxHeight : bounds.height();
-      float x0 = useAbsoluteSizes ? start[0] : (bounds.left + start[0] * width);
-      float y0 = useAbsoluteSizes ? start[1] : (bounds.top + start[1] * height);
-      float x1 = useAbsoluteSizes ? end[0] : (bounds.left + end[0] * width);
-      float y1 = useAbsoluteSizes ? end[1] : (bounds.top + end[1] * height);
+      float x0 = (useViewFrame ? 0 : bounds.left) + start[0] * width;
+      float y0 = (useViewFrame ? 0 : bounds.top) + start[1] * height;
+      float x1 = (useViewFrame ? 0 : bounds.left) + end[0] * width;
+      float y1 = (useViewFrame ? 0 : bounds.top) + end[1] * height;
 
       mGradient = new LinearGradient(x0, y0, x1, y1, colors, locations, Shader.TileMode.CLAMP);
     }

TextGradientExample/ios/TextGradientExample-tvOSTests/Info.plist

@@ -65,8 +65,7 @@ protected RNSetGradientSpanOperation createSpan(
       end,
       maxWidth,
       maxHeight,
-      builder.toString(),
-      mUseAbsoluteSizes
+      builder.toString()
     );
 
     return new RNSetGradientSpanOperation(start, end, span);

TextGradientExample/ios/TextGradientExample.xcodeproj/project.pbxproj

@@ -69,7 +69,6 @@ public void onLayoutChange(View v, int left, int top, int right, int bottom, int
   protected float[] mLocations;
   protected int[] mColors;
   protected boolean mUseViewFrame;
-  protected boolean mUseAbsoluteSizes;
   private WeakReference<ReactApplicationContext> mContext;
 
   public RNShadowTextGradient(ReactApplicationContext context) {
@@ -149,14 +148,6 @@ public void setUseViewFrame(boolean useViewFrame) {
     markUpdated();
   }
 
-  @SuppressWarnings("unused")
-  @ReactProp(name = "useAbsoluteSizes")
-  public void setUseAbsoluteSizes(boolean useAbsoluteSizes) {
-    mUseAbsoluteSizes = useAbsoluteSizes;
-
-    markUpdated();
-  }
-
   @Override
   public boolean dispatchUpdates(
     float absoluteX,