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

package/lib/components/Drawer.d.ts

@@ -41,6 +41,7 @@ export declare class Drawer extends React.Component<DrawerProps, DrawerState> {
     isRootClosed: boolean;
     resizer: React.RefObject<HTMLDivElement>;
     resizeCoord: number;
+    transitionRef: React.RefObject<HTMLDivElement>;
     componentDidMount(): void;
     componentDidUpdate(prevProps: DrawerProps): void;
     componentWillUnmount(): void;
@@ -65,9 +66,9 @@ export declare class Drawer extends React.Component<DrawerProps, DrawerState> {
 declare const _default: {
     new (props: Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "width" | "height" | "children" | "disabled" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName" | "onDragging"> & {
         container?: any;
+        showCloseButton?: boolean | undefined;
         size?: any;
         overlay?: boolean | undefined;
-        showCloseButton?: boolean | undefined;
         position?: DrawerPosition | undefined;
     } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps): {
         ref: any;
@@ -77,17 +78,17 @@ declare const _default: {
         context: unknown;
         setState<K extends never>(state: {} | ((prevState: Readonly<{}>, props: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "width" | "height" | "children" | "disabled" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName" | "onDragging"> & {
             container?: any;
+            showCloseButton?: boolean | undefined;
             size?: any;
             overlay?: boolean | undefined;
-            showCloseButton?: boolean | undefined;
             position?: DrawerPosition | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>) => {} | Pick<{}, K> | null) | Pick<{}, K> | null, callback?: (() => void) | undefined): void;
         forceUpdate(callback?: (() => void) | undefined): void;
         readonly props: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "width" | "height" | "children" | "disabled" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName" | "onDragging"> & {
             container?: any;
+            showCloseButton?: boolean | undefined;
             size?: any;
             overlay?: boolean | undefined;
-            showCloseButton?: boolean | undefined;
             position?: DrawerPosition | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>;
         state: Readonly<{}>;
@@ -97,55 +98,55 @@ declare const _default: {
         componentDidMount?(): void;
         shouldComponentUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "width" | "height" | "children" | "disabled" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName" | "onDragging"> & {
             container?: any;
+            showCloseButton?: boolean | undefined;
             size?: any;
             overlay?: boolean | undefined;
-            showCloseButton?: boolean | undefined;
             position?: DrawerPosition | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): boolean;
         componentWillUnmount?(): void;
         componentDidCatch?(error: Error, errorInfo: React.ErrorInfo): void;
         getSnapshotBeforeUpdate?(prevProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "width" | "height" | "children" | "disabled" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName" | "onDragging"> & {
             container?: any;
+            showCloseButton?: boolean | undefined;
             size?: any;
             overlay?: boolean | undefined;
-            showCloseButton?: boolean | undefined;
             position?: DrawerPosition | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>): any;
         componentDidUpdate?(prevProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "width" | "height" | "children" | "disabled" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName" | "onDragging"> & {
             container?: any;
+            showCloseButton?: boolean | undefined;
             size?: any;
             overlay?: boolean | undefined;
-            showCloseButton?: boolean | undefined;
             position?: DrawerPosition | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, prevState: Readonly<{}>, snapshot?: any): void;
         componentWillMount?(): void;
         UNSAFE_componentWillMount?(): void;
         componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "width" | "height" | "children" | "disabled" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName" | "onDragging"> & {
             container?: any;
+            showCloseButton?: boolean | undefined;
             size?: any;
             overlay?: boolean | undefined;
-            showCloseButton?: boolean | undefined;
             position?: DrawerPosition | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
         UNSAFE_componentWillReceiveProps?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "width" | "height" | "children" | "disabled" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName" | "onDragging"> & {
             container?: any;
+            showCloseButton?: boolean | undefined;
             size?: any;
             overlay?: boolean | undefined;
-            showCloseButton?: boolean | undefined;
             position?: DrawerPosition | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextContext: any): void;
         componentWillUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "width" | "height" | "children" | "disabled" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName" | "onDragging"> & {
             container?: any;
+            showCloseButton?: boolean | undefined;
             size?: any;
             overlay?: boolean | undefined;
-            showCloseButton?: boolean | undefined;
             position?: DrawerPosition | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
         UNSAFE_componentWillUpdate?(nextProps: Readonly<Pick<Omit<DrawerProps, keyof import("amis-core").ThemeProps>, "width" | "height" | "children" | "disabled" | "onHide" | "closeOnEsc" | "closeOnOutside" | "show" | "onExited" | "onEntered" | "bodyClassName" | "resizable" | "drawerClassName" | "drawerMaskClassName" | "onDragging"> & {
             container?: any;
+            showCloseButton?: boolean | undefined;
             size?: any;
             overlay?: boolean | undefined;
-            showCloseButton?: boolean | undefined;
             position?: DrawerPosition | undefined;
         } & {} & import("packages/amis-core/lib/theme").ThemeOuterProps>, nextState: Readonly<{}>, nextContext: any): void;
     };

package/lib/components/Drawer.js

@@ -1,5 +1,5 @@
 /**
- * amis-ui v7.0.0-next.0
+ * amis-ui v7.0.0-next.1
  * Copyright 2018-2025 fex
  */
 
@@ -39,6 +39,7 @@ var Drawer = /** @class */ (function (_super) {
         _this.isRootClosed = false;
         _this.resizer = React__default["default"].createRef();
         _this.resizeCoord = 0;
+        _this.transitionRef = React__default["default"].createRef();
         _this.contentRef = function (ref) { return (_this.contentDom = ref); };
         _this.handleEnter = function () {
             document.body.classList.add("is-modalOpened");
@@ -210,7 +211,7 @@ var Drawer = /** @class */ (function (_super) {
         var _a = this.props, ns = _a.classPrefix, className = _a.className, children = _a.children, container = _a.container, show = _a.show, showCloseButton = _a.showCloseButton, position = _a.position, size = _a.size, onHide = _a.onHide, disabled = _a.disabled, overlay = _a.overlay, bodyClassName = _a.bodyClassName, resizable = _a.resizable, drawerClassName = _a.drawerClassName, drawerMaskClassName = _a.drawerMaskClassName;
         var bodyStyle = this.getDrawerStyle();
         return (_J$X_(Portal__default["default"], { container: Modal.getContainerWithFullscreen(container) },
-            _J$X_(Transition__default["default"], { mountOnEnter: true, unmountOnExit: true, appear: true, in: show, timeout: 500, onEnter: this.handleEnter, onExited: this.handleExited, onEntered: this.handleEntered }, function (status) {
+            _J$X_(Transition__default["default"], { mountOnEnter: true, unmountOnExit: true, appear: true, in: show, timeout: 500, onEnter: this.handleEnter, onExited: this.handleExited, onEntered: this.handleEntered, nodeRef: this.transitionRef }, function (status) {
                 var _a;
                 if (status === Transition.ENTERING) {
                     // force reflow
@@ -218,7 +219,10 @@ var Drawer = /** @class */ (function (_super) {
                     // 否则看不到动画。
                     _this.contentDom.offsetWidth;
                 }
-                return (_J$X_("div", { ref: _this.modalRef, role: "dialog", className: cx__default["default"]("amis-dialog-widget ".concat(ns, "Drawer"), (_a = {},
+                return (_J$X_("div", { ref: function (node) {
+                        _this.modalRef(node);
+                        _this.transitionRef.current = node;
+                    }, role: "dialog", className: cx__default["default"]("amis-dialog-widget ".concat(ns, "Drawer"), (_a = {},
                         _a["".concat(ns, "Drawer--").concat(position)] = position,
                         _a["".concat(ns, "Drawer--").concat(size)] = size,
                         _a["".concat(ns, "Drawer--noOverlay")] = !overlay,