clay-radio - npm Package Compare versions

Comparing version 2.0.0-rc.3 to 2.0.0-rc.4

lib/ClayRadio.js

@@ -85,11 +85,2 @@ 'use strict';
 	/**
-  * Flag to indicate if label should be hide.
-  * @instance
-  * @memberof ClayRadio
-  * @type {?bool}
-  * @default false
-  */
-	hideLabel: _metalState.Config.bool().value(false),
-
-	/**
   * Id to be applied to the element.
@@ -123,3 +114,2 @@ * @instance
   * Custom content of the radio label. Use it to use your custom html.
-  * If this is used label and hideLabel params are ignored.
   * @instance
@@ -142,2 +132,11 @@ * @memberof ClayRadio
 	/**
+  * Flag to indicate if label should be hide.
+  * @instance
+  * @memberof ClayRadio
+  * @type {?bool}
+  * @default true
+  */
+	showLabel: _metalState.Config.bool().value(true),
+
+	/**
   * Value to be applied to the element.
@@ -144,0 +143,0 @@ * @instance

lib/ClayRadio.soy.js

@@ -53,2 +53,3 @@ 'use strict';
     opt_ijData = opt_ijData_deprecated || opt_ijData;
+    var $$temp;
     opt_data = opt_data || {};
@@ -61,4 +62,2 @@ /** @type {boolean|null|undefined} */
     var elementClasses = soy.asserts.assertType(opt_data.elementClasses == null || goog.isString(opt_data.elementClasses) || opt_data.elementClasses instanceof goog.soy.data.SanitizedContent, 'elementClasses', opt_data.elementClasses, '!goog.soy.data.SanitizedContent|null|string|undefined');
-    /** @type {boolean|null|undefined} */
-    var hideLabel = soy.asserts.assertType(opt_data.hideLabel == null || goog.isBoolean(opt_data.hideLabel) || opt_data.hideLabel === 1 || opt_data.hideLabel === 0, 'hideLabel', opt_data.hideLabel, 'boolean|null|undefined');
     /** @type {!goog.soy.data.SanitizedContent|null|string|undefined} */
@@ -74,2 +73,4 @@ var id = soy.asserts.assertType(opt_data.id == null || goog.isString(opt_data.id) || opt_data.id instanceof goog.soy.data.SanitizedContent, 'id', opt_data.id, '!goog.soy.data.SanitizedContent|null|string|undefined');
     var name = soy.asserts.assertType(opt_data.name == null || goog.isString(opt_data.name) || opt_data.name instanceof goog.soy.data.SanitizedContent, 'name', opt_data.name, '!goog.soy.data.SanitizedContent|null|string|undefined');
+    /** @type {boolean|null|undefined} */
+    var showLabel = soy.asserts.assertType(opt_data.showLabel == null || goog.isBoolean(opt_data.showLabel) || opt_data.showLabel === 1 || opt_data.showLabel === 0, 'showLabel', opt_data.showLabel, 'boolean|null|undefined');
     /** @type {!goog.soy.data.SanitizedContent|null|string|undefined} */
@@ -86,3 +87,3 @@ var value = soy.asserts.assertType(opt_data.value == null || goog.isString(opt_data.value) || opt_data.value instanceof goog.soy.data.SanitizedContent, 'value', opt_data.value, '!goog.soy.data.SanitizedContent|null|string|undefined');
     incrementalDom.elementOpenEnd();
-    $input(opt_data, null, opt_ijData);
+    $input({ checked: checked, disabled: disabled, label: label, labelContent: labelContent, name: name, showLabel: ($$temp = showLabel) == null ? true : $$temp, value: value }, null, opt_ijData);
     incrementalDom.elementClose('div');
@@ -96,3 +97,2 @@ };
    *  elementClasses: (!goog.soy.data.SanitizedContent|null|string|undefined),
-   *  hideLabel: (boolean|null|undefined),
    *  id: (!goog.soy.data.SanitizedContent|null|string|undefined),
@@ -103,2 +103,3 @@ *  inline: (boolean|null|undefined),
    *  name: (!goog.soy.data.SanitizedContent|null|string|undefined),
+   *  showLabel: (boolean|null|undefined),
    *  value: (!goog.soy.data.SanitizedContent|null|string|undefined),
@@ -126,4 +127,2 @@ * }}
     var disabled = soy.asserts.assertType(opt_data.disabled == null || goog.isBoolean(opt_data.disabled) || opt_data.disabled === 1 || opt_data.disabled === 0, 'disabled', opt_data.disabled, 'boolean|null|undefined');
-    /** @type {boolean|null|undefined} */
-    var hideLabel = soy.asserts.assertType(opt_data.hideLabel == null || goog.isBoolean(opt_data.hideLabel) || opt_data.hideLabel === 1 || opt_data.hideLabel === 0, 'hideLabel', opt_data.hideLabel, 'boolean|null|undefined');
     /** @type {!goog.soy.data.SanitizedContent|null|string|undefined} */
@@ -135,2 +134,4 @@ var label = soy.asserts.assertType(opt_data.label == null || goog.isString(opt_data.label) || opt_data.label instanceof goog.soy.data.SanitizedContent, 'label', opt_data.label, '!goog.soy.data.SanitizedContent|null|string|undefined');
     var name = soy.asserts.assertType(opt_data.name == null || goog.isString(opt_data.name) || opt_data.name instanceof goog.soy.data.SanitizedContent, 'name', opt_data.name, '!goog.soy.data.SanitizedContent|null|string|undefined');
+    /** @type {boolean|null|undefined} */
+    var showLabel = soy.asserts.assertType(opt_data.showLabel == null || goog.isBoolean(opt_data.showLabel) || opt_data.showLabel === 1 || opt_data.showLabel === 0, 'showLabel', opt_data.showLabel, 'boolean|null|undefined');
     /** @type {!goog.soy.data.SanitizedContent|null|string|undefined} */
@@ -164,10 +165,8 @@ var value = soy.asserts.assertType(opt_data.value == null || goog.isString(opt_data.value) || opt_data.value instanceof goog.soy.data.SanitizedContent, 'value', opt_data.value, '!goog.soy.data.SanitizedContent|null|string|undefined');
     incrementalDom.elementOpenEnd();
-    if (labelContent) {
-      labelContent();
-    } else {
-      var spanLabelClasses__soy91 = '';
-      spanLabelClasses__soy91 += 'custom-control-label-text';
-      spanLabelClasses__soy91 += hideLabel ? ' sr-only' : '';
+    if (label) {
+      var spanLabelClasses__soy87 = '';
+      spanLabelClasses__soy87 += 'custom-control-label-text';
+      spanLabelClasses__soy87 += !showLabel ? ' sr-only' : '';
       incrementalDom.elementOpenStart('span');
-      incrementalDom.attr('class', spanLabelClasses__soy91);
+      incrementalDom.attr('class', spanLabelClasses__soy87);
       incrementalDom.elementOpenEnd();
@@ -178,2 +177,5 @@ soyIdom.print(label);
     incrementalDom.elementClose('span');
+    if (labelContent) {
+      labelContent();
+    }
     incrementalDom.elementClose('label');
@@ -186,6 +188,6 @@ };
    *  disabled: (boolean|null|undefined),
-   *  hideLabel: (boolean|null|undefined),
    *  label: (!goog.soy.data.SanitizedContent|null|string|undefined),
    *  labelContent: (function()|null|undefined),
    *  name: (!goog.soy.data.SanitizedContent|null|string|undefined),
+   *  showLabel: (boolean|null|undefined),
    *  value: (!goog.soy.data.SanitizedContent|null|string|undefined),
@@ -199,6 +201,6 @@ * }}
 
-  exports.render.params = ["checked", "disabled", "elementClasses", "hideLabel", "id", "inline", "label", "labelContent", "name", "value"];
-  exports.render.types = { "checked": "bool", "disabled": "bool", "elementClasses": "string", "hideLabel": "bool", "id": "string", "inline": "bool", "label": "string", "labelContent": "html", "name": "string", "value": "string" };
-  exports.input.params = ["checked", "disabled", "hideLabel", "label", "labelContent", "name", "value"];
-  exports.input.types = { "checked": "bool", "disabled": "bool", "hideLabel": "bool", "label": "string", "labelContent": "html", "name": "string", "value": "string" };
+  exports.render.params = ["checked", "disabled", "elementClasses", "id", "inline", "label", "labelContent", "name", "showLabel", "value"];
+  exports.render.types = { "checked": "bool", "disabled": "bool", "elementClasses": "string", "id": "string", "inline": "bool", "label": "string", "labelContent": "html", "name": "string", "showLabel": "bool", "value": "string" };
+  exports.input.params = ["checked", "disabled", "label", "labelContent", "name", "showLabel", "value"];
+  exports.input.types = { "checked": "bool", "disabled": "bool", "label": "string", "labelContent": "html", "name": "string", "showLabel": "bool", "value": "string" };
   exports.templates = templates = exports;
@@ -205,0 +207,0 @@ return exports;

package.json

 {
   "name": "clay-radio",
-  "version": "2.0.0-rc.3",
+  "version": "2.0.0-rc.4",
   "description": "Clay Radio Component",
@@ -42,3 +42,3 @@ "license": "BSD",
     "browserslist-config-clay-components": "^2.0.0-rc.3",
-    "clay": "^2.0.0-rc.3",
+    "clay": "^2.0.0-rc.4",
     "metal-dom": "^2.13.2",
@@ -45,0 +45,0 @@ "metal-tools-soy": "^6.0.0",

src/__tests__/ClayRadio.js

@@ -68,4 +68,4 @@ import ClayRadio from '../ClayRadio';
 		clayRadio = new ClayRadio({
-			hideLabel: true,
 			label: 'My Radio',
+			showLabel: false,
 		});
@@ -72,0 +72,0 @@

src/ClayRadio.js

@@ -47,11 +47,2 @@ import Component from 'metal-component';
 	/**
-	 * Flag to indicate if label should be hide.
-	 * @instance
-	 * @memberof ClayRadio
-	 * @type {?bool}
-	 * @default false
-	 */
-	hideLabel: Config.bool().value(false),
-
-	/**
 	 * Id to be applied to the element.
@@ -85,3 +76,2 @@ * @instance
 	 * Custom content of the radio label. Use it to use your custom html.
-	 * If this is used label and hideLabel params are ignored.
 	 * @instance
@@ -104,2 +94,11 @@ * @memberof ClayRadio
 	/**
+	 * Flag to indicate if label should be hide.
+	 * @instance
+	 * @memberof ClayRadio
+	 * @type {?bool}
+	 * @default true
+	 */
+	showLabel: Config.bool().value(true),
+
+	/**
 	 * Value to be applied to the element.
@@ -106,0 +105,0 @@ * @instance

src/ClayRadio.soy.js

@@ -34,2 +34,3 @@ /* jshint ignore:start */
   opt_ijData = opt_ijData_deprecated || opt_ijData;
+  var $$temp;
   opt_data = opt_data || {};
@@ -42,4 +43,2 @@ /** @type {boolean|null|undefined} */
   var elementClasses = soy.asserts.assertType(opt_data.elementClasses == null || (goog.isString(opt_data.elementClasses) || opt_data.elementClasses instanceof goog.soy.data.SanitizedContent), 'elementClasses', opt_data.elementClasses, '!goog.soy.data.SanitizedContent|null|string|undefined');
-  /** @type {boolean|null|undefined} */
-  var hideLabel = soy.asserts.assertType(opt_data.hideLabel == null || (goog.isBoolean(opt_data.hideLabel) || opt_data.hideLabel === 1 || opt_data.hideLabel === 0), 'hideLabel', opt_data.hideLabel, 'boolean|null|undefined');
   /** @type {!goog.soy.data.SanitizedContent|null|string|undefined} */
@@ -55,2 +54,4 @@ var id = soy.asserts.assertType(opt_data.id == null || (goog.isString(opt_data.id) || opt_data.id instanceof goog.soy.data.SanitizedContent), 'id', opt_data.id, '!goog.soy.data.SanitizedContent|null|string|undefined');
   var name = soy.asserts.assertType(opt_data.name == null || (goog.isString(opt_data.name) || opt_data.name instanceof goog.soy.data.SanitizedContent), 'name', opt_data.name, '!goog.soy.data.SanitizedContent|null|string|undefined');
+  /** @type {boolean|null|undefined} */
+  var showLabel = soy.asserts.assertType(opt_data.showLabel == null || (goog.isBoolean(opt_data.showLabel) || opt_data.showLabel === 1 || opt_data.showLabel === 0), 'showLabel', opt_data.showLabel, 'boolean|null|undefined');
   /** @type {!goog.soy.data.SanitizedContent|null|string|undefined} */
@@ -67,3 +68,3 @@ var value = soy.asserts.assertType(opt_data.value == null || (goog.isString(opt_data.value) || opt_data.value instanceof goog.soy.data.SanitizedContent), 'value', opt_data.value, '!goog.soy.data.SanitizedContent|null|string|undefined');
   incrementalDom.elementOpenEnd();
-  $input(opt_data, null, opt_ijData);
+  $input({checked: checked, disabled: disabled, label: label, labelContent: labelContent, name: name, showLabel: ($$temp = showLabel) == null ? true : $$temp, value: value}, null, opt_ijData);
   incrementalDom.elementClose('div');
@@ -77,3 +78,2 @@ };
  *  elementClasses: (!goog.soy.data.SanitizedContent|null|string|undefined),
- *  hideLabel: (boolean|null|undefined),
  *  id: (!goog.soy.data.SanitizedContent|null|string|undefined),
@@ -84,2 +84,3 @@ *  inline: (boolean|null|undefined),
  *  name: (!goog.soy.data.SanitizedContent|null|string|undefined),
+ *  showLabel: (boolean|null|undefined),
  *  value: (!goog.soy.data.SanitizedContent|null|string|undefined),
@@ -108,4 +109,2 @@ * }}
   var disabled = soy.asserts.assertType(opt_data.disabled == null || (goog.isBoolean(opt_data.disabled) || opt_data.disabled === 1 || opt_data.disabled === 0), 'disabled', opt_data.disabled, 'boolean|null|undefined');
-  /** @type {boolean|null|undefined} */
-  var hideLabel = soy.asserts.assertType(opt_data.hideLabel == null || (goog.isBoolean(opt_data.hideLabel) || opt_data.hideLabel === 1 || opt_data.hideLabel === 0), 'hideLabel', opt_data.hideLabel, 'boolean|null|undefined');
   /** @type {!goog.soy.data.SanitizedContent|null|string|undefined} */
@@ -117,2 +116,4 @@ var label = soy.asserts.assertType(opt_data.label == null || (goog.isString(opt_data.label) || opt_data.label instanceof goog.soy.data.SanitizedContent), 'label', opt_data.label, '!goog.soy.data.SanitizedContent|null|string|undefined');
   var name = soy.asserts.assertType(opt_data.name == null || (goog.isString(opt_data.name) || opt_data.name instanceof goog.soy.data.SanitizedContent), 'name', opt_data.name, '!goog.soy.data.SanitizedContent|null|string|undefined');
+  /** @type {boolean|null|undefined} */
+  var showLabel = soy.asserts.assertType(opt_data.showLabel == null || (goog.isBoolean(opt_data.showLabel) || opt_data.showLabel === 1 || opt_data.showLabel === 0), 'showLabel', opt_data.showLabel, 'boolean|null|undefined');
   /** @type {!goog.soy.data.SanitizedContent|null|string|undefined} */
@@ -146,10 +147,8 @@ var value = soy.asserts.assertType(opt_data.value == null || (goog.isString(opt_data.value) || opt_data.value instanceof goog.soy.data.SanitizedContent), 'value', opt_data.value, '!goog.soy.data.SanitizedContent|null|string|undefined');
   incrementalDom.elementOpenEnd();
-  if (labelContent) {
-    labelContent();
-  } else {
-    var spanLabelClasses__soy91 = '';
-    spanLabelClasses__soy91 += 'custom-control-label-text';
-    spanLabelClasses__soy91 += hideLabel ? ' sr-only' : '';
+  if (label) {
+    var spanLabelClasses__soy87 = '';
+    spanLabelClasses__soy87 += 'custom-control-label-text';
+    spanLabelClasses__soy87 += !showLabel ? ' sr-only' : '';
     incrementalDom.elementOpenStart('span');
-        incrementalDom.attr('class', spanLabelClasses__soy91);
+        incrementalDom.attr('class', spanLabelClasses__soy87);
     incrementalDom.elementOpenEnd();
@@ -160,2 +159,5 @@ soyIdom.print(label);
   incrementalDom.elementClose('span');
+  if (labelContent) {
+    labelContent();
+  }
   incrementalDom.elementClose('label');
@@ -168,6 +170,6 @@ };
  *  disabled: (boolean|null|undefined),
- *  hideLabel: (boolean|null|undefined),
  *  label: (!goog.soy.data.SanitizedContent|null|string|undefined),
  *  labelContent: (function()|null|undefined),
  *  name: (!goog.soy.data.SanitizedContent|null|string|undefined),
+ *  showLabel: (boolean|null|undefined),
  *  value: (!goog.soy.data.SanitizedContent|null|string|undefined),
@@ -181,6 +183,6 @@ * }}
 
-exports.render.params = ["checked","disabled","elementClasses","hideLabel","id","inline","label","labelContent","name","value"];
-exports.render.types = {"checked":"bool","disabled":"bool","elementClasses":"string","hideLabel":"bool","id":"string","inline":"bool","label":"string","labelContent":"html","name":"string","value":"string"};
-exports.input.params = ["checked","disabled","hideLabel","label","labelContent","name","value"];
-exports.input.types = {"checked":"bool","disabled":"bool","hideLabel":"bool","label":"string","labelContent":"html","name":"string","value":"string"};
+exports.render.params = ["checked","disabled","elementClasses","id","inline","label","labelContent","name","showLabel","value"];
+exports.render.types = {"checked":"bool","disabled":"bool","elementClasses":"string","id":"string","inline":"bool","label":"string","labelContent":"html","name":"string","showLabel":"bool","value":"string"};
+exports.input.params = ["checked","disabled","label","labelContent","name","showLabel","value"];
+exports.input.types = {"checked":"bool","disabled":"bool","label":"string","labelContent":"html","name":"string","showLabel":"bool","value":"string"};
 templates = exports;
@@ -187,0 +189,0 @@ return exports;

No alert changes

Improved metrics

Total package byte prevSize

60935

increased by1.01%

Lines of code

675

increased by0.3%

No dependency changes