Revert "Remove min/max Width/Height in the docs"

This reverts commit 2529179.
bjornco · Mar 8, 2016 · a8e756a · a8e756a
1 parent 9d92a28
commit a8e756a
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 0 deletions.
diff --git a/Libraries/StyleSheet/LayoutPropTypes.js b/Libraries/StyleSheet/LayoutPropTypes.js
@@ -27,7 +27,11 @@ var ReactPropTypes = require('ReactPropTypes');
  */
 var LayoutPropTypes = {
   width: ReactPropTypes.number,
+  maxWidth: ReactPropTypes.number,
+  minWidth: ReactPropTypes.number,
   height: ReactPropTypes.number,
+  maxHeight: ReactPropTypes.number,
+  minHeight: ReactPropTypes.number,
   top: ReactPropTypes.number,
   left: ReactPropTypes.number,
   right: ReactPropTypes.number,

diff --git a/React/Views/RCTShadowView.h b/React/Views/RCTShadowView.h
@@ -63,6 +63,10 @@ typedef void (^RCTApplierBlock)(NSDictionary<NSNumber *, UIView *> *viewRegistry
 
 @property (nonatomic, assign) CGFloat width;
 @property (nonatomic, assign) CGFloat height;
+@property (nonatomic, assign) CGFloat minWidth;
+@property (nonatomic, assign) CGFloat minHeight;
+@property (nonatomic, assign) CGFloat maxWidth;
+@property (nonatomic, assign) CGFloat maxHeight;
 @property (nonatomic, assign) CGRect frame;
 
 - (void)setTopLeft:(CGPoint)topLeft;

diff --git a/React/Views/RCTShadowView.m b/React/Views/RCTShadowView.m
@@ -507,6 +507,10 @@ - (CGFloat)getProp                                                     \
 
 RCT_DIMENSIONS_PROPERTY(Width, width, WIDTH, dimensions)
 RCT_DIMENSIONS_PROPERTY(Height, height, HEIGHT, dimensions)
+RCT_DIMENSIONS_PROPERTY(MinWidth, minWidth, WIDTH, minDimensions)
+RCT_DIMENSIONS_PROPERTY(MinHeight, minHeight, HEIGHT, minDimensions)
+RCT_DIMENSIONS_PROPERTY(MaxWidth, maxWidth, WIDTH, maxDimensions)
+RCT_DIMENSIONS_PROPERTY(MaxHeight, maxHeight, HEIGHT, maxDimensions)
 
 // Position
 

diff --git a/React/Views/RCTViewManager.m b/React/Views/RCTViewManager.m
@@ -253,6 +253,10 @@ - (RCTViewManagerUIBlock)uiBlockToAmendWithShadowViewRegistry:(__unused NSDictio
 
 RCT_EXPORT_SHADOW_PROPERTY(width, CGFloat)
 RCT_EXPORT_SHADOW_PROPERTY(height, CGFloat)
+RCT_EXPORT_SHADOW_PROPERTY(minWidth, CGFloat)
+RCT_EXPORT_SHADOW_PROPERTY(minHeight, CGFloat)
+RCT_EXPORT_SHADOW_PROPERTY(maxWidth, CGFloat)
+RCT_EXPORT_SHADOW_PROPERTY(maxHeight, CGFloat)
 
 RCT_EXPORT_SHADOW_PROPERTY(borderTopWidth, CGFloat)
 RCT_EXPORT_SHADOW_PROPERTY(borderRightWidth, CGFloat)