Skip to content

Commit c1b7a36

Browse files
lexsfacebook-github-bot-4
authored andcommitted
Move UIManager annotations to separate package
Summary: Moves ReactProp and ReactPropGroup to `com.facebook.react.uimanager.annotations`. This is needed so that future annotation processor can run on code inside the com.facebook.react.uimanager package. public Reviewed By: astreet Differential Revision: D2754842 fb-gh-sync-id: 3808c3e3f6c45e5897ecab88cd4175573c0c24e6
1 parent 23cd9fe commit c1b7a36

26 files changed

+38
-32
lines changed

ReactAndroid/src/main/java/com/facebook/react/uimanager/BaseViewManager.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
import android.view.View;
88

99
import com.facebook.react.bridge.ReadableMap;
10+
import com.facebook.react.uimanager.annotations.ReactProp;
1011

1112
/**
1213
* Base class that should be suitable for the majority of subclasses of {@link ViewManager}.

ReactAndroid/src/main/java/com/facebook/react/uimanager/LayoutShadowNode.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,8 @@
1212
import com.facebook.csslayout.CSSJustify;
1313
import com.facebook.csslayout.CSSPositionType;
1414
import com.facebook.csslayout.CSSWrap;
15+
import com.facebook.react.uimanager.annotations.ReactProp;
16+
import com.facebook.react.uimanager.annotations.ReactPropGroup;
1517

1618
/**
1719
* Supply setters for base view layout properties such as width, height, flex properties,

ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManager.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,8 @@
2020
import com.facebook.react.bridge.ReadableMapKeySetIterator;
2121
import com.facebook.react.touch.CatalystInterceptingViewGroup;
2222
import com.facebook.react.touch.JSResponderHandler;
23+
import com.facebook.react.uimanager.annotations.ReactProp;
24+
import com.facebook.react.uimanager.annotations.ReactPropGroup;
2325

2426
/**
2527
* Class responsible for knowing how to create and update catalyst Views of a given type. It is also

ReactAndroid/src/main/java/com/facebook/react/uimanager/ViewManagersPropertyCache.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@
1515
import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
1616
import com.facebook.react.bridge.ReadableArray;
1717
import com.facebook.react.bridge.ReadableMap;
18+
import com.facebook.react.uimanager.annotations.ReactProp;
19+
import com.facebook.react.uimanager.annotations.ReactPropGroup;
1820

1921
/**
2022
* This class is responsible for holding view manager property setters and is used in a process of

ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactProp.java renamed to ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactProp.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2004-present Facebook. All Rights Reserved.
22

3-
package com.facebook.react.uimanager;
3+
package com.facebook.react.uimanager.annotations;
44

55
import javax.annotation.Nullable;
66

@@ -12,7 +12,8 @@
1212

1313
/**
1414
* Use this annotation to annotate properties of native views that should be exposed to JS. This
15-
* annotation should only be used for setter methods of subclasses of {@link ViewManager}.
15+
* annotation should only be used for setter methods of subclasses of
16+
* {@link com.facebook.react.uimanager.ViewManager}.
1617
*
1718
* Each annotated method should return {@code void} and take exactly two arguments: first being
1819
* a view instance to be updated and second a value that should be set.
@@ -21,8 +22,8 @@
2122
* - primitives (int, boolean, double, float)
2223
* - {@link String}
2324
* - {@link Boolean}
24-
* - {@link ReadableArray}
25-
* - {@link ReadableMap}
25+
* - {@link com.facebook.react.bridge.ReadableArray}
26+
* - {@link com.facebook.react.bridge.ReadableMap}
2627
*
2728
* When property gets removed from the corresponding component in React, annotated setter will be
2829
* called with {@code null} in case of non-primitive value type or with a default value in case when

ReactAndroid/src/main/java/com/facebook/react/uimanager/ReactPropGroup.java renamed to ReactAndroid/src/main/java/com/facebook/react/uimanager/annotations/ReactPropGroup.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// Copyright 2004-present Facebook. All Rights Reserved.
22

3-
package com.facebook.react.uimanager;
3+
package com.facebook.react.uimanager.annotations;
44

55
import javax.annotation.Nullable;
66

@@ -12,9 +12,10 @@
1212

1313
/**
1414
* Use this annotation to annotate group of properties of native views that should be exposed to JS.
15-
* This annotation should only be used for setter methods of subclasses of {@link ViewManager}. It's
16-
* a batched version of {@link ReactProp} annotation (please see documentation of {@link ReactProp}
17-
* for more details about how this annotation can be used).
15+
* This annotation should only be used for setter methods of subclasses of
16+
* {@link com.facebook.react.uimanager.ViewManager}. It's a batched version of {@link ReactProp}
17+
* annotation (please see documentation of {@link ReactProp} for more details about how this
18+
* annotation can be used).
1819
*
1920
* This annotation is meant to be used for a group of similar properties. That's why it support only
2021
* a set of properties of the same type. A good example is supporting "border", where we have 7

ReactAndroid/src/main/java/com/facebook/react/views/art/ARTShapeShadowNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import com.facebook.react.bridge.JSApplicationIllegalArgumentException;
2121
import com.facebook.react.bridge.ReadableArray;
2222
import com.facebook.react.common.ReactConstants;
23-
import com.facebook.react.uimanager.ReactProp;
23+
import com.facebook.react.uimanager.annotations.ReactProp;
2424

2525
/**
2626
* Shadow node for virtual ARTShape view

ReactAndroid/src/main/java/com/facebook/react/views/art/ARTTextShadowNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818

1919
import com.facebook.react.bridge.ReadableArray;
2020
import com.facebook.react.bridge.ReadableMap;
21-
import com.facebook.react.uimanager.ReactProp;
21+
import com.facebook.react.uimanager.annotations.ReactProp;
2222

2323
/**
2424
* Shadow node for virtual ARTText view

ReactAndroid/src/main/java/com/facebook/react/views/art/ARTVirtualNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import com.facebook.react.bridge.ReadableArray;
2020
import com.facebook.react.uimanager.CatalystStylesDiffMap;
2121
import com.facebook.react.uimanager.DisplayMetricsHolder;
22-
import com.facebook.react.uimanager.ReactProp;
22+
import com.facebook.react.uimanager.annotations.ReactProp;
2323
import com.facebook.react.uimanager.ReactShadowNode;
2424

2525
/**

ReactAndroid/src/main/java/com/facebook/react/views/drawer/ReactDrawerLayoutManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import com.facebook.react.bridge.ReadableArray;
2323
import com.facebook.react.common.MapBuilder;
2424
import com.facebook.react.uimanager.PixelUtil;
25-
import com.facebook.react.uimanager.ReactProp;
25+
import com.facebook.react.uimanager.annotations.ReactProp;
2626
import com.facebook.react.uimanager.ThemedReactContext;
2727
import com.facebook.react.uimanager.UIManagerModule;
2828
import com.facebook.react.uimanager.ViewGroupManager;

0 commit comments

Comments
 (0)