@nutui/nutui-react-taro 3.0.19-cpp.15-beta.0 → 3.0.19-cpp.16

package/dist/es/packages/dialog/style-jrkf/dialog.scss

@@ -141,25 +141,25 @@
       }
     }
 
-    &-ok-container{
+    &-ok-container {
       position: relative;
       display: flex;
       align-items: center;
       width: 100%;
       justify-content: space-around;
 
-      .nut-dialog-footer-ok-badge{
+      .nut-dialog-footer-ok-badge {
         position: absolute;
         right: 0;
-        top: $dialog-footer-ok-badge-top;
+        top: $dialog-footer-badge-top;
         display: flex;
         align-items: center;
-        height: $dialog-footer-ok-badge-height;
-        padding: $dialog-footer-ok-badge-padding;
-        background: $dialog-footer-ok-badge-bg;
-        border-radius: $dialog-footer-ok-badge-border-radius;
-        font-size: $dialog-footer-ok-badge-fontsize;
-        color: $dialog-footer-ok-badge-color;
+        height: $dialog-footer-badge-height;
+        padding: $dialog-footer-badge-padding;
+        background: $dialog-footer-badge-bg-ok;
+        border-radius: $dialog-footer-badge-border-radius;
+        font-size: $dialog-footer-badge-fontsize;
+        color: $dialog-footer-badge-color-ok;
       }
     }
 
@@ -169,7 +169,6 @@
       .nut-button-children {
         font-weight: $font-weight-medium;
       }
-
     }
 
     &-block {
@@ -177,6 +176,28 @@
         min-width: 100%;
       }
     }
+
+    &-cancel-container {
+      position: relative;
+      display: flex;
+      align-items: center;
+      width: 100%;
+      justify-content: space-around;
+
+      .nut-dialog-footer-cancel-badge {
+        position: absolute;
+        right: $dialog-footer-cancel-margin-right;
+        top: $dialog-footer-badge-top;
+        display: flex;
+        align-items: center;
+        height: $dialog-footer-badge-height;
+        padding: $dialog-footer-badge-padding;
+        background: $dialog-footer-badge-bg-cancel;
+        border-radius: $dialog-footer-badge-border-radius;
+        font-size: $dialog-footer-badge-fontsize;
+        color: $dialog-footer-badge-color-cancel;
+      }
+    }
   }
 }
 

package/dist/es/packages/dialog/style-jrkf/style.css

@@ -141,15 +141,15 @@
 .nut-dialog-footer-ok-container .nut-dialog-footer-ok-badge {
   position: absolute;
   right: 0;
-  top: var(--nutui-dialog-footer-ok-badge-top, -8px);
+  top: var(--nutui-dialog-footer-badge-top, -8px);
   display: flex;
   align-items: center;
-  height: var(--nutui-dialog-footer-ok-badge-height, 14px);
-  padding: var(--nutui-dialog-footer-ok-badge-padding, 0 3px);
-  background: var(--nutui-dialog-footer-ok-badge-bg, var(--nutui-color-danger-light));
-  border-radius: var(--nutui-dialog-footer-ok-badge-border-radius, 2px 2px 0px 2px);
-  font-size: var(--nutui-dialog-footer-ok-badge-fontsize, 10px);
-  color: var(--nutui-dialog-footer-ok-badge-color, var(--nutui-color-primary, #ff6666));
+  height: var(--nutui-dialog-footer-badge-height, 14px);
+  padding: var(--nutui-dialog-footer-badge-padding, 0 3px);
+  background: var(--nutui-dialog-footer-badge-bg-ok, var(--nutui-color-danger-light));
+  border-radius: var(--nutui-dialog-footer-badge-border-radius, 2px 2px 0px 2px);
+  font-size: var(--nutui-dialog-footer-badge-fontsize, 10px);
+  color: var(--nutui-dialog-footer-badge-color-ok, var(--nutui-color-primary, #ff6666));
 }
 .nut-dialog-footer-ok {
   max-width: var(--nutui-dialog-footer-ok-max-width, 128px);
@@ -161,6 +161,26 @@
 .nut-dialog-footer-block.nut-button {
   min-width: 100%;
 }
+.nut-dialog-footer-cancel-container {
+  position: relative;
+  display: flex;
+  align-items: center;
+  width: 100%;
+  justify-content: space-around;
+}
+.nut-dialog-footer-cancel-container .nut-dialog-footer-cancel-badge {
+  position: absolute;
+  right: var(--nutui-dialog-footer-cancel-margin-right, 12px);
+  top: var(--nutui-dialog-footer-badge-top, -8px);
+  display: flex;
+  align-items: center;
+  height: var(--nutui-dialog-footer-badge-height, 14px);
+  padding: var(--nutui-dialog-footer-badge-padding, 0 3px);
+  background: var(--nutui-dialog-footer-badge-bg-cancel, var(--nutui-color-danger-light));
+  border-radius: var(--nutui-dialog-footer-badge-border-radius, 2px 2px 0px 2px);
+  font-size: var(--nutui-dialog-footer-badge-fontsize, 10px);
+  color: var(--nutui-dialog-footer-badge-color-cancel, var(--nutui-color-primary, #ff6666));
+}
 
 [dir=rtl] .nut-dialog-outer,
 .nut-rtl .nut-dialog-outer {

package/dist/es/packages/tabs/tabs.js

@@ -15,6 +15,7 @@ import { useForceUpdate } from "../../hooks/use-force-update";
 import raf from "../../utils/raf";
 import { useUuid } from "../../hooks/use-uuid";
 import { useRtl } from "../configprovider/configprovider";
+import { td } from "../../utils/taro/platform";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     tabStyle: {},
     activeColor: '',
@@ -150,6 +151,13 @@ export var Tabs = function(props) {
             return String(t.value) === String(value);
         });
         index = index < 0 ? 0 : index;
+        // 适配 安卓 处理，临时方案，hack
+        if (td()) {
+            return {
+                transform: direction === 'horizontal' ? "translate3d(".concat(rtl ? '' : '-').concat(index * 50, "%, 0, 0)") : "translate3d( 0, -".concat(index * 50, "%, 0)"),
+                transitionDuration: "".concat(duration, "ms")
+            };
+        }
         return {
             transform: direction === 'horizontal' ? "translate3d(".concat(rtl ? '' : '-').concat(index * 100, "%, 0, 0)") : "translate3d( 0, -".concat(index * 100, "%, 0)"),
             transitionDuration: "".concat(duration, "ms")

package/dist/es/packages/textarea/textarea.js

@@ -22,7 +22,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
 });
 export var TextArea = /*#__PURE__*/ forwardRef(function(props, ref) {
     var locale = useConfig().locale;
-    var _ref = _object_spread({}, defaultProps, props), className = _ref.className, value = _ref.value, defaultValue = _ref.defaultValue, showCount = _ref.showCount, maxLength = _ref.maxLength, rows = _ref.rows, placeholder = _ref.placeholder, readOnly = _ref.readOnly, disabled = _ref.disabled, autoSize = _ref.autoSize, style = _ref.style, plain = _ref.plain, status = _ref.status, onChange = _ref.onChange, onBlur = _ref.onBlur, onFocus = _ref.onFocus, rest = _object_without_properties(_ref, [
+    var _ref = _object_spread({}, defaultProps, props), className = _ref.className, value = _ref.value, defaultValue = _ref.defaultValue, showCount = _ref.showCount, maxLength = _ref.maxLength, rows = _ref.rows, placeholder = _ref.placeholder, readOnly = _ref.readOnly, disabled = _ref.disabled, autoSize = _ref.autoSize, style = _ref.style, plain = _ref.plain, status = _ref.status, viewId = _ref.viewId, onChange = _ref.onChange, onBlur = _ref.onBlur, onFocus = _ref.onFocus, rest = _object_without_properties(_ref, [
         "className",
         "value",
         "defaultValue",
@@ -36,6 +36,7 @@ export var TextArea = /*#__PURE__*/ forwardRef(function(props, ref) {
         "style",
         "plain",
         "status",
+        "viewId",
         "onChange",
         "onBlur",
         "onFocus"
@@ -97,6 +98,7 @@ export var TextArea = /*#__PURE__*/ forwardRef(function(props, ref) {
     });
     var _obj;
     return /*#__PURE__*/ React.createElement(React.Fragment, null, /*#__PURE__*/ React.createElement(View, {
+        id: viewId,
         className: classNames(classPrefix, (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-disabled"), disabled), _define_property(_obj, "".concat(classPrefix, "-readonly"), readOnly), _define_property(_obj, "".concat(classPrefix, "-rtl"), rtl), _define_property(_obj, "".concat(classPrefix, "-plain"), plain), _define_property(_obj, "".concat(classPrefix, "-container"), !plain), _define_property(_obj, "".concat(classPrefix, "-").concat(status), status), _obj), className)
     }, /*#__PURE__*/ React.createElement(Textarea, _object_spread_props(_object_spread({}, rest), {
         ref: textareaRef,

package/dist/es/types/spec/dialog/base.d.ts

@@ -14,7 +14,6 @@ export interface BaseContentProps extends BasicComponent {
     header: ReactNode;
     footer: ReactNode;
     close: ReactNode;
-    badge: ReactNode;
     footerDirection: DialogFooterDirection;
 }
 export interface DialogWrapProps extends WebOverlayProps, Omit<BaseContentProps, 'onClick'> {
@@ -39,6 +38,8 @@ export interface BaseDialog extends DialogWrapProps {
     * 取消按钮文案
     */
     cancelText: ReactNode
+    confirmBadge: ReactNode;
+    cancelBadge: ReactNode;
     /**
     * 是否隐藏确定按钮
     */

package/dist/es/types/spec/textarea/base.d.ts

@@ -1,5 +1,6 @@
 import { BaseProps } from '../../base/props';
 export interface BaseTextArea<EVENT = any> extends BaseProps {
+    viewId: string;
     /**
     * 输入框内容，受控
     */

package/dist/nutui.react.umd.js

@@ -4303,6 +4303,12 @@
         return String(t.value) === String(value2);
       });
       index2 = index2 < 0 ? 0 : index2;
+      if (td()) {
+        return {
+          transform: direction === "horizontal" ? "translate3d(".concat(rtl ? "" : "-").concat(index2 * 50, "%, 0, 0)") : "translate3d( 0, -".concat(index2 * 50, "%, 0)"),
+          transitionDuration: "".concat(duration, "ms")
+        };
+      }
       return {
         transform: direction === "horizontal" ? "translate3d(".concat(rtl ? "" : "-").concat(index2 * 100, "%, 0, 0)") : "translate3d( 0, -".concat(index2 * 100, "%, 0)"),
         transitionDuration: "".concat(duration, "ms")
@@ -14163,7 +14169,7 @@
   });
   var TextArea = /* @__PURE__ */ React.forwardRef(function(props, ref) {
     var locale = useConfig().locale;
-    var _ref = _object_spread({}, defaultProps$L, props), className = _ref.className, value2 = _ref.value, defaultValue = _ref.defaultValue, showCount = _ref.showCount, maxLength = _ref.maxLength, rows = _ref.rows, placeholder = _ref.placeholder, readOnly = _ref.readOnly, disabled = _ref.disabled, autoSize = _ref.autoSize, style = _ref.style, plain = _ref.plain, status = _ref.status, onChange = _ref.onChange, onBlur = _ref.onBlur, onFocus = _ref.onFocus, rest = _object_without_properties(_ref, [
+    var _ref = _object_spread({}, defaultProps$L, props), className = _ref.className, value2 = _ref.value, defaultValue = _ref.defaultValue, showCount = _ref.showCount, maxLength = _ref.maxLength, rows = _ref.rows, placeholder = _ref.placeholder, readOnly = _ref.readOnly, disabled = _ref.disabled, autoSize = _ref.autoSize, style = _ref.style, plain = _ref.plain, status = _ref.status, viewId = _ref.viewId, onChange = _ref.onChange, onBlur = _ref.onBlur, onFocus = _ref.onFocus, rest = _object_without_properties(_ref, [
       "className",
       "value",
       "defaultValue",
@@ -14177,6 +14183,7 @@
       "style",
       "plain",
       "status",
+      "viewId",
       "onChange",
       "onBlur",
       "onFocus"
@@ -14238,6 +14245,7 @@
     });
     var _obj;
     return /* @__PURE__ */ React.createElement(React.Fragment, null, /* @__PURE__ */ React.createElement(components.View, {
+      id: viewId,
       className: classNames(classPrefix2, (_obj = {}, _define_property(_obj, "".concat(classPrefix2, "-disabled"), disabled), _define_property(_obj, "".concat(classPrefix2, "-readonly"), readOnly), _define_property(_obj, "".concat(classPrefix2, "-rtl"), rtl), _define_property(_obj, "".concat(classPrefix2, "-plain"), plain), _define_property(_obj, "".concat(classPrefix2, "-container"), !plain), _define_property(_obj, "".concat(classPrefix2, "-").concat(status), status), _obj), className)
     }, /* @__PURE__ */ React.createElement(components.Textarea, _object_spread_props(_object_spread({}, rest), {
       ref: textareaRef,
@@ -15116,7 +15124,8 @@
     content: "",
     header: "",
     footer: "",
-    badge: "",
+    cancelBadge: "",
+    confirmBadge: "",
     confirmText: "",
     cancelText: "",
     hideConfirmButton: false,
@@ -15146,7 +15155,7 @@
     }
   });
   var BaseDialog = function(props) {
-    var _useParams = useParams(mergeProps(defaultProps$H, 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, content2 = _useParams_params.content, disableConfirmButton = _useParams_params.disableConfirmButton, footer = _useParams_params.footer, footerDirection = _useParams_params.footerDirection, header = _useParams_params.header, badge = _useParams_params.badge, 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;
+    var _useParams = useParams(mergeProps(defaultProps$H, 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, content2 = _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;
     var classPrefix2 = "nut-dialog";
     var locale = useConfig().locale;
     var _useState = _sliced_to_array(React.useState(false), 2), loading = _useState[0], setLoading = _useState[1];
@@ -15216,17 +15225,28 @@
         }, cancelText || locale.cancel);
       };
       var renderCancel = function() {
-        return !hideCancelButton && /* @__PURE__ */ React.createElement(Button, {
+        return !hideCancelButton && /* @__PURE__ */ React.createElement(React.Fragment, null, cancelBadge ? /* @__PURE__ */ React.createElement(components.View, {
+          className: "".concat(classPrefix2, "-footer-cancel-container")
+        }, /* @__PURE__ */ React.createElement(Button, {
           type: "default",
           size: "large",
           className: "".concat(classPrefix2, "-footer-cancel ").concat(btnClass),
           onClick: function(e) {
             return handleCancel(e);
           }
-        }, cancelText || locale.cancel);
+        }, cancelText || locale.cancel), cancelBadge ? /* @__PURE__ */ React.createElement(components.View, {
+          className: "".concat(classPrefix2, "-footer-cancel-badge")
+        }, cancelBadge) : null) : /* @__PURE__ */ React.createElement(Button, {
+          type: "default",
+          size: "large",
+          className: "".concat(classPrefix2, "-footer-cancel ").concat(btnClass),
+          onClick: function(e) {
+            return handleCancel(e);
+          }
+        }, cancelText || locale.cancel));
       };
       var renderConfirm = function() {
-        return !hideConfirmButton && /* @__PURE__ */ React.createElement(React.Fragment, null, badge ? /* @__PURE__ */ React.createElement(components.View, {
+        return !hideConfirmButton && /* @__PURE__ */ React.createElement(React.Fragment, null, confirmBadge ? /* @__PURE__ */ React.createElement(components.View, {
           className: "".concat(classPrefix2, "-footer-ok-container")
         }, /* @__PURE__ */ React.createElement(Button, {
           type: "primary",
@@ -15239,9 +15259,9 @@
             return handleOk(e);
           },
           loading
-        }, confirmText || locale.confirm), badge ? /* @__PURE__ */ React.createElement(components.View, {
+        }, confirmText || locale.confirm), confirmBadge ? /* @__PURE__ */ React.createElement(components.View, {
           className: "".concat(classPrefix2, "-footer-ok-badge")
-        }, badge) : null) : /* @__PURE__ */ React.createElement(Button, {
+        }, confirmBadge) : null) : /* @__PURE__ */ React.createElement(Button, {
           type: "primary",
           size: "large",
           className: classNames("".concat(classPrefix2, "-footer-ok ").concat(btnClass), {