@nutui/nutui-react 3.0.0-beta.1 → 3.0.0-beta.10

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

@@ -1,12 +1,17 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-grid-item {
   display: flex;
   flex-direction: column;
   position: relative;
   box-sizing: border-box;
-  color: var(--nutui-grid-item-text-color, var(--nutui-color-title, #1a1a1a));
+  color: var(--nutui-grid-item-text-color, var(--nutui-gray-7));
+  overflow: hidden;
 }
 .nut-grid-item-text {
-  color: var(--nutui-grid-item-text-color, var(--nutui-color-title, #1a1a1a));
+  color: var(--nutui-grid-item-text-color, var(--nutui-gray-7));
   font-size: var(--nutui-grid-item-text-font-size, var(--nutui-font-size-s, 12px));
   word-break: break-all;
   margin: var(--nutui-grid-item-text-margin, 8px) 0 0 0;
@@ -27,16 +32,17 @@
   flex-direction: column;
   width: 100%;
   padding: var(--nutui-grid-item-content-padding, 16px 8px);
-  background: var(--nutui-grid-item-content-bg-color, #ffffff);
-  border: 0 solid var(--nutui-grid-border-color, var(--nutui-color-border, rgba(0, 0, 0, 0.06)));
+  background: var(--nutui-grid-item-content-bg-color, var(--nutui-gray-1));
+  border: 0 solid var(--nutui-grid-border-color, var(--nutui-black-3));
 }
 .nut-grid-item-content-border {
-  border-right-width: 1px;
-  border-bottom-width: 1px;
+  border-right-width: var(--nutui-grid-border-width, 0px);
+  border-bottom-width: var(--nutui-grid-border-width, 0px);
 }
 .nut-grid-item-content-surround {
-  border-top-width: 1px;
-  border-left-width: 1px;
+  border-top-width: var(--nutui-grid-border-width, 0px);
+  border-left-width: var(--nutui-grid-border-width, 0px);
+  border-radius: var(--nutui-grid-item-border-radius, var(--nutui-radius-l, 8px));
 }
 .nut-grid-item-content-center {
   align-items: center;
@@ -63,9 +69,9 @@
   left: 50%;
   width: 100%;
   height: 100%;
-  background-color: var(--nutui-color-mask, rgba(0, 0, 0, 0.7));
+  background-color: var(--nutui-black-10);
   border: inherit;
-  border-color: var(--nutui-color-mask, rgba(0, 0, 0, 0.7));
+  border-color: var(--nutui-black-10);
   border-radius: inherit;
   transform: translate(-50%, -50%);
   opacity: 0;

package/dist/es/packages/hoverbutton/hoverbutton.js

@@ -6,6 +6,7 @@ import { ComponentDefaults } from "../../utils/typings";
 import { useRtl } from "../configprovider/index";
 import HoverButtonItem from "../hoverbuttonitem/index";
 import SafeArea from "../safearea/index";
+import { UI_BOTTOM_DISTANCE } from "./utils";
 var defaultProps = _object_spread({}, ComponentDefaults);
 var classPrefix = 'nut-hoverbutton';
 export var HoverButton = function(props) {
@@ -13,7 +14,7 @@ export var HoverButton = function(props) {
     var rtl = useRtl();
     var baseStyle = _object_spread({}, style);
     if (tabbarHeight) {
-        var bottom = tabbarHeight + 16;
+        var bottom = tabbarHeight + UI_BOTTOM_DISTANCE;
         baseStyle.bottom = "".concat(bottom, "px");
     }
     if (typeof zIndex !== 'undefined') {

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

@@ -1,45 +1,70 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-hoverbutton-item-container {
-  width: 40px;
-  height: 40px;
-  border-radius: 20px;
-  border: 1px solid var(--nutui-hoverbutton-item-border-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
-  background-color: var(--nutui-hoverbutton-item-background, var(--nutui-gray-1, #ffffff));
+  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, var(--nutui-gray-3, #f6f6f6));
+  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-16, 16px));
+  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, #1a1a1a));
-  fill: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7, #1a1a1a));
+  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-6, #595959));
-  fill: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-6, #595959));
+  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-16, 16px));
+  gap: var(--nutui-hoverbutton-spacing, var(--nutui-spacing-base, 8px));
 }
 .nut-hoverbutton-container {
   position: fixed;
-  right: var(--nutui-hoverbutton-position-right, var(--nutui-spacing-16, 16px));
-  bottom: var(--nutui-hoverbutton-position-bottom, 48px);
+  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 {
@@ -49,5 +74,5 @@
 [dir=rtl] .nut-hoverbutton-container,
 .nut-hoverbutton-container-rtl {
   right: auto;
-  left: var(--nutui-hoverbutton-position-right, var(--nutui-spacing-16, 16px));
+  left: var(--nutui-hoverbutton-position-right, var(--nutui-spacing-base, 8px));
 }

package/dist/es/packages/hoverbutton/utils.d.ts

@@ -0,0 +1 @@
+export declare const UI_BOTTOM_DISTANCE = 60;

package/dist/es/packages/hoverbutton/utils.js

@@ -0,0 +1 @@
+export var UI_BOTTOM_DISTANCE = 60;

package/dist/es/packages/hoverbuttonitem/hoverbuttonitem.js

@@ -1,32 +1,41 @@
+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 React from "react";
 import classNames from "classnames";
 import { ComponentDefaults } from "../../utils/typings";
+import { getIcon } from "./utils";
 var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     icon: null,
     onClick: function(event) {}
 });
 var classPrefix = 'nut-hoverbutton-item';
 export var HoverButtonItem = function(props) {
-    var _$_object_spread = _object_spread({}, defaultProps, props), className = _$_object_spread.className, style = _$_object_spread.style, icon = _$_object_spread.icon, onClick = _$_object_spread.onClick;
+    var _$_object_spread = _object_spread({}, defaultProps, props), className = _$_object_spread.className, children = _$_object_spread.children, style = _$_object_spread.style, icon = _$_object_spread.icon, onClick = _$_object_spread.onClick;
     var handleClick = function(event) {
         if (onClick) {
             onClick(event);
         }
     };
+    var renderBody = function() {
+        if (icon && !children) return /*#__PURE__*/ React.createElement("div", {
+            className: "".concat(classPrefix, "-icon")
+        }, getIcon(icon));
+        if (icon && children) {
+            return /*#__PURE__*/ React.createElement(React.Fragment, null, /*#__PURE__*/ React.createElement("div", {
+                className: classNames(_define_property({}, "".concat(classPrefix, "-text-icon"), true))
+            }), getIcon(icon), /*#__PURE__*/ React.createElement("div", {
+                className: classNames(_define_property({}, "".concat(classPrefix, "-text"), true))
+            }, children));
+        }
+    };
     return /*#__PURE__*/ React.createElement("div", {
         className: classNames([
             "".concat(classPrefix, "-container"),
             className
-        ]),
+        ], _define_property({}, "".concat(classPrefix, "-container-icontext"), icon && children)),
         style: style,
         onClick: handleClick
-    }, /*#__PURE__*/ React.createElement("div", {
-        className: "".concat(classPrefix, "-icon")
-    }, /*#__PURE__*/ React.isValidElement(icon) ? /*#__PURE__*/ React.cloneElement(icon, {
-        // @ts-ignore
-        size: 20
-    }) : icon));
+    }, renderBody());
 };
 HoverButtonItem.displayName = 'NutHoverButtonItem';

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

@@ -1,8 +1,8 @@
 .nut-hoverbutton-item {
   &-container {
-    width: 40px;
-    height: 40px;
-    border-radius: 20px;
+    width: $hoverbutton-item-size;
+    height: $hoverbutton-item-size;
+    border-radius: $hoverbutton-item-size;
     border: 1px solid $hoverbutton-item-border-color;
     background-color: $hoverbutton-item-background;
 
@@ -18,6 +18,19 @@
         margin-bottom: 0;
       }
     }
+
+    &-icontext {
+      display: flex;
+      flex-direction: column;
+      align-items: center;
+
+      .nut-icon {
+        display: block;
+        width: 14px;
+        height: 14px;
+        font-size: 14px;
+      }
+    }
   }
 
   &-icon {
@@ -31,6 +44,7 @@
       display: block;
       width: 20px;
       height: 20px;
+      font-size: 20px;
     }
   }
 
@@ -38,4 +52,15 @@
     color: $hoverbutton-item-icon-color-active;
     fill: $hoverbutton-item-icon-color-active;
   }
+
+  &-text-icon {
+    width: 14px;
+    height: 5px;
+  }
+
+  &-text {
+    font-size: 10px;
+    margin-top: 5px;
+    line-height: 9px;
+  }
 }

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

@@ -1,32 +1,57 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-hoverbutton-item-container {
-  width: 40px;
-  height: 40px;
-  border-radius: 20px;
-  border: 1px solid var(--nutui-hoverbutton-item-border-color, var(--nutui-black-3, rgba(0, 0, 0, 0.06)));
-  background-color: var(--nutui-hoverbutton-item-background, var(--nutui-gray-1, #ffffff));
+  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, var(--nutui-gray-3, #f6f6f6));
+  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-16, 16px));
+  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, #1a1a1a));
-  fill: var(--nutui-hoverbutton-item-icon-color, var(--nutui-gray-7, #1a1a1a));
+  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-6, #595959));
-  fill: var(--nutui-hoverbutton-item-icon-color-active, var(--nutui-gray-6, #595959));
+  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;
 }

package/dist/es/packages/hoverbuttonitem/utils.d.ts

@@ -0,0 +1,2 @@
+import React from 'react';
+export declare const getIcon: (icon: React.ReactNode) => string | number | boolean | React.ReactElement<any, string | React.JSXElementConstructor<any>> | Iterable<React.ReactNode> | null | undefined;

package/dist/es/packages/hoverbuttonitem/utils.js

@@ -0,0 +1,7 @@
+import React from "react";
+export var getIcon = function(icon) {
+    return React.isValidElement(icon) ? React.cloneElement(icon, {
+        // @ts-ignore
+        className: 'nut-icon'
+    }) : icon;
+};

package/dist/es/packages/image/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%;
 }
 

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

@@ -17,17 +17,9 @@ export interface VideoOption {
     index?: number;
 }
 export interface ImagePreviewProps extends BasicComponent {
-    /**
-    * 预览图片数组
-    * @default []
-    */
     images: Array<{
         src: string;
-    }>
-    /**
-    * 预览的视频数组（视频自动放到图片之前）
-    * @default []
-    */
+    }>;
     videos: Array<{
         source: {
             src: string;
@@ -37,66 +29,18 @@ export interface ImagePreviewProps extends BasicComponent {
             muted: boolean;
             controls: boolean;
         };
-    }>
-    /**
-    * 是否展示预览图片
-    * @default false
-    */
-    visible: boolean
-    /**
-    * 自动轮播时长，0表示不会自动轮播
-    * @default 3000
-    */
-    autoPlay: number | string
-    /**
-    * 页码，受控
-    * @default 1
-    */
-    value?: number
-    /**
-    * 初始页码
-    * @default 1
-    */
-    defaultValue: number
-    /**
-    * 点击图片可以退出预览
-    * @default false
-    */
-    closeOnContentClick: boolean
-    /**
-    * 分页是否展示
-    * @default true
-    */
-    pagination: boolean
-    /**
-    * 分页指示器是否展示
-    * @default false
-    */
-    indicator: boolean
-    /**
-    * 分页指示器选中的颜色
-    * @default #fff
-    */
-    indicatorColor: string
-    /**
-    * 关闭按钮
-    * @default false
-    */
-    closeIcon: boolean | ReactNode
-    /**
-    * 关闭按钮位置
-    * @default top-right
-    */
-    closeIconPosition: ImagePreviewCloseIconPosition
-    /**
-    * 切换时触发
-    * @default -
-    */
-    onChange: (value: number) => void
-    /**
-    * 点击遮罩关闭图片预览时触发
-    * @default -
-    */
-    onClose: () => void
+    }>;
+    visible: boolean;
+    autoPlay: number | string;
+    value?: number;
+    defaultValue: number;
+    closeOnContentClick: boolean;
+    pagination: boolean;
+    indicator: boolean;
+    indicatorColor: string;
+    closeIcon: boolean | ReactNode;
+    closeIconPosition: ImagePreviewCloseIconPosition;
+    onChange: (value: number) => void;
+    onClose: () => void;
 }
 export declare const ImagePreview: FunctionComponent<Partial<ImagePreviewProps>>;

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

@@ -34,6 +34,10 @@
     background: transparent;
     color: $white;
 
+    .nut-icon {
+      color: $white;
+    }
+
     &.top-right {
       top: 50px;
       right: 20px;
@@ -68,6 +72,13 @@
       justify-content: center;
       height: 100%;
 
+      .nut-image,
+      .nut-video {
+        display: flex;
+        justify-content: center;
+        align-items: center;
+      }
+
       .nut-image-preview-box {
         width: 100%;
       }