@nutui/nutui-react-taro 3.0.0 → 3.0.2

package/dist/es/packages/datepickerview/types.d.ts

@@ -0,0 +1,15 @@
+import { BasicComponent } from "../../utils/typings";
+import { PickerOptions, PickerValue, PickerOption } from "../pickerview/types";
+export interface DatePickerViewProps extends BasicComponent {
+    value?: Date;
+    defaultValue?: Date;
+    type: 'date' | 'time' | 'year-month' | 'month-day' | 'datehour' | 'datetime' | 'hour-minutes';
+    showChinese: boolean;
+    minuteStep: number;
+    startDate: Date;
+    endDate: Date;
+    threeDimensional: boolean;
+    formatter: (type: string, option: PickerOption) => PickerOption;
+    filter: (type: string, options: PickerOptions) => PickerOptions;
+    onChange: (selectedOptions: PickerOptions, selectedValue: PickerValue[], columnIndex: number) => void;
+}

package/dist/es/packages/datepickerview/types.js

@@ -0,0 +1 @@
+export { };

package/dist/es/packages/dialog/dialog.js

@@ -17,6 +17,7 @@ import { customEvents, useCustomEvent, useCustomEventsPath, useParams } from "..
 import { useLockScrollTaro } from "../../hooks/use-lock-scoll-taro";
 import { mergeProps } from "../../utils/merge-props";
 import { defaultOverlayProps } from "../overlay/overlay";
+import { harmony } from "../../utils/platform-taro";
 var defaultProps = _object_spread_props(_object_spread({}, defaultOverlayProps, defaultContentProps), {
     title: '',
     content: '',
@@ -172,6 +173,8 @@ export var BaseDialog = function(props) {
         }
     };
     var renderContent = function() {
+        var contentZIndex = harmony() ? zIndex + 1 : zIndex // 解决harmony层级问题
+        ;
         return /*#__PURE__*/ React.createElement(CSSTransition, {
             in: visible,
             timeout: 300,
@@ -180,7 +183,9 @@ export var BaseDialog = function(props) {
             appear: true
         }, /*#__PURE__*/ React.createElement(Content, {
             className: className,
-            style: style,
+            style: _object_spread({
+                zIndex: contentZIndex
+            }, style),
             title: title,
             header: header,
             close: renderCloseIcon(),
@@ -195,7 +200,7 @@ export var BaseDialog = function(props) {
         },
         ref: refObject,
         catchMove: lockScroll
-    }, overlay ? /*#__PURE__*/ React.createElement(Overlay, {
+    }, overlay && /*#__PURE__*/ React.createElement(Overlay, {
         zIndex: zIndex,
         visible: visible,
         style: overlayStyle,
@@ -203,7 +208,7 @@ export var BaseDialog = function(props) {
         closeOnOverlayClick: closeOnOverlayClick,
         lockScroll: lockScroll,
         onClick: onHandleClickOverlay
-    }, renderContent()) : renderContent());
+    }), renderContent());
 };
 export function open(selector, options) {
     // eslint-disable-next-line react-hooks/rules-of-hooks

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

@@ -26,7 +26,6 @@
     -webkit-transform: translate(-50%, -50%);
     transform: translate(-50%, -50%);
     border-radius: $dialog-border-radius;
-    z-index: $dialog-z-index;
     animation-duration: 0.3s;
   }
 

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

@@ -470,7 +470,6 @@
   -webkit-transform: translate(-50%, -50%);
   transform: translate(-50%, -50%);
   border-radius: var(--nutui-dialog-border-radius, var(--nutui-radius-xl, 12px));
-  z-index: var(--nutui-dialog-z-index, 1200);
   animation-duration: 0.3s;
 }
 .nut-dialog-close {

package/dist/es/packages/dialog/style/style.harmony.css

@@ -26,7 +26,6 @@
   -webkit-transform: translate(-50%, -50%);
   transform: translate(-50%, -50%);
   border-radius: 12px;
-  z-index: 1200;
   animation-duration: 0.3s;
 }
 .nut-dialog-close {

package/dist/es/packages/drag/drag.js

@@ -1,14 +1,14 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
-import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_properties";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import React, { useState, useEffect, useRef } from "react";
-import { createSelectorQuery } from "@tarojs/taro";
-import { getWindowInfo } from "../../utils/get-system-info";
+import { View } from "@tarojs/components";
 import { ComponentDefaults } from "../../utils/typings";
 import { getRectByTaro } from "../../utils/get-rect-by-taro";
+import { getWindowInfo } from "../../utils/get-system-info";
+import { web } from "../../utils/platform-taro";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     attract: false,
     direction: undefined,
@@ -21,17 +21,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     className: 'myDrag'
 });
 export var Drag = function(props) {
-    var _ref = _object_spread({}, defaultProps, props), attract = _ref.attract, direction = _ref.direction, boundary = _ref.boundary, onDrag = _ref.onDrag, onDragStart = _ref.onDragStart, onDragEnd = _ref.onDragEnd, children = _ref.children, className = _ref.className, style = _ref.style, reset = _object_without_properties(_ref, [
-        "attract",
-        "direction",
-        "boundary",
-        "onDrag",
-        "onDragStart",
-        "onDragEnd",
-        "children",
-        "className",
-        "style"
-    ]);
+    var _$_object_spread = _object_spread({}, defaultProps, props), attract = _$_object_spread.attract, direction = _$_object_spread.direction, boundary = _$_object_spread.boundary, onDrag = _$_object_spread.onDrag, onDragStart = _$_object_spread.onDragStart, onDragEnd = _$_object_spread.onDragEnd, children = _$_object_spread.children, className = _$_object_spread.className, style = _$_object_spread.style;
     var classPrefix = 'nut-drag';
     var _useState = _sliced_to_array(useState(boundary), 2), boundaryState = _useState[0], setBoundaryState = _useState[1];
     var myDrag = useRef(null);
@@ -51,7 +41,7 @@ export var Drag = function(props) {
     var middleLine = useRef(0);
     var getInfo = /*#__PURE__*/ function() {
         var _ref = _async_to_generator(function() {
-            var el, _dragRef_current, top, left, bottom, right, _getWindowInfo, screenWidth, windowHeight, _ref, width, height;
+            var el, top, left, bottom, right, _getWindowInfo, screenWidth, windowHeight, _ref, width, height, dragTop, dragLeft;
             return _ts_generator(this, function(_state) {
                 switch(_state.label){
                     case 0:
@@ -67,17 +57,14 @@ export var Drag = function(props) {
                             getRectByTaro(dragRef.current)
                         ];
                     case 1:
-                        _ref = _state.sent(), width = _ref.width, height = _ref.height;
-                        (_dragRef_current = dragRef.current) === null || _dragRef_current === void 0 ? void 0 : _dragRef_current.getBoundingClientRect();
-                        createSelectorQuery().select(".".concat(className)).boundingClientRect(function(rec) {
-                            setBoundaryState({
-                                top: -rec.top + top,
-                                left: -rec.left + left,
-                                bottom: windowHeight - rec.top - bottom - Math.ceil(height),
-                                right: screenWidth - rec.left - right - Math.ceil(width)
-                            });
-                            middleLine.current = screenWidth - rec.width - rec.left - (screenWidth - rec.width) / 2;
-                        }).exec();
+                        _ref = _state.sent(), width = _ref.width, height = _ref.height, dragTop = _ref.top, dragLeft = _ref.left;
+                        setBoundaryState({
+                            top: -dragTop + top,
+                            left: -dragLeft + left,
+                            bottom: windowHeight - dragTop - bottom - Math.ceil(height),
+                            right: screenWidth - dragLeft - right - Math.ceil(width)
+                        });
+                        middleLine.current = screenWidth - width - dragLeft - (screenWidth - width) / 2;
                         _state.label = 2;
                     case 2:
                         return [
@@ -132,7 +119,7 @@ export var Drag = function(props) {
             });
         }
     };
-    var touchEnd = function(e) {
+    var touchEnd = function() {
         onDragEnd === null || onDragEnd === void 0 ? void 0 : onDragEnd({
             offset: [
                 translateX.current,
@@ -152,27 +139,34 @@ export var Drag = function(props) {
         }
     };
     useEffect(function() {
-        timer.current = window.setTimeout(function() {
-            getInfo();
-        }, 300);
+        if (dragRef.current) {
+            if (web()) {
+                timer.current = window.setTimeout(function() {
+                    getInfo();
+                }, 300);
+            } else {
+                getInfo();
+            }
+        }
         return function() {
             clearTimeout(timer.current);
         };
-    }, []);
-    return /*#__PURE__*/ React.createElement("div", _object_spread_props(_object_spread({
+    }, [
+        dragRef.current
+    ]);
+    return /*#__PURE__*/ React.createElement(View, {
         style: style,
-        className: "".concat(classPrefix, " ").concat(className)
-    }, reset), {
+        className: "".concat(classPrefix, " ").concat(className),
         ref: myDrag
-    }), /*#__PURE__*/ React.createElement("div", {
+    }, /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-inner"),
-        onTouchStart: function(event) {
-            return touchStart(event);
-        },
         ref: dragRef,
+        catchMove: true,
+        // @ts-ignore
+        onTouchStart: touchStart,
+        // @ts-ignore
         onTouchMove: touchMove,
         onTouchEnd: touchEnd,
-        // eslint-disable-next-line react/no-unknown-property
         style: currstyle
     }, children));
 };

package/dist/es/packages/drag/style/drag.scss

@@ -10,5 +10,6 @@
     display: inline-flex;
     width: fit-content;
     height: fit-content;
+    touch-action: none;
   }
 }

package/dist/es/packages/drag/style/style.css

@@ -15,4 +15,5 @@
   display: inline-flex;
   width: fit-content;
   height: fit-content;
+  touch-action: none;
 }

package/dist/es/packages/drag/style/style.harmony.css

@@ -15,4 +15,5 @@
   display: inline-flex;
   width: fit-content;
   height: fit-content;
+  touch-action: none;
 }

package/dist/es/packages/fixednav/fixednav.js

@@ -7,6 +7,7 @@ import { View } from "@tarojs/components";
 import Overlay from "../overlay/index";
 import { useConfig } from "../configprovider/index";
 import { defaultOverlayProps } from "../overlay/overlay";
+import Badge from "../badge/index";
 var defaultProps = _object_spread_props(_object_spread({}, defaultOverlayProps), {
     activeText: '',
     inactiveText: '',
@@ -28,6 +29,20 @@ export var FixedNav = function(props) {
     var classes = classNames(classPrefix, {
         active: visible
     }, type, className);
+    var renderListItem = function(item, index) {
+        return /*#__PURE__*/ React.createElement(View, {
+            className: "".concat(classPrefix, "-list-item"),
+            onClick: function(event) {
+                return onSelect(item, event);
+            },
+            key: item.id || index
+        }, /*#__PURE__*/ React.isValidElement(item.icon) ? item.icon : /*#__PURE__*/ React.createElement("img", {
+            src: item.icon,
+            alt: ""
+        }), /*#__PURE__*/ React.createElement(View, {
+            className: "".concat(classPrefix, "-list-text")
+        }, item.text));
+    };
     return /*#__PURE__*/ React.createElement(View, {
         className: classes,
         style: _object_spread({}, position, style)
@@ -42,20 +57,11 @@ export var FixedNav = function(props) {
     }, children || /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-list")
     }, list.map(function(item, index) {
-        return /*#__PURE__*/ React.createElement(View, {
-            className: "".concat(classPrefix, "-list-item"),
-            onClick: function(event) {
-                return onSelect(item, event);
-            },
-            key: item.id || index
-        }, /*#__PURE__*/ React.isValidElement(item.icon) ? item.icon : /*#__PURE__*/ React.createElement("img", {
-            src: item.icon,
-            alt: ""
-        }), /*#__PURE__*/ React.createElement(View, {
-            className: "".concat(classPrefix, "-list-text")
-        }, item.text), item.num && /*#__PURE__*/ React.createElement(View, {
-            className: "b"
-        }, item.num));
+        return /*#__PURE__*/ React.createElement(React.Fragment, null, item.num ? /*#__PURE__*/ React.createElement(Badge, {
+            value: item.num,
+            top: 8,
+            right: 6
+        }, renderListItem(item, index)) : /*#__PURE__*/ React.createElement(React.Fragment, null, renderListItem(item, index)));
     }))), /*#__PURE__*/ React.createElement(View, {
         className: "".concat(classPrefix, "-btn"),
         onClick: function() {

package/dist/es/packages/fixednav/style/fixednav.scss

@@ -95,21 +95,6 @@
       .nut-fixednav-list-text {
         font-size: 10px;
       }
-
-      .b {
-        position: absolute;
-        right: 0;
-        top: 1px;
-        height: 14px;
-        line-height: 14px;
-        font-size: 10px;
-        padding: 0 3px;
-        color: white;
-        background: $color-primary;
-        border-radius: 7px;
-        text-align: center;
-        min-width: 12px;
-      }
     }
   }
 

package/dist/es/packages/fixednav/style/style.css

@@ -136,20 +136,6 @@
 .nut-fixednav-list-item .nut-fixednav-list-text {
   font-size: 10px;
 }
-.nut-fixednav-list-item .b {
-  position: absolute;
-  right: 0;
-  top: 1px;
-  height: 14px;
-  line-height: 14px;
-  font-size: 10px;
-  padding: 0 3px;
-  color: white;
-  background: var(--nutui-color-primary, #ff0f23);
-  border-radius: 7px;
-  text-align: center;
-  min-width: 12px;
-}
 .nut-fixednav.left {
   right: auto;
   left: 0;

package/dist/es/packages/fixednav/style/style.harmony.css

@@ -81,20 +81,6 @@
 .nut-fixednav-list-item .nut-fixednav-list-text {
   font-size: 10px;
 }
-.nut-fixednav-list-item .b {
-  position: absolute;
-  right: 0;
-  top: 1px;
-  height: 14px;
-  line-height: 14px;
-  font-size: 10px;
-  padding: 0 3px;
-  color: white;
-  background: #ff0f23;
-  border-radius: 7px;
-  text-align: center;
-  min-width: 12px;
-}
 .nut-fixednav.left {
   right: auto;
   left: 0;

package/dist/es/packages/form/form.d.ts

@@ -22,8 +22,18 @@ export interface FormProps extends TFormProps {
     * @default -
     */
     form: any
+    /**
+    * 是否禁用
+    * @default false
+    */
+    disabled: boolean
     divider: boolean;
     /**
+    * 统一设置字段触发验证的时机
+    * @default onChange
+    */
+    validateTrigger: string | string[] | false
+    /**
     * 表单项 label 的位置
     * @default 'left'\
     */

package/dist/es/packages/form/form.js

@@ -12,7 +12,9 @@ import Cell from "../cell/index";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     labelPosition: 'right',
     starPosition: 'left',
+    disabled: false,
     divider: false,
+    validateTrigger: 'onChange',
     onFinish: function(values) {},
     onFinishFailed: function(values, errorFields) {}
 });
@@ -23,15 +25,17 @@ var PositionInfo = {
 };
 export var Form = /*#__PURE__*/ React.forwardRef(function(props, ref) {
     var classPrefix = 'nut-form';
-    var _ref = _object_spread({}, defaultProps, props), className = _ref.className, style = _ref.style, footer = _ref.footer, children = _ref.children, initialValues = _ref.initialValues, divider = _ref.divider, onFinish = _ref.onFinish, onFinishFailed = _ref.onFinishFailed, labelPosition = _ref.labelPosition, starPosition = _ref.starPosition, form = _ref.form, rest = _object_without_properties(_ref, [
+    var _ref = _object_spread({}, defaultProps, props), className = _ref.className, style = _ref.style, footer = _ref.footer, children = _ref.children, initialValues = _ref.initialValues, divider = _ref.divider, disabled = _ref.disabled, onFinish = _ref.onFinish, onFinishFailed = _ref.onFinishFailed, validateTrigger = _ref.validateTrigger, labelPosition = _ref.labelPosition, starPosition = _ref.starPosition, form = _ref.form, rest = _object_without_properties(_ref, [
         "className",
         "style",
         "footer",
         "children",
         "initialValues",
         "divider",
+        "disabled",
         "onFinish",
         "onFinishFailed",
+        "validateTrigger",
         "labelPosition",
         "starPosition",
         "form"
@@ -78,7 +82,12 @@ export var Form = /*#__PURE__*/ React.forwardRef(function(props, ref) {
     }), /*#__PURE__*/ React.createElement(Cell.Group, {
         divider: divider
     }, /*#__PURE__*/ React.createElement(Context.Provider, {
-        value: formInstance
+        value: {
+            formInstance: formInstance,
+            labelPosition: labelPosition,
+            disabled: disabled,
+            validateTrigger: validateTrigger
+        }
     }, children), footer ? /*#__PURE__*/ React.createElement(Cell, {
         className: "".concat(classPrefix, "-footer")
     }, footer) : null));

package/dist/es/packages/form/index.d.ts

@@ -2,11 +2,12 @@ import React from 'react';
 import { FormProps } from "./form";
 import { FormItem } from "../formitem/formitem";
 import { FormInstance } from './types';
-import { useForm } from "./useform";
+import { useForm, useWatch } from "./useform";
 export type { FormItemRuleWithoutValidator, FormInstance, FormFieldEntity, } from './types';
 type CompoundedComponent = React.ForwardRefExoticComponent<Partial<FormProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'onChange'> & React.RefAttributes<FormInstance>> & {
     Item: typeof FormItem;
     useForm: typeof useForm;
+    useWatch: typeof useWatch;
 };
 declare const InnerForm: CompoundedComponent;
 export default InnerForm;

package/dist/es/packages/form/index.js

@@ -1,8 +1,9 @@
 import React from "react";
 import { Form } from "./form";
 import { FormItem } from "../formitem/formitem";
-import { useForm } from "./useform";
+import { useForm, useWatch } from "./useform";
 var InnerForm = Form;
 InnerForm.Item = FormItem;
 InnerForm.useForm = useForm;
+InnerForm.useWatch = useWatch;
 export default InnerForm;

package/dist/es/packages/form/style/form.scss

@@ -1,67 +1 @@
-.form-layout-right .nut-form-item-label {
-  text-align: right;
-  padding-right: 24px;
-  white-space: nowrap;
-}
 
-.form-layout-left .nut-form-item-label {
-  position: relative;
-  text-align: left;
-  padding-left: 12px;
-  white-space: nowrap;
-
-  .required {
-    display: block;
-    line-height: 1.5;
-    position: absolute;
-    left: 0.1em;
-  }
-}
-
-.form-layout-top .nut-form-item {
-  flex-direction: column;
-  align-items: flex-start;
-  white-space: nowrap;
-}
-
-.form-layout-top .nut-form-item-label {
-  padding-bottom: 4px;
-  display: block;
-  padding-right: 24px;
-}
-
-.form-layout-top .nut-form-item-body {
-  margin-left: 0;
-  width: 100%;
-}
-
-[dir='rtl'] .form-layout-right .nut-form-item-label,
-.nut-rtl .form-layout-right .nut-form-item-label {
-  text-align: left;
-  padding-right: 0;
-  padding-left: 24px;
-}
-
-[dir='rtl'] .form-layout-left .nut-form-item-label,
-.nut-rtl .form-layout-left .nut-form-item-label {
-  text-align: right;
-  padding-left: 0;
-  padding-right: 12px;
-
-  .required {
-    left: auto;
-    right: 0.1em;
-  }
-}
-
-[dir='rtl'] .form-layout-top .nut-form-item-label,
-.nut-rtl .form-layout-top .nut-form-item-label {
-  padding-right: 0;
-  padding-left: 24px;
-}
-
-[dir='rtl'] .form-layout-top .nut-form-item-body,
-.nut-rtl .form-layout-top .nut-form-item-body {
-  margin-left: 0;
-  margin-right: 0;
-}

package/dist/es/packages/form/style/style.css

@@ -142,32 +142,38 @@
 
 .nut-form-item {
   display: flex;
-  align-items: center;
-  padding: 4px 12px;
+  line-height: unset;
 }
-.nut-form-item.error.line::before {
-  border-bottom: 1px solid var(--nutui-form-item-error-line-color, var(--nutui-color-primary, #ff0f23));
-  transform: scaleX(1);
-  transition: transform 200ms cubic-bezier(0, 0, 0.2, 1) 0ms;
+.nut-form-item-disabled {
+  opacity: 0.4;
+  pointer-events: none;
 }
 .nut-form-item-label {
+  display: flex;
+  flex-direction: row;
   font-size: var(--nutui-form-item-label-font-size, var(--nutui-font-size-base, 14px));
   font-weight: normal;
   width: var(--nutui-form-item-label-width, 90px);
   margin-right: var(--nutui-form-item-label-margin-right, 10px);
-  flex: none !important;
-  display: inline-block !important;
+  flex: 0 0 auto;
   word-wrap: break-word;
   text-align: var(--nutui-form-item-label-text-align, left);
+  line-height: unset;
 }
-.nut-form-item-label .required::before {
-  content: "*";
+.nut-form-item-label-required {
   color: var(--nutui-form-item-required-color, var(--nutui-color-primary, #ff0f23));
   margin-right: var(--nutui-form-item-required-margin-right, 4px);
+  display: block;
+  position: absolute;
+  left: -10px;
+}
+.nut-form-item .nut-form-item-labeltxt {
+  position: relative;
+  font-size: 12px;
 }
 .nut-form-item-body {
   flex: 1;
-  display: flex !important;
+  display: flex;
   flex-direction: column;
 }
 .nut-form-item-body-slots {
@@ -177,6 +183,9 @@
   padding: 0;
   border: 0;
 }
+.nut-form-item-body-slots .nut-input-container {
+  height: auto;
+}
 .nut-form-item-body-slots .nut-input-text {
   font-size: var(--nutui-form-item-body-font-size, var(--nutui-font-size-base, 14px));
   text-align: var(--nutui-form-item-body-input-text-align, left);
@@ -191,7 +200,7 @@
   min-height: 24px;
 }
 .nut-form-item-body-slots .nut-textarea {
-  padding: 0 !important;
+  padding: 0;
 }
 .nut-form-item-body-slots .nut-textarea .nut-textarea-textarea {
   font: inherit;
@@ -237,38 +246,39 @@
   text-align: right;
 }
 
-.form-layout-right .nut-form-item-label {
-  text-align: right;
+/* position */
+.nut-form-item-label-right {
+  justify-content: flex-end;
   padding-right: 24px;
   white-space: nowrap;
 }
 
-.form-layout-left .nut-form-item-label {
+.nut-form-item-label-left {
   position: relative;
-  text-align: left;
   padding-left: 12px;
   white-space: nowrap;
 }
-.form-layout-left .nut-form-item-label .required {
+
+.nut-form-item-label-left-required {
   display: block;
   line-height: 1.5;
   position: absolute;
   left: 0.1em;
 }
 
-.form-layout-top .nut-form-item {
+.nut-form-item-top {
   flex-direction: column;
   align-items: flex-start;
   white-space: nowrap;
 }
 
-.form-layout-top .nut-form-item-label {
-  padding-bottom: 4px;
+.nut-form-item-label-top {
   display: block;
+  padding-bottom: 4px;
   padding-right: 24px;
 }
 
-.form-layout-top .nut-form-item-body {
+.nut-form-item-body-top {
   margin-left: 0;
   width: 100%;
 }