@nutui/nutui-react-taro 3.0.21-cpp → 3.1.0-beta.1

package/dist/cjs/packages/tabs/style-jmapp/style.css

@@ -34,13 +34,13 @@
   justify-content: flex-start;
 }
 .nut-tabs-titles-left .nut-tabs-titles-item {
-  padding: 0 22px;
+  padding: 0 scale-px(22px);
 }
 .nut-tabs-titles-right {
   justify-content: flex-end;
 }
 .nut-tabs-titles-right .nut-tabs-titles-item {
-  padding: 0 22px;
+  padding: 0 scale-px(22px);
 }
 .nut-tabs-titles-item {
   position: relative;
@@ -84,10 +84,14 @@
 }
 .nut-tabs-titles-item-smile .nut-icon {
   position: absolute;
-  font-size: 20px;
+  font-size: var(--nutui-font-size-2xl, 20px);
   width: 100%;
   height: 100%;
 }
+.nut-tabs-titles-item-smile-icon {
+  width: scale-px(40px);
+  height: scale-px(20px);
+}
 .nut-tabs-titles-item-active .nut-icon {
   color: var(--nutui-tabs-titles-item-active-color, var(--nutui-color-primary));
 }
@@ -108,8 +112,8 @@
   /* #ifndef dynamic*/
   overflow: unset;
   /* #endif */
-  width: 40px;
-  height: 20px;
+  width: scale-px(40px);
+  height: scale-px(20px);
 }
 .nut-tabs-titles-item-active .nut-tabs-titles-item-smile .nut-icon {
   color: var(--nutui-tabs-titles-item-active-color, var(--nutui-color-primary));
@@ -134,15 +138,15 @@
   border-radius: var(--nutui-radius-base) var(--nutui-radius-base) 0 0;
 }
 .nut-tabs-titles-button .nut-tabs-titles-item {
-  padding: 0 10px;
+  padding: 0 scale-px(10px);
 }
 .nut-tabs-titles-button .nut-tabs-titles-item .nut-tabs-titles-item-text {
   flex: 1;
-  height: 28px;
+  height: scale-px(28px);
   display: flex;
   align-items: center;
   justify-content: center;
-  padding: 0 8px;
+  padding: 0 scale-px(8px);
 }
 .nut-tabs-titles-button .nut-tabs-titles-item-active .nut-tabs-titles-item-text {
   background: var(--nutui-color-default-light);
@@ -153,7 +157,7 @@
   border: var(--nutui-tabs-button-active-border, 1px solid var(--nutui-color-primary));
 }
 .nut-tabs-titles-divider {
-  border-bottom: 1px solid var(--nutui-color-border);
+  border-bottom: scale-px(1px) solid var(--nutui-color-border);
 }
 .nut-tabs-titles-divider .nut-tabs-titles-item {
   position: relative;
@@ -164,7 +168,7 @@
   right: 0;
   top: 50%;
   height: 50%;
-  width: 1px;
+  width: scale-px(1px);
   background: var(--nutui-color-border);
   transform: translateY(-50%);
 }
@@ -175,12 +179,12 @@
 .nut-tabs-vertical .nut-tabs-ellipsis {
   white-space: break-spaces;
   /* #ifdef harmony dynamic*/
-  padding-left: 12px;
+  padding-left: scale-px(12px);
   /* #endif */
   /* #ifndef harmony dynamic*/
-  padding-left: 6px;
+  padding-left: scale-px(6px);
   /* #endif */
-  width: 90px;
+  width: scale-px(90px);
   line-height: var(--nutui-font-text);
 }
 .nut-tabs-vertical .nut-tabs-titles {
@@ -211,13 +215,13 @@
   background-color: var(--nutui-tabs-titles-item-active-background-color, var(--nutui-color-surface-2));
 }
 .nut-tabs-vertical .nut-tabs-titles-item-active .nut-tabs-titles-item-line {
-  left: 10px;
+  left: scale-px(10px);
   width: var(--nutui-tabs-vertical-tab-line-width, 3px);
   height: var(--nutui-tabs-vertical-tab-line-height, 12px);
   background: var(--nutui-tabs-vertical-tab-line-color, linear-gradient(180deg, var(--nutui-color-primary) 0%, var(--nutui-color-primary-light-pressed) 100%));
 }
 .nut-tabs-vertical .nut-tabs-titles-item-active .nut-tabs-titles-item-smile {
-  right: -12px;
+  right: scale-px(-12px);
   bottom: -2%;
   left: auto;
   transform: rotate(320deg);
@@ -248,7 +252,7 @@
 .nut-tabs-vertical .nut-tabs-horizontal .nut-tabs-titles-item-active .nut-tabs-titles-item-smile {
   left: 50%;
   right: auto;
-  bottom: -3px;
+  bottom: scale-px(-3px);
   transform: translate(-50%, 0) rotate(0deg);
 }
 .nut-tabs-vertical .nut-tabs-content {
@@ -286,16 +290,16 @@
 [dir=rtl] .nut-tabs-vertical .nut-tabs-titles-line .nut-tabs-titles-item,
 .nut-rtl .nut-tabs-vertical .nut-tabs-titles-line .nut-tabs-titles-item {
   padding-left: 0;
-  padding-right: 14px;
+  padding-right: scale-px(14px);
 }
 [dir=rtl] .nut-tabs-vertical .nut-tabs-titles-item-active .nut-tabs-titles-item-line,
 .nut-rtl .nut-tabs-vertical .nut-tabs-titles-item-active .nut-tabs-titles-item-line {
   left: auto;
-  right: 10px;
+  right: scale-px(10px);
 }
 [dir=rtl] .nut-tabs-vertical .nut-tabs-titles-item-active .nut-tabs-titles-item-smile,
 .nut-rtl .nut-tabs-vertical .nut-tabs-titles-item-active .nut-tabs-titles-item-smile {
-  left: -12px;
+  left: scale-px(-12px);
   right: auto;
   transform: rotate(-320deg);
 }

package/dist/cjs/packages/tabs/style-jmapp/tabs.scss

@@ -33,14 +33,14 @@
   &-left {
     justify-content: flex-start;
     .nut-tabs-titles-item {
-      padding: 0 22px;
+      padding: 0 scale-px(22px);
     }
   }
 
   &-right {
     justify-content: flex-end;
     .nut-tabs-titles-item {
-      padding: 0 22px;
+      padding: 0 scale-px(22px);
     }
   }
 
@@ -92,12 +92,17 @@
 
       .nut-icon {
         position: absolute;
-        font-size: 20px;
+        font-size: $font-size-2xl;
         width: 100%;
         height: 100%;
       }
     }
 
+    &-smile-icon {
+      width: scale-px(40px);
+      height: scale-px(20px);
+    }
+
     &-active {
       .nut-icon {
         color: $tabs-titles-item-active-color;
@@ -122,8 +127,8 @@
         /* #ifndef dynamic*/
         overflow: unset;
         /* #endif */
-        width: 40px;
-        height: 20px;
+        width: scale-px(40px);
+        height: scale-px(20px);
 
         .nut-icon {
           color: $tabs-titles-item-active-color;
@@ -166,14 +171,14 @@
 
   &-button {
     .nut-tabs-titles-item {
-      padding: 0 10px;
+      padding: 0 scale-px(10px);
       .nut-tabs-titles-item-text {
         flex: 1;
-        height: 28px;
+        height: scale-px(28px);
         display: flex;
         align-items: center;
         justify-content: center;
-        padding: 0 8px;
+        padding: 0 scale-px(8px);
       }
     }
     .nut-tabs-titles-item-active {
@@ -189,7 +194,7 @@
   }
 
   &-divider {
-    border-bottom: 1px solid $color-border;
+    border-bottom: scale-px(1px) solid $color-border;
 
     .nut-tabs-titles-item {
       position: relative;
@@ -200,7 +205,7 @@
         right: 0;
         top: 50%;
         height: 50%;
-        width: 1px;
+        width: scale-px(1px);
         background: $color-border;
         transform: translateY(-50%);
       }
@@ -218,12 +223,12 @@
   .nut-tabs-ellipsis {
     white-space: break-spaces;
     /* #ifdef harmony dynamic*/
-    padding-left: 12px;
+    padding-left: scale-px(12px);
     /* #endif */
     /* #ifndef harmony dynamic*/
-    padding-left: 6px;
+    padding-left: scale-px(6px);
     /* #endif */
-    width: 90px;
+    width: scale-px(90px);
     line-height: $font-size-base;
   }
 
@@ -259,14 +264,14 @@
     &-active {
       background-color: $tabs-titles-item-active-background-color;
       .nut-tabs-titles-item-line {
-        left: 10px;
+        left: scale-px(10px);
         width: $tabs-vertical-tab-line-width;
         height: $tabs-vertical-tab-line-height;
         background: $tabs-vertical-tab-line-color;
       }
 
       .nut-tabs-titles-item-smile {
-        right: -12px;
+        right: scale-px(-12px);
         bottom: -2%;
         left: auto;
         transform: rotate(320deg);
@@ -305,7 +310,7 @@
       .nut-tabs-titles-item-smile {
         left: 50%;
         right: auto;
-        bottom: -3px;
+        bottom: scale-px(-3px);
         transform: translate(-50%, 0) rotate(0deg);
       }
     }
@@ -360,7 +365,7 @@
     &-line {
       .nut-tabs-titles-item {
         padding-left: 0;
-        padding-right: 14px;
+        padding-right: scale-px(14px);
       }
     }
   }
@@ -369,11 +374,11 @@
     &-active {
       .nut-tabs-titles-item-line {
         left: auto;
-        right: 10px;
+        right: scale-px(10px);
       }
 
       .nut-tabs-titles-item-smile {
-        left: -12px;
+        left: scale-px(-12px);
         right: auto;
         transform: rotate(-320deg);
       }

package/dist/cjs/packages/tabs/style-jrkf/style.css

@@ -34,13 +34,13 @@
   justify-content: flex-start;
 }
 .nut-tabs-titles-left .nut-tabs-titles-item {
-  padding: 0 22px;
+  padding: 0 scale-px(22px);
 }
 .nut-tabs-titles-right {
   justify-content: flex-end;
 }
 .nut-tabs-titles-right .nut-tabs-titles-item {
-  padding: 0 22px;
+  padding: 0 scale-px(22px);
 }
 .nut-tabs-titles-item {
   position: relative;
@@ -84,10 +84,14 @@
 }
 .nut-tabs-titles-item-smile .nut-icon {
   position: absolute;
-  font-size: 20px;
+  font-size: var(--nutui-font-size-2xl, 20px);
   width: 100%;
   height: 100%;
 }
+.nut-tabs-titles-item-smile-icon {
+  width: scale-px(40px);
+  height: scale-px(20px);
+}
 .nut-tabs-titles-item-active .nut-icon {
   color: var(--nutui-tabs-titles-item-active-color, var(--nutui-color-primary, #ff6666));
 }
@@ -108,8 +112,8 @@
   /* #ifndef dynamic*/
   overflow: unset;
   /* #endif */
-  width: 40px;
-  height: 20px;
+  width: scale-px(40px);
+  height: scale-px(20px);
 }
 .nut-tabs-titles-item-active .nut-tabs-titles-item-smile .nut-icon {
   color: var(--nutui-tabs-titles-item-active-color, var(--nutui-color-primary, #ff6666));
@@ -134,15 +138,15 @@
   border-radius: var(--nutui-radius-base) var(--nutui-radius-base) 0 0;
 }
 .nut-tabs-titles-button .nut-tabs-titles-item {
-  padding: 0 10px;
+  padding: 0 scale-px(10px);
 }
 .nut-tabs-titles-button .nut-tabs-titles-item .nut-tabs-titles-item-text {
   flex: 1;
-  height: 28px;
+  height: scale-px(28px);
   display: flex;
   align-items: center;
   justify-content: center;
-  padding: 0 8px;
+  padding: 0 scale-px(8px);
 }
 .nut-tabs-titles-button .nut-tabs-titles-item-active .nut-tabs-titles-item-text {
   background: var(--nutui-color-default-light);
@@ -153,7 +157,7 @@
   border: var(--nutui-tabs-button-active-border, 1px solid var(--nutui-color-primary, #ff6666));
 }
 .nut-tabs-titles-divider {
-  border-bottom: 1px solid var(--nutui-color-border);
+  border-bottom: scale-px(1px) solid var(--nutui-color-border);
 }
 .nut-tabs-titles-divider .nut-tabs-titles-item {
   position: relative;
@@ -164,7 +168,7 @@
   right: 0;
   top: 50%;
   height: 50%;
-  width: 1px;
+  width: scale-px(1px);
   background: var(--nutui-color-border);
   transform: translateY(-50%);
 }
@@ -175,12 +179,12 @@
 .nut-tabs-vertical .nut-tabs-ellipsis {
   white-space: break-spaces;
   /* #ifdef harmony dynamic*/
-  padding-left: 12px;
+  padding-left: scale-px(12px);
   /* #endif */
   /* #ifndef harmony dynamic*/
-  padding-left: 6px;
+  padding-left: scale-px(6px);
   /* #endif */
-  width: 90px;
+  width: scale-px(90px);
   line-height: var(--nutui-font-text);
 }
 .nut-tabs-vertical .nut-tabs-titles {
@@ -211,13 +215,13 @@
   background-color: var(--nutui-tabs-titles-item-active-background-color, var(--nutui-color-surface-2));
 }
 .nut-tabs-vertical .nut-tabs-titles-item-active .nut-tabs-titles-item-line {
-  left: 10px;
+  left: scale-px(10px);
   width: var(--nutui-tabs-vertical-tab-line-width, 3px);
   height: var(--nutui-tabs-vertical-tab-line-height, 12px);
   background: var(--nutui-tabs-vertical-tab-line-color, linear-gradient(180deg, var(--nutui-color-primary-stop-1, #ff9999) 0%, var(--nutui-color-primary-light, #ffe5e5) 100%));
 }
 .nut-tabs-vertical .nut-tabs-titles-item-active .nut-tabs-titles-item-smile {
-  right: -12px;
+  right: scale-px(-12px);
   bottom: -2%;
   left: auto;
   transform: rotate(320deg);
@@ -248,7 +252,7 @@
 .nut-tabs-vertical .nut-tabs-horizontal .nut-tabs-titles-item-active .nut-tabs-titles-item-smile {
   left: 50%;
   right: auto;
-  bottom: -3px;
+  bottom: scale-px(-3px);
   transform: translate(-50%, 0) rotate(0deg);
 }
 .nut-tabs-vertical .nut-tabs-content {
@@ -286,16 +290,16 @@
 [dir=rtl] .nut-tabs-vertical .nut-tabs-titles-line .nut-tabs-titles-item,
 .nut-rtl .nut-tabs-vertical .nut-tabs-titles-line .nut-tabs-titles-item {
   padding-left: 0;
-  padding-right: 14px;
+  padding-right: scale-px(14px);
 }
 [dir=rtl] .nut-tabs-vertical .nut-tabs-titles-item-active .nut-tabs-titles-item-line,
 .nut-rtl .nut-tabs-vertical .nut-tabs-titles-item-active .nut-tabs-titles-item-line {
   left: auto;
-  right: 10px;
+  right: scale-px(10px);
 }
 [dir=rtl] .nut-tabs-vertical .nut-tabs-titles-item-active .nut-tabs-titles-item-smile,
 .nut-rtl .nut-tabs-vertical .nut-tabs-titles-item-active .nut-tabs-titles-item-smile {
-  left: -12px;
+  left: scale-px(-12px);
   right: auto;
   transform: rotate(-320deg);
 }

package/dist/cjs/packages/tabs/style-jrkf/tabs.scss

@@ -33,14 +33,14 @@
   &-left {
     justify-content: flex-start;
     .nut-tabs-titles-item {
-      padding: 0 22px;
+      padding: 0 scale-px(22px);
     }
   }
 
   &-right {
     justify-content: flex-end;
     .nut-tabs-titles-item {
-      padding: 0 22px;
+      padding: 0 scale-px(22px);
     }
   }
 
@@ -92,12 +92,17 @@
 
       .nut-icon {
         position: absolute;
-        font-size: 20px;
+        font-size: $font-size-2xl;
         width: 100%;
         height: 100%;
       }
     }
 
+    &-smile-icon {
+      width: scale-px(40px);
+      height: scale-px(20px);
+    }
+
     &-active {
       .nut-icon {
         color: $tabs-titles-item-active-color;
@@ -122,8 +127,8 @@
         /* #ifndef dynamic*/
         overflow: unset;
         /* #endif */
-        width: 40px;
-        height: 20px;
+        width: scale-px(40px);
+        height: scale-px(20px);
 
         .nut-icon {
           color: $tabs-titles-item-active-color;
@@ -166,14 +171,14 @@
 
   &-button {
     .nut-tabs-titles-item {
-      padding: 0 10px;
+      padding: 0 scale-px(10px);
       .nut-tabs-titles-item-text {
         flex: 1;
-        height: 28px;
+        height: scale-px(28px);
         display: flex;
         align-items: center;
         justify-content: center;
-        padding: 0 8px;
+        padding: 0 scale-px(8px);
       }
     }
     .nut-tabs-titles-item-active {
@@ -189,7 +194,7 @@
   }
 
   &-divider {
-    border-bottom: 1px solid $color-border;
+    border-bottom: scale-px(1px) solid $color-border;
 
     .nut-tabs-titles-item {
       position: relative;
@@ -200,7 +205,7 @@
         right: 0;
         top: 50%;
         height: 50%;
-        width: 1px;
+        width: scale-px(1px);
         background: $color-border;
         transform: translateY(-50%);
       }
@@ -218,12 +223,12 @@
   .nut-tabs-ellipsis {
     white-space: break-spaces;
     /* #ifdef harmony dynamic*/
-    padding-left: 12px;
+    padding-left: scale-px(12px);
     /* #endif */
     /* #ifndef harmony dynamic*/
-    padding-left: 6px;
+    padding-left: scale-px(6px);
     /* #endif */
-    width: 90px;
+    width: scale-px(90px);
     line-height: $font-size-base;
   }
 
@@ -259,14 +264,14 @@
     &-active {
       background-color: $tabs-titles-item-active-background-color;
       .nut-tabs-titles-item-line {
-        left: 10px;
+        left: scale-px(10px);
         width: $tabs-vertical-tab-line-width;
         height: $tabs-vertical-tab-line-height;
         background: $tabs-vertical-tab-line-color;
       }
 
       .nut-tabs-titles-item-smile {
-        right: -12px;
+        right: scale-px(-12px);
         bottom: -2%;
         left: auto;
         transform: rotate(320deg);
@@ -305,7 +310,7 @@
       .nut-tabs-titles-item-smile {
         left: 50%;
         right: auto;
-        bottom: -3px;
+        bottom: scale-px(-3px);
         transform: translate(-50%, 0) rotate(0deg);
       }
     }
@@ -360,7 +365,7 @@
     &-line {
       .nut-tabs-titles-item {
         padding-left: 0;
-        padding-right: 14px;
+        padding-right: scale-px(14px);
       }
     }
   }
@@ -369,11 +374,11 @@
     &-active {
       .nut-tabs-titles-item-line {
         left: auto;
-        right: 10px;
+        right: scale-px(10px);
       }
 
       .nut-tabs-titles-item-smile {
-        left: -12px;
+        left: scale-px(-12px);
         right: auto;
         transform: rotate(-320deg);
       }

package/dist/cjs/packages/tabs/tabs.js

@@ -57,13 +57,13 @@ var Tabs = function Tabs(props) {
         "defaultValue"
     ]);
     var uuid = (0, _useuuid.useUuid)();
+    var tabsRef = (0, _react.useRef)(null);
     var _usePropsValue = (0, _sliced_to_array._)((0, _usepropsvalue.usePropsValue)({
         value: outerValue,
         defaultValue: outerDefaultValue,
         onChange: onChange
     }), 2), value = _usePropsValue[0], setValue = _usePropsValue[1];
     var titleItemsRef = (0, _react.useRef)([]);
-    var tabsRef = (0, _react.useRef)(null);
     var getTitles = function getTitles() {
         var titles = [];
         _react.default.Children.forEach(children, function(child, idx) {
@@ -104,7 +104,10 @@ var Tabs = function Tabs(props) {
     var getRect = function getRect(selector) {
         return new Promise(function(resolve) {
             var _tabsRef_current;
-            (0, _taro.createSelectorQuery)().in(((_tabsRef_current = tabsRef.current) === null || _tabsRef_current === void 0 ? void 0 : _tabsRef_current._scope) || tabsRef.current).select(selector).boundingClientRect().exec(function() {
+            var query = (0, _taro.createSelectorQuery)();
+            var scope = (_tabsRef_current = tabsRef.current) === null || _tabsRef_current === void 0 ? void 0 : _tabsRef_current._scope;
+            var scopedQuery = scope ? query.in(scope) : query;
+            scopedQuery.select(selector).boundingClientRect().exec(function() {
                 var rect = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [];
                 resolve(rect[0]);
             });
@@ -113,7 +116,10 @@ var Tabs = function Tabs(props) {
     var getAllRect = function getAllRect(selector) {
         return new Promise(function(resolve) {
             var _tabsRef_current;
-            (0, _taro.createSelectorQuery)().in(((_tabsRef_current = tabsRef.current) === null || _tabsRef_current === void 0 ? void 0 : _tabsRef_current._scope) || tabsRef.current).selectAll(selector).boundingClientRect().exec(function() {
+            var query = (0, _taro.createSelectorQuery)();
+            var scope = (_tabsRef_current = tabsRef.current) === null || _tabsRef_current === void 0 ? void 0 : _tabsRef_current._scope;
+            var scopedQuery = scope ? query.in(scope) : query;
+            scopedQuery.selectAll(selector).boundingClientRect().exec(function() {
                 var rect = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : [];
                 resolve(rect[0]);
             });
@@ -193,11 +199,10 @@ var Tabs = function Tabs(props) {
             setValue(item.value);
         }
     };
-    return /*#__PURE__*/ _react.default.createElement(_components.View, (0, _object_spread_props._)((0, _object_spread._)({
-        className: classes
-    }, rest), {
+    return /*#__PURE__*/ _react.default.createElement(_components.View, (0, _object_spread._)({
+        className: classes,
         ref: tabsRef
-    }), /*#__PURE__*/ _react.default.createElement(_components.ScrollView, {
+    }, rest), /*#__PURE__*/ _react.default.createElement(_components.ScrollView, {
         enableFlex: true,
         scrollX: direction === 'horizontal',
         scrollY: direction === 'vertical',
@@ -229,11 +234,10 @@ var Tabs = function Tabs(props) {
                 background: activeColor
             }
         }), activeType === 'smile' && /*#__PURE__*/ _react.default.createElement(_components.View, {
-            className: "".concat(classPrefix, "-titles-item-smile"),
-            // @ts-ignore
-            ariaHidden: true
+            className: "".concat(classPrefix, "-titles-item-smile")
         }, /*#__PURE__*/ _react.default.createElement(_iconsreacttaro.JoySmile, {
-            color: activeColor
+            color: activeColor,
+            className: "".concat(classPrefix, "-titles-item-smile-icon")
         })), /*#__PURE__*/ _react.default.createElement(_components.View, {
             className: (0, _classnames.default)((0, _define_property._)({}, "".concat(classPrefix, "-ellipsis"), direction === 'vertical'), "".concat(classPrefix, "-titles-item-text")),
             style: {