@canlooks/can-ui 0.0.171 → 0.0.173

package/dist/cjs/components/curd/curd.js

@@ -143,7 +143,7 @@ exports.Curd = (0, react_1.memo)((props) => {
     const setInnerRows = (data) => {
         setOptions?.(data);
         _setInnerRows(data);
-        containerRef.current.scrollTop = 0;
+        containerRef.current.scrollTop = containerRef.current.scrollLeft = 0;
     };
     const [innerTotal, setInnerTotal] = (0, utils_1.useDerivedState)(props.paginationProps?.total || 0);
     const suppressReload = (0, react_1.useRef)(false);

package/dist/cjs/components/dataGrid/dataGrid.js

@@ -89,7 +89,7 @@ exports.DataGrid = (0, react_1.memo)(({ slots, slotProps, columns, rows, rowProp
         return new Set(innerExpanded.current);
     }, [innerExpanded.current]);
     const syncOnExpandedChange = (0, utils_1.useSync)(onExpandedChange);
-    const toggleExpanded = (0, react_1.useCallback)((key) => {
+    const toggleExpanded = (key) => {
         const currentExpanded = expandedSet.has(key);
         setInnerExpanded(o => {
             const newExpanded = currentExpanded
@@ -98,7 +98,7 @@ exports.DataGrid = (0, react_1.memo)(({ slots, slotProps, columns, rows, rowProp
             syncOnExpandedChange.current?.(newExpanded, key, !currentExpanded);
             return newExpanded;
         });
-    }, []);
+    };
     /**
      * ---------------------------------------------------------------
      * 分页

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

@@ -2,8 +2,8 @@ import { ReactNode } from 'react';
 import { ColorPropsValue, DivProps, Size } from '../../types';
 import { DatePickerSharedProps, DateTimePickerProps } from '../dateTimePicker';
 import { Dayjs } from 'dayjs';
-type DateValueType = [Dayjs | null, Dayjs | null] | null;
-type PickerType = 'start' | 'end';
+export type DateValueType = [Dayjs | null, Dayjs | null] | null;
+export type PickerType = 'start' | 'end';
 export interface DateTimeRangePickerProps extends DatePickerSharedProps, Omit<DivProps, 'defaultValue' | 'onChange'> {
     startPickerProps?: DateTimePickerProps;
     endPickerProps?: DateTimePickerProps;
@@ -25,4 +25,3 @@ export interface DateTimeRangePickerProps extends DatePickerSharedProps, Omit<Di
     autoFocus?: boolean;
 }
 export declare const DateTimeRangePicker: import("react").MemoExoticComponent<({ startPickerProps, endPickerProps, format, defaultValue, value, onChange, defaultOpenPicker, openPicker, onOpenPickerChange, autoClose, separator, min, max, disabledDates, disabledHours, disabledMinutes, disabledSeconds, variant, size, color, disabled, readOnly, autoFocus, ...props }: DateTimeRangePickerProps) => import("@emotion/react/jsx-runtime").JSX.Element>;
-export {};

package/dist/cjs/components/tabs/tabs.js

@@ -24,7 +24,6 @@ exports.Tabs = (0, react_2.memo)(({ tabs, labelKey = 'label', primaryKey = 'valu
     const setInnerValue = (value) => {
         if (!readOnly && !disabled && value !== innerValue.current) {
             _setInnerValue(value);
-            console.log(96, value);
             variant === 'line' && setAnimating(true);
         }
     };

package/dist/cjs/components/transitionBase/collapse.js

@@ -17,6 +17,7 @@ const Sweeping = ({ ref, in: _in = false, orientation = 'vertical', collapsedSiz
         return typeof collapsedSize === 'function' ? collapsedSize() : collapsedSize;
     };
     const [size, setSize] = (0, react_1.useState)(() => !_in ? getCollapsedSize() : 'auto');
+    const [transiting, setTransiting] = (0, utils_1.useDerivedState)(true, [_in]);
     const getFullSize = () => {
         const el = innerRef.current;
         let size;
@@ -69,7 +70,13 @@ const Sweeping = ({ ref, in: _in = false, orientation = 'vertical', collapsedSiz
             : collapse();
     }, [_in]);
     return ((0, jsx_runtime_1.jsx)(transitionBase_1.TransitionBase, { ...props, ref: (0, utils_1.cloneRef)(ref, innerRef), in: _in, orientation: orientation, appear: appear, style: {
-            [styleProperty]: size,
+            ...(transiting.current || !_in) && { [styleProperty]: size },
             ...props.style
+        }, onEntered: () => {
+            props.onEntered?.();
+            setTransiting(false);
+        }, onExited: () => {
+            props.onExited?.();
+            setTransiting(false);
         } }));
 };

package/dist/esm/components/curd/curd.js

@@ -140,7 +140,7 @@ export const Curd = memo((props) => {
     const setInnerRows = (data) => {
         setOptions?.(data);
         _setInnerRows(data);
-        containerRef.current.scrollTop = 0;
+        containerRef.current.scrollTop = containerRef.current.scrollLeft = 0;
     };
     const [innerTotal, setInnerTotal] = useDerivedState(props.paginationProps?.total || 0);
     const suppressReload = useRef(false);

package/dist/esm/components/dataGrid/dataGrid.js

@@ -85,7 +85,7 @@ export const DataGrid = memo(({ slots, slotProps, columns, rows, rowProps, prima
         return new Set(innerExpanded.current);
     }, [innerExpanded.current]);
     const syncOnExpandedChange = useSync(onExpandedChange);
-    const toggleExpanded = useCallback((key) => {
+    const toggleExpanded = (key) => {
         const currentExpanded = expandedSet.has(key);
         setInnerExpanded(o => {
             const newExpanded = currentExpanded
@@ -94,7 +94,7 @@ export const DataGrid = memo(({ slots, slotProps, columns, rows, rowProps, prima
             syncOnExpandedChange.current?.(newExpanded, key, !currentExpanded);
             return newExpanded;
         });
-    }, []);
+    };
     /**
      * ---------------------------------------------------------------
      * 分页

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

@@ -2,8 +2,8 @@ import { ReactNode } from 'react';
 import { ColorPropsValue, DivProps, Size } from '../../types.js';
 import { DatePickerSharedProps, DateTimePickerProps } from '../dateTimePicker/index.js';
 import { Dayjs } from 'dayjs';
-type DateValueType = [Dayjs | null, Dayjs | null] | null;
-type PickerType = 'start' | 'end';
+export type DateValueType = [Dayjs | null, Dayjs | null] | null;
+export type PickerType = 'start' | 'end';
 export interface DateTimeRangePickerProps extends DatePickerSharedProps, Omit<DivProps, 'defaultValue' | 'onChange'> {
     startPickerProps?: DateTimePickerProps;
     endPickerProps?: DateTimePickerProps;
@@ -25,4 +25,3 @@ export interface DateTimeRangePickerProps extends DatePickerSharedProps, Omit<Di
     autoFocus?: boolean;
 }
 export declare const DateTimeRangePicker: import("react").MemoExoticComponent<({ startPickerProps, endPickerProps, format, defaultValue, value, onChange, defaultOpenPicker, openPicker, onOpenPickerChange, autoClose, separator, min, max, disabledDates, disabledHours, disabledMinutes, disabledSeconds, variant, size, color, disabled, readOnly, autoFocus, ...props }: DateTimeRangePickerProps) => import("@emotion/react/jsx-runtime").JSX.Element>;
-export {};

package/dist/esm/components/tabs/tabs.js

@@ -20,7 +20,6 @@ export const Tabs = memo(({ tabs, labelKey = 'label', primaryKey = 'value', size
     const setInnerValue = (value) => {
         if (!readOnly && !disabled && value !== innerValue.current) {
             _setInnerValue(value);
-            console.log(96, value);
             variant === 'line' && setAnimating(true);
         }
     };

package/dist/esm/components/transitionBase/collapse.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx } from "@emotion/react/jsx-runtime";
 import { useLayoutEffect, useRef, useState } from 'react';
 import { TransitionBase } from './transitionBase.js';
-import { cloneRef, useUpdateEffect } from '../../utils/index.js';
+import { cloneRef, useDerivedState, useUpdateEffect } from '../../utils/index.js';
 export const Collapse = ({ transitionType = 'sweeping', ...props }) => {
     const Component = transitionType === 'sweeping' ? Sweeping : TransitionBase;
     return (_jsx(Component, { ...props, _mode: transitionType === 'sweeping' ? '_sweeping' : 'collapse' }));
@@ -13,6 +13,7 @@ const Sweeping = ({ ref, in: _in = false, orientation = 'vertical', collapsedSiz
         return typeof collapsedSize === 'function' ? collapsedSize() : collapsedSize;
     };
     const [size, setSize] = useState(() => !_in ? getCollapsedSize() : 'auto');
+    const [transiting, setTransiting] = useDerivedState(true, [_in]);
     const getFullSize = () => {
         const el = innerRef.current;
         let size;
@@ -65,7 +66,13 @@ const Sweeping = ({ ref, in: _in = false, orientation = 'vertical', collapsedSiz
             : collapse();
     }, [_in]);
     return (_jsx(TransitionBase, { ...props, ref: cloneRef(ref, innerRef), in: _in, orientation: orientation, appear: appear, style: {
-            [styleProperty]: size,
+            ...(transiting.current || !_in) && { [styleProperty]: size },
             ...props.style
+        }, onEntered: () => {
+            props.onEntered?.();
+            setTransiting(false);
+        }, onExited: () => {
+            props.onExited?.();
+            setTransiting(false);
         } }));
 };

package/package.json

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