@nutui/nutui-react-taro 3.0.0-beta.7 → 3.0.0-beta.9

package/dist/cjs/packages/navbar/navbar.js

@@ -9,26 +9,18 @@ Object.defineProperty(exports, "NavBar", {
     }
 });
 var _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-var _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
-var _async_to_generator = require("@swc/helpers/_/_async_to_generator");
 var _define_property = require("@swc/helpers/_/_define_property");
 var _object_spread = require("@swc/helpers/_/_object_spread");
 var _object_spread_props = require("@swc/helpers/_/_object_spread_props");
-var _sliced_to_array = require("@swc/helpers/_/_sliced_to_array");
-var _ts_generator = require("@swc/helpers/_/_ts_generator");
-var _react = /*#__PURE__*/ _interop_require_wildcard._(require("react"));
+var _react = /*#__PURE__*/ _interop_require_default._(require("react"));
 var _classnames = /*#__PURE__*/ _interop_require_default._(require("classnames"));
 var _components = require("@tarojs/components");
 var _index = require("../configprovider/index");
 var _typings = require("../../utils/typings");
-var _getrectbytaro = require("../../utils/get-rect-by-taro");
-var _platformtaro = require("../../utils/platform-taro");
-var _pxtransform = /*#__PURE__*/ _interop_require_default._(require("../../utils/px-transform"));
-var _safearea = require("../safearea/safearea");
+var _index1 = /*#__PURE__*/ _interop_require_default._(require("../safearea/index"));
 var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typings.ComponentDefaults), {
     left: '',
     right: '',
-    titleAlign: 'center',
     back: '',
     fixed: false,
     safeAreaInsetTop: false,
@@ -36,7 +28,7 @@ var defaultProps = (0, _object_spread_props._)((0, _object_spread._)({}, _typing
     zIndex: 10
 });
 var NavBar = function NavBar(props) {
-    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), right = _$_object_spread.right, left = _$_object_spread.left, titleAlign = _$_object_spread.titleAlign, className = _$_object_spread.className, style = _$_object_spread.style, back = _$_object_spread.back, fixed = _$_object_spread.fixed, safeAreaInsetTop = _$_object_spread.safeAreaInsetTop, placeholder = _$_object_spread.placeholder, zIndex = _$_object_spread.zIndex, onBackClick = _$_object_spread.onBackClick;
+    var _$_object_spread = (0, _object_spread._)({}, defaultProps, props), right = _$_object_spread.right, left = _$_object_spread.left, title = _$_object_spread.title, className = _$_object_spread.className, style = _$_object_spread.style, back = _$_object_spread.back, fixed = _$_object_spread.fixed, safeAreaInsetTop = _$_object_spread.safeAreaInsetTop, placeholder = _$_object_spread.placeholder, zIndex = _$_object_spread.zIndex, onBackClick = _$_object_spread.onBackClick;
     var classPrefix = 'nut-navbar';
     var rtl = (0, _index.useRtl)();
     var children = Array.isArray(props.children) ? props.children : [
@@ -47,143 +39,39 @@ var NavBar = function NavBar(props) {
             zIndex: zIndex
         });
     };
-    var leftRef = (0, _react.useRef)(null);
-    var rightRef = (0, _react.useRef)(null);
-    var wrapperRef = (0, _react.useRef)(null);
-    var _useState = (0, _sliced_to_array._)((0, _react.useState)('50%'), 2), contentWidth = _useState[0], setContentWidth = _useState[1];
-    var getNodeWidth = /*#__PURE__*/ function() {
-        var _ref = (0, _async_to_generator._)(function(node) {
-            var refe;
-            return (0, _ts_generator._)(this, function(_state) {
-                switch(_state.label){
-                    case 0:
-                        if (!node) return [
-                            3,
-                            2
-                        ];
-                        return [
-                            4,
-                            (0, _getrectbytaro.getRectByTaro)(node)
-                        ];
-                    case 1:
-                        refe = _state.sent();
-                        return [
-                            2,
-                            refe.width
-                        ];
-                    case 2:
-                        return [
-                            2,
-                            0
-                        ];
-                }
-            });
-        });
-        return function getNodeWidth(node) {
-            return _ref.apply(this, arguments);
-        };
-    }();
-    (0, _react.useEffect)(function() {
-        if (titleAlign === 'left') {
-            return;
-        }
-        if (!(back || left || right)) {
-            setContentWidth('100%');
-        }
-        var init = /*#__PURE__*/ function() {
-            var _ref = (0, _async_to_generator._)(function() {
-                var leftRectWidth, rightRectWidth, wrapperWidth, centerWidth;
-                return (0, _ts_generator._)(this, function(_state) {
-                    switch(_state.label){
-                        case 0:
-                            return [
-                                4,
-                                getNodeWidth(leftRef === null || leftRef === void 0 ? void 0 : leftRef.current)
-                            ];
-                        case 1:
-                            leftRectWidth = _state.sent();
-                            return [
-                                4,
-                                getNodeWidth(rightRef === null || rightRef === void 0 ? void 0 : rightRef.current)
-                            ];
-                        case 2:
-                            rightRectWidth = _state.sent();
-                            return [
-                                4,
-                                getNodeWidth(wrapperRef === null || wrapperRef === void 0 ? void 0 : wrapperRef.current)
-                            ];
-                        case 3:
-                            wrapperWidth = _state.sent();
-                            centerWidth = wrapperWidth / 2;
-                            if (leftRectWidth && rightRectWidth) {
-                                centerWidth = wrapperWidth - (leftRectWidth > rightRectWidth ? leftRectWidth * 2 : rightRectWidth * 2);
-                            } else {
-                                centerWidth = wrapperWidth - leftRectWidth * 2 - rightRectWidth * 2;
-                            }
-                            setContentWidth(centerWidth.toFixed(2));
-                            return [
-                                2
-                            ];
-                    }
-                });
-            });
-            return function init() {
-                return _ref.apply(this, arguments);
-            };
-        }();
-        setTimeout(function() {
-            init();
-        }, 0);
-    }, [
-        left,
-        right,
-        back
-    ]);
     var renderLeft = function renderLeft() {
         var _obj, _obj1;
-        return back || left ? /*#__PURE__*/ _react.default.createElement(_components.View, {
-            className: (0, _classnames.default)((_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-left"), true), (0, _define_property._)(_obj, "".concat(classPrefix, "-left-align-").concat(titleAlign), true), (0, _define_property._)(_obj, "".concat(classPrefix, "-left-rtl"), rtl), _obj)),
-            ref: leftRef
-        }, back && /*#__PURE__*/ _react.default.createElement(_components.View, {
-            className: (0, _classnames.default)((_obj1 = {}, (0, _define_property._)(_obj1, "".concat(classPrefix, "-left-back"), true), (0, _define_property._)(_obj1, "".concat(classPrefix, "-left-back-align-").concat(titleAlign), true), (0, _define_property._)(_obj1, "".concat(classPrefix, "-left-back-children"), left), (0, _define_property._)(_obj1, "".concat(classPrefix, "-left-back-children-rtl"), left && rtl), _obj1)),
+        return /*#__PURE__*/ _react.default.createElement(_components.View, {
+            className: (0, _classnames.default)((_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-left"), true), (0, _define_property._)(_obj, "".concat(classPrefix, "-left-maxwidth"), title), (0, _define_property._)(_obj, "".concat(classPrefix, "-left-hidden"), !left && !back), (0, _define_property._)(_obj, "".concat(classPrefix, "-left-rtl"), rtl), _obj))
+        }, back ? /*#__PURE__*/ _react.default.createElement(_components.View, {
+            className: (0, _classnames.default)((_obj1 = {}, (0, _define_property._)(_obj1, "".concat(classPrefix, "-left-back"), true), (0, _define_property._)(_obj1, "".concat(classPrefix, "-left-back-children"), left), (0, _define_property._)(_obj1, "".concat(classPrefix, "-left-back-children-rtl"), left && rtl), _obj1)),
             onClick: function onClick(e) {
                 return onBackClick(e);
             }
-        }, back), left) : null;
+        }, back) : null, left);
     };
     var renderContent = function renderContent() {
-        var titleStyle = {};
-        if (titleAlign === 'center') {
-            var width = (0, _platformtaro.harmonyAndRn)() ? (0, _pxtransform.default)(Number(contentWidth)) : "".concat(contentWidth, "px");
-            var contentRealWidth = /%$/i.test(contentWidth) ? contentWidth : width;
-            titleStyle = {
-                width: contentRealWidth
-            };
-        }
         var _obj;
         return /*#__PURE__*/ _react.default.createElement(_components.View, {
-            className: (0, _classnames.default)((_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-title"), true), (0, _define_property._)(_obj, "".concat(classPrefix, "-title-align-").concat(titleAlign), true), _obj)),
-            style: titleStyle
-        }, children);
+            className: (0, _classnames.default)((_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-title"), true), (0, _define_property._)(_obj, "".concat(classPrefix, "-title-center"), title), _obj))
+        }, title || children);
     };
     var renderRight = function renderRight() {
         var _obj;
         return /*#__PURE__*/ _react.default.createElement(_components.View, {
-            className: (0, _classnames.default)((_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-right"), true), (0, _define_property._)(_obj, "".concat(classPrefix, "-right-align-").concat(titleAlign), true), (0, _define_property._)(_obj, "".concat(classPrefix, "-right-rtl"), rtl), _obj)),
-            ref: rightRef
+            className: (0, _classnames.default)((_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-right"), true), (0, _define_property._)(_obj, "".concat(classPrefix, "-right-maxwidth"), title), (0, _define_property._)(_obj, "".concat(classPrefix, "-right-rtl"), rtl), _obj))
         }, right);
     };
     var renderWrapper = function renderWrapper() {
         return /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: cls,
-            style: styles(),
-            ref: wrapperRef
+            style: styles()
         }, renderLeft(), renderContent(), renderRight());
     };
     var _obj;
-    var classes = (0, _classnames.default)((_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-fixed"), fixed), (0, _define_property._)(_obj, "".concat(classPrefix, "-safe-area-inset-top"), safeAreaInsetTop), (0, _define_property._)(_obj, "".concat(classPrefix, "-align-").concat(titleAlign), true), (0, _define_property._)(_obj, "".concat(classPrefix, "-rtl"), rtl), _obj));
-    var cls = (0, _classnames.default)(classPrefix, classes, className);
-    return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, safeAreaInsetTop && /*#__PURE__*/ _react.default.createElement(_safearea.SafeArea, {
+    var classes = (0, _classnames.default)((_obj = {}, (0, _define_property._)(_obj, "".concat(classPrefix, "-fixed"), fixed), (0, _define_property._)(_obj, "".concat(classPrefix, "-safe-area-inset-top"), safeAreaInsetTop), (0, _define_property._)(_obj, "".concat(classPrefix, "-rtl"), rtl), _obj));
+    var cls = (0, _classnames.default)(classPrefix, classes, className, (0, _define_property._)({}, "".concat(classPrefix, "-title-wrapper"), title));
+    return /*#__PURE__*/ _react.default.createElement(_react.default.Fragment, null, safeAreaInsetTop && /*#__PURE__*/ _react.default.createElement(_index1.default, {
         position: "top"
     }), fixed && placeholder ? /*#__PURE__*/ _react.default.createElement(_components.View, {
         className: "".concat(classPrefix, "-placeholder")

package/dist/cjs/packages/navbar/style/navbar.scss

@@ -3,16 +3,14 @@
   position: relative;
   display: flex;
   flex-direction: row;
-  justify-content: center;
+  justify-content: space-between;
   align-items: center;
   height: $navbar-height;
   box-sizing: border-box;
-  background: $navbar-background;
-  box-shadow: $navbar-box-shadow;
   font-size: $navbar-font-size;
   color: $navbar-color;
-  margin-bottom: $navbar-margin-bottom;
   overflow: hidden;
+  padding: 0 16px;
 
   &-fixed {
     position: fixed;
@@ -32,27 +30,24 @@
     padding-top: env(safe-area-inset-top);
   }
 
-  &-align-left {
-    padding-left: 14px;
+  &-title-wrapper {
+    justify-content: space-between;
   }
 
   &-title {
-    width: 50%;
     height: 100%;
     text-align: center;
     display: flex;
+    flex: 1;
     flex-direction: row;
     align-items: center;
-    justify-content: center;
     font-size: $navbar-title-font-size;
     font-weight: $navbar-title-font-weight;
     color: $navbar-title-font-color;
-    &-align-left {
-      min-width: 0;
-      flex: 1;
-      justify-content: flex-start;
-      padding: 0 8px;
-      text-align: left;
+
+    &-center {
+      max-width: 129px;
+      justify-content: center;
     }
   }
 
@@ -62,15 +57,12 @@
 
   &-left,
   &-right {
-    position: absolute;
-    top: 0;
-    bottom: 0;
     display: flex;
     align-items: center;
     flex-direction: row;
+    max-width: 124px;
     height: 100%;
     cursor: pointer;
-    padding: 0 14px;
     /* #ifndef rn harmony jd h5 weapp*/
     .nut-icon,
     .nutui-iconfont {
@@ -78,18 +70,21 @@
       height: 20px;
       font-size: 20px;
     }
+
     /* #endif */
+    &-maxwidth {
+      box-sizing: border-box;
+      width: calc(124px - 16px);
+    }
   }
 
   &-left {
-    left: 0;
+    padding-right: 16px;
+    gap: 16px;
+
     &-rtl {
-      left: auto;
-      right: 0;
-    }
-    &-align-left {
-      position: static;
-      padding: 0;
+      padding-right: 0;
+      padding-left: 16px;
     }
 
     &-back {
@@ -97,29 +92,26 @@
       flex-direction: row;
       align-items: center;
       justify-content: center;
-      &-children {
-        margin-right: 10px;
-        &-rtl {
-          margin-right: 0;
-          margin-left: 10px;
-        }
-      }
+      gap: 16px;
+    }
+
+    &-hidden {
+      padding-left: 0;
+      padding-right: 0;
     }
   }
 
   &-right {
-    right: 0;
+    padding-left: 16px;
+    justify-content: flex-end;
+    gap: 16px;
+
     &-rtl {
-      right: auto;
-      left: 0;
-    }
-    &-align-left {
-      position: static;
-      display: inline-flex;
-      white-space: nowrap;
+      padding-right: 16px;
       padding-left: 0;
     }
   }
+
   &-rtl {
     .nut-icon-ArrowLeft {
       transform: rotateY(180deg);

package/dist/cjs/packages/navbar/style/style.css

@@ -7,16 +7,14 @@
   position: relative;
   display: flex;
   flex-direction: row;
-  justify-content: center;
+  justify-content: space-between;
   align-items: center;
   height: var(--nutui-navbar-height, 44px);
   box-sizing: border-box;
-  background: var(--nutui-navbar-background, var(--nutui-color-background, #f5f6fa));
-  box-shadow: var(--nutui-navbar-box-shadow, 0 0 transparent);
   font-size: var(--nutui-navbar-font-size, var(--nutui-font-size-base, 14px));
-  color: var(--nutui-navbar-color, var(--nutui-color-title, #1a1a1a));
-  margin-bottom: var(--nutui-navbar-margin-bottom, 20px);
+  color: var(--nutui-navbar-color, var(--nutui-gray-7));
   overflow: hidden;
+  padding: 0 16px;
 }
 .nut-navbar-fixed {
   position: fixed;
@@ -33,41 +31,34 @@
   padding-top: constant(safe-area-inset-top);
   padding-top: env(safe-area-inset-top);
 }
-.nut-navbar-align-left {
-  padding-left: 14px;
+.nut-navbar-title-wrapper {
+  justify-content: space-between;
 }
 .nut-navbar-title {
-  width: 50%;
   height: 100%;
   text-align: center;
   display: flex;
+  flex: 1;
   flex-direction: row;
   align-items: center;
-  justify-content: center;
   font-size: var(--nutui-navbar-title-font-size, var(--nutui-font-size-xl, 18px));
   font-weight: var(--nutui-navbar-title-font-weight, var(--nutui-font-weight-bold, 600));
-  color: var(--nutui-navbar-title-font-color, var(--nutui-color-title, #1a1a1a));
+  color: var(--nutui-navbar-title-font-color, var(--nutui-gray-7));
 }
-.nut-navbar-title-align-left {
-  min-width: 0;
-  flex: 1;
-  justify-content: flex-start;
-  padding: 0 8px;
-  text-align: left;
+.nut-navbar-title-center {
+  max-width: 129px;
+  justify-content: center;
 }
 .nut-navbar-title ::-webkit-scrollbar {
   display: none;
 }
 .nut-navbar-left, .nut-navbar-right {
-  position: absolute;
-  top: 0;
-  bottom: 0;
   display: flex;
   align-items: center;
   flex-direction: row;
+  max-width: 124px;
   height: 100%;
   cursor: pointer;
-  padding: 0 14px;
   /* #ifndef rn harmony jd h5 weapp*/
   /* #endif */
 }
@@ -78,41 +69,36 @@
   height: 20px;
   font-size: 20px;
 }
+.nut-navbar-left-maxwidth, .nut-navbar-right-maxwidth {
+  box-sizing: border-box;
+  width: 108px;
+}
 .nut-navbar-left {
-  left: 0;
+  padding-right: 16px;
+  gap: 16px;
 }
 .nut-navbar-left-rtl {
-  left: auto;
-  right: 0;
-}
-.nut-navbar-left-align-left {
-  position: static;
-  padding: 0;
+  padding-right: 0;
+  padding-left: 16px;
 }
 .nut-navbar-left-back {
   display: flex;
   flex-direction: row;
   align-items: center;
   justify-content: center;
+  gap: 16px;
 }
-.nut-navbar-left-back-children {
-  margin-right: 10px;
-}
-.nut-navbar-left-back-children-rtl {
-  margin-right: 0;
-  margin-left: 10px;
+.nut-navbar-left-hidden {
+  padding-left: 0;
+  padding-right: 0;
 }
 .nut-navbar-right {
-  right: 0;
+  padding-left: 16px;
+  justify-content: flex-end;
+  gap: 16px;
 }
 .nut-navbar-right-rtl {
-  right: auto;
-  left: 0;
-}
-.nut-navbar-right-align-left {
-  position: static;
-  display: inline-flex;
-  white-space: nowrap;
+  padding-right: 16px;
   padding-left: 0;
 }
 .nut-navbar-rtl .nut-icon-ArrowLeft {

package/dist/cjs/packages/notify/style/style.css

@@ -73,17 +73,17 @@
   bottom: 0;
 }
 .nut-notify-base {
-  background: var(--nutui-notify-base-background-color, var(--nutui-color-primary, #ff0f23));
+  background: var(--nutui-notify-base-background-color, var(--nutui-brand-6));
 }
 .nut-notify-primary {
   background: var(--nutui-notify-primary-background-color, var(--nutui-color-info, #0073ff));
 }
 .nut-notify-success {
-  background: var(--nutui-notify-success-background-color, var(--nutui-color-success, #00d900));
+  background: var(--nutui-notify-success-background-color, var(--nutui-green-2));
 }
 .nut-notify-danger {
-  background: var(--nutui-notify-danger-background-color, var(--nutui-color-primary, #ff0f23));
+  background: var(--nutui-notify-danger-background-color, var(--nutui-brand-6));
 }
 .nut-notify-warning {
-  background: var(--nutui-notify-warning-background-color, var(--nutui-color-warning, #ffbf00));
+  background: var(--nutui-notify-warning-background-color, var(--nutui-yellow-2));
 }