@nutui/nutui-react-taro 3.0.19-cpp.17 → 3.0.19-cpp.18

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (58) hide show
  1. package/dist/cjs/locales/base.d.ts +2 -0
  2. package/dist/cjs/locales/en-US.js +3 -1
  3. package/dist/cjs/locales/id-ID.js +3 -1
  4. package/dist/cjs/locales/tr-TR.js +3 -1
  5. package/dist/cjs/locales/zh-CN.js +3 -1
  6. package/dist/cjs/locales/zh-TW.js +3 -1
  7. package/dist/cjs/locales/zh-UG.js +3 -1
  8. package/dist/cjs/packages/button/button.js +5 -1
  9. package/dist/cjs/packages/checkbox/checkbox.js +6 -11
  10. package/dist/cjs/packages/dialog/content.js +6 -2
  11. package/dist/cjs/packages/dialog/dialog.js +12 -4
  12. package/dist/cjs/packages/overlay/overlay.js +9 -4
  13. package/dist/cjs/packages/popup/popup.js +9 -3
  14. package/dist/cjs/packages/radio/radio.js +9 -3
  15. package/dist/cjs/packages/switch/switch.js +10 -3
  16. package/dist/cjs/packages/textarea/textarea.js +2 -1
  17. package/dist/cjs/packages/toast/toast.js +2 -1
  18. package/dist/cjs/types/spec/checkbox/base.d.ts +0 -1
  19. package/dist/cjs/types/spec/dialog/base.d.ts +1 -0
  20. package/dist/cjs/types/spec/dialog/h5.d.ts +2 -0
  21. package/dist/cjs/types/spec/dialog/taro.d.ts +2 -0
  22. package/dist/cjs/types/spec/overlay/base.d.ts +1 -0
  23. package/dist/cjs/types/spec/popup/base.d.ts +1 -0
  24. package/dist/cjs/types/spec/radio/base.d.ts +1 -0
  25. package/dist/cjs/types/spec/switch/base.d.ts +1 -0
  26. package/dist/es/locales/base.d.ts +2 -0
  27. package/dist/es/locales/en-US.js +3 -1
  28. package/dist/es/locales/id-ID.js +3 -1
  29. package/dist/es/locales/tr-TR.js +3 -1
  30. package/dist/es/locales/zh-CN.js +3 -1
  31. package/dist/es/locales/zh-TW.js +3 -1
  32. package/dist/es/locales/zh-UG.js +3 -1
  33. package/dist/es/packages/button/button.js +5 -1
  34. package/dist/es/packages/checkbox/checkbox.js +7 -12
  35. package/dist/es/packages/dialog/content.js +6 -2
  36. package/dist/es/packages/dialog/dialog.js +12 -4
  37. package/dist/es/packages/overlay/overlay.js +9 -4
  38. package/dist/es/packages/popup/popup.js +9 -3
  39. package/dist/es/packages/radio/radio.js +9 -3
  40. package/dist/es/packages/switch/switch.js +10 -3
  41. package/dist/es/packages/textarea/textarea.js +2 -1
  42. package/dist/es/packages/toast/toast.js +2 -1
  43. package/dist/es/types/spec/checkbox/base.d.ts +0 -1
  44. package/dist/es/types/spec/dialog/base.d.ts +1 -0
  45. package/dist/es/types/spec/dialog/h5.d.ts +2 -0
  46. package/dist/es/types/spec/dialog/taro.d.ts +2 -0
  47. package/dist/es/types/spec/overlay/base.d.ts +1 -0
  48. package/dist/es/types/spec/popup/base.d.ts +1 -0
  49. package/dist/es/types/spec/radio/base.d.ts +1 -0
  50. package/dist/es/types/spec/switch/base.d.ts +1 -0
  51. package/dist/nutui.react.umd.js +71 -34
  52. package/dist/style-jmapp.css +1 -1
  53. package/dist/style-jmapp.scss +20 -20
  54. package/dist/style-jrkf.css +1 -1
  55. package/dist/style-jrkf.scss +33 -33
  56. package/dist/style.css +1 -1
  57. package/dist/style.scss +29 -29
  58. package/package.json +1 -1
@@ -8,6 +8,7 @@ export interface BaseLang {
8
8
  select: string;
9
9
  edit: string;
10
10
  reset: string;
11
+ close: string;
11
12
  video: {
12
13
  errorTip: string;
13
14
  clickRetry: string;
@@ -140,4 +141,5 @@ export interface BaseLang {
140
141
  watermark: {
141
142
  errorCanvasTips: string;
142
143
  };
144
+ mask: string;
143
145
  }
@@ -18,6 +18,7 @@ var enUS = {
18
18
  select: 'Select',
19
19
  edit: 'Edit',
20
20
  reset: 'Reset',
21
+ close: 'Close',
21
22
  video: {
22
23
  errorTip: 'Error Tip',
23
24
  clickRetry: 'Click Retry'
@@ -163,6 +164,7 @@ var enUS = {
163
164
  },
164
165
  watermark: {
165
166
  errorCanvasTips: 'Canvas is not supported in the current environment'
166
- }
167
+ },
168
+ mask: 'Mask'
167
169
  };
168
170
  var _default = enUS;
@@ -18,6 +18,7 @@ var idID = {
18
18
  select: 'Pilih',
19
19
  edit: 'Sunting',
20
20
  reset: 'Mengatur Ulang',
21
+ close: 'Tutup',
21
22
  video: {
22
23
  errorTip: 'Terjadi Kesalahan',
23
24
  clickRetry: 'Coba Lagi'
@@ -163,6 +164,7 @@ var idID = {
163
164
  },
164
165
  watermark: {
165
166
  errorCanvasTips: 'Canvas is not supported in the current environment'
166
- }
167
+ },
168
+ mask: 'Masker'
167
169
  };
168
170
  var _default = idID;
@@ -18,6 +18,7 @@ var trTR = {
18
18
  select: 'Seçiniz',
19
19
  edit: 'düzenlemek',
20
20
  reset: 'sıfırlama',
21
+ close: 'Kapat',
21
22
  video: {
22
23
  errorTip: 'Video yüklenemedi',
23
24
  clickRetry: 'Yeniden Tıklayın'
@@ -163,6 +164,7 @@ var trTR = {
163
164
  },
164
165
  watermark: {
165
166
  errorCanvasTips: 'Geçerli ortam Canvası desteklemiyor'
166
- }
167
+ },
168
+ mask: 'Maske'
167
169
  };
168
170
  var _default = trTR;
@@ -18,6 +18,7 @@ var zhCN = {
18
18
  select: '请选择',
19
19
  edit: '编辑',
20
20
  reset: '重置',
21
+ close: '关闭',
21
22
  video: {
22
23
  errorTip: '视频加载失败',
23
24
  clickRetry: '点击重试'
@@ -163,6 +164,7 @@ var zhCN = {
163
164
  },
164
165
  watermark: {
165
166
  errorCanvasTips: '当前环境不支持Canvas'
166
- }
167
+ },
168
+ mask: '蒙层'
167
169
  };
168
170
  var _default = zhCN;
@@ -18,6 +18,7 @@ var zhCN = {
18
18
  select: '請選擇',
19
19
  edit: '編輯',
20
20
  reset: '重置',
21
+ close: '關閉',
21
22
  video: {
22
23
  errorTip: '視頻加載失敗',
23
24
  clickRetry: '點擊重試'
@@ -163,6 +164,7 @@ var zhCN = {
163
164
  },
164
165
  watermark: {
165
166
  errorCanvasTips: '當前環境不支持Canvas'
166
- }
167
+ },
168
+ mask: '蒙層'
167
169
  };
168
170
  var _default = zhCN;
@@ -18,6 +18,7 @@ var zhUG = {
18
18
  select: 'تاللاڭ',
19
19
  edit: 'يحرر',
20
20
  reset: 'إعادة ضبط',
21
+ close: 'تاقاش',
21
22
  video: {
22
23
  errorTip: 'فىلىمنى قويۇش مەغلۇپ بولدى',
23
24
  clickRetry: 'قايتا سىناش'
@@ -163,6 +164,7 @@ var zhUG = {
163
164
  },
164
165
  watermark: {
165
166
  errorCanvasTips: 'Canvas نى قوللىمايدۇ'
166
- }
167
+ },
168
+ mask: 'mask'
167
169
  };
168
170
  var _default = zhUG;
@@ -52,6 +52,7 @@ var Button = /*#__PURE__*/ _react.default.forwardRef(function(props, ref) {
52
52
  "nativeType",
53
53
  "onClick"
54
54
  ]);
55
+ var role = 'button';
55
56
  var getStyle = (0, _react.useMemo)(function() {
56
57
  var style = {};
57
58
  if (color) {
@@ -116,7 +117,10 @@ var Button = /*#__PURE__*/ _react.default.forwardRef(function(props, ref) {
116
117
  style: (0, _object_spread._)({}, getStyle, style),
117
118
  onClick: function onClick(e) {
118
119
  return handleClick(e);
119
- }
120
+ },
121
+ ariaRole: role,
122
+ // @ts-ignore
123
+ ariaDisabled: disabled
120
124
  }), /*#__PURE__*/ _react.default.createElement(_components.View, {
121
125
  className: "nut-button-wrap"
122
126
  }, loading && /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Loading, {
@@ -29,13 +29,12 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
29
29
  icon: null,
30
30
  activeIcon: null,
31
31
  indeterminateIcon: null,
32
- timeout: 300,
33
32
  onChange: function onChange(value) {}
34
33
  });
35
34
  var classPrefix = 'nut-checkbox';
36
35
  var Checkbox = function Checkbox(props) {
37
36
  var children = (0, _object_spread._)({}, defaultProps, props).children;
38
- var icon = props.icon, label = props.label, className = props.className, activeIcon = props.activeIcon, checked = props.checked, value = props.value, defaultChecked = props.defaultChecked, shape = props.shape, disabled = props.disabled, onChange = props.onChange, indeterminate = props.indeterminate, indeterminateIcon = props.indeterminateIcon, timeout = props.timeout, others = (0, _object_without_properties._)(props, [
37
+ var icon = props.icon, label = props.label, className = props.className, activeIcon = props.activeIcon, checked = props.checked, value = props.value, defaultChecked = props.defaultChecked, shape = props.shape, disabled = props.disabled, onChange = props.onChange, indeterminate = props.indeterminate, indeterminateIcon = props.indeterminateIcon, others = (0, _object_without_properties._)(props, [
39
38
  "icon",
40
39
  "label",
41
40
  "className",
@@ -47,8 +46,7 @@ var Checkbox = function Checkbox(props) {
47
46
  "disabled",
48
47
  "onChange",
49
48
  "indeterminate",
50
- "indeterminateIcon",
51
- "timeout"
49
+ "indeterminateIcon"
52
50
  ]);
53
51
  // eslint-disable-next-line prefer-const
54
52
  var labelPosition = others.labelPosition, rest = (0, _object_without_properties._)(others, [
@@ -142,15 +140,9 @@ var Checkbox = function Checkbox(props) {
142
140
  className: (0, _classnames.default)("".concat(classPrefix, "-label "), (0, _define_property._)({}, "".concat(classPrefix, "-label-disabled"), innerDisabled))
143
141
  }, children || label);
144
142
  };
145
- var loadingRef = (0, _react.useRef)(false);
146
143
  var handleClick = function handleClick() {
147
144
  // 禁用的时候直接返回
148
145
  if (disabled) return;
149
- if (loadingRef.current) return;
150
- loadingRef.current = true;
151
- setTimeout(function() {
152
- loadingRef.current = false;
153
- }, timeout);
154
146
  // 先转换状态
155
147
  var latestChecked = !innerChecked;
156
148
  setChecked(latestChecked);
@@ -179,7 +171,10 @@ var Checkbox = function Checkbox(props) {
179
171
  return /*#__PURE__*/ _react.default.createElement(_components.View, (0, _object_spread_props._)((0, _object_spread._)({
180
172
  className: (0, _classnames.default)(classPrefix, (_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-reverse"), labelPosition === 'left'), (0, _define_property._)(_obj, 'nut-checkbox-list-item', ctx === null || ctx === void 0 ? void 0 : ctx.list), (0, _define_property._)(_obj, "".concat(classPrefix, "-active"), innerChecked), _obj), className)
181
173
  }, rest), {
182
- onClick: handleClick
174
+ onClick: handleClick,
175
+ ariaRole: "checkbox",
176
+ tabIndex: innerDisabled ? -1 : 0,
177
+ ariaChecked: innerIndeterminate ? 'mixed' : innerChecked
183
178
  }), renderCheckboxItem());
184
179
  };
185
180
  Checkbox.displayName = 'NutCheckBox';
@@ -32,7 +32,7 @@ var defaultContentProps = {
32
32
  onClick: function onClick() {}
33
33
  };
34
34
  var Content = function Content(props) {
35
- var _$_object_spread = (0, _object_spread._)({}, defaultContentProps, props), visible = _$_object_spread.visible, title = _$_object_spread.title, header = _$_object_spread.header, footer = _$_object_spread.footer, close = _$_object_spread.close, footerDirection = _$_object_spread.footerDirection, children = _$_object_spread.children, style = _$_object_spread.style, className = _$_object_spread.className, onClick = _$_object_spread.onClick;
35
+ var _$_object_spread = (0, _object_spread._)({}, defaultContentProps, props), visible = _$_object_spread.visible, title = _$_object_spread.title, header = _$_object_spread.header, footer = _$_object_spread.footer, close = _$_object_spread.close, footerDirection = _$_object_spread.footerDirection, children = _$_object_spread.children, style = _$_object_spread.style, className = _$_object_spread.className, onClick = _$_object_spread.onClick, ariaRole = _$_object_spread.ariaRole, ariaLabel = _$_object_spread.ariaLabel;
36
36
  var classPrefix = 'nut-dialog';
37
37
  var renderHeader = function renderHeader() {
38
38
  return title && /*#__PURE__*/ _react.default.createElement(_components.View, {
@@ -52,7 +52,11 @@ var Content = function Content(props) {
52
52
  style: style,
53
53
  onClick: function onClick(e) {
54
54
  return handleClick(e);
55
- }
55
+ },
56
+ ariaRole: ariaRole,
57
+ ariaLabel: ariaLabel,
58
+ // @ts-ignore
59
+ tabIndex: -1
56
60
  }, close, header, /*#__PURE__*/ _react.default.createElement(_components.View, {
57
61
  className: classPrefix,
58
62
  style: {
@@ -70,13 +70,15 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _overla
70
70
  onConfirm: function onConfirm() {},
71
71
  onOverlayClick: function onOverlayClick() {
72
72
  return true;
73
- }
73
+ },
74
+ ariaLabel: 'dialog'
74
75
  });
75
76
  var BaseDialog = function BaseDialog(props) {
76
- var _useParams = (0, _usecustomevent.useParams)((0, _mergeprops.mergeProps)(defaultProps, props)), _useParams_params = _useParams.params, id = _useParams_params.id, closeOnOverlayClick = _useParams_params.closeOnOverlayClick, confirmText = _useParams_params.confirmText, cancelText = _useParams_params.cancelText, children = _useParams_params.children, className = _useParams_params.className, closeIconPosition = _useParams_params.closeIconPosition, closeIcon = _useParams_params.closeIcon, content = _useParams_params.content, disableConfirmButton = _useParams_params.disableConfirmButton, footer = _useParams_params.footer, footerDirection = _useParams_params.footerDirection, header = _useParams_params.header, cancelBadge = _useParams_params.cancelBadge, confirmBadge = _useParams_params.confirmBadge, hideConfirmButton = _useParams_params.hideConfirmButton, hideCancelButton = _useParams_params.hideCancelButton, lockScroll = _useParams_params.lockScroll, overlay = _useParams_params.overlay, overlayStyle = _useParams_params.overlayStyle, overlayClassName = _useParams_params.overlayClassName, style = _useParams_params.style, title = _useParams_params.title, visible = _useParams_params.visible, zIndex = _useParams_params.zIndex, beforeCancel = _useParams_params.beforeCancel, beforeClose = _useParams_params.beforeClose, onClose = _useParams_params.onClose, onCancel = _useParams_params.onCancel, onConfirm = _useParams_params.onConfirm, onOverlayClick = _useParams_params.onOverlayClick, setParams = _useParams.setParams;
77
+ var _useParams = (0, _usecustomevent.useParams)((0, _mergeprops.mergeProps)(defaultProps, props)), _useParams_params = _useParams.params, id = _useParams_params.id, closeOnOverlayClick = _useParams_params.closeOnOverlayClick, confirmText = _useParams_params.confirmText, cancelText = _useParams_params.cancelText, children = _useParams_params.children, className = _useParams_params.className, closeIconPosition = _useParams_params.closeIconPosition, closeIcon = _useParams_params.closeIcon, content = _useParams_params.content, disableConfirmButton = _useParams_params.disableConfirmButton, footer = _useParams_params.footer, footerDirection = _useParams_params.footerDirection, header = _useParams_params.header, cancelBadge = _useParams_params.cancelBadge, confirmBadge = _useParams_params.confirmBadge, hideConfirmButton = _useParams_params.hideConfirmButton, hideCancelButton = _useParams_params.hideCancelButton, lockScroll = _useParams_params.lockScroll, overlay = _useParams_params.overlay, overlayStyle = _useParams_params.overlayStyle, overlayClassName = _useParams_params.overlayClassName, style = _useParams_params.style, title = _useParams_params.title, visible = _useParams_params.visible, zIndex = _useParams_params.zIndex, beforeCancel = _useParams_params.beforeCancel, beforeClose = _useParams_params.beforeClose, onClose = _useParams_params.onClose, onCancel = _useParams_params.onCancel, onConfirm = _useParams_params.onConfirm, onOverlayClick = _useParams_params.onOverlayClick, ariaLabel = _useParams_params.ariaLabel, setParams = _useParams.setParams;
77
78
  var classPrefix = 'nut-dialog';
78
79
  var locale = (0, _configprovider.useConfig)().locale;
79
80
  var _useState = (0, _sliced_to_array._)((0, _react.useState)(false), 2), loading = _useState[0], setLoading = _useState[1];
81
+ var role = 'dialog';
80
82
  (0, _usecustomevent.useCustomEvent)(id, function(param) {
81
83
  var status = param.status, options = param.options;
82
84
  setParams((0, _object_spread_props._)((0, _object_spread._)({}, options), {
@@ -206,7 +208,11 @@ var BaseDialog = function BaseDialog(props) {
206
208
  var systomIcon = closeIconPosition !== 'bottom' ? /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Close, null) : /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Failure, null);
207
209
  return /*#__PURE__*/ _react.default.createElement(_components.View, {
208
210
  className: closeClasses,
209
- onClick: handleClose
211
+ onClick: handleClose,
212
+ ariaRole: "button",
213
+ ariaLabel: locale.close,
214
+ // @ts-ignore
215
+ tabIndex: 0
210
216
  }, /*#__PURE__*/ _react.default.isValidElement(closeIcon) ? closeIcon : systomIcon);
211
217
  };
212
218
  var onHandleClickOverlay = function onHandleClickOverlay(e) {
@@ -237,7 +243,9 @@ var BaseDialog = function BaseDialog(props) {
237
243
  close: renderCloseIcon(),
238
244
  footer: renderFooter(),
239
245
  footerDirection: footerDirection,
240
- visible: visible
246
+ visible: visible,
247
+ ariaRole: role,
248
+ ariaLabel: ariaLabel
241
249
  }, content || children));
242
250
  };
243
251
  return /*#__PURE__*/ _react.default.createElement(_components.View, {
@@ -27,6 +27,7 @@ var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames")
27
27
  var _components = require("@tarojs/components");
28
28
  var _typings = require("../../utils/typings");
29
29
  var _uselockscoll = require("../../hooks/taro/use-lock-scoll");
30
+ var _configprovider = require("../configprovider/configprovider");
30
31
  var defaultOverlayProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
31
32
  zIndex: 1000,
32
33
  duration: 300,
@@ -38,7 +39,7 @@ var defaultOverlayProps = (0, _object_spread_props._)((0, _object_spread._)({},
38
39
  afterClose: function afterClose() {}
39
40
  });
40
41
  var Overlay = function Overlay(props) {
41
- var _ref = (0, _object_spread._)({}, defaultOverlayProps, props), children = _ref.children, zIndex = _ref.zIndex, duration = _ref.duration, className = _ref.className, closeOnOverlayClick = _ref.closeOnOverlayClick, visible = _ref.visible, lockScroll = _ref.lockScroll, style = _ref.style, afterShow = _ref.afterShow, afterClose = _ref.afterClose, onClick = _ref.onClick, rest = (0, _object_without_properties._)(_ref, [
42
+ var _ref = (0, _object_spread._)({}, defaultOverlayProps, props), children = _ref.children, zIndex = _ref.zIndex, duration = _ref.duration, className = _ref.className, closeOnOverlayClick = _ref.closeOnOverlayClick, visible = _ref.visible, lockScroll = _ref.lockScroll, style = _ref.style, afterShow = _ref.afterShow, afterClose = _ref.afterClose, onClick = _ref.onClick, ariaLabel = _ref.ariaLabel, rest = (0, _object_without_properties._)(_ref, [
42
43
  "children",
43
44
  "zIndex",
44
45
  "duration",
@@ -49,11 +50,13 @@ var Overlay = function Overlay(props) {
49
50
  "style",
50
51
  "afterShow",
51
52
  "afterClose",
52
- "onClick"
53
+ "onClick",
54
+ "ariaLabel"
53
55
  ]);
54
56
  var classPrefix = 'nut-overlay';
55
57
  var _useState = (0, _sliced_to_array._)((0, _react.useState)(visible), 2), innerVisible = _useState[0], setInnerVisible = _useState[1];
56
58
  var nodeRef = (0, _uselockscoll.useLockScrollTaro)(!!lockScroll && innerVisible);
59
+ var locale = (0, _configprovider.useConfig)().locale;
57
60
  (0, _react.useEffect)(function() {
58
61
  setInnerVisible(visible);
59
62
  }, [
@@ -69,7 +72,7 @@ var Overlay = function Overlay(props) {
69
72
  }
70
73
  };
71
74
  var renderOverlay = function renderOverlay() {
72
- return /*#__PURE__*/ _react.default.createElement(_components.View, (0, _object_spread_props._)((0, _object_spread._)({
75
+ return /*#__PURE__*/ _react.default.createElement(_components.View, (0, _object_spread._)((0, _object_spread_props._)((0, _object_spread._)({
73
76
  ref: nodeRef,
74
77
  className: classes,
75
78
  style: (0, _object_spread_props._)((0, _object_spread._)({}, styles), {
@@ -78,7 +81,9 @@ var Overlay = function Overlay(props) {
78
81
  }, rest), {
79
82
  catchMove: lockScroll,
80
83
  onClick: handleClick
81
- }), children);
84
+ }), closeOnOverlayClick ? {
85
+ ariaLabel: ariaLabel || locale.mask
86
+ } : {}), children);
82
87
  };
83
88
  return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, renderOverlay());
84
89
  // return (
@@ -28,6 +28,7 @@ var _index = /*#__PURE__*/ _interop_require_default._(require("../overlay/index"
28
28
  var _uselockscoll = require("../../hooks/taro/use-lock-scoll");
29
29
  var _platform = require("../../utils/taro/platform");
30
30
  var _pxtransform = require("../../utils/taro/px-transform");
31
+ var _configprovider = require("../configprovider/configprovider");
31
32
  var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _overlay.defaultOverlayProps), {
32
33
  position: 'center',
33
34
  transition: '',
@@ -57,7 +58,7 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _overla
57
58
  // 默认1000,参看variables
58
59
  var _zIndex = 1100;
59
60
  var Popup = function Popup(props) {
60
- var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), children = _$_object_spread.children, visible = _$_object_spread.visible, overlay = _$_object_spread.overlay, closeOnOverlayClick = _$_object_spread.closeOnOverlayClick, overlayStyle = _$_object_spread.overlayStyle, overlayClassName = _$_object_spread.overlayClassName, zIndex = _$_object_spread.zIndex, lockScroll = _$_object_spread.lockScroll, duration = _$_object_spread.duration, closeable = _$_object_spread.closeable, closeIconPosition = _$_object_spread.closeIconPosition, closeIcon = _$_object_spread.closeIcon, left = _$_object_spread.left, title = _$_object_spread.title, top = _$_object_spread.top, description = _$_object_spread.description, style = _$_object_spread.style, transition = _$_object_spread.transition, round = _$_object_spread.round, position = _$_object_spread.position, className = _$_object_spread.className, destroyOnClose = _$_object_spread.destroyOnClose, portal = _$_object_spread.portal, resizable = _$_object_spread.resizable, minHeight = _$_object_spread.minHeight, onOpen = _$_object_spread.onOpen, onClose = _$_object_spread.onClose, onOverlayClick = _$_object_spread.onOverlayClick, onCloseIconClick = _$_object_spread.onCloseIconClick, afterShow = _$_object_spread.afterShow, afterClose = _$_object_spread.afterClose, onClick = _$_object_spread.onClick, onTouchStart = _$_object_spread.onTouchStart, onTouchMove = _$_object_spread.onTouchMove, onTouchEnd = _$_object_spread.onTouchEnd;
61
+ var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), children = _$_object_spread.children, visible = _$_object_spread.visible, overlay = _$_object_spread.overlay, closeOnOverlayClick = _$_object_spread.closeOnOverlayClick, overlayStyle = _$_object_spread.overlayStyle, overlayClassName = _$_object_spread.overlayClassName, zIndex = _$_object_spread.zIndex, lockScroll = _$_object_spread.lockScroll, duration = _$_object_spread.duration, closeable = _$_object_spread.closeable, closeIconPosition = _$_object_spread.closeIconPosition, closeIcon = _$_object_spread.closeIcon, left = _$_object_spread.left, title = _$_object_spread.title, top = _$_object_spread.top, description = _$_object_spread.description, style = _$_object_spread.style, transition = _$_object_spread.transition, round = _$_object_spread.round, position = _$_object_spread.position, className = _$_object_spread.className, destroyOnClose = _$_object_spread.destroyOnClose, portal = _$_object_spread.portal, resizable = _$_object_spread.resizable, minHeight = _$_object_spread.minHeight, onOpen = _$_object_spread.onOpen, onClose = _$_object_spread.onClose, onOverlayClick = _$_object_spread.onOverlayClick, onCloseIconClick = _$_object_spread.onCloseIconClick, afterShow = _$_object_spread.afterShow, afterClose = _$_object_spread.afterClose, onClick = _$_object_spread.onClick, onTouchStart = _$_object_spread.onTouchStart, onTouchMove = _$_object_spread.onTouchMove, onTouchEnd = _$_object_spread.onTouchEnd, closeAriaLabel = _$_object_spread.closeAriaLabel;
61
62
  var innerIndex = zIndex || _zIndex;
62
63
  var _useState = (0, _sliced_to_array._)((0, _react.useState)(innerIndex), 2), index = _useState[0], setIndex = _useState[1];
63
64
  var _useState1 = (0, _sliced_to_array._)((0, _react.useState)(visible), 2), innerVisible = _useState1[0], setInnerVisible = _useState1[1];
@@ -71,6 +72,7 @@ var Popup = function Popup(props) {
71
72
  var heightRef = (0, _react.useRef)(0);
72
73
  var defaultHeightRef = (0, _react.useRef)(0);
73
74
  var isTouching = (0, _react.useRef)(false);
75
+ var locale = (0, _configprovider.useConfig)().locale;
74
76
  var classPrefix = 'nut-popup';
75
77
  var overlayStyles = (0, _object_spread._)({}, overlayStyle);
76
78
  var contentZIndex = (0, _platform.harmony)() ? index + 1 : index // 解决harmony层级问题
@@ -83,6 +85,7 @@ var Popup = function Popup(props) {
83
85
  var popClassName = (0, _classnames.default)(classPrefix, (_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-round"), round || position === 'bottom'), (0, _define_property._)(_obj, "".concat(classPrefix, "-").concat(position), true), _obj), className);
84
86
  var _useState4 = (0, _sliced_to_array._)((0, _react.useState)(''), 2), popupHeight = _useState4[0], setPopupHeight = _useState4[1];
85
87
  var _useState5 = (0, _sliced_to_array._)((0, _react.useState)(''), 2), topBottom = _useState5[0], setTopBottom = _useState5[1];
88
+ var role = 'dialog';
86
89
  var resizeStyles = function resizeStyles() {
87
90
  if (popupHeight !== '') {
88
91
  return {
@@ -160,7 +163,9 @@ var Popup = function Popup(props) {
160
163
  var closeClasses = (0, _classnames.default)("".concat(classPrefix, "-title-right"), "".concat(classPrefix, "-title-right-").concat(closeIconPosition));
161
164
  return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, closeable && /*#__PURE__*/ _react.default.createElement(_components.View, {
162
165
  className: closeClasses,
163
- onClick: handleCloseIconClick
166
+ onClick: handleCloseIconClick,
167
+ ariaRole: "button",
168
+ ariaLabel: closeAriaLabel || locale.close
164
169
  }, /*#__PURE__*/ _react.default.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.Close, null)));
165
170
  };
166
171
  var renderTop = function renderTop() {
@@ -262,7 +267,8 @@ var Popup = function Popup(props) {
262
267
  onTouchStart: handleTouchStart,
263
268
  onTouchMove: handleTouchMove,
264
269
  onTouchEnd: handleTouchEnd,
265
- onTouchCancel: handleTouchEnd
270
+ onTouchCancel: handleTouchEnd,
271
+ ariaRole: role
266
272
  }, renderTop(), renderTitle(), showChildren ? children : null);
267
273
  };
268
274
  // const renderPop = () => {
@@ -33,7 +33,7 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
33
33
  });
34
34
  var Radio = function Radio(props) {
35
35
  var classPrefix = 'nut-radio';
36
- var _ref = (0, _object_spread._)({}, defaultProps, props), children = _ref.children, className = _ref.className, style = _ref.style, checked = _ref.checked, defaultChecked = _ref.defaultChecked, shape = _ref.shape, value = _ref.value, icon = _ref.icon, activeIcon = _ref.activeIcon, onChange = _ref.onChange, others = (0, _object_without_properties._)(_ref, [
36
+ var _ref = (0, _object_spread._)({}, defaultProps, props), children = _ref.children, className = _ref.className, style = _ref.style, checked = _ref.checked, defaultChecked = _ref.defaultChecked, shape = _ref.shape, value = _ref.value, icon = _ref.icon, activeIcon = _ref.activeIcon, onChange = _ref.onChange, ariaLabel = _ref.ariaLabel, others = (0, _object_without_properties._)(_ref, [
37
37
  "children",
38
38
  "className",
39
39
  "style",
@@ -43,7 +43,8 @@ var Radio = function Radio(props) {
43
43
  "value",
44
44
  "icon",
45
45
  "activeIcon",
46
- "onChange"
46
+ "onChange",
47
+ "ariaLabel"
47
48
  ]);
48
49
  // eslint-disable-next-line prefer-const
49
50
  var labelPosition = others.labelPosition, disabled = others.disabled;
@@ -122,7 +123,12 @@ var Radio = function Radio(props) {
122
123
  return /*#__PURE__*/ _react.default.createElement(_components.View, {
123
124
  className: cls,
124
125
  style: style,
125
- onClick: handleClick
126
+ onClick: handleClick,
127
+ ariaRole: "radio",
128
+ ariaLabel: ariaLabel,
129
+ // @ts-ignore
130
+ ariaChecked: checkedStatement,
131
+ ariaDisabled: disabled
126
132
  }, renderRadioItem());
127
133
  };
128
134
  Radio.displayName = 'NutRadio';
@@ -33,7 +33,7 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
33
33
  onLoadingChange: function onLoadingChange(loading) {}
34
34
  });
35
35
  var Switch = function Switch(props) {
36
- var _ref = (0, _object_spread._)({}, defaultProps, props), checked = _ref.checked, defaultChecked = _ref.defaultChecked, disabled = _ref.disabled, activeText = _ref.activeText, inactiveText = _ref.inactiveText, loadingIcon = _ref.loadingIcon, className = _ref.className, style = _ref.style, onChange = _ref.onChange, propLoading = _ref.loading, onLoadingChange = _ref.onLoadingChange, rest = (0, _object_without_properties._)(_ref, [
36
+ var _ref = (0, _object_spread._)({}, defaultProps, props), checked = _ref.checked, defaultChecked = _ref.defaultChecked, disabled = _ref.disabled, activeText = _ref.activeText, inactiveText = _ref.inactiveText, loadingIcon = _ref.loadingIcon, className = _ref.className, style = _ref.style, onChange = _ref.onChange, propLoading = _ref.loading, onLoadingChange = _ref.onLoadingChange, ariaLabel = _ref.ariaLabel, rest = (0, _object_without_properties._)(_ref, [
37
37
  "checked",
38
38
  "defaultChecked",
39
39
  "disabled",
@@ -44,7 +44,8 @@ var Switch = function Switch(props) {
44
44
  "style",
45
45
  "onChange",
46
46
  "loading",
47
- "onLoadingChange"
47
+ "onLoadingChange",
48
+ "ariaLabel"
48
49
  ]);
49
50
  var classPrefix = 'nut-switch';
50
51
  var rtl = (0, _index.useRtl)();
@@ -126,7 +127,13 @@ var Switch = function Switch(props) {
126
127
  return /*#__PURE__*/ _react.default.createElement(_components.View, (0, _object_spread._)({
127
128
  className: classes(),
128
129
  onClick: onClick,
129
- style: style
130
+ style: style,
131
+ ariaRole: "switch",
132
+ // @ts-ignore
133
+ ariaChecked: value,
134
+ ariaDisabled: disabled,
135
+ tabIndex: disabled ? -1 : 0,
136
+ ariaLabel: ariaLabel
130
137
  }, rest), /*#__PURE__*/ _react.default.createElement(_components.View, {
131
138
  className: (0, _classnames.default)([
132
139
  [
@@ -135,7 +135,8 @@ var TextArea = /*#__PURE__*/ (0, _react.forwardRef)(function(props, ref) {
135
135
  onFocus: handleFocus,
136
136
  autoHeight: autoSize,
137
137
  maxlength: maxLength,
138
- placeholder: placeholder !== undefined ? placeholder : locale.placeholder
138
+ placeholder: placeholder !== undefined ? placeholder : locale.placeholder,
139
+ showCount: showCount
139
140
  })), showCount && /*#__PURE__*/ _react.default.createElement(_components.View, {
140
141
  className: (0, _classnames.default)("".concat(classPrefix, "-limit"), (0, _define_property._)({}, "".concat(classPrefix, "-limit-disabled"), disabled))
141
142
  }, innerValue.length, "/", maxLength < 0 ? 0 : maxLength)));
@@ -155,7 +155,8 @@ var Toast = function Toast(props) {
155
155
  id: id
156
156
  }, /*#__PURE__*/ _react.default.createElement(_components.View, {
157
157
  className: (0, _classnames.default)("".concat(classPrefix, "-inner"), "".concat(classPrefix, "-").concat(position), contentClassName, "".concat(classPrefix, "-inner-").concat(size), "".concat(classPrefix, "-inner-").concat(wordBreak), (0, _define_property._)({}, "".concat(classPrefix, "-inner-descrption"), content)),
158
- style: (0, _object_spread._)({}, styles, contentStyle)
158
+ style: (0, _object_spread._)({}, styles, contentStyle),
159
+ ariaRole: "alert"
159
160
  }, renderIcon(), title && /*#__PURE__*/ _react.default.createElement(_components.Text, {
160
161
  className: "".concat(classPrefix, "-title")
161
162
  }, title), content && ((0, _platform.td)() ? /*#__PURE__*/ _react.default.createElement(_components.Text, {
@@ -22,7 +22,6 @@ export interface BaseCheckbox extends BaseProps {
22
22
  value: string | number;
23
23
  indeterminate: boolean;
24
24
  label: ReactNode;
25
- timeout: number;
26
25
  onChange: (value: boolean) => void;
27
26
  }
28
27
  export interface BaseCheckboxGroup extends BaseProps {
@@ -39,6 +39,7 @@ export interface BaseDialog extends DialogWrapProps {
39
39
  beforeClose: () => boolean;
40
40
  beforeCancel: () => boolean;
41
41
  onConfirm: (e?: MouseEvent<HTMLButtonElement>) => PromiseLike<any> | void;
42
+ ariaLabel?: string;
42
43
  }
43
44
  export type DialogReturnProps = {
44
45
  update: (newConfig: Partial<BaseDialog>) => void;
@@ -1,6 +1,8 @@
1
1
  import { BaseDialog, BaseContentProps } from './base';
2
2
  export interface WebContentProps extends BaseContentProps {
3
3
  onClick: (event: MouseEvent) => void;
4
+ ariaRole?: string;
5
+ ariaLabel?: string;
4
6
  }
5
7
  export interface WebDialogProps extends BaseDialog {
6
8
  }
@@ -2,6 +2,8 @@ import { ITouchEvent } from '@tarojs/components';
2
2
  import { BaseDialog, BaseContentProps } from './base';
3
3
  export interface TaroContentProps extends BaseContentProps {
4
4
  onClick: (event: ITouchEvent) => void;
5
+ ariaRole?: string;
6
+ ariaLabel?: string;
5
7
  }
6
8
  export interface TaroDialogProps extends Omit<BaseDialog, 'onOverlayClick' | 'onClick'> {
7
9
  onClick: (event: ITouchEvent) => void;
@@ -8,4 +8,5 @@ export interface BaseOverlay extends BaseProps {
8
8
  afterShow: () => void;
9
9
  afterClose: () => void;
10
10
  onClick: (event: any) => void;
11
+ ariaLabel?: string;
11
12
  }
@@ -26,4 +26,5 @@ export interface BasePopup extends BaseProps, BaseOverlay {
26
26
  onTouchMove: (height: number, e: any, direction: 'up' | 'down') => void;
27
27
  onTouchStart: (height: number, e: any) => void;
28
28
  onTouchEnd: (height: number, e: any) => void;
29
+ closeAriaLabel?: string;
29
30
  }
@@ -19,6 +19,7 @@ export interface BaseRadio extends BaseProps {
19
19
  activeIcon: ReactNode;
20
20
  value: SimpleValue;
21
21
  onChange: (checked: boolean) => void;
22
+ ariaLabel?: string;
22
23
  }
23
24
  export interface BaseRadioGroup extends BaseProps {
24
25
  value?: SimpleValue;
@@ -10,4 +10,5 @@ export interface BaseSwitch extends BaseProps {
10
10
  loading: boolean | undefined;
11
11
  onLoadingChange: (loading: boolean) => void;
12
12
  onChange: (val: boolean) => void;
13
+ ariaLabel?: string;
13
14
  }
@@ -8,6 +8,7 @@ export interface BaseLang {
8
8
  select: string;
9
9
  edit: string;
10
10
  reset: string;
11
+ close: string;
11
12
  video: {
12
13
  errorTip: string;
13
14
  clickRetry: string;
@@ -140,4 +141,5 @@ export interface BaseLang {
140
141
  watermark: {
141
142
  errorCanvasTips: string;
142
143
  };
144
+ mask: string;
143
145
  }
@@ -8,6 +8,7 @@ var enUS = {
8
8
  select: 'Select',
9
9
  edit: 'Edit',
10
10
  reset: 'Reset',
11
+ close: 'Close',
11
12
  video: {
12
13
  errorTip: 'Error Tip',
13
14
  clickRetry: 'Click Retry'
@@ -153,6 +154,7 @@ var enUS = {
153
154
  },
154
155
  watermark: {
155
156
  errorCanvasTips: 'Canvas is not supported in the current environment'
156
- }
157
+ },
158
+ mask: 'Mask'
157
159
  };
158
160
  export default enUS;
@@ -8,6 +8,7 @@ var idID = {
8
8
  select: 'Pilih',
9
9
  edit: 'Sunting',
10
10
  reset: 'Mengatur Ulang',
11
+ close: 'Tutup',
11
12
  video: {
12
13
  errorTip: 'Terjadi Kesalahan',
13
14
  clickRetry: 'Coba Lagi'
@@ -153,6 +154,7 @@ var idID = {
153
154
  },
154
155
  watermark: {
155
156
  errorCanvasTips: 'Canvas is not supported in the current environment'
156
- }
157
+ },
158
+ mask: 'Masker'
157
159
  };
158
160
  export default idID;
@@ -8,6 +8,7 @@ var trTR = {
8
8
  select: 'Seçiniz',
9
9
  edit: 'düzenlemek',
10
10
  reset: 'sıfırlama',
11
+ close: 'Kapat',
11
12
  video: {
12
13
  errorTip: 'Video yüklenemedi',
13
14
  clickRetry: 'Yeniden Tıklayın'
@@ -153,6 +154,7 @@ var trTR = {
153
154
  },
154
155
  watermark: {
155
156
  errorCanvasTips: 'Geçerli ortam Canvası desteklemiyor'
156
- }
157
+ },
158
+ mask: 'Maske'
157
159
  };
158
160
  export default trTR;
@@ -8,6 +8,7 @@ var zhCN = {
8
8
  select: '请选择',
9
9
  edit: '编辑',
10
10
  reset: '重置',
11
+ close: '关闭',
11
12
  video: {
12
13
  errorTip: '视频加载失败',
13
14
  clickRetry: '点击重试'
@@ -153,6 +154,7 @@ var zhCN = {
153
154
  },
154
155
  watermark: {
155
156
  errorCanvasTips: '当前环境不支持Canvas'
156
- }
157
+ },
158
+ mask: '蒙层'
157
159
  };
158
160
  export default zhCN;
@@ -8,6 +8,7 @@ var zhCN = {
8
8
  select: '請選擇',
9
9
  edit: '編輯',
10
10
  reset: '重置',
11
+ close: '關閉',
11
12
  video: {
12
13
  errorTip: '視頻加載失敗',
13
14
  clickRetry: '點擊重試'
@@ -153,6 +154,7 @@ var zhCN = {
153
154
  },
154
155
  watermark: {
155
156
  errorCanvasTips: '當前環境不支持Canvas'
156
- }
157
+ },
158
+ mask: '蒙層'
157
159
  };
158
160
  export default zhCN;