@nutui/nutui-react 2.6.18 → 2.6.20

package/dist/types/packages/uploader/preview.d.ts

@@ -1,2 +1,2 @@
-import React from 'react';
+import { default as React } from 'react';
 export declare const Preview: React.FunctionComponent<any>;

package/dist/types/packages/uploader/preview.taro.d.ts

@@ -1,2 +1,2 @@
-import React from 'react';
+import { default as React } from 'react';
 export declare const Preview: React.FunctionComponent<any>;

package/dist/types/packages/uploader/uploader.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import { default as React } from 'react';
 import { UploadOptions } from './upload';
 import { BasicComponent } from '../../utils/typings';
 import { FileItem } from './file-item';

package/dist/types/packages/uploader/uploader.taro.d.ts

@@ -1,23 +1,20 @@
-import React from 'react';
-import Taro from '@tarojs/taro';
+import { default as React } from 'react';
+import { default as Taro } from '@tarojs/taro';
 import { UploadOptions } from './upload';
 import { BasicComponent } from '../../utils/typings';
 import { FileItem } from './file-item';
-/** 图片的尺寸 */
 interface sizeType {
     /** 原图 */
     original: string;
     /** compressed */
     compressed: string;
 }
-/** 图片的来源 */
 interface sourceType {
     /** 从相册选图 */
     album: string;
     /** 使用相机 */
     camera: string;
 }
-/** 视频的来源 */
 interface mediaType {
     /** 只能拍摄图片或从相册选择图片 */
     image: string;

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

@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react';
+import { default as React, FunctionComponent } from 'react';
 import { BasicComponent } from '../../utils/typings';
 export interface VideoProps extends BasicComponent {
     /**

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

@@ -1,5 +1,5 @@
 import { FunctionComponent, ReactNode } from 'react';
-import type { Data } from './types';
+import { Data } from './types';
 import { BasicComponent } from '../../utils/typings';
 export interface VirtualListProps extends BasicComponent {
     /**

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

@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react';
+import { default as React, FunctionComponent } from 'react';
 import { BasicComponent } from '../../utils/typings';
 export interface WaterMarkProps extends BasicComponent {
     /**

package/dist/types/packages/watermark/watermark.taro.d.ts

@@ -1,4 +1,4 @@
-import React, { FunctionComponent } from 'react';
+import { default as React, FunctionComponent } from 'react';
 import { BasicComponent } from '../../utils/typings';
 export interface WaterMarkProps extends BasicComponent {
     content: string;

package/dist/types/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/types/utils/render.d.ts

@@ -1,5 +1,5 @@
 import { ReactElement } from 'react';
-import type { Root } from 'react-dom/client';
+import { Root } from 'react-dom/client';
 declare const MARK = "__nutui_react_root__";
 type ContainerType = (Element | DocumentFragment) & {
     [MARK]?: Root;

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

@@ -1,4 +1,4 @@
-import type { CSSProperties, ReactNode } from 'react';
+import { CSSProperties, ReactNode } from 'react';
 export interface BasicComponent {
     className?: string;
     style?: CSSProperties;

package/dist/types/utils/use-lock-scoll-taro.d.ts

@@ -1 +1 @@
-export declare const useLockScrollTaro: (shouldLock: boolean) => import("react").MutableRefObject<null>;
+export declare const useLockScrollTaro: (shouldLock: boolean) => import('react').MutableRefObject<null>;

package/dist/types/utils/use-touch.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import { default as React } from 'react';
 type Direction = '' | 'vertical' | 'horizontal';
 export declare function useTouch(): {
     end: (event: React.TouchEvent<HTMLElement>) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nutui/nutui-react",
-  "version": "2.6.18",
+  "version": "2.6.20",
   "style": "dist/style.css",
   "main": "dist/nutui.react.umd.js",
   "module": "dist/esm/nutui-react.es.js",
@@ -48,7 +48,7 @@
   },
   "lint-staged": {
     "*.{scss,md}": "prettier --write",
-    "*.{ts,tsx,js,md}": "eslint"
+    "*.{ts,tsx,js}": "eslint"
   },
   "dependencies": {
     "@babel/runtime": "^7.23.9",