@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.
- package/dist/cjs/locales/base.d.ts +2 -0
- package/dist/cjs/locales/en-US.js +3 -1
- package/dist/cjs/locales/id-ID.js +3 -1
- package/dist/cjs/locales/tr-TR.js +3 -1
- package/dist/cjs/locales/zh-CN.js +3 -1
- package/dist/cjs/locales/zh-TW.js +3 -1
- package/dist/cjs/locales/zh-UG.js +3 -1
- package/dist/cjs/packages/button/button.js +5 -1
- package/dist/cjs/packages/checkbox/checkbox.js +6 -11
- package/dist/cjs/packages/dialog/content.js +6 -2
- package/dist/cjs/packages/dialog/dialog.js +12 -4
- package/dist/cjs/packages/overlay/overlay.js +9 -4
- package/dist/cjs/packages/popup/popup.js +9 -3
- package/dist/cjs/packages/radio/radio.js +9 -3
- package/dist/cjs/packages/switch/switch.js +10 -3
- package/dist/cjs/packages/textarea/textarea.js +2 -1
- package/dist/cjs/packages/toast/toast.js +2 -1
- package/dist/cjs/types/spec/checkbox/base.d.ts +0 -1
- package/dist/cjs/types/spec/dialog/base.d.ts +1 -0
- package/dist/cjs/types/spec/dialog/h5.d.ts +2 -0
- package/dist/cjs/types/spec/dialog/taro.d.ts +2 -0
- package/dist/cjs/types/spec/overlay/base.d.ts +1 -0
- package/dist/cjs/types/spec/popup/base.d.ts +1 -0
- package/dist/cjs/types/spec/radio/base.d.ts +1 -0
- package/dist/cjs/types/spec/switch/base.d.ts +1 -0
- package/dist/es/locales/base.d.ts +2 -0
- package/dist/es/locales/en-US.js +3 -1
- package/dist/es/locales/id-ID.js +3 -1
- package/dist/es/locales/tr-TR.js +3 -1
- package/dist/es/locales/zh-CN.js +3 -1
- package/dist/es/locales/zh-TW.js +3 -1
- package/dist/es/locales/zh-UG.js +3 -1
- package/dist/es/packages/button/button.js +5 -1
- package/dist/es/packages/checkbox/checkbox.js +7 -12
- package/dist/es/packages/dialog/content.js +6 -2
- package/dist/es/packages/dialog/dialog.js +12 -4
- package/dist/es/packages/overlay/overlay.js +9 -4
- package/dist/es/packages/popup/popup.js +9 -3
- package/dist/es/packages/radio/radio.js +9 -3
- package/dist/es/packages/switch/switch.js +10 -3
- package/dist/es/packages/textarea/textarea.js +2 -1
- package/dist/es/packages/toast/toast.js +2 -1
- package/dist/es/types/spec/checkbox/base.d.ts +0 -1
- package/dist/es/types/spec/dialog/base.d.ts +1 -0
- package/dist/es/types/spec/dialog/h5.d.ts +2 -0
- package/dist/es/types/spec/dialog/taro.d.ts +2 -0
- package/dist/es/types/spec/overlay/base.d.ts +1 -0
- package/dist/es/types/spec/popup/base.d.ts +1 -0
- package/dist/es/types/spec/radio/base.d.ts +1 -0
- package/dist/es/types/spec/switch/base.d.ts +1 -0
- package/dist/nutui.react.umd.js +71 -34
- package/dist/style-jmapp.css +1 -1
- package/dist/style-jmapp.scss +20 -20
- package/dist/style-jrkf.css +1 -1
- package/dist/style-jrkf.scss +33 -33
- package/dist/style.css +1 -1
- package/dist/style.scss +29 -29
- package/package.json +1 -1
package/dist/es/locales/zh-UG.js
CHANGED
|
@@ -8,6 +8,7 @@ var zhUG = {
|
|
|
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 zhUG = {
|
|
|
153
154
|
},
|
|
154
155
|
watermark: {
|
|
155
156
|
errorCanvasTips: 'Canvas نى قوللىمايدۇ'
|
|
156
|
-
}
|
|
157
|
+
},
|
|
158
|
+
mask: 'mask'
|
|
157
159
|
};
|
|
158
160
|
export default zhUG;
|
|
@@ -42,6 +42,7 @@ export var Button = /*#__PURE__*/ React.forwardRef(function(props, ref) {
|
|
|
42
42
|
"nativeType",
|
|
43
43
|
"onClick"
|
|
44
44
|
]);
|
|
45
|
+
var role = 'button';
|
|
45
46
|
var getStyle = useMemo(function() {
|
|
46
47
|
var style = {};
|
|
47
48
|
if (color) {
|
|
@@ -107,7 +108,10 @@ export var Button = /*#__PURE__*/ React.forwardRef(function(props, ref) {
|
|
|
107
108
|
style: _object_spread({}, getStyle, style),
|
|
108
109
|
onClick: function(e) {
|
|
109
110
|
return handleClick(e);
|
|
110
|
-
}
|
|
111
|
+
},
|
|
112
|
+
ariaRole: role,
|
|
113
|
+
// @ts-ignore
|
|
114
|
+
ariaDisabled: disabled
|
|
111
115
|
}), /*#__PURE__*/ React.createElement(View, {
|
|
112
116
|
className: "nut-button-wrap"
|
|
113
117
|
}, loading && /*#__PURE__*/ React.createElement(Loading, {
|
|
@@ -3,7 +3,7 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
|
|
|
3
3
|
import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
|
|
4
4
|
import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
|
|
5
5
|
import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
|
|
6
|
-
import React, { useContext, useEffect,
|
|
6
|
+
import React, { useContext, useEffect, useState } from "react";
|
|
7
7
|
import { CheckDisabled, Checked, CheckNormal } from "@nutui/icons-react-taro";
|
|
8
8
|
import classNames from "classnames";
|
|
9
9
|
import { View } from "@tarojs/components";
|
|
@@ -17,13 +17,12 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
|
|
|
17
17
|
icon: null,
|
|
18
18
|
activeIcon: null,
|
|
19
19
|
indeterminateIcon: null,
|
|
20
|
-
timeout: 300,
|
|
21
20
|
onChange: function(value) {}
|
|
22
21
|
});
|
|
23
22
|
var classPrefix = 'nut-checkbox';
|
|
24
23
|
export var Checkbox = function(props) {
|
|
25
24
|
var children = _object_spread({}, defaultProps, props).children;
|
|
26
|
-
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,
|
|
25
|
+
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 = _object_without_properties(props, [
|
|
27
26
|
"icon",
|
|
28
27
|
"label",
|
|
29
28
|
"className",
|
|
@@ -35,8 +34,7 @@ export var Checkbox = function(props) {
|
|
|
35
34
|
"disabled",
|
|
36
35
|
"onChange",
|
|
37
36
|
"indeterminate",
|
|
38
|
-
"indeterminateIcon"
|
|
39
|
-
"timeout"
|
|
37
|
+
"indeterminateIcon"
|
|
40
38
|
]);
|
|
41
39
|
// eslint-disable-next-line prefer-const
|
|
42
40
|
var labelPosition = others.labelPosition, rest = _object_without_properties(others, [
|
|
@@ -130,15 +128,9 @@ export var Checkbox = function(props) {
|
|
|
130
128
|
className: classNames("".concat(classPrefix, "-label "), _define_property({}, "".concat(classPrefix, "-label-disabled"), innerDisabled))
|
|
131
129
|
}, children || label);
|
|
132
130
|
};
|
|
133
|
-
var loadingRef = useRef(false);
|
|
134
131
|
var handleClick = function() {
|
|
135
132
|
// 禁用的时候直接返回
|
|
136
133
|
if (disabled) return;
|
|
137
|
-
if (loadingRef.current) return;
|
|
138
|
-
loadingRef.current = true;
|
|
139
|
-
setTimeout(function() {
|
|
140
|
-
loadingRef.current = false;
|
|
141
|
-
}, timeout);
|
|
142
134
|
// 先转换状态
|
|
143
135
|
var latestChecked = !innerChecked;
|
|
144
136
|
setChecked(latestChecked);
|
|
@@ -167,7 +159,10 @@ export var Checkbox = function(props) {
|
|
|
167
159
|
return /*#__PURE__*/ React.createElement(View, _object_spread_props(_object_spread({
|
|
168
160
|
className: classNames(classPrefix, (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-reverse"), labelPosition === 'left'), _define_property(_obj, 'nut-checkbox-list-item', ctx === null || ctx === void 0 ? void 0 : ctx.list), _define_property(_obj, "".concat(classPrefix, "-active"), innerChecked), _obj), className)
|
|
169
161
|
}, rest), {
|
|
170
|
-
onClick: handleClick
|
|
162
|
+
onClick: handleClick,
|
|
163
|
+
ariaRole: "checkbox",
|
|
164
|
+
tabIndex: innerDisabled ? -1 : 0,
|
|
165
|
+
ariaChecked: innerIndeterminate ? 'mixed' : innerChecked
|
|
171
166
|
}), renderCheckboxItem());
|
|
172
167
|
};
|
|
173
168
|
Checkbox.displayName = 'NutCheckBox';
|
|
@@ -13,7 +13,7 @@ export var defaultContentProps = {
|
|
|
13
13
|
onClick: function() {}
|
|
14
14
|
};
|
|
15
15
|
export var Content = function(props) {
|
|
16
|
-
var _$_object_spread = _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;
|
|
16
|
+
var _$_object_spread = _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;
|
|
17
17
|
var classPrefix = 'nut-dialog';
|
|
18
18
|
var renderHeader = function() {
|
|
19
19
|
return title && /*#__PURE__*/ React.createElement(View, {
|
|
@@ -33,7 +33,11 @@ export var Content = function(props) {
|
|
|
33
33
|
style: style,
|
|
34
34
|
onClick: function(e) {
|
|
35
35
|
return handleClick(e);
|
|
36
|
-
}
|
|
36
|
+
},
|
|
37
|
+
ariaRole: ariaRole,
|
|
38
|
+
ariaLabel: ariaLabel,
|
|
39
|
+
// @ts-ignore
|
|
40
|
+
tabIndex: -1
|
|
37
41
|
}, close, header, /*#__PURE__*/ React.createElement(View, {
|
|
38
42
|
className: classPrefix,
|
|
39
43
|
style: {
|
|
@@ -47,13 +47,15 @@ var defaultProps = _object_spread_props(_object_spread({}, defaultOverlayProps,
|
|
|
47
47
|
onConfirm: function() {},
|
|
48
48
|
onOverlayClick: function() {
|
|
49
49
|
return true;
|
|
50
|
-
}
|
|
50
|
+
},
|
|
51
|
+
ariaLabel: 'dialog'
|
|
51
52
|
});
|
|
52
53
|
export var BaseDialog = function(props) {
|
|
53
|
-
var _useParams = useParams(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;
|
|
54
|
+
var _useParams = useParams(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;
|
|
54
55
|
var classPrefix = 'nut-dialog';
|
|
55
56
|
var locale = useConfig().locale;
|
|
56
57
|
var _useState = _sliced_to_array(useState(false), 2), loading = _useState[0], setLoading = _useState[1];
|
|
58
|
+
var role = 'dialog';
|
|
57
59
|
useCustomEvent(id, function(param) {
|
|
58
60
|
var status = param.status, options = param.options;
|
|
59
61
|
setParams(_object_spread_props(_object_spread({}, options), {
|
|
@@ -183,7 +185,11 @@ export var BaseDialog = function(props) {
|
|
|
183
185
|
var systomIcon = closeIconPosition !== 'bottom' ? /*#__PURE__*/ React.createElement(Close, null) : /*#__PURE__*/ React.createElement(Failure, null);
|
|
184
186
|
return /*#__PURE__*/ React.createElement(View, {
|
|
185
187
|
className: closeClasses,
|
|
186
|
-
onClick: handleClose
|
|
188
|
+
onClick: handleClose,
|
|
189
|
+
ariaRole: "button",
|
|
190
|
+
ariaLabel: locale.close,
|
|
191
|
+
// @ts-ignore
|
|
192
|
+
tabIndex: 0
|
|
187
193
|
}, /*#__PURE__*/ React.isValidElement(closeIcon) ? closeIcon : systomIcon);
|
|
188
194
|
};
|
|
189
195
|
var onHandleClickOverlay = function(e) {
|
|
@@ -215,7 +221,9 @@ export var BaseDialog = function(props) {
|
|
|
215
221
|
close: renderCloseIcon(),
|
|
216
222
|
footer: renderFooter(),
|
|
217
223
|
footerDirection: footerDirection,
|
|
218
|
-
visible: visible
|
|
224
|
+
visible: visible,
|
|
225
|
+
ariaRole: role,
|
|
226
|
+
ariaLabel: ariaLabel
|
|
219
227
|
}, content || children))
|
|
220
228
|
);
|
|
221
229
|
};
|
|
@@ -7,6 +7,7 @@ import classNames from "classnames";
|
|
|
7
7
|
import { View } from "@tarojs/components";
|
|
8
8
|
import { ComponentDefaults } from "../../utils/typings";
|
|
9
9
|
import { useLockScrollTaro } from "../../hooks/taro/use-lock-scoll";
|
|
10
|
+
import { useConfig } from "../configprovider/configprovider";
|
|
10
11
|
export var defaultOverlayProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
|
|
11
12
|
zIndex: 1000,
|
|
12
13
|
duration: 300,
|
|
@@ -18,7 +19,7 @@ export var defaultOverlayProps = _object_spread_props(_object_spread({}, Compone
|
|
|
18
19
|
afterClose: function() {}
|
|
19
20
|
});
|
|
20
21
|
export var Overlay = function(props) {
|
|
21
|
-
var _ref = _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 = _object_without_properties(_ref, [
|
|
22
|
+
var _ref = _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 = _object_without_properties(_ref, [
|
|
22
23
|
"children",
|
|
23
24
|
"zIndex",
|
|
24
25
|
"duration",
|
|
@@ -29,11 +30,13 @@ export var Overlay = function(props) {
|
|
|
29
30
|
"style",
|
|
30
31
|
"afterShow",
|
|
31
32
|
"afterClose",
|
|
32
|
-
"onClick"
|
|
33
|
+
"onClick",
|
|
34
|
+
"ariaLabel"
|
|
33
35
|
]);
|
|
34
36
|
var classPrefix = 'nut-overlay';
|
|
35
37
|
var _useState = _sliced_to_array(useState(visible), 2), innerVisible = _useState[0], setInnerVisible = _useState[1];
|
|
36
38
|
var nodeRef = useLockScrollTaro(!!lockScroll && innerVisible);
|
|
39
|
+
var locale = useConfig().locale;
|
|
37
40
|
useEffect(function() {
|
|
38
41
|
setInnerVisible(visible);
|
|
39
42
|
}, [
|
|
@@ -49,7 +52,7 @@ export var Overlay = function(props) {
|
|
|
49
52
|
}
|
|
50
53
|
};
|
|
51
54
|
var renderOverlay = function() {
|
|
52
|
-
return /*#__PURE__*/ React.createElement(View, _object_spread_props(_object_spread({
|
|
55
|
+
return /*#__PURE__*/ React.createElement(View, _object_spread(_object_spread_props(_object_spread({
|
|
53
56
|
ref: nodeRef,
|
|
54
57
|
className: classes,
|
|
55
58
|
style: _object_spread_props(_object_spread({}, styles), {
|
|
@@ -58,7 +61,9 @@ export var Overlay = function(props) {
|
|
|
58
61
|
}, rest), {
|
|
59
62
|
catchMove: lockScroll,
|
|
60
63
|
onClick: handleClick
|
|
61
|
-
}),
|
|
64
|
+
}), closeOnOverlayClick ? {
|
|
65
|
+
ariaLabel: ariaLabel || locale.mask
|
|
66
|
+
} : {}), children);
|
|
62
67
|
};
|
|
63
68
|
return /*#__PURE__*/ React.createElement(React.Fragment, null, renderOverlay());
|
|
64
69
|
// return (
|
|
@@ -17,6 +17,7 @@ import Overlay from "../overlay/index";
|
|
|
17
17
|
import { useLockScrollTaro } from "../../hooks/taro/use-lock-scoll";
|
|
18
18
|
import { harmony } from "../../utils/taro/platform";
|
|
19
19
|
import { pxTransform } from "../../utils/taro/px-transform";
|
|
20
|
+
import { useConfig } from "../configprovider/configprovider";
|
|
20
21
|
var defaultProps = _object_spread_props(_object_spread({}, defaultOverlayProps), {
|
|
21
22
|
position: 'center',
|
|
22
23
|
transition: '',
|
|
@@ -46,7 +47,7 @@ var defaultProps = _object_spread_props(_object_spread({}, defaultOverlayProps),
|
|
|
46
47
|
// 默认1000,参看variables
|
|
47
48
|
var _zIndex = 1100;
|
|
48
49
|
export var Popup = function(props) {
|
|
49
|
-
var _$_object_spread = _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;
|
|
50
|
+
var _$_object_spread = _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;
|
|
50
51
|
var innerIndex = zIndex || _zIndex;
|
|
51
52
|
var _useState = _sliced_to_array(useState(innerIndex), 2), index = _useState[0], setIndex = _useState[1];
|
|
52
53
|
var _useState1 = _sliced_to_array(useState(visible), 2), innerVisible = _useState1[0], setInnerVisible = _useState1[1];
|
|
@@ -60,6 +61,7 @@ export var Popup = function(props) {
|
|
|
60
61
|
var heightRef = useRef(0);
|
|
61
62
|
var defaultHeightRef = useRef(0);
|
|
62
63
|
var isTouching = useRef(false);
|
|
64
|
+
var locale = useConfig().locale;
|
|
63
65
|
var classPrefix = 'nut-popup';
|
|
64
66
|
var overlayStyles = _object_spread({}, overlayStyle);
|
|
65
67
|
var contentZIndex = harmony() ? index + 1 : index // 解决harmony层级问题
|
|
@@ -72,6 +74,7 @@ export var Popup = function(props) {
|
|
|
72
74
|
var popClassName = classNames(classPrefix, (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-round"), round || position === 'bottom'), _define_property(_obj, "".concat(classPrefix, "-").concat(position), true), _obj), className);
|
|
73
75
|
var _useState4 = _sliced_to_array(useState(''), 2), popupHeight = _useState4[0], setPopupHeight = _useState4[1];
|
|
74
76
|
var _useState5 = _sliced_to_array(useState(''), 2), topBottom = _useState5[0], setTopBottom = _useState5[1];
|
|
77
|
+
var role = 'dialog';
|
|
75
78
|
var resizeStyles = function() {
|
|
76
79
|
if (popupHeight !== '') {
|
|
77
80
|
return {
|
|
@@ -149,7 +152,9 @@ export var Popup = function(props) {
|
|
|
149
152
|
var closeClasses = classNames("".concat(classPrefix, "-title-right"), "".concat(classPrefix, "-title-right-").concat(closeIconPosition));
|
|
150
153
|
return /*#__PURE__*/ React.createElement(React.Fragment, null, closeable && /*#__PURE__*/ React.createElement(View, {
|
|
151
154
|
className: closeClasses,
|
|
152
|
-
onClick: handleCloseIconClick
|
|
155
|
+
onClick: handleCloseIconClick,
|
|
156
|
+
ariaRole: "button",
|
|
157
|
+
ariaLabel: closeAriaLabel || locale.close
|
|
153
158
|
}, /*#__PURE__*/ React.isValidElement(closeIcon) ? closeIcon : /*#__PURE__*/ React.createElement(Close, null)));
|
|
154
159
|
};
|
|
155
160
|
var renderTop = function() {
|
|
@@ -251,7 +256,8 @@ export var Popup = function(props) {
|
|
|
251
256
|
onTouchStart: handleTouchStart,
|
|
252
257
|
onTouchMove: handleTouchMove,
|
|
253
258
|
onTouchEnd: handleTouchEnd,
|
|
254
|
-
onTouchCancel: handleTouchEnd
|
|
259
|
+
onTouchCancel: handleTouchEnd,
|
|
260
|
+
ariaRole: role
|
|
255
261
|
}, renderTop(), renderTitle(), showChildren ? children : null);
|
|
256
262
|
};
|
|
257
263
|
// const renderPop = () => {
|
|
@@ -21,7 +21,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
|
|
|
21
21
|
});
|
|
22
22
|
export var Radio = function(props) {
|
|
23
23
|
var classPrefix = 'nut-radio';
|
|
24
|
-
var _ref = _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 = _object_without_properties(_ref, [
|
|
24
|
+
var _ref = _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 = _object_without_properties(_ref, [
|
|
25
25
|
"children",
|
|
26
26
|
"className",
|
|
27
27
|
"style",
|
|
@@ -31,7 +31,8 @@ export var Radio = function(props) {
|
|
|
31
31
|
"value",
|
|
32
32
|
"icon",
|
|
33
33
|
"activeIcon",
|
|
34
|
-
"onChange"
|
|
34
|
+
"onChange",
|
|
35
|
+
"ariaLabel"
|
|
35
36
|
]);
|
|
36
37
|
// eslint-disable-next-line prefer-const
|
|
37
38
|
var labelPosition = others.labelPosition, disabled = others.disabled;
|
|
@@ -110,7 +111,12 @@ export var Radio = function(props) {
|
|
|
110
111
|
return /*#__PURE__*/ React.createElement(View, {
|
|
111
112
|
className: cls,
|
|
112
113
|
style: style,
|
|
113
|
-
onClick: handleClick
|
|
114
|
+
onClick: handleClick,
|
|
115
|
+
ariaRole: "radio",
|
|
116
|
+
ariaLabel: ariaLabel,
|
|
117
|
+
// @ts-ignore
|
|
118
|
+
ariaChecked: checkedStatement,
|
|
119
|
+
ariaDisabled: disabled
|
|
114
120
|
}, renderRadioItem());
|
|
115
121
|
};
|
|
116
122
|
Radio.displayName = 'NutRadio';
|
|
@@ -21,7 +21,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
|
|
|
21
21
|
onLoadingChange: function(loading) {}
|
|
22
22
|
});
|
|
23
23
|
export var Switch = function(props) {
|
|
24
|
-
var _ref = _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 = _object_without_properties(_ref, [
|
|
24
|
+
var _ref = _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 = _object_without_properties(_ref, [
|
|
25
25
|
"checked",
|
|
26
26
|
"defaultChecked",
|
|
27
27
|
"disabled",
|
|
@@ -32,7 +32,8 @@ export var Switch = function(props) {
|
|
|
32
32
|
"style",
|
|
33
33
|
"onChange",
|
|
34
34
|
"loading",
|
|
35
|
-
"onLoadingChange"
|
|
35
|
+
"onLoadingChange",
|
|
36
|
+
"ariaLabel"
|
|
36
37
|
]);
|
|
37
38
|
var classPrefix = 'nut-switch';
|
|
38
39
|
var rtl = useRtl();
|
|
@@ -114,7 +115,13 @@ export var Switch = function(props) {
|
|
|
114
115
|
return /*#__PURE__*/ React.createElement(View, _object_spread({
|
|
115
116
|
className: classes(),
|
|
116
117
|
onClick: onClick,
|
|
117
|
-
style: style
|
|
118
|
+
style: style,
|
|
119
|
+
ariaRole: "switch",
|
|
120
|
+
// @ts-ignore
|
|
121
|
+
ariaChecked: value,
|
|
122
|
+
ariaDisabled: disabled,
|
|
123
|
+
tabIndex: disabled ? -1 : 0,
|
|
124
|
+
ariaLabel: ariaLabel
|
|
118
125
|
}, rest), /*#__PURE__*/ React.createElement(View, {
|
|
119
126
|
className: classNames([
|
|
120
127
|
[
|
|
@@ -123,7 +123,8 @@ export var TextArea = /*#__PURE__*/ forwardRef(function(props, ref) {
|
|
|
123
123
|
onFocus: handleFocus,
|
|
124
124
|
autoHeight: autoSize,
|
|
125
125
|
maxlength: maxLength,
|
|
126
|
-
placeholder: placeholder !== undefined ? placeholder : locale.placeholder
|
|
126
|
+
placeholder: placeholder !== undefined ? placeholder : locale.placeholder,
|
|
127
|
+
showCount: showCount
|
|
127
128
|
})), showCount && /*#__PURE__*/ React.createElement(View, {
|
|
128
129
|
className: classNames("".concat(classPrefix, "-limit"), _define_property({}, "".concat(classPrefix, "-limit-disabled"), disabled))
|
|
129
130
|
}, innerValue.length, "/", maxLength < 0 ? 0 : maxLength)));
|
|
@@ -132,7 +132,8 @@ export var Toast = function(props) {
|
|
|
132
132
|
id: id
|
|
133
133
|
}, /*#__PURE__*/ React.createElement(View, {
|
|
134
134
|
className: classNames("".concat(classPrefix, "-inner"), "".concat(classPrefix, "-").concat(position), contentClassName, "".concat(classPrefix, "-inner-").concat(size), "".concat(classPrefix, "-inner-").concat(wordBreak), _define_property({}, "".concat(classPrefix, "-inner-descrption"), content)),
|
|
135
|
-
style: _object_spread({}, styles, contentStyle)
|
|
135
|
+
style: _object_spread({}, styles, contentStyle),
|
|
136
|
+
ariaRole: "alert"
|
|
136
137
|
}, renderIcon(), title && /*#__PURE__*/ React.createElement(Text, {
|
|
137
138
|
className: "".concat(classPrefix, "-title")
|
|
138
139
|
}, title), content && (td() ? /*#__PURE__*/ React.createElement(Text, {
|
|
@@ -72,6 +72,7 @@ export interface BaseDialog extends DialogWrapProps {
|
|
|
72
72
|
* 确定按钮回调
|
|
73
73
|
*/
|
|
74
74
|
onConfirm: (e?: MouseEvent<HTMLButtonElement>) => PromiseLike<any> | void
|
|
75
|
+
ariaLabel?: string;
|
|
75
76
|
}
|
|
76
77
|
export type DialogReturnProps = {
|
|
77
78
|
update: (newConfig: Partial<BaseDialog>) => void;
|
|
@@ -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;
|