amis-ui 7.0.0-next.0 → 7.0.0-next.1

package/lib/components/Collapse.d.ts

@@ -53,11 +53,12 @@ export declare class Collapse extends React.Component<CollapseProps, CollapseSta
     changeCollapsedState(targetState: boolean): void;
     contentDom: any;
     contentRef: (ref: any) => any;
-    handleEnter(elem: HTMLElement): void;
-    handleEntering(elem: HTMLElement): void;
-    handleEntered(elem: HTMLElement): void;
-    handleExit(elem: HTMLElement): void;
-    handleExiting(elem: HTMLElement): void;
+    transitionRef: React.RefObject<HTMLDivElement>;
+    handleEnter(): void;
+    handleEntering(): void;
+    handleEntered(): void;
+    handleExit(): void;
+    handleExiting(): void;
     render(): React.JSX.Element;
 }
 declare const _default: {
@@ -65,13 +66,13 @@ declare const _default: {
         children?: React.ReactNode | React.ReactNode[];
         body?: any;
         header?: React.ReactNode;
+        disabled?: boolean | undefined;
         translate?: TranslateFn | undefined;
         id?: string | undefined;
         size?: "xs" | "sm" | "md" | "lg" | "base" | undefined;
-        disabled?: boolean | undefined;
-        key?: string | undefined;
         mountOnEnter?: boolean | undefined;
         unmountOnExit?: boolean | undefined;
+        key?: string | undefined;
         wrapperComponent?: any;
         showArrow?: boolean | undefined;
         bodyClassName?: string | undefined;
@@ -92,8 +93,8 @@ declare const _default: {
     } & {
         className?: string | undefined;
         style?: any;
-        classnames?: ClassNamesFn | undefined;
         classPrefix?: string | undefined;
+        classnames?: ClassNamesFn | undefined;
         theme?: string | undefined;
         mobileUI?: boolean | undefined;
     } & import("packages/amis-core/lib/theme").ThemeOuterProps): {
@@ -106,13 +107,13 @@ declare const _default: {
             children?: React.ReactNode | React.ReactNode[];
             body?: any;
             header?: React.ReactNode;
+            disabled?: boolean | undefined;
             translate?: TranslateFn | undefined;
             id?: string | undefined;
             size?: "xs" | "sm" | "md" | "lg" | "base" | undefined;
-            disabled?: boolean | undefined;
-            key?: string | undefined;
             mountOnEnter?: boolean | undefined;
             unmountOnExit?: boolean | undefined;
+            key?: string | undefined;
             wrapperComponent?: any;
             showArrow?: boolean | undefined;
             bodyClassName?: string | undefined;
@@ -133,8 +134,8 @@ declare const _default: {
         } & {
             className?: string | undefined;
             style?: any;
-            classnames?: ClassNamesFn | undefined;
             classPrefix?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
             theme?: string | undefined;
             mobileUI?: boolean | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
@@ -143,13 +144,13 @@ declare const _default: {
             children?: React.ReactNode | React.ReactNode[];
             body?: any;
             header?: React.ReactNode;
+            disabled?: boolean | undefined;
             translate?: TranslateFn | undefined;
             id?: string | undefined;
             size?: "xs" | "sm" | "md" | "lg" | "base" | undefined;
-            disabled?: boolean | undefined;
-            key?: string | undefined;
             mountOnEnter?: boolean | undefined;
             unmountOnExit?: boolean | undefined;
+            key?: string | undefined;
             wrapperComponent?: any;
             showArrow?: boolean | undefined;
             bodyClassName?: string | undefined;
@@ -170,8 +171,8 @@ declare const _default: {
         } & {
             className?: string | undefined;
             style?: any;
-            classnames?: ClassNamesFn | undefined;
             classPrefix?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
             theme?: string | undefined;
             mobileUI?: boolean | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>;
@@ -184,13 +185,13 @@ declare const _default: {
             children?: React.ReactNode | React.ReactNode[];
             body?: any;
             header?: React.ReactNode;
+            disabled?: boolean | undefined;
             translate?: TranslateFn | undefined;
             id?: string | undefined;
             size?: "xs" | "sm" | "md" | "lg" | "base" | undefined;
-            disabled?: boolean | undefined;
-            key?: string | undefined;
             mountOnEnter?: boolean | undefined;
             unmountOnExit?: boolean | undefined;
+            key?: string | undefined;
             wrapperComponent?: any;
             showArrow?: boolean | undefined;
             bodyClassName?: string | undefined;
@@ -211,8 +212,8 @@ declare const _default: {
         } & {
             className?: string | undefined;
             style?: any;
-            classnames?: ClassNamesFn | undefined;
             classPrefix?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
             theme?: string | undefined;
             mobileUI?: boolean | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
@@ -222,13 +223,13 @@ declare const _default: {
             children?: React.ReactNode | React.ReactNode[];
             body?: any;
             header?: React.ReactNode;
+            disabled?: boolean | undefined;
             translate?: TranslateFn | undefined;
             id?: string | undefined;
             size?: "xs" | "sm" | "md" | "lg" | "base" | undefined;
-            disabled?: boolean | undefined;
-            key?: string | undefined;
             mountOnEnter?: boolean | undefined;
             unmountOnExit?: boolean | undefined;
+            key?: string | undefined;
             wrapperComponent?: any;
             showArrow?: boolean | undefined;
             bodyClassName?: string | undefined;
@@ -249,8 +250,8 @@ declare const _default: {
         } & {
             className?: string | undefined;
             style?: any;
-            classnames?: ClassNamesFn | undefined;
             classPrefix?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
             theme?: string | undefined;
             mobileUI?: boolean | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>): any;
@@ -258,13 +259,13 @@ declare const _default: {
             children?: React.ReactNode | React.ReactNode[];
             body?: any;
             header?: React.ReactNode;
+            disabled?: boolean | undefined;
             translate?: TranslateFn | undefined;
             id?: string | undefined;
             size?: "xs" | "sm" | "md" | "lg" | "base" | undefined;
-            disabled?: boolean | undefined;
-            key?: string | undefined;
             mountOnEnter?: boolean | undefined;
             unmountOnExit?: boolean | undefined;
+            key?: string | undefined;
             wrapperComponent?: any;
             showArrow?: boolean | undefined;
             bodyClassName?: string | undefined;
@@ -285,8 +286,8 @@ declare const _default: {
         } & {
             className?: string | undefined;
             style?: any;
-            classnames?: ClassNamesFn | undefined;
             classPrefix?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
             theme?: string | undefined;
             mobileUI?: boolean | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>, snapshot?: any): void;
@@ -296,13 +297,13 @@ declare const _default: {
             children?: React.ReactNode | React.ReactNode[];
             body?: any;
             header?: React.ReactNode;
+            disabled?: boolean | undefined;
             translate?: TranslateFn | undefined;
             id?: string | undefined;
             size?: "xs" | "sm" | "md" | "lg" | "base" | undefined;
-            disabled?: boolean | undefined;
-            key?: string | undefined;
             mountOnEnter?: boolean | undefined;
             unmountOnExit?: boolean | undefined;
+            key?: string | undefined;
             wrapperComponent?: any;
             showArrow?: boolean | undefined;
             bodyClassName?: string | undefined;
@@ -323,8 +324,8 @@ declare const _default: {
         } & {
             className?: string | undefined;
             style?: any;
-            classnames?: ClassNamesFn | undefined;
             classPrefix?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
             theme?: string | undefined;
             mobileUI?: boolean | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
@@ -332,13 +333,13 @@ declare const _default: {
             children?: React.ReactNode | React.ReactNode[];
             body?: any;
             header?: React.ReactNode;
+            disabled?: boolean | undefined;
             translate?: TranslateFn | undefined;
             id?: string | undefined;
             size?: "xs" | "sm" | "md" | "lg" | "base" | undefined;
-            disabled?: boolean | undefined;
-            key?: string | undefined;
             mountOnEnter?: boolean | undefined;
             unmountOnExit?: boolean | undefined;
+            key?: string | undefined;
             wrapperComponent?: any;
             showArrow?: boolean | undefined;
             bodyClassName?: string | undefined;
@@ -359,8 +360,8 @@ declare const _default: {
         } & {
             className?: string | undefined;
             style?: any;
-            classnames?: ClassNamesFn | undefined;
             classPrefix?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
             theme?: string | undefined;
             mobileUI?: boolean | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
@@ -368,13 +369,13 @@ declare const _default: {
             children?: React.ReactNode | React.ReactNode[];
             body?: any;
             header?: React.ReactNode;
+            disabled?: boolean | undefined;
             translate?: TranslateFn | undefined;
             id?: string | undefined;
             size?: "xs" | "sm" | "md" | "lg" | "base" | undefined;
-            disabled?: boolean | undefined;
-            key?: string | undefined;
             mountOnEnter?: boolean | undefined;
             unmountOnExit?: boolean | undefined;
+            key?: string | undefined;
             wrapperComponent?: any;
             showArrow?: boolean | undefined;
             bodyClassName?: string | undefined;
@@ -395,8 +396,8 @@ declare const _default: {
         } & {
             className?: string | undefined;
             style?: any;
-            classnames?: ClassNamesFn | undefined;
             classPrefix?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
             theme?: string | undefined;
             mobileUI?: boolean | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
@@ -404,13 +405,13 @@ declare const _default: {
             children?: React.ReactNode | React.ReactNode[];
             body?: any;
             header?: React.ReactNode;
+            disabled?: boolean | undefined;
             translate?: TranslateFn | undefined;
             id?: string | undefined;
             size?: "xs" | "sm" | "md" | "lg" | "base" | undefined;
-            disabled?: boolean | undefined;
-            key?: string | undefined;
             mountOnEnter?: boolean | undefined;
             unmountOnExit?: boolean | undefined;
+            key?: string | undefined;
             wrapperComponent?: any;
             showArrow?: boolean | undefined;
             bodyClassName?: string | undefined;
@@ -431,8 +432,8 @@ declare const _default: {
         } & {
             className?: string | undefined;
             style?: any;
-            classnames?: ClassNamesFn | undefined;
             classPrefix?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
             theme?: string | undefined;
             mobileUI?: boolean | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;

package/lib/components/Collapse.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v7.0.0-next.0
+ * amis-ui v7.0.0-next.1
  * Copyright 2018-2025 fex
  */
 
@@ -35,6 +35,7 @@ var Collapse = /** @class */ (function (_super) {
             collapsed: false
         };
         _this.contentRef = function (ref) { return (_this.contentDom = ref); };
+        _this.transitionRef = React__default["default"].createRef();
         _this.toggleCollapsed = _this.toggleCollapsed.bind(_this);
         _this.state.collapsed = props.collapsable ? !!props.collapsed : false;
         return _this;
@@ -77,26 +78,41 @@ var Collapse = /** @class */ (function (_super) {
             (_b = (_a = _this.props).onCollapse) === null || _b === void 0 ? void 0 : _b.call(_a, targetState);
         });
     };
-    Collapse.prototype.handleEnter = function (elem) {
-        elem.style['height'] = '';
+    Collapse.prototype.handleEnter = function () {
+        var elem = this.transitionRef.current;
+        if (elem) {
+            elem.style['height'] = '';
+        }
     };
-    Collapse.prototype.handleEntering = function (elem) {
-        elem.style['height'] = "".concat(elem['scrollHeight'], "px");
+    Collapse.prototype.handleEntering = function () {
+        var elem = this.transitionRef.current;
+        if (elem) {
+            elem.style['height'] = "".concat(elem['scrollHeight'], "px");
+        }
     };
-    Collapse.prototype.handleEntered = function (elem) {
-        elem.style['height'] = '';
+    Collapse.prototype.handleEntered = function () {
+        var elem = this.transitionRef.current;
+        if (elem) {
+            elem.style['height'] = '';
+        }
     };
-    Collapse.prototype.handleExit = function (elem) {
-        var offsetHeight = elem['offsetHeight'];
-        var height = offsetHeight +
-            parseInt(getComputedStyle(elem).getPropertyValue('margin-top'), 10) +
-            parseInt(getComputedStyle(elem).getPropertyValue('margin-bottom'), 10);
-        elem.style['height'] = "".concat(height, "px");
-        // trigger browser reflow
-        elem.offsetHeight;
+    Collapse.prototype.handleExit = function () {
+        var elem = this.transitionRef.current;
+        if (elem) {
+            var offsetHeight = elem['offsetHeight'];
+            var height = offsetHeight +
+                parseInt(getComputedStyle(elem).getPropertyValue('margin-top'), 10) +
+                parseInt(getComputedStyle(elem).getPropertyValue('margin-bottom'), 10);
+            elem.style['height'] = "".concat(height, "px");
+            // trigger browser reflow
+            elem.offsetHeight;
+        }
     };
-    Collapse.prototype.handleExiting = function (elem) {
-        elem.style['height'] = '';
+    Collapse.prototype.handleExiting = function () {
+        var elem = this.transitionRef.current;
+        if (elem) {
+            elem.style['height'] = '';
+        }
     };
     Collapse.prototype.render = function () {
         var _a;
@@ -111,11 +127,14 @@ var Collapse = /** @class */ (function (_super) {
                 showArrow && collapsable ? (expandIcon ? (React__default["default"].cloneElement(expandIcon, tslib.__assign(tslib.__assign({}, expandIcon.props), { className: cx('Collapse-icon-tranform', (_b = expandIcon.props) === null || _b === void 0 ? void 0 : _b.className) }))) : (_J$X_("span", { className: cx('Collapse-arrow-wrap') },
                     _J$X_(icons.Icon, { icon: "right-arrow-bold", className: cx('Collapse-arrow', 'icon'), classNameProp: cx('Collapse-arrow'), iconContent: "Collapse-arrow" })))) : (''),
                 finalHeader),
-            _J$X_(Transition__default["default"], { key: "body", mountOnEnter: mountOnEnter, unmountOnExit: unmountOnExit, in: !this.state.collapsed, timeout: 300, onEnter: this.handleEnter, onEntering: this.handleEntering, onEntered: this.handleEntered, onExit: this.handleExit, onExiting: this.handleExiting }, function (status) {
+            _J$X_(Transition__default["default"], { key: "body", mountOnEnter: mountOnEnter, unmountOnExit: unmountOnExit, in: !this.state.collapsed, timeout: 300, onEnter: this.handleEnter, onEntering: this.handleEntering, onEntered: this.handleEntered, onExit: this.handleExit, onExiting: this.handleExiting, nodeRef: this.transitionRef }, function (status) {
                 if (status === Transition.ENTERING) {
                     _this.contentDom.offsetWidth;
                 }
-                return (_J$X_("div", { className: cx('Collapse-contentWrapper', collapseStyles[status]), ref: _this.contentRef },
+                return (_J$X_("div", { className: cx('Collapse-contentWrapper', collapseStyles[status]), ref: function (node) {
+                        _this.contentRef(node);
+                        _this.transitionRef.current = node;
+                    } },
                     _J$X_("div", { className: cx('Collapse-body', bodyClassName) },
                         _J$X_("div", { className: cx('Collapse-content') }, body || children))));
             })
@@ -157,31 +176,31 @@ var Collapse = /** @class */ (function (_super) {
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", [HTMLElement]),
+        tslib.__metadata("design:paramtypes", []),
         tslib.__metadata("design:returntype", void 0)
     ], Collapse.prototype, "handleEnter", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", [HTMLElement]),
+        tslib.__metadata("design:paramtypes", []),
         tslib.__metadata("design:returntype", void 0)
     ], Collapse.prototype, "handleEntering", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", [HTMLElement]),
+        tslib.__metadata("design:paramtypes", []),
         tslib.__metadata("design:returntype", void 0)
     ], Collapse.prototype, "handleEntered", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", [HTMLElement]),
+        tslib.__metadata("design:paramtypes", []),
         tslib.__metadata("design:returntype", void 0)
     ], Collapse.prototype, "handleExit", null);
     tslib.__decorate([
         amisCore.autobind,
         tslib.__metadata("design:type", Function),
-        tslib.__metadata("design:paramtypes", [HTMLElement]),
+        tslib.__metadata("design:paramtypes", []),
         tslib.__metadata("design:returntype", void 0)
     ], Collapse.prototype, "handleExiting", null);
     return Collapse;

package/lib/components/CollapseGroup.d.ts

@@ -44,8 +44,8 @@ declare const _default: {
     } & {
         className?: string | undefined;
         style?: any;
-        classnames?: ClassNamesFn | undefined;
         classPrefix?: string | undefined;
+        classnames?: ClassNamesFn | undefined;
         theme?: string | undefined;
         mobileUI?: boolean | undefined;
     } & import("packages/amis-core/lib/theme").ThemeOuterProps): {
@@ -65,8 +65,8 @@ declare const _default: {
         } & {
             className?: string | undefined;
             style?: any;
-            classnames?: ClassNamesFn | undefined;
             classPrefix?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
             theme?: string | undefined;
             mobileUI?: boolean | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
@@ -82,8 +82,8 @@ declare const _default: {
         } & {
             className?: string | undefined;
             style?: any;
-            classnames?: ClassNamesFn | undefined;
             classPrefix?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
             theme?: string | undefined;
             mobileUI?: boolean | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>;
@@ -103,8 +103,8 @@ declare const _default: {
         } & {
             className?: string | undefined;
             style?: any;
-            classnames?: ClassNamesFn | undefined;
             classPrefix?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
             theme?: string | undefined;
             mobileUI?: boolean | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
@@ -121,8 +121,8 @@ declare const _default: {
         } & {
             className?: string | undefined;
             style?: any;
-            classnames?: ClassNamesFn | undefined;
             classPrefix?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
             theme?: string | undefined;
             mobileUI?: boolean | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>): any;
@@ -137,8 +137,8 @@ declare const _default: {
         } & {
             className?: string | undefined;
             style?: any;
-            classnames?: ClassNamesFn | undefined;
             classPrefix?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
             theme?: string | undefined;
             mobileUI?: boolean | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>, snapshot?: any): void;
@@ -155,8 +155,8 @@ declare const _default: {
         } & {
             className?: string | undefined;
             style?: any;
-            classnames?: ClassNamesFn | undefined;
             classPrefix?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
             theme?: string | undefined;
             mobileUI?: boolean | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
@@ -171,8 +171,8 @@ declare const _default: {
         } & {
             className?: string | undefined;
             style?: any;
-            classnames?: ClassNamesFn | undefined;
             classPrefix?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
             theme?: string | undefined;
             mobileUI?: boolean | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
@@ -187,8 +187,8 @@ declare const _default: {
         } & {
             className?: string | undefined;
             style?: any;
-            classnames?: ClassNamesFn | undefined;
             classPrefix?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
             theme?: string | undefined;
             mobileUI?: boolean | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
@@ -203,8 +203,8 @@ declare const _default: {
         } & {
             className?: string | undefined;
             style?: any;
-            classnames?: ClassNamesFn | undefined;
             classPrefix?: string | undefined;
+            classnames?: ClassNamesFn | undefined;
             theme?: string | undefined;
             mobileUI?: boolean | undefined;
         } & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;

package/lib/components/CollapseGroup.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v7.0.0-next.0
+ * amis-ui v7.0.0-next.1
  * Copyright 2018-2025 fex
  */