@daoyi/nmtl-ui 2.0.1-beta.120 → 2.0.1-beta.122

package/lib/components/{Button-305b69a0.js → Button-7bd5aa09.js}

@@ -1,3 +1,4 @@
+import { c as _objectWithoutProperties, _ as _extends } from './_rollupPluginBabelHelpers-a52356f6.js';
 import React__default from 'react';
 import PropTypes from 'prop-types';
 import { c as classNames } from './index-b76a85f4.js';
@@ -7,6 +8,7 @@ import { s as styleInject } from './style-inject.es-1f59c1d0.js';
 var css_248z = ".button {\n  border: 1px solid #ffffff99;\n  border-radius: 45px;\n  padding: 8px 16px;\n  background: #007bff;\n  color: white;\n  cursor: pointer;\n}\n.button:hover {\n  opacity: 0.9;\n}";
 styleInject(css_248z);
 
+var _excluded = ["style", "className", "tabIndex", "alt", "text", "size", "variant", "type", "color", "loading", "disabled", "icon", "endIcon", "children", "onClick"];
 var Button = function Button(props) {
   var style = props.style,
     className = props.className,
@@ -23,7 +25,27 @@ var Button = function Button(props) {
     endIcon = props.endIcon,
     children = props.children,
     onClick = props.onClick;
-  return /*#__PURE__*/React__default.createElement(Button$1, {
+  /* 本元件原本逐一挑選 props，呼叫端傳入的 aria-*／title／role 會被靜默丟掉——
+     nmtl-web 有三處為了補可及名稱而傳 aria-label，其中 areaMap 那處自 80db4537
+     起就一直沒有生效（WCAG 4.1.2，Freego HM1410200C）。
+     把宣告過的 props 取出後，其餘一律往下傳。 */
+  props.style;
+    props.className;
+    props.tabIndex;
+    props.alt;
+    props.text;
+    props.size;
+    props.variant;
+    props.type;
+    props.color;
+    props.loading;
+    props.disabled;
+    props.icon;
+    props.endIcon;
+    props.children;
+    props.onClick;
+    var rest = _objectWithoutProperties(props, _excluded);
+  return /*#__PURE__*/React__default.createElement(Button$1, _extends({}, rest, {
     style: style,
     className: classNames('button', className),
     tabIndex: tabIndex,
@@ -37,7 +59,7 @@ var Button = function Button(props) {
     endIcon: loading ? /*#__PURE__*/React__default.createElement(CircularProgress, {
       size: 16
     }) : endIcon
-  }, text, children);
+  }), text, children);
 };
 Button.defaultProps = {
   style: undefined,

package/lib/components/Button.js

@@ -1,4 +1,5 @@
-export { B as default } from './Button-305b69a0.js';
+export { B as default } from './Button-7bd5aa09.js';
+import './_rollupPluginBabelHelpers-a52356f6.js';
 import 'react';
 import 'prop-types';
 import './index-b76a85f4.js';

package/lib/components/{ContactModal-763fc7cb.js → ContactModal-ac82e7a6.js}

@@ -3,7 +3,7 @@ import React__default, { createContext, forwardRef, createElement, useContext, u
 import PropTypes from 'prop-types';
 import { h as hoistNonReactStatics_cjs } from './hoist-non-react-statics.cjs-3f408ad2.js';
 import axios from 'axios';
-import { M as Modal } from './Modal-76fef34f.js';
+import { M as Modal } from './Modal-b62ff592.js';
 import { c as commonjsGlobal, a as getDefaultExportFromCjs } from './_commonjsHelpers-70de2c37.js';
 import { c as classNames } from './index-b76a85f4.js';
 import { Input, IconButton, Button, Box, Typography, FormControl, RadioGroup, FormControlLabel, Radio, TextField, TextareaAutosize } from '@material-ui/core';

package/lib/components/ContactModal.js

@@ -1,15 +1,15 @@
-export { C as default } from './ContactModal-763fc7cb.js';
+export { C as default } from './ContactModal-ac82e7a6.js';
 import './_rollupPluginBabelHelpers-a52356f6.js';
 import 'react';
 import 'prop-types';
 import './hoist-non-react-statics.cjs-3f408ad2.js';
 import 'react-is';
 import 'axios';
-import './Modal-76fef34f.js';
+import './Modal-b62ff592.js';
 import './index-b76a85f4.js';
 import '@material-ui/core';
 import '@material-ui/icons';
-import './Button-305b69a0.js';
+import './Button-7bd5aa09.js';
 import './style-inject.es-1f59c1d0.js';
 import './Spin-8f87eadc.js';
 import './globalConfig';

package/lib/components/Footer.js

@@ -3,16 +3,16 @@ import React__default, { useState, useEffect } from 'react';
 import { c as classNames } from './index-b76a85f4.js';
 import PropTypes from 'prop-types';
 import axios from 'axios';
-import { C as ContactModal } from './ContactModal-763fc7cb.js';
+import { C as ContactModal } from './ContactModal-ac82e7a6.js';
 import { S as Spin } from './Spin-8f87eadc.js';
 import { getIntl } from './globalConfig';
 import { s as styleInject } from './style-inject.es-1f59c1d0.js';
 import './hoist-non-react-statics.cjs-3f408ad2.js';
 import 'react-is';
-import './Modal-76fef34f.js';
+import './Modal-b62ff592.js';
 import '@material-ui/core';
 import '@material-ui/icons';
-import './Button-305b69a0.js';
+import './Button-7bd5aa09.js';
 import './_commonjsHelpers-70de2c37.js';
 import './defaultTheme-ed7746fe.js';
 import '@material-ui/styles';

package/lib/components/Input.js

@@ -13,7 +13,8 @@ var Input = function Input(props) {
     defaultValue = props.defaultValue,
     value = props.value,
     type = props.type,
-    error = props.error; // Attributes
+    error = props.error,
+    ariaLabel = props.ariaLabel; // Attributes
 
   var _onChange = props.onChange,
     _onKeyPress = props.onKeyPress,
@@ -22,8 +23,11 @@ var Input = function Input(props) {
   var suffix = props.suffix; // Dom Status
 
   var OutlinedInputProps = {
+    /* WCAG 3.3.2（Freego HM1130104C）：placeholder 不是 label，包裹式 label 檢測工具也不認，
+       需要時由呼叫端傳 ariaLabel，直接標在 input 元素上 */
     inputProps: {
-      className: classNames('input', className)
+      className: classNames('input', className),
+      'aria-label': ariaLabel
     },
     placeholder: placeholder,
     defaultValue: defaultValue,
@@ -52,7 +56,8 @@ Input.defaultProps = {
   onPressEnter: undefined,
   suffix: null,
   type: 'text',
-  error: false
+  error: false,
+  ariaLabel: undefined
 };
 
 /* Write props detail information and 'npm run updateStory' will help you generate stories's argTypes */
@@ -76,7 +81,9 @@ Input.propTypes = {
   /** HTML5 Input type */
   type: PropTypes.string,
   /** Input error */
-  error: PropTypes.bool
+  error: PropTypes.bool,
+  /** 無可見 label 時的可及名稱（WCAG 3.3.2）；會標在 input 元素上 */
+  ariaLabel: PropTypes.string
 };
 
 export { Input as default };

package/lib/components/Keywords.js

@@ -2,13 +2,13 @@ import { a as _slicedToArray } from './_rollupPluginBabelHelpers-a52356f6.js';
 import React__default, { useState, useEffect, useRef } from 'react';
 import PropTypes from 'prop-types';
 import { c as classNames } from './index-b76a85f4.js';
-import { M as Modal } from './Modal-76fef34f.js';
+import { M as Modal } from './Modal-b62ff592.js';
 import { Typography } from '@material-ui/core';
 import { r as requireCreateSvgIcon, i as interopRequireDefault, a as interopRequireWildcard } from './createSvgIcon-e3803ee1.js';
 import { getIntl } from './globalConfig';
 import { s as styleInject } from './style-inject.es-1f59c1d0.js';
 import '@material-ui/icons';
-import './Button-305b69a0.js';
+import './Button-7bd5aa09.js';
 import './Spin-8f87eadc.js';
 import './_commonjsHelpers-70de2c37.js';
 import './defaultTheme-ed7746fe.js';

package/lib/components/{Modal-76fef34f.js → Modal-b62ff592.js}

@@ -3,7 +3,7 @@ import { c as classNames } from './index-b76a85f4.js';
 import PropTypes from 'prop-types';
 import { Dialog, DialogTitle, IconButton, DialogContent, DialogActions, CircularProgress } from '@material-ui/core';
 import { CloseSharp } from '@material-ui/icons';
-import { B as Button } from './Button-305b69a0.js';
+import { B as Button } from './Button-7bd5aa09.js';
 import { S as Spin } from './Spin-8f87eadc.js';
 import { getIntl } from './globalConfig';
 import { s as styleInject } from './style-inject.es-1f59c1d0.js';

package/lib/components/Modal.js

@@ -1,10 +1,11 @@
-export { M as default } from './Modal-76fef34f.js';
+export { M as default } from './Modal-b62ff592.js';
 import 'react';
 import './index-b76a85f4.js';
 import 'prop-types';
 import '@material-ui/core';
 import '@material-ui/icons';
-import './Button-305b69a0.js';
+import './Button-7bd5aa09.js';
+import './_rollupPluginBabelHelpers-a52356f6.js';
 import './style-inject.es-1f59c1d0.js';
 import './Spin-8f87eadc.js';
 import './globalConfig';

package/lib/components/Radio.js

@@ -32,11 +32,16 @@ var Radio = function Radio(props) {
   }, Array.isArray(options) && options.map(function (option) {
     return /*#__PURE__*/React__default.createElement(FormControlLabel, {
       value: option.value,
-      key: option.value,
+      key: option.value
+      /* WCAG 4.1.2（Freego HM1130104C）：FormControlLabel 產生的是「包裹式」隱式 label，
+         檢測工具只認 input 自身的 for／title／aria-*，故把選項文字同步標在 input 上 */,
       control: /*#__PURE__*/React__default.createElement(Radio$1, {
         disabled: option.disabled || false,
         size: size,
-        className: className
+        className: className,
+        inputProps: {
+          'aria-label': typeof option.label === 'string' ? option.label : String(option.value)
+        }
       }),
       label: option.label
     });

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@daoyi/nmtl-ui",
-	"version": "2.0.1-beta.120",
+	"version": "2.0.1-beta.122",
 	"description": "This project is to be used as a starter kit for building React component using Storybook and Rollup",
 	"author": "daoyi",
 	"main": "lib/index.js",