@canlooks/can-ui 0.0.196 → 0.0.198

package/dist/cjs/components/checkboxBase/checkboxBase.style.js

@@ -24,6 +24,7 @@ function useStyle({ color }) {
                 display: inline-flex;
                 align-items: center;
                 gap: 6px;
+                vertical-align: middle;
                 cursor: pointer;
                 position: relative;
                 -webkit-tap-highlight-color: transparent;

package/dist/cjs/components/upload/upload.d.ts

@@ -1,7 +1,7 @@
 import { Dispatch, ReactElement, ReactNode, SetStateAction, ComponentProps } from 'react';
 import { DivProps } from '../../types';
 import { ButtonProps } from '../button';
-import { DropArea } from './dropArea';
+import { DropArea, DropAreaProps } from './dropArea';
 export type UploadStatus = 'default' | 'uploading' | 'success' | 'error';
 export interface UploadFile<R = any, A extends any[] = any[]> extends File {
     id: string;
@@ -31,6 +31,7 @@ export interface UploadProps<R = any, A extends any[] = any[]> extends UploadSha
     size?: number;
     /** 是否支持“将文件拖拽到此处” */
     droppable?: boolean;
+    dropAreaProps?: DropAreaProps;
     sortable?: boolean;
     defaultValue?: UploadFile<R, A>[];
     value?: UploadFile<R, A>[];

package/dist/cjs/components/upload/upload.js

@@ -23,7 +23,7 @@ const markFileId = (files) => {
         }
     }
 };
-exports.Upload = (0, react_1.memo)(({ inputProps, type = 'file', accept = type === 'image' ? 'image/*' : void 0, max = Infinity, showButton = true, buttonProps, buttonText = '选择文件', variant = 'square', sortable, droppable, defaultValue, value, onChange, onUpload, ...props }) => {
+exports.Upload = (0, react_1.memo)(({ inputProps, type = 'file', accept = type === 'image' ? 'image/*' : void 0, max = Infinity, showButton = true, buttonProps, buttonText = '选择文件', variant = 'square', sortable, droppable, dropAreaProps, defaultValue, value, onChange, onUpload, ...props }) => {
     const wrapperRef = (0, react_1.useRef)(null);
     const itemRefs = (0, react_1.useRef)(new Map());
     (0, react_1.useImperativeHandle)(props.ref, () => {
@@ -99,7 +99,10 @@ exports.Upload = (0, react_1.memo)(({ inputProps, type = 'file', accept = type =
                     onChange: inputChangeHandler
                 }), "data-hidden": "true" }), (0, jsx_runtime_1.jsx)(react_2.DragDropProvider, { sensors: utils_1.defaultSensors, onDragEnd: dragEndHandler, children: type === 'file'
                     ? (0, jsx_runtime_1.jsxs)(jsx_runtime_1.Fragment, { children: [droppable
-                                ? (0, jsx_runtime_1.jsx)(dropArea_1.DropArea, { onClick: () => innerInputRef.current.click(), onDrop: changeFn })
+                                ? (0, jsx_runtime_1.jsx)(dropArea_1.DropArea, { ...(0, utils_1.mergeComponentProps)(dropAreaProps, {
+                                        onClick: () => innerInputRef.current.click(),
+                                        onDrop: changeFn
+                                    }) })
                                 : showButton &&
                                     (0, jsx_runtime_1.jsx)(button_1.Button, { variant: "outlined", prefix: (0, jsx_runtime_1.jsx)(icon_1.Icon, { icon: faUpload_1.faUpload }), ...buttonProps, onClick: buttonClick, children: buttonText }), (0, jsx_runtime_1.jsx)(react_transition_group_1.TransitionGroup, { className: upload_style_1.classes.files, children: innerValue.current.map((file, index) => (0, jsx_runtime_1.jsx)(sortableItem_1.SortableItem, { component: transitionBase_1.Collapse, className: upload_style_1.classes.sortableItem, id: file.id, index: index, disabled: !sortable, children: (0, jsx_runtime_1.jsx)(fileItem_1.FileItem, { ref: r => {
                                             r

package/dist/esm/components/checkboxBase/checkboxBase.style.js

@@ -19,6 +19,7 @@ export function useStyle({ color }) {
                 display: inline-flex;
                 align-items: center;
                 gap: 6px;
+                vertical-align: middle;
                 cursor: pointer;
                 position: relative;
                 -webkit-tap-highlight-color: transparent;

package/dist/esm/components/upload/upload.d.ts

@@ -1,7 +1,7 @@
 import { Dispatch, ReactElement, ReactNode, SetStateAction, ComponentProps } from 'react';
 import { DivProps } from '../../types.js';
 import { ButtonProps } from '../button/index.js';
-import { DropArea } from './dropArea.js';
+import { DropArea, DropAreaProps } from './dropArea.js';
 export type UploadStatus = 'default' | 'uploading' | 'success' | 'error';
 export interface UploadFile<R = any, A extends any[] = any[]> extends File {
     id: string;
@@ -31,6 +31,7 @@ export interface UploadProps<R = any, A extends any[] = any[]> extends UploadSha
     size?: number;
     /** 是否支持“将文件拖拽到此处” */
     droppable?: boolean;
+    dropAreaProps?: DropAreaProps;
     sortable?: boolean;
     defaultValue?: UploadFile<R, A>[];
     value?: UploadFile<R, A>[];

package/dist/esm/components/upload/upload.js

@@ -20,7 +20,7 @@ const markFileId = (files) => {
         }
     }
 };
-export const Upload = memo(({ inputProps, type = 'file', accept = type === 'image' ? 'image/*' : void 0, max = Infinity, showButton = true, buttonProps, buttonText = '选择文件', variant = 'square', sortable, droppable, defaultValue, value, onChange, onUpload, ...props }) => {
+export const Upload = memo(({ inputProps, type = 'file', accept = type === 'image' ? 'image/*' : void 0, max = Infinity, showButton = true, buttonProps, buttonText = '选择文件', variant = 'square', sortable, droppable, dropAreaProps, defaultValue, value, onChange, onUpload, ...props }) => {
     const wrapperRef = useRef(null);
     const itemRefs = useRef(new Map());
     useImperativeHandle(props.ref, () => {
@@ -96,7 +96,10 @@ export const Upload = memo(({ inputProps, type = 'file', accept = type === 'imag
                     onChange: inputChangeHandler
                 }), "data-hidden": "true" }), _jsx(DragDropProvider, { sensors: defaultSensors, onDragEnd: dragEndHandler, children: type === 'file'
                     ? _jsxs(_Fragment, { children: [droppable
-                                ? _jsx(DropArea, { onClick: () => innerInputRef.current.click(), onDrop: changeFn })
+                                ? _jsx(DropArea, { ...mergeComponentProps(dropAreaProps, {
+                                        onClick: () => innerInputRef.current.click(),
+                                        onDrop: changeFn
+                                    }) })
                                 : showButton &&
                                     _jsx(Button, { variant: "outlined", prefix: _jsx(Icon, { icon: faUpload }), ...buttonProps, onClick: buttonClick, children: buttonText }), _jsx(TransitionGroup, { className: classes.files, children: innerValue.current.map((file, index) => _jsx(SortableItem, { component: Collapse, className: classes.sortableItem, id: file.id, index: index, disabled: !sortable, children: _jsx(FileItem, { ref: r => {
                                             r

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@canlooks/can-ui",
-  "version": "0.0.196",
+  "version": "0.0.198",
   "author": "C.CanLiang <canlooks@gmail.com>",
   "description": "My ui framework",
   "license": "MIT",