@nutui/nutui-react-taro 3.0.0-beta.1 → 3.0.0-beta.11

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-image {
   display: block;
   position: relative;
@@ -21,7 +25,7 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  background: var(--nutui-color-background, #f5f6fa);
+  background: var(--nutui-gray-3);
   background-size: 100% 100%;
 }
 .nut-image-error {
@@ -34,7 +38,7 @@
   flex-direction: column;
   align-items: center;
   justify-content: center;
-  background: var(--nutui-color-background, #f5f6fa);
+  background: var(--nutui-gray-3);
   background-size: 100% 100%;
 }
 
@@ -73,6 +77,11 @@
 .nut-avatar {
   position: relative;
   flex: 0 0 auto;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: var(--nutui-avatar-normal-width, 40px);
+  height: var(--nutui-avatar-normal-height, 40px);
 }
 .nut-avatar-round {
   border-radius: 999px;
@@ -96,21 +105,12 @@
 .nut-avatar-icon {
   background-size: 100% 100%;
 }
-.nut-avatar .nut-icon-img {
-  width: 100%;
-  height: 100%;
-}
 .nut-avatar-text {
   display: flex;
   justify-content: center;
   align-items: center;
-  width: 100%;
-  height: 100%;
 }
 .nut-avatar-large {
-  display: flex;
-  justify-content: center;
-  align-items: center;
   width: var(--nutui-avatar-large-width, 60px);
   height: var(--nutui-avatar-large-height, 60px);
 }
@@ -118,53 +118,19 @@
   width: var(--nutui-avatar-large-width, 60px);
   height: var(--nutui-avatar-large-height, 60px);
 }
-.nut-avatar-large-img-image {
-  width: var(--nutui-avatar-large-width, 60px);
-  height: var(--nutui-avatar-large-height, 60px);
-}
 .nut-avatar-large-icon {
   width: var(--nutui-avatar-large-width, 60px);
   height: var(--nutui-avatar-large-height, 60px);
 }
-.nut-avatar-large .nut-icon-img {
-  width: 100%;
-  height: 100%;
-}
 .nut-avatar-large-text {
   width: var(--nutui-avatar-large-width, 60px);
   height: var(--nutui-avatar-large-height, 60px);
 }
 .nut-avatar-small {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: var(--nutui-avatar-small-width, 32px);
-  height: var(--nutui-avatar-small-height, 32px);
-}
-.nut-avatar-small-img-image {
   width: var(--nutui-avatar-small-width, 32px);
   height: var(--nutui-avatar-small-height, 32px);
 }
 .nut-avatar-small-text {
   width: var(--nutui-avatar-small-width, 32px);
   height: var(--nutui-avatar-small-height, 32px);
-}
-.nut-avatar-normal {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: var(--nutui-avatar-normal-width, 40px);
-  height: var(--nutui-avatar-normal-height, 40px);
-}
-.nut-avatar-normal-img-image {
-  width: var(--nutui-avatar-normal-width, 40px);
-  height: var(--nutui-avatar-normal-height, 40px);
-}
-.nut-avatar-normal .nut-icon-img {
-  width: 100%;
-  height: 100%;
-}
-.nut-avatar-normal-text {
-  width: var(--nutui-avatar-normal-width, 40px);
-  height: var(--nutui-avatar-normal-height, 40px);
 }

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

@@ -1,78 +1,15 @@
-.nut-image {
-  display: block;
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
+.nut-avatar {
   position: relative;
-}
-.nut-image-default {
-  display: block;
-  width: 100%;
-  height: 100%;
-}
-.nut-image.nut-image-round {
-  border-radius: 50%;
-  overflow: hidden;
-}
-.nut-image-loading {
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  top: 0;
-  left: 0;
+  flex: 0 0 auto;
   display: flex;
-  flex-direction: column;
-  align-items: center;
   justify-content: center;
-  background: #f5f6fa;
-  background-size: 100% 100%;
-}
-.nut-image-error {
-  width: 100%;
-  height: 100%;
-  position: absolute;
-  top: 0;
-  left: 0;
-  display: flex;
-  flex-direction: column;
   align-items: center;
-  justify-content: center;
-  background: #f5f6fa;
-  background-size: 100% 100%;
-}
-
-[dir=rtl] .nut-image .nut-img-loading,
-.nut-rtl .nut-image .nut-img-loading {
-  left: auto;
-  right: 0;
-}
-[dir=rtl] .nut-image .nut-img-error,
-.nut-rtl .nut-image .nut-img-error {
-  left: auto;
-  right: 0;
-}
-
-.nut-avatar-group {
-  display: flex;
-  flex-direction: row;
-  flex: 0 0 auto;
-}
-.nut-avatar-group-avatar,
-.nut-avatar-group .nut-avatar {
-  border: 1px solid #fff;
-  margin-left: -8px;
-}
-.nut-avatar-group-avatar:not(:first-of-type),
-.nut-avatar-group .nut-avatar:not(:first-of-type) {
-  margin-left: -8px;
-}
-
-[dir=rtl] .nut-avatar-group .nut-avatar:not(:first-of-type),
-.nut-rtl .nut-avatar-group .nut-avatar:not(:first-of-type) {
-  margin-left: 0;
-  margin-right: -8px;
-}
-
-.nut-avatar {
-  position: relative;
-  flex: 0 0 auto;
+  width: 40px;
+  height: 40px;
 }
 .nut-avatar-round {
   border-radius: 999px;
@@ -96,21 +33,12 @@
 .nut-avatar-icon {
   background-size: 100% 100%;
 }
-.nut-avatar .nut-icon-img {
-  width: 100%;
-  height: 100%;
-}
 .nut-avatar-text {
   display: flex;
   justify-content: center;
   align-items: center;
-  width: 100%;
-  height: 100%;
 }
 .nut-avatar-large {
-  display: flex;
-  justify-content: center;
-  align-items: center;
   width: 60px;
   height: 60px;
 }
@@ -118,53 +46,19 @@
   width: 60px;
   height: 60px;
 }
-.nut-avatar-large-img-image {
-  width: 60px;
-  height: 60px;
-}
 .nut-avatar-large-icon {
   width: 60px;
   height: 60px;
 }
-.nut-avatar-large .nut-icon-img {
-  width: 100%;
-  height: 100%;
-}
 .nut-avatar-large-text {
   width: 60px;
   height: 60px;
 }
 .nut-avatar-small {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 32px;
-  height: 32px;
-}
-.nut-avatar-small-img-image {
   width: 32px;
   height: 32px;
 }
 .nut-avatar-small-text {
   width: 32px;
   height: 32px;
-}
-.nut-avatar-normal {
-  display: flex;
-  justify-content: center;
-  align-items: center;
-  width: 40px;
-  height: 40px;
-}
-.nut-avatar-normal-img-image {
-  width: 40px;
-  height: 40px;
-}
-.nut-avatar-normal .nut-icon-img {
-  width: 100%;
-  height: 100%;
-}
-.nut-avatar-normal-text {
-  width: 40px;
-  height: 40px;
 }

package/dist/es/packages/avatarcropper/avatarcropper.js

@@ -9,7 +9,7 @@ import Taro, { useReady, createSelectorQuery } from "@tarojs/taro";
 import classNames from "classnames";
 import { Canvas, View } from "@tarojs/components";
 import { Button } from "../button/button";
-import { useConfig } from "../configprovider/configprovider";
+import { useConfig } from "../configprovider/index";
 import { ComponentDefaults } from "../../utils/typings";
 import { useTouch } from "../../utils/use-touch";
 import { clamp, preventDefault } from "../../utils";

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-avatar-cropper {
   position: relative;
   display: flex;

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-avatar-cropper {
   position: relative;
   display: flex;

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-avatar-group {
   display: flex;
   flex-direction: row;

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-avatar-group {
   display: flex;
   flex-direction: row;

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

@@ -1,9 +1,8 @@
 import React, { FunctionComponent } from 'react';
-import type { MouseEvent } from 'react';
 import { PageScrollObject } from '@tarojs/taro';
 import { ITouchEvent } from '@tarojs/components';
-import { BasicComponent } from "../../utils/typings";
-export interface BackTopProps extends BasicComponent {
+import { HoverButtonProps } from "../hoverbutton/index";
+export interface BackTopProps extends HoverButtonProps {
     threshold: number;
     zIndex: number;
     duration: number;
@@ -11,6 +10,6 @@ export interface BackTopProps extends BasicComponent {
      * 容器滚动时的回调参数，主要用于 rn、鸿蒙端
      */
     scrollRes?: PageScrollObject;
-    onClick?: (event: React.MouseEvent<Element, MouseEvent> | ITouchEvent) => void;
+    onClick?: (event: React.MouseEvent<HTMLDivElement> | ITouchEvent) => void;
 }
 export declare const BackTop: FunctionComponent<Partial<BackTopProps> & Omit<React.HTMLAttributes<HTMLDivElement>, 'onClick'>>;

package/dist/es/packages/backtop/backtop.js

@@ -2,41 +2,31 @@ import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
-import React, { useCallback, useState, useMemo, useEffect, useRef } from "react";
+import React, { useCallback, useState, useEffect, useRef } from "react";
 import { usePageScroll, pageScrollTo, getSystemInfo } from "@tarojs/taro";
 import { View } from "@tarojs/components";
-import { Top } from "@nutui/icons-react-taro";
 import classNames from "classnames";
+import { Top } from "@nutui/icons-react-taro";
 import { ComponentDefaults } from "../../utils/typings";
-import { useRtl } from "../configprovider/index";
-import { harmonyAndRn, rn } from "../../utils/platform-taro";
-import pxTransform from "../../utils/px-transform";
+import HoverButton from "../hoverbutton/index";
+import { rn } from "../../utils/platform-taro";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     threshold: 200,
     zIndex: 900,
     duration: 1000
 });
-var isNative = harmonyAndRn();
 export var BackTop = function(props) {
-    var rtl = useRtl();
-    var _$_object_spread = _object_spread({}, defaultProps, props), children = _$_object_spread.children, threshold = _$_object_spread.threshold, zIndex = _$_object_spread.zIndex, className = _$_object_spread.className, duration = _$_object_spread.duration, style = _$_object_spread.style, scrollRes = _$_object_spread.scrollRes, onClick = _$_object_spread.onClick;
+    var _$_object_spread = _object_spread({}, defaultProps, props), children = _$_object_spread.children, threshold = _$_object_spread.threshold, zIndex = _$_object_spread.zIndex, className = _$_object_spread.className, duration = _$_object_spread.duration, icon = _$_object_spread.icon, style = _$_object_spread.style, scrollRes = _$_object_spread.scrollRes, onClick = _$_object_spread.onClick;
     var classPrefix = 'nut-backtop';
     var _useState = _sliced_to_array(useState(false), 2), backTop = _useState[0], setBackTop = _useState[1];
-    var _useState1 = _sliced_to_array(useState(false), 2), isTouchStart = _useState1[0], setTouchStart = _useState1[1];
     var _obj;
-    var cls = classNames(classPrefix, (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-show"), backTop), _define_property(_obj, "".concat(classPrefix, "-show-active"), isNative && isTouchStart), _define_property(_obj, "".concat(classPrefix, "-rn"), rn()), _obj), className);
+    var cls = classNames(classPrefix, (_obj = {}, _define_property(_obj, "".concat(classPrefix, "-show"), backTop), _define_property(_obj, "".concat(classPrefix, "-rn"), rn()), _obj), className);
     var systemInfo = useRef({});
     useEffect(function() {
         getSystemInfo().then(function(res) {
             systemInfo.current = res;
         });
     }, []);
-    var handleActiveStart = useCallback(function() {
-        isNative && setTouchStart(true);
-    }, []);
-    var handleActiveEnd = useCallback(function() {
-        isNative && setTouchStart(false);
-    }, []);
     var onScroll = useCallback(function(res) {
         var scrollTop = res.scrollTop;
         setBackTop(scrollTop >= threshold);
@@ -63,28 +53,20 @@ export var BackTop = function(props) {
         duration,
         onClick
     ]);
-    var styles = useMemo(function() {
-        var _obj;
-        return Object.keys(style || {}).length !== 0 ? _object_spread({
-            zIndex: zIndex
-        }, style) : (_obj = {}, _define_property(_obj, rtl ? 'left' : 'right', pxTransform(10)), _define_property(_obj, "bottom", pxTransform(20)), _define_property(_obj, "zIndex", zIndex), _obj);
-    }, [
-        rtl,
-        style,
-        zIndex
-    ]);
-    return /*#__PURE__*/ React.createElement(View, {
+    return /*#__PURE__*/ React.createElement(HoverButton, {
         className: cls,
-        style: styles,
+        style: _object_spread({
+            zIndex: zIndex
+        }, style),
+        icon: !children && (icon || /*#__PURE__*/ React.createElement(Top, null)),
+        onClick: function(e) {
+            goTop(e);
+        }
+    }, children && /*#__PURE__*/ React.createElement(View, {
+        className: "nut-hoverbutton-item-container",
         onClick: function(e) {
             goTop(e);
-        },
-        onTouchStart: handleActiveStart,
-        onTouchEnd: handleActiveEnd,
-        onTouchCancel: handleActiveEnd
-    }, children || /*#__PURE__*/ React.createElement(Top, {
-        size: 19,
-        className: "nut-backtop-main"
-    }));
+        }
+    }, children));
 };
 BackTop.displayName = 'NutBackTop';

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

@@ -1,31 +1,22 @@
 .nut-backtop {
   display: none;
-  position: fixed;
 
   &-rn {
     position: absolute;
   }
 
   &-show {
-    width: 40px;
-    height: 40px;
     display: flex;
     align-items: center;
     justify-content: center;
-    background: $color-background-overlay;
-    color: $color-title;
-    border: 1px solid $backtop-border-color;
-    border-radius: 21px;
-    z-index: 100;
-
-    &:active,
-    &-active {
-      background: $color-background;
-    }
-  }
-
-  &-main {
+    width: $hoverbutton-item-size;
+    height: $hoverbutton-item-size;
     transition: all 0.2s ease-in-out;
-    color: $color-title;
+    .nut-hoverbutton-item-container {
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+    }
   }
 }

package/dist/es/packages/backtop/style/index.js

@@ -1 +1,3 @@
+import '../../hoverbutton/style';
+import '../../hoverbuttonitem/style';
 import './backtop.scss';

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

@@ -1,26 +1,153 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
+.nut-hoverbutton-item-container {
+  width: var(--nutui-hoverbutton-item-size, 40px);
+  height: var(--nutui-hoverbutton-item-size, 40px);
+  border-radius: var(--nutui-hoverbutton-item-size, 40px);
+  border: 1px solid var(--nutui-hoverbutton-item-border-color, rgba(0, 0, 0, 0.12));
+  background-color: var(--nutui-hoverbutton-item-background, var(--nutui-white-12));
+}
+.nut-hoverbutton-item-container:active, .nut-hoverbutton-item-container-active {
+  background-color: var(--nutui-hoverbutton-item-background-active, rgba(247, 248, 252, 0.9));
+}
+.nut-hoverbutton-item-container-harmony {
+  margin-bottom: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-base, 8px));
+}
+.nut-hoverbutton-item-container-harmony:last-child {
+  margin-bottom: 0;
+}
+.nut-hoverbutton-item-container-icontext {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.nut-hoverbutton-item-container-icontext .nut-icon {
+  display: block;
+  width: 14px;
+  height: 14px;
+  font-size: 14px;
+}
+.nut-hoverbutton-item-icon {
+  width: 20px;
+  height: 20px;
+  margin: 9px;
+  color: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7));
+  fill: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7));
+}
+.nut-hoverbutton-item-icon .nut-icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  font-size: 20px;
+}
+.nut-hoverbutton-item-container:active .nut-hoverbutton-item-icon {
+  color: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-7));
+  fill: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-7));
+}
+.nut-hoverbutton-item-text-icon {
+  width: 14px;
+  height: 5px;
+}
+.nut-hoverbutton-item-text {
+  font-size: 10px;
+  margin-top: 5px;
+  line-height: 9px;
+}
+
+.nut-hoverbutton {
+  display: flex;
+  flex-direction: column;
+  gap: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-base, 8px));
+}
+.nut-hoverbutton-container {
+  position: fixed;
+  right: var(--nutui-hoverbutton-position-right, var(--nutui-spacing-base, 8px));
+  bottom: var(--nutui-hoverbutton-position-bottom, 60px);
+  z-index: 10;
+}
+.nut-hoverbutton-container-rn {
+  position: absolute;
+}
+
+[dir=rtl] .nut-hoverbutton-container,
+.nut-hoverbutton-container-rtl {
+  right: auto;
+  left: var(--nutui-hoverbutton-position-right, var(--nutui-spacing-base, 8px));
+}
+
+.nut-hoverbutton-item-container {
+  width: var(--nutui-hoverbutton-item-size, 40px);
+  height: var(--nutui-hoverbutton-item-size, 40px);
+  border-radius: var(--nutui-hoverbutton-item-size, 40px);
+  border: 1px solid var(--nutui-hoverbutton-item-border-color, rgba(0, 0, 0, 0.12));
+  background-color: var(--nutui-hoverbutton-item-background, var(--nutui-white-12));
+}
+.nut-hoverbutton-item-container:active, .nut-hoverbutton-item-container-active {
+  background-color: var(--nutui-hoverbutton-item-background-active, rgba(247, 248, 252, 0.9));
+}
+.nut-hoverbutton-item-container-harmony {
+  margin-bottom: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-base, 8px));
+}
+.nut-hoverbutton-item-container-harmony:last-child {
+  margin-bottom: 0;
+}
+.nut-hoverbutton-item-container-icontext {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.nut-hoverbutton-item-container-icontext .nut-icon {
+  display: block;
+  width: 14px;
+  height: 14px;
+  font-size: 14px;
+}
+.nut-hoverbutton-item-icon {
+  width: 20px;
+  height: 20px;
+  margin: 9px;
+  color: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7));
+  fill: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7));
+}
+.nut-hoverbutton-item-icon .nut-icon {
+  display: block;
+  width: 20px;
+  height: 20px;
+  font-size: 20px;
+}
+.nut-hoverbutton-item-container:active .nut-hoverbutton-item-icon {
+  color: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-7));
+  fill: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-7));
+}
+.nut-hoverbutton-item-text-icon {
+  width: 14px;
+  height: 5px;
+}
+.nut-hoverbutton-item-text {
+  font-size: 10px;
+  margin-top: 5px;
+  line-height: 9px;
+}
+
 .nut-backtop {
   display: none;
-  position: fixed;
 }
 .nut-backtop-rn {
   position: absolute;
 }
 .nut-backtop-show {
-  width: 40px;
-  height: 40px;
   display: flex;
   align-items: center;
   justify-content: center;
-  background: var(--nutui-color-background-overlay, #ffffff);
-  color: var(--nutui-color-title, #1a1a1a);
-  border: 1px solid var(--nutui-backtop-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
-  border-radius: 21px;
-  z-index: 100;
-}
-.nut-backtop-show:active, .nut-backtop-show-active {
-  background: var(--nutui-color-background, #f5f6fa);
-}
-.nut-backtop-main {
+  width: var(--nutui-hoverbutton-item-size, 40px);
+  height: var(--nutui-hoverbutton-item-size, 40px);
   transition: all 0.2s ease-in-out;
-  color: var(--nutui-color-title, #1a1a1a);
+}
+.nut-backtop-show .nut-hoverbutton-item-container {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
 }

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

@@ -1,29 +1,24 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-backtop {
   display: none;
-  position: fixed;
 }
 .nut-backtop-rn {
   position: absolute;
 }
 .nut-backtop-show {
-  width: 40px;
-  height: 40px;
   display: flex;
   align-items: center;
   justify-content: center;
-  background: #ffffff;
-  color: #1a1a1a;
-  border: 1px solid rgba(0, 0, 0, 0.06);
-  border-radius: 21px;
-  z-index: 100;
-}
-.nut-backtop-show:active {
-  background: #f5f6fa;
-}
-.nut-backtop-show-active {
-  background: #f5f6fa;
-}
-.nut-backtop-main {
+  width: 40px;
+  height: 40px;
   transition: all 0.2s ease-in-out;
-  color: #1a1a1a;
+}
+.nut-backtop-show .nut-hoverbutton-item-container {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
 }