v1.0.0-alpha.8

Merge pull request #47 from CMSgov/staging
CMSgov · May 2, 2017 · 7fbfe05 · 7fbfe05
2 parents 3563f4c + 448d489
commit 7fbfe05
Show file tree

Hide file tree

Showing 9 changed files with 38 additions and 7 deletions.
diff --git a/packages/core/dist/components/TextField/TextField.js b/packages/core/dist/components/TextField/TextField.js
@@ -88,7 +88,7 @@ var TextField = exports.TextField = function (_React$PureComponent) {
           onChange: this.props.onChange,
           onBlur: this.props.onBlur,
           rows: rows,
-          type: this.props.multiline ? undefined : 'text',
+          type: this.props.multiline ? undefined : this.props.type,
           value: this.props.value
         })
       );
@@ -98,6 +98,10 @@ var TextField = exports.TextField = function (_React$PureComponent) {
   return TextField;
 }(_react2.default.PureComponent);
 
+TextField.defaultProps = {
+  type: 'text'
+};
+
 TextField.propTypes = {
   /**
    * Additional classes to be added to the root element
@@ -142,6 +146,10 @@ TextField.propTypes = {
    * applicable if this is a multiline field
    */
   rows: _propTypes2.default.oneOfType([_propTypes2.default.number, _propTypes2.default.string]),
+  /**
+   * Any valid `input` [type](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input).
+   */
+  type: _propTypes2.default.string,
   /**
    * Current value of the text field. Use this for a controlled component where
    * you are maintaining its current state; otherwise, use the `defaultValue` property

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.0.0-alpha.7",
+  "version": "1.0.0-alpha.8",
   "publishConfig": {
     "access": "public"
   },

diff --git a/packages/core/src/components/TextField/TextField.example.jsx b/packages/core/src/components/TextField/TextField.example.jsx
@@ -24,6 +24,11 @@ export default function() {
         name='disabled_example'
         value='Example value'
       />
+      <TextField
+        label='Password field'
+        name='disabled_example'
+        type='password'
+      />
 
       <div className='ds-base--inverse ds-u-margin-top--3 ds-u-padding--2'>
         <TextField

diff --git a/packages/core/src/components/TextField/TextField.jsx b/packages/core/src/components/TextField/TextField.jsx
@@ -53,14 +53,18 @@ export class TextField extends React.PureComponent {
           onChange={this.props.onChange}
           onBlur={this.props.onBlur}
           rows={rows}
-          type={this.props.multiline ? undefined : 'text'}
+          type={this.props.multiline ? undefined : this.props.type}
           value={this.props.value}
         />
       </div>
     );
   }
 }
 
+TextField.defaultProps = {
+  type: 'text'
+};
+
 TextField.propTypes = {
   /**
    * Additional classes to be added to the root element
@@ -108,6 +112,10 @@ TextField.propTypes = {
     PropTypes.number,
     PropTypes.string
   ]),
+  /**
+   * Any valid `input` [type](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/input).
+   */
+  type: PropTypes.string,
   /**
    * Current value of the text field. Use this for a controlled component where
    * you are maintaining its current state; otherwise, use the `defaultValue` property

diff --git a/packages/core/src/components/TextField/TextField.test.jsx b/packages/core/src/components/TextField/TextField.test.jsx
@@ -33,6 +33,13 @@ describe('TextField', function() {
     expect(field.prop('type')).toBeUndefined();
   });
 
+  it('is a password field', () => {
+    const data = shallowRender({ type: 'password' });
+    const field = data.wrapper.find('.ds-c-field').first();
+
+    expect(field.prop('type')).toBe('password');
+  });
+
   it('is disabled', () => {
     const data = shallowRender({ disabled: true });
     const field = data.wrapper.find('.ds-c-field').first();

diff --git a/packages/docs/package.json b/packages/docs/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@cmsgov/design-system-docs",
-  "version": "1.0.0-alpha.7",
+  "version": "1.0.0-alpha.8",
   "private": true,
   "description": "Design system's documentation website",
   "repository": "CMSgov/design-system",

diff --git a/packages/docs/src/styles/base/_code.scss b/packages/docs/src/styles/base/_code.scss
@@ -16,6 +16,10 @@ code {
   padding: 2px;
 }
 
+a code {
+  text-decoration: underline;
+}
+
 pre {
   line-height: 1.4;
   margin: 0;

diff --git a/scripts/publish.sh b/scripts/publish.sh
@@ -20,5 +20,4 @@ npm publish
 
 echo "${ORANGE}[TODO] Publish docs${NC}"
 
-echo "${GREEN}Publishing Succeeded!${NC}"
-git stash apply
+echo "${GREEN}Publishing Succeeded!${NC}"