@daoyi/nmtl-ui 2.0.1-beta.121 → 2.0.1-beta.123

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/{ForwardLink-e86c1080.js → ForwardLink-9f22205c.js}

@@ -28,10 +28,10 @@ var ForwardLink = function ForwardLink(_ref) {
   var _useMemo = useMemo(function () {
       var _rest$pathname;
       if (disabled) return {};
-      /*
-       * 若將 search 寫在 pathname 中，意即 pathname=/asd?zxc=qwe
-       * 會導致換頁時 React route dom 無法匹配 => 空白畫面
-       * 若真有此情況發生 需把 search 提領出來
+      /*
+       * 若將 search 寫在 pathname 中，意即 pathname=/asd?zxc=qwe
+       * 會導致換頁時 React route dom 無法匹配 => 空白畫面
+       * 若真有此情況發生 需把 search 提領出來
        */
       var foundIndex = (_rest$pathname = rest.pathname) === null || _rest$pathname === void 0 ? void 0 : _rest$pathname.indexOf('?');
       if (foundIndex > -1) return {
@@ -54,20 +54,26 @@ var ForwardLink = function ForwardLink(_ref) {
   var newWindowLabel = target === '_blank' && (typeof children === 'string' || title) ? "".concat(typeof children === 'string' ? children : title).concat(getIntl().formatMessage({
     id: 'aria.newWindow'
   })) : undefined;
-  /* R24：aria-label 已含 title 全文時不再輸出 title 屬性——NVDA 會把 title 屬性當
+  /* R24：aria-label 已含 title 全文時不再輸出 title 屬性——NVDA 會把 title 屬性當
      description 接在 aria-label 之後再唸一次，造成「書名 ×2」（abo 首頁推薦卡實測） */
   var linkTitle = newWindowLabel ? undefined : domTitle;
+
+  /* 沒有可及名稱的連結對所有使用者都無用，且會被判 Freego HM1240401C
+     （實測 ocean books?id=ART469770：某筆資料人名為空 → <a> 內容全空）。
+     children 為空字串／空值且無 title 時，改以非互動元素呈現。 */
+  var namelessChildren = children === undefined || children === null || children === false || typeof children === 'string' && !children.trim();
+  var nameless = namelessChildren && !title;
   var linkComponent = /*#__PURE__*/React__default.createElement("div", {
     className: className
   }, /*#__PURE__*/React__default.createElement("div", {
     className: "forwardLink"
-  }, disabled ? /*#__PURE__*/React__default.createElement("div", {
+  }, disabled || nameless ? /*#__PURE__*/React__default.createElement("div", {
     title: domTitle,
     className: classNames('forwardLink__link--disabled', linkClassName)
   }, children) :
   /*#__PURE__*/
-  /* linkClassName 直接掛在可聚焦的 <a> 上：消費端的 ellipsis/overflow 樣式若掛在
-     外層 className（包裹 div），會裁掉 <a> 的焦點框（WCAG 2.4.7 走查實測）——
+  /* linkClassName 直接掛在可聚焦的 <a> 上：消費端的 ellipsis/overflow 樣式若掛在
+     外層 className（包裹 div），會裁掉 <a> 的焦點框（WCAG 2.4.7 走查實測）——
      此類樣式應改傳 linkClassName */
   React__default.createElement(Link, {
     className: classNames('forwardLink__link', linkClassName),

package/lib/components/ForwardLink.js

@@ -1,4 +1,4 @@
-export { F as default } from './ForwardLink-e86c1080.js';
+export { F as default } from './ForwardLink-9f22205c.js';
 import './_rollupPluginBabelHelpers-a52356f6.js';
 import 'react';
 import 'prop-types';

package/lib/components/KeywordTicker.js

@@ -2,7 +2,7 @@ import { a as _slicedToArray } from './_rollupPluginBabelHelpers-a52356f6.js';
 import React__default, { useState, useRef, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import { c as classNames } from './index-b76a85f4.js';
-import { F as ForwardLink } from './ForwardLink-e86c1080.js';
+import { F as ForwardLink } from './ForwardLink-9f22205c.js';
 import { getIntl } from './globalConfig';
 import { s as styleInject } from './style-inject.es-1f59c1d0.js';
 import './index-b47819f3.js';

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/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@daoyi/nmtl-ui",
-	"version": "2.0.1-beta.121",
+	"version": "2.0.1-beta.123",
 	"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",