From 9e670a64fcb0062f20e89a9b0bca07f99ec23548 Mon Sep 17 00:00:00 2001
From: Krzysztof Magiera <krzysztof@fb.com>
Date: Wed, 18 Nov 2015 07:00:46 -0800
Subject: [PATCH] Fix resetting margins and borders on android.

Summary: public

Instead of using 0 as a default we should use UNDEFINED values. That is because setting 0 for left border in case when the property was deleted will interfere with horizontal border (or margin) value. Setting UNDEFINED makes CSSLayout nodes behave correctly in that case.

Reviewed By: andreicoman11

Differential Revision: D2668669

fb-gh-sync-id: 61ce62081583fc39864268333ac8c1409c276cad
---
 .../java/com/facebook/react/uimanager/LayoutShadowNode.java   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java b/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
index 19353bc81..31670c716 100644
--- a/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
+++ b/ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java
@@ -93,7 +93,7 @@ public class LayoutShadowNode extends ReactShadowNode {
       ViewProps.MARGIN_RIGHT,
       ViewProps.MARGIN_TOP,
       ViewProps.MARGIN_BOTTOM,
-  }, defaultFloat = 0f)
+  }, defaultFloat = CSSConstants.UNDEFINED)
   public void setMargins(int index, float margin) {
     setMargin(ViewProps.PADDING_MARGIN_SPACING_TYPES[index], PixelUtil.toPixelFromDIP(margin));
   }
@@ -119,7 +119,7 @@ public class LayoutShadowNode extends ReactShadowNode {
       ViewProps.BORDER_RIGHT_WIDTH,
       ViewProps.BORDER_TOP_WIDTH,
       ViewProps.BORDER_BOTTOM_WIDTH,
-  }, defaultFloat = 0f)
+  }, defaultFloat = CSSConstants.UNDEFINED)
   public void setBorderWidths(int index, float borderWidth) {
     setBorder(ViewProps.BORDER_SPACING_TYPES[index], PixelUtil.toPixelFromDIP(borderWidth));
   }