kylefang/react-native
1
0
Fork 0
mirror of https://github.com/zhigang1992/react-native.git synced 2026-04-05 09:29:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Make AndroidView an interface

Browse Source 
Summary:
The current AndroidView stipulates that the backing shadow node can't
be a FlatShadowNode. In some cases, however, we want to apply some of the same
logic (ex not adding NodeRegions, etc) to other ViewManagers that have a
FlatShadowNode backing (and that don't necessarily create a FlatViewGroup).
This commit renames AndroidView to NativeViewWrapper, and re-introduces
AndroidView as an interface, so that logic for padding, NodeRegions, etc can
be shared.

Differential Revision: D2942387
This commit is contained in:
Ahmed El-Helw
2016-02-17 19:08:19 -08:00
parent b461c70b76
commit f0535152ab
5 changed files with 142 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
ReactAndroid/src/main/java/com/facebook/react/flat/RCTTextInput.java
View File

@@ -9,20 +9,17 @@
package com.facebook.react.flat;
import javax.annotation.Nullable;
import android.text.SpannableStringBuilder;
import com.facebook.csslayout.Spacing;
import com.facebook.react.uimanager.UIViewOperationQueue;
import com.facebook.react.uimanager.annotations.ReactProp;
import com.facebook.react.views.text.ReactTextUpdate;
import static com.facebook.react.views.text.ReactTextShadowNode.UNSET;
public class RCTTextInput extends RCTVirtualText {
public class RCTTextInput extends RCTVirtualText implements AndroidView {
private int mJsEventCount = UNSET;
private @Nullable float[] mComputedPadding;
private boolean mPaddingChanged = false;
public RCTTextInput() {
forceMountToView();
@@ -46,15 +43,11 @@ public class RCTTextInput extends RCTVirtualText {
@Override
public void onCollectExtraUpdates(UIViewOperationQueue uiViewOperationQueue) {
super.onCollectExtraUpdates(uiViewOperationQueue);
if (mComputedPadding != null) {
uiViewOperationQueue.enqueueUpdateExtraData(getReactTag(), mComputedPadding);
mComputedPadding = null;
if (mJsEventCount != UNSET) {
ReactTextUpdate reactTextUpdate =
new ReactTextUpdate(getText(), mJsEventCount, false);
uiViewOperationQueue.enqueueUpdateExtraData(getReactTag(), reactTextUpdate);
}
ReactTextUpdate reactTextUpdate =
new ReactTextUpdate(getText(), mJsEventCount, false);
uiViewOperationQueue.enqueueUpdateExtraData(getReactTag(), reactTextUpdate);
}
@ReactProp(name = "mostRecentEventCount")
@@ -64,18 +57,20 @@ public class RCTTextInput extends RCTVirtualText {
@Override
public void setPadding(int spacingType, float padding) {
super.setPadding(spacingType, padding);
mComputedPadding = spacingToFloatArray(getPadding());
markUpdated();
if (getPadding().set(spacingType, padding)) {
mPaddingChanged = true;
dirty();
}
}
private static float[] spacingToFloatArray(Spacing spacing) {
return new float[] {
spacing.get(Spacing.LEFT),
spacing.get(Spacing.TOP),
spacing.get(Spacing.RIGHT),
spacing.get(Spacing.BOTTOM),
};
@Override
public boolean isPaddingChanged() {
return mPaddingChanged;
}
@Override
public void resetPaddingChanged() {
mPaddingChanged = false;
}
/**
@@ -87,4 +82,9 @@ public class RCTTextInput extends RCTVirtualText {
applySpans(sb);
return sb;
}
@Override
public boolean needsCustomLayoutForChildren() {
return false;
}
}