Add min-max options for number types

Author: vidartf

js/scripts/prop-types.js

@@ -199,25 +199,43 @@ _.extend(Bool.prototype, BaseType.prototype, {
 function Int(defaultValue, options) {
     options = options || {};
     this.nullable = options.nullable === true;
+    this.minValue = options.minValue;
+    this.maxValue = options.maxValue;
     this.defaultValue = (defaultValue === null || defaultValue === undefined) && !this.nullable ? 0 : defaultValue ;
 }
 _.extend(Int.prototype, BaseType.prototype, {
     getTraitlet: function() {
         var nullableStr = this.nullable ? 'True' : 'False';
-        return `CInt(${this.getPythonDefaultValue()}, allow_none=${nullableStr}).tag(sync=True)`;
+        var limits = '';
+        if (this.minValue !== undefined) {
+            limits += `, min=${this.minValue}`
+        }
+        if (this.maxValue !== undefined) {
+            limits += `, max=${this.maxValue}`
+        }
+        return `CInt(${this.getPythonDefaultValue()}, allow_none=${nullableStr}${limits}).tag(sync=True)`;
     },
 
 });
 
 function Float(defaultValue, options) {
     options = options || {};
     this.nullable = options.nullable === true;
+    this.minValue = options.minValue;
+    this.maxValue = options.maxValue;
     this.defaultValue = (defaultValue === null || defaultValue === undefined) && !this.nullable ? 0.0 : defaultValue;
 }
 _.extend(Float.prototype, BaseType.prototype, {
     getTraitlet: function() {
         var nullableStr = this.nullable ? 'True' : 'False';
-        return `CFloat(${this.getPythonDefaultValue()}, allow_none=${nullableStr}).tag(sync=True)`;
+        var limits = '';
+        if (this.minValue !== undefined) {
+            limits += `, min=${this.minValue}`
+        }
+        if (this.maxValue !== undefined) {
+            limits += `, max=${this.maxValue}`
+        }
+        return `CFloat(${this.getPythonDefaultValue()}, allow_none=${nullableStr}${limits}).tag(sync=True)`;
     },
     getPropertyConverterFn: function() {
         return 'convertFloat';

js/scripts/three-class-config.js

@@ -1400,7 +1400,7 @@ module.exports = {
         constructorArgs: [ 'radius', 'segments', 'thetaStart', 'thetaLength' ],
         properties: {
             radius:      new Types.Float(50.0),
-            segments:    new Types.Int(8), // TODO: min:3
+            segments:    new Types.Int(8, {minValue: 3}),
             thetaStart:  new Types.Float(0.0),
             thetaLength: new Types.Float(Math.PI * 2.0),
         },
@@ -1411,7 +1411,7 @@ module.exports = {
         constructorArgs: [ 'radius', 'segments', 'thetaStart', 'thetaLength' ],
         properties: {
             radius:      new Types.Float(50.0),
-            segments:    new Types.Int(8), // TODO: min:3
+            segments:    new Types.Int(8, {minValue: 3}),
             thetaStart:  new Types.Float(0.0),
             thetaLength: new Types.Float(Math.PI * 2.0),
         },
@@ -1570,8 +1570,8 @@ module.exports = {
         properties: {
             innerRadius:   new Types.Float(0.0), // Docs: "Default is 0, but it doesn't work right when innerRadius is set to 0.
             outerRadius:   new Types.Float(50.0),
-            thetaSegments: new Types.Int(8), // TODO: min: 3
-            phiSegments:   new Types.Int(8), // TODO: min 1
+            thetaSegments: new Types.Int(8, {minValue: 3}),
+            phiSegments:   new Types.Int(8, {minValue: 1}),
             thetaStart:    new Types.Float(0),
             thetaLength:   new Types.Float(Math.PI * 2),
         },
@@ -1583,8 +1583,8 @@ module.exports = {
         properties: {
             innerRadius:   new Types.Float(0.0), // Docs: "Default is 0, but it doesn't work right when innerRadius is set to 0.
             outerRadius:   new Types.Float(50.0),
-            thetaSegments: new Types.Int(8), // TODO: min: 3
-            phiSegments:   new Types.Int(8), // TODO: min 1
+            thetaSegments: new Types.Int(8, {minValue: 3}),
+            phiSegments:   new Types.Int(8, {minValue: 1}),
             thetaStart:    new Types.Float(0),
             thetaLength:   new Types.Float(Math.PI * 2),
         },