@nutui/nutui-react-taro 3.0.0-beta.0 → 3.0.0-beta.10

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

@@ -1,18 +1,10 @@
 import { FunctionComponent } from 'react';
 import { VideoProps as VideoPropsTaro, BaseEventOrig } from '@tarojs/components';
 export interface VideoProps extends Omit<VideoPropsTaro, 'src'> {
-    /**
-    * 视频地址和类型设置
-    * @default {type: {}, src: ''}
-    */
     source: {
         type: string;
         src: string;
-    }
-    /**
-    * 控制视频播放属性
-    * @default -
-    */
+    };
     options: {
         controls?: boolean;
         muted?: boolean;
@@ -20,21 +12,9 @@ export interface VideoProps extends Omit<VideoPropsTaro, 'src'> {
         poster?: string;
         playsinline?: boolean;
         loop?: boolean;
-    }
-    /**
-    * 播放
-    * @default -
-    */
-    onPlay: (event: BaseEventOrig<any>) => void
-    /**
-    * 暂停
-    * @default -
-    */
-    onPause: (event: BaseEventOrig<any>) => void
-    /**
-    * 播放完成回调
-    * @default -
-    */
-    onPlayEnd: (event: BaseEventOrig<any>) => void
+    };
+    onPlay: (event: BaseEventOrig<any>) => void;
+    onPause: (event: BaseEventOrig<any>) => void;
+    onPlayEnd: (event: BaseEventOrig<any>) => void;
 }
 export declare const Video: FunctionComponent<Partial<VideoProps>>;

package/dist/es/packages/video/video.js

@@ -3,6 +3,7 @@ import { _ as _object_without_properties } from "@swc/helpers/_/_object_without_
 import React from "react";
 import classNames from "classnames";
 import { Video as VideoTaro, View } from "@tarojs/components";
+import { mergeProps } from "../../utils/merge-props";
 var defaultProps = {
     source: {
         type: {},
@@ -19,8 +20,7 @@ var defaultProps = {
 };
 var classPrefix = "nut-video";
 export var Video = function(props) {
-    var _ref = _object_spread({}, defaultProps, props), children = _ref.children, source = _ref.source, options = _ref.options, className = _ref.className, style = _ref.style, onPlay = _ref.onPlay, onPause = _ref.onPause, onPlayEnd = _ref.onPlayEnd, restProps = _object_without_properties(_ref, [
-        "children",
+    var _mergeProps = mergeProps(defaultProps, props), source = _mergeProps.source, options = _mergeProps.options, className = _mergeProps.className, style = _mergeProps.style, onPlay = _mergeProps.onPlay, onPause = _mergeProps.onPause, onPlayEnd = _mergeProps.onPlayEnd, restProps = _object_without_properties(_mergeProps, [
         "source",
         "options",
         "className",
@@ -34,7 +34,7 @@ export var Video = function(props) {
         className: classes,
         style: style
     }, /*#__PURE__*/ React.createElement(VideoTaro, _object_spread({
-        className: "nut-video-player",
+        className: "".concat(classPrefix, "-player"),
         muted: options.muted,
         autoplay: options.autoplay,
         loop: options.loop,

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

@@ -1,11 +1,15 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-horizontal-items {
   float: left;
 }
 .nut-horizontal-items li {
   display: block;
   float: left;
-  color: var(--nutui-gray-7, #1a1a1a);
-  background: var(--nutui-gray-1, #ffffff);
+  color: var(--nutui-gray-7);
+  background: var(--nutui-gray-1);
   padding: 10px;
   margin-right: 20px;
 }
@@ -18,8 +22,8 @@
 
 .nut-vertical-items li {
   display: block;
-  color: var(--nutui-gray-7, #1a1a1a);
-  background: var(--nutui-gray-1, #ffffff);
+  color: var(--nutui-gray-7);
+  background: var(--nutui-gray-1);
   border-radius: 7px;
   box-shadow: 0 1px 6px 0 rgb(237, 238, 241);
   margin-top: 20px;

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

@@ -34,7 +34,7 @@ export interface VirtualListProps extends BasicComponent {
     */
     overscan: number
     /**
-    * 滑动到底的事件，可以实现无限滚动
+    * 滑动到底(右)的事件，可以实现无限滚动
     * @default -
     */
     onScroll: () => void

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

@@ -1,3 +1,7 @@
+/* #ifdef harmony */
+/* #endif */
+/* #ifndef harmony */
+/* #endif */
 .nut-watermark {
   position: absolute;
   z-index: var(--nutui-watermark-z-index, 1200);

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

@@ -27,6 +27,16 @@ export interface WaterMarkProps extends BasicComponent {
     */
     gapY: number
     /**
+    * 水印之间的水平起点
+    * @default 0
+    */
+    startX: number
+    /**
+    * 水印之间的垂直起点
+    * @default 0
+    */
+    startY: number
+    /**
     * 水印的宽度
     * @default 120
     */

package/dist/es/packages/watermark/watermark.js

@@ -16,6 +16,8 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
     gapY: 48,
     width: 120,
     height: 64,
+    startX: 0,
+    startY: 0,
     image: '',
     imageWidth: 120,
     imageHeight: 64,
@@ -27,7 +29,7 @@ var defaultProps = _object_spread_props(_object_spread({}, ComponentDefaults), {
 });
 export var WaterMark = function(props) {
     var locale = useConfig().locale;
-    var _$_object_spread = _object_spread({}, defaultProps, props), content = _$_object_spread.content, fullPage = _$_object_spread.fullPage, zIndex = _$_object_spread.zIndex, className = _$_object_spread.className, gapX = _$_object_spread.gapX, gapY = _$_object_spread.gapY, width = _$_object_spread.width, height = _$_object_spread.height, image = _$_object_spread.image, imageWidth = _$_object_spread.imageWidth, imageHeight = _$_object_spread.imageHeight, rotate = _$_object_spread.rotate, color = _$_object_spread.color, fontStyle = _$_object_spread.fontStyle, fontFamily = _$_object_spread.fontFamily, fontWeight = _$_object_spread.fontWeight, fontSize = _$_object_spread.fontSize, style = _$_object_spread.style;
+    var _$_object_spread = _object_spread({}, defaultProps, props), content = _$_object_spread.content, fullPage = _$_object_spread.fullPage, zIndex = _$_object_spread.zIndex, className = _$_object_spread.className, gapX = _$_object_spread.gapX, gapY = _$_object_spread.gapY, startX = _$_object_spread.startX, startY = _$_object_spread.startY, width = _$_object_spread.width, height = _$_object_spread.height, image = _$_object_spread.image, imageWidth = _$_object_spread.imageWidth, imageHeight = _$_object_spread.imageHeight, rotate = _$_object_spread.rotate, color = _$_object_spread.color, fontStyle = _$_object_spread.fontStyle, fontFamily = _$_object_spread.fontFamily, fontWeight = _$_object_spread.fontWeight, fontSize = _$_object_spread.fontSize, style = _$_object_spread.style;
     var _useState = _sliced_to_array(useState(''), 2), base64Url = _useState[0], setBase64Url = _useState[1];
     var classPrefix = 'nut-watermark';
     var classes = classNames(classPrefix, _define_property({}, "".concat(classPrefix, "-full-page"), fullPage));
@@ -87,7 +89,7 @@ export var WaterMark = function(props) {
                     var markSize = Number(fontSize) * ratio;
                     ctx.font = "".concat(fontStyle, " normal ").concat(fontWeight, " ").concat(markSize, "px/").concat(markHeight, "px ").concat(fontFamily);
                     ctx.fillStyle = color;
-                    ctx.fillText(content, 0, 0) // 在画布上绘制"被填充的"文本。
+                    ctx.fillText(content, startX, startY) // 在画布上绘制"被填充的"文本。
                     ;
                     ctx.restore() // 返回之前保存过的路径状态和属性。
                     ;

package/dist/es/utils/add-color-for-harmony.d.ts

@@ -0,0 +1,9 @@
+import React, { ReactNode } from 'react';
+/**
+ * 为支持 Harmony 的 React 元素添加颜色属性
+ * @param maybeElement - 要处理的 React 节点
+ * @param color - 要添加的颜色值（如：'#ff0000'）
+ * @returns 处理后的 React 节点
+ */
+declare function addColorForHarmony(maybeElement: ReactNode, color?: string): string | number | boolean | React.ReactElement<any, string | React.JSXElementConstructor<any>> | Iterable<React.ReactNode> | null | undefined;
+export default addColorForHarmony;

package/dist/es/utils/add-color-for-harmony.js

@@ -0,0 +1,16 @@
+import React from "react";
+import { harmony } from "./platform-taro";
+/**
+ * 为支持 Harmony 的 React 元素添加颜色属性
+ * @param maybeElement - 要处理的 React 节点
+ * @param color - 要添加的颜色值（如：'#ff0000'）
+ * @returns 处理后的 React 节点
+ */ function addColorForHarmony(maybeElement, color) {
+    if (React.isValidElement(maybeElement) && harmony()) {
+        return React.cloneElement(maybeElement, {
+            color: color
+        });
+    }
+    return maybeElement;
+}
+export default addColorForHarmony;

package/dist/es/utils/get-rect-by-taro.js

@@ -14,7 +14,7 @@ export function makeRect(width, height) {
         height: height
     };
 }
-export var getRectByTaro = function() {
+export var getRectByTaro = /*#__PURE__*/ function() {
     var _ref = _async_to_generator(function(element) {
         return _ts_generator(this, function(_state) {
             if (element) {

package/dist/es/utils/get-scroll-parent.d.ts

@@ -1,4 +1,4 @@
 type ScrollElement = HTMLElement | Window;
-export declare function getScrollParent(el: Element, root?: ScrollElement | null | undefined): Window | Element | null | undefined;
+export declare function getScrollParent(el: Element | null | undefined, root?: ScrollElement | null | undefined): Window | Element | null | undefined;
 export declare function getAllScrollableParents(element: Element | null, scrollableParents?: Element[]): Element[];
 export {};

package/dist/es/utils/merge-props.d.ts

@@ -1,5 +1,9 @@
-export declare function mergeProps<T, U>(defaultProps: T, props: U): {
-    [Key in Extract<keyof T, keyof U>]: U[Key];
-} & {
-    [Key in Exclude<keyof U, keyof T>]?: U[Key];
-};
+export declare function mergeProps<A, B>(a: A, b: B): B & A;
+export declare function mergeProps<A, B, C>(a: A, b: B, c: C): C & B & A;
+export declare function mergeProps<A, B, C, D>(a: A, b: B, c: C, d: D): D & C & B & A;
+/**
+ * Merge props and return the first non-undefined value.
+ * The later has higher priority. e.g. (10, 1, 5) => 5 wins.
+ * This is useful with legacy props that have been deprecated.
+ */
+export declare function mergeProp<T, DefaultT extends T = T>(defaultProp: DefaultT, ...propList: T[]): T | undefined;

package/dist/es/utils/merge-props.js

@@ -1,4 +1,31 @@
-import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
-export function mergeProps(defaultProps, props) {
-    return _object_spread({}, defaultProps, props);
+export function mergeProps() {
+    for(var _len = arguments.length, items = new Array(_len), _key = 0; _key < _len; _key++){
+        items[_key] = arguments[_key];
+    }
+    var ret = {};
+    items.forEach(function(item) {
+        if (item) {
+            Object.keys(item).forEach(function(key) {
+                if (item[key] !== undefined) {
+                    ret[key] = item[key];
+                }
+            });
+        }
+    });
+    return ret;
+}
+/**
+ * Merge props and return the first non-undefined value.
+ * The later has higher priority. e.g. (10, 1, 5) => 5 wins.
+ * This is useful with legacy props that have been deprecated.
+ */ export function mergeProp(defaultProp) {
+    for(var _len = arguments.length, propList = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++){
+        propList[_key - 1] = arguments[_key];
+    }
+    for(var i = propList.length - 1; i >= 0; i -= 1){
+        if (propList[i] !== undefined) {
+            return propList[i];
+        }
+    }
+    return defaultProp;
 }

package/dist/es/utils/platform-taro.d.ts

@@ -2,3 +2,4 @@ export declare const harmonyAndRn: () => boolean;
 export declare const harmony: () => boolean;
 export declare const rn: () => boolean;
 export declare const web: () => boolean;
+export declare const miniprogram: () => boolean;

package/dist/es/utils/platform-taro.js

@@ -26,3 +26,8 @@ export var web = function() {
         'web'
     ].includes(Taro.getEnv().toLowerCase());
 };
+export var miniprogram = function() {
+    return [
+        'mini'
+    ].includes(Taro.getEnv().toLowerCase());
+};

package/dist/es/utils/raf.js

@@ -1,7 +1,7 @@
 export var inBrowser = typeof window !== 'undefined';
 // 防频
 function requestAniFrame() {
-    if (typeof window !== 'undefined') {
+    if (inBrowser) {
         var _window = window;
         return _window.requestAnimationFrame || _window.webkitRequestAnimationFrame || function(callback) {
             _window.setTimeout(callback, 1000 / 60);
@@ -13,7 +13,8 @@ function requestAniFrame() {
 }
 export function cancelRaf(id) {
     if (inBrowser) {
-        cancelAnimationFrame(id);
+        var _window = window;
+        (_window.cancelAnimationFrame || _window.webkitCancelAnimationFrame)(id);
     } else {
         clearTimeout(id);
     }

package/dist/es/utils/typings.d.ts

@@ -9,3 +9,4 @@ export declare const ComponentDefaults: {
     className: string;
     style: {};
 };
+export type Timeout = ReturnType<typeof setTimeout>;

package/dist/es/utils/use-client-rect.d.ts

@@ -9,4 +9,4 @@ export declare function isWindow(val: unknown): val is Window;
   right	右侧与视图窗口左上角的距离	number
   bottom	底部与视图窗口左上角的距离	number
  */
-export declare const getRect: (elementRef: Element | Window | undefined) => any;
+export declare const getRect: (elementRef: HTMLElement | Element | Window | undefined | null) => any;