Release v1.10.0

CMSgov · Jan 17, 2018 · 0581f38 · 0581f38
1 parent b8e9808
commit 0581f38
Show file tree

Hide file tree

Showing 11 changed files with 34 additions and 17 deletions.
diff --git a/lerna.json b/lerna.json
@@ -10,6 +10,9 @@
     }
   },
   "npmClient": "yarn",
-  "packages": ["packages/*", "packages/themes/*"],
-  "version": "1.9.0"
+  "packages": [
+    "packages/*",
+    "packages/themes/*"
+  ],
+  "version": "1.10.0"
 }
diff --git a/packages/core/dist/components/Button/Button.js b/packages/core/dist/components/Button/Button.js
@@ -163,7 +163,10 @@ Button.propTypes = {
    * Button [`type`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/button#attr-type) attribute
    */
   type: _propTypes2.default.oneOf(['button', 'submit']),
-  variation: _propTypes2.default.oneOf(['primary', 'danger', 'success', 'transparent'])
+  /**
+   * A string corresponding to the button-component variation classes (`primary`, `danger`, `success`, `transparent`)
+   */
+  variation: _propTypes2.default.string
 };
 
 exports.default = Button;
diff --git a/packages/core/dist/components/FormLabel/FormLabel.js b/packages/core/dist/components/FormLabel/FormLabel.js
@@ -68,11 +68,22 @@ var FormLabel = exports.FormLabel = function (_React$PureComponent) {
         'ds-c-field__hint--inverse': this.props.inversed
       });
 
+      if (requirementLabel && hint) {
+        if (typeof requirementLabel === 'string') {
+          // Remove any existing spacing and punctuation
+          requirementLabel = requirementLabel.trim().replace(/\.$/, '');
+          // Add punctuation after the requirementLabel so it doesn't run into the hint
+          requirementLabel = requirementLabel + '.';
+        }
+
+        // Add space between hint and preceding requirementLabel
+        hint = ' ' + hint;
+      }
+
       return _react2.default.createElement(
         'span',
         { className: classes },
         requirementLabel,
-        requirementLabel && hint && ' ',
         hint
       );
     }

diff --git a/packages/core/dist/components/StepList/StepList.css b/packages/core/dist/components/StepList/StepList.css
diff --git a/packages/core/dist/components/TextField/TextField.css b/packages/core/dist/components/TextField/TextField.css
diff --git a/packages/core/dist/index.css b/packages/core/dist/index.css
diff --git a/packages/core/package.json b/packages/core/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cmsgov/design-system-core",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "publishConfig": {
     "access": "public"
   },
@@ -9,7 +9,7 @@
   "license": "SEE LICENSE IN LICENSE.md",
   "main": "dist/index.js",
   "dependencies": {
-    "@cmsgov/design-system-support": "^1.9.0",
+    "@cmsgov/design-system-support": "^1.10.0",
     "classnames": "^2.2.5",
     "core-js": "^2.5.1",
     "downshift": "^1.22.5",

diff --git a/packages/docs/package.json b/packages/docs/package.json
@@ -1,13 +1,13 @@
 {
   "name": "@cmsgov/design-system-docs",
-  "version": "1.9.0",
+  "version": "1.10.0",
   "private": true,
   "description": "Design system's documentation website",
   "repository": "CMSgov/design-system",
   "dependencies": {
-    "@cmsgov/design-system-core": "^1.9.0",
-    "@cmsgov/design-system-layout": "^1.9.0",
-    "@cmsgov/design-system-support": "^1.9.0",
+    "@cmsgov/design-system-core": "^1.10.0",
+    "@cmsgov/design-system-layout": "^1.10.0",
+    "@cmsgov/design-system-support": "^1.10.0",
     "classnames": "^2.2.5",
     "core-js": "^2.5.3",
     "lodash": "^4.17.4",