antd-mobile 5.0.0-rc.20 → 5.0.0-rc.24

package/2x/es/components/form/form.css

@@ -1,8 +1,17 @@
 .adm-form .adm-list.adm-list {
-  --padding-left: 40px;
-  --padding-right: 40px;
+  --padding-left: 32px;
+  --padding-right: 24px;
+}
+
+.adm-form-horizontal .adm-list.adm-list {
+  --prefix-width: 6em;
+  --align-items: stretch;
+}
+
+.adm-form-horizontal .adm-list.adm-list .adm-list-item-content-extra {
+  align-self: center;
 }
 
 .adm-form .adm-form-footer {
-  padding: 24px;
+  padding: 40px 24px;
 }

package/2x/es/components/form/form.d.ts

@@ -1,16 +1,17 @@
 import React, { ReactNode } from 'react';
 import { NativeProps } from '../../utils/native-props';
 import { ListProps } from '../list';
-import type { FormProps as RcFormProps, FormInstance } from 'rc-field-form';
+import type { FormProps as RcFormProps, FormInstance as RCFormInstance } from 'rc-field-form';
 import { FormContextType } from './context';
 import type { FormLayout } from '.';
-export declare type FormProps = RcFormProps & NativeProps & Partial<FormContextType> & {
+export declare type FormInstance = Pick<RCFormInstance, 'getFieldValue' | 'getFieldsValue' | 'getFieldError' | 'getFieldsError' | 'isFieldTouched' | 'isFieldsTouched' | 'resetFields' | 'setFields' | 'setFieldsValue' | 'submit' | 'validateFields'>;
+export declare type FormProps = Pick<RcFormProps, 'form' | 'initialValues' | 'name' | 'preserve' | 'validateMessages' | 'validateTrigger' | 'onFieldsChange' | 'onFinish' | 'onFinishFailed' | 'onValuesChange' | 'children'> & NativeProps & Partial<FormContextType> & {
     footer?: ReactNode;
     layout?: FormLayout;
     mode?: ListProps['mode'];
 };
-export declare const Form: React.ForwardRefExoticComponent<RcFormProps<any> & NativeProps<never> & Partial<FormContextType> & {
+export declare const Form: React.ForwardRefExoticComponent<Pick<RcFormProps<any>, "children" | "form" | "name" | "initialValues" | "preserve" | "validateMessages" | "validateTrigger" | "onFieldsChange" | "onFinish" | "onFinishFailed" | "onValuesChange"> & NativeProps<never> & Partial<FormContextType> & {
     footer?: ReactNode;
     layout?: "horizontal" | "vertical" | undefined;
     mode?: ListProps['mode'];
-} & React.RefAttributes<FormInstance<any>>>;
+} & React.RefAttributes<Pick<RCFormInstance<any>, "submit" | "getFieldValue" | "getFieldsValue" | "getFieldError" | "getFieldsError" | "isFieldTouched" | "isFieldsTouched" | "resetFields" | "setFields" | "setFieldsValue" | "validateFields">>>;

package/2x/es/components/form/form.js

@@ -36,11 +36,7 @@ export const Form = forwardRef((p, ref) => {
     lists.push(React.createElement(List, {
       header: currentHeader,
       key: count,
-      mode: mode,
-      style: {
-        '--prefix-width': '6em',
-        '--align-items': 'stretch'
-      }
+      mode: mode
     }, items));
     items = [];
   }

package/2x/es/components/form/index.css

@@ -1,10 +1,19 @@
 .adm-form .adm-list.adm-list {
-  --padding-left: 40px;
-  --padding-right: 40px;
+  --padding-left: 32px;
+  --padding-right: 24px;
+}
+
+.adm-form-horizontal .adm-list.adm-list {
+  --prefix-width: 6em;
+  --align-items: stretch;
+}
+
+.adm-form-horizontal .adm-list.adm-list .adm-list-item-content-extra {
+  align-self: center;
 }
 
 .adm-form .adm-form-footer {
-  padding: 24px;
+  padding: 40px 24px;
 }
 
 .adm-form-item + .adm-form-item {
@@ -22,7 +31,8 @@
 .adm-form-item-label-required {
   position: absolute;
   left: -0.6em;
-  top: 0.2em;
+  top: 0;
+  font-family: SimSun, sans-serif;
   color: var(--adm-color-danger);
   user-select: none;
 }
@@ -36,14 +46,19 @@
 }
 
 .adm-form-vertical .adm-form-item-label {
-  margin-bottom: 8px;
   font-size: 30px;
+  margin-bottom: 8px;
 }
 
 .adm-form-vertical .adm-form-item-footer {
   margin-top: 8px;
 }
 
+.adm-form-horizontal .adm-list-item-content-prefix {
+  padding-top: 24px;
+  padding-bottom: 24px;
+}
+
 .adm-form-item-label {
   color: #666666;
 }

package/2x/es/components/form/index.d.ts

@@ -2,13 +2,14 @@
 import './index.less';
 import { useForm } from 'rc-field-form';
 export declare type FormLayout = 'vertical' | 'horizontal';
-export type { FormProps } from './form';
-export type { FormInstance } from 'rc-field-form';
-declare const _default: import("react").ForwardRefExoticComponent<import("rc-field-form").FormProps<any> & import("../../utils/native-props").NativeProps<never> & Partial<import("./context").FormContextType> & {
+export type { FormProps, FormInstance } from './form';
+export type { FormItemProps } from './form-item';
+export type { ValidateMessages, FieldData, NamePath, } from 'rc-field-form/es/interface';
+declare const _default: import("react").ForwardRefExoticComponent<Pick<import("rc-field-form").FormProps<any>, "children" | "form" | "name" | "initialValues" | "preserve" | "validateMessages" | "validateTrigger" | "onFieldsChange" | "onFinish" | "onFinishFailed" | "onValuesChange"> & import("../../utils/native-props").NativeProps<never> & Partial<import("./context").FormContextType> & {
     footer?: import("react").ReactNode;
     layout?: "horizontal" | "vertical" | undefined;
     mode?: "default" | "card" | undefined;
-} & import("react").RefAttributes<import("rc-field-form").FormInstance<any>>> & {
+} & import("react").RefAttributes<Pick<import("rc-field-form").FormInstance<any>, "submit" | "getFieldValue" | "getFieldsValue" | "getFieldError" | "getFieldsError" | "isFieldTouched" | "isFieldsTouched" | "resetFields" | "setFields" | "setFieldsValue" | "validateFields">>> & {
     Item: import("react").FC<import("./form-item").FormItemProps>;
     Header: import("react").FC<{}>;
     useForm: typeof useForm;

package/2x/es/components/image/image.d.ts

@@ -11,5 +11,6 @@ export declare type ImageProps = {
     lazy?: boolean;
     onClick?: (event: React.MouseEvent<HTMLImageElement, Event>) => void;
     onError?: (event: React.SyntheticEvent<HTMLImageElement, Event>) => void;
+    onLoad?: (event: React.SyntheticEvent<HTMLImageElement, Event>) => void;
 } & NativeProps<'--width' | '--height'> & Pick<React.ImgHTMLAttributes<HTMLImageElement>, 'crossOrigin' | 'decoding' | 'loading' | 'referrerPolicy' | 'sizes' | 'srcSet' | 'useMap'>;
 export declare const Image: React.FC<ImageProps>;

package/2x/es/components/image/image.js

@@ -42,8 +42,11 @@ export const Image = staged(p => {
       src: src,
       alt: props.alt,
       onClick: props.onClick,
-      onLoad: () => {
+      onLoad: e => {
+        var _a;
+
         setLoaded(true);
+        (_a = props.onLoad) === null || _a === void 0 ? void 0 : _a.call(props, e);
       },
       onError: e => {
         var _a;

package/2x/es/components/image-viewer/image-viewer.d.ts

@@ -1,5 +1,6 @@
-import { FC } from 'react';
+import React, { FC } from 'react';
 import { GetContainer } from '../../utils/render-to-container';
+import { SlidesRef } from './slides';
 export declare type ImageViewerProps = {
     image?: string;
     maxZoom?: number;
@@ -9,9 +10,14 @@ export declare type ImageViewerProps = {
     afterClose?: () => void;
 };
 export declare const ImageViewer: FC<ImageViewerProps>;
+export declare type MultiImageViewerRef = SlidesRef;
 export declare type MultiImageViewerProps = Omit<ImageViewerProps, 'image'> & {
     images?: string[];
     defaultIndex?: number;
     onIndexChange?: (index: number) => void;
 };
-export declare const MultiImageViewer: FC<MultiImageViewerProps>;
+export declare const MultiImageViewer: React.ForwardRefExoticComponent<Pick<ImageViewerProps, "visible" | "onClose" | "afterClose" | "getContainer" | "maxZoom"> & {
+    images?: string[] | undefined;
+    defaultIndex?: number | undefined;
+    onIndexChange?: ((index: number) => void) | undefined;
+} & React.RefAttributes<SlidesRef>>;

package/2x/es/components/image-viewer/image-viewer.js

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { forwardRef } from 'react';
 import { mergeProps } from '../../utils/with-default-props';
 import { renderToContainer } from '../../utils/render-to-container';
 import Mask from '../mask';
@@ -33,7 +33,7 @@ export const ImageViewer = p => {
 const multiDefaultProps = Object.assign(Object.assign({}, defaultProps), {
   defaultIndex: 0
 });
-export const MultiImageViewer = p => {
+export const MultiImageViewer = forwardRef((p, ref) => {
   const props = mergeProps(multiDefaultProps, p);
   const node = React.createElement(Mask, {
     visible: props.visible,
@@ -43,6 +43,7 @@ export const MultiImageViewer = p => {
   }, React.createElement("div", {
     className: `${classPrefix}-content`
   }, props.images && React.createElement(Slides, {
+    ref: ref,
     defaultIndex: props.defaultIndex,
     onIndexChange: props.onIndexChange,
     images: props.images,
@@ -54,4 +55,4 @@ export const MultiImageViewer = p => {
     maxZoom: props.maxZoom
   })));
   return renderToContainer(props.getContainer, node);
-};
+});

package/2x/es/components/image-viewer/index.d.ts

@@ -1,10 +1,14 @@
 /// <reference types="react" />
 import './image-viewer.less';
 import { showMultiImageViewer, showImageViewer, clearImageViewer } from './methods';
-export type { ImageViewerProps, MultiImageViewerProps } from './image-viewer';
+export type { ImageViewerProps, MultiImageViewerProps, MultiImageViewerRef, } from './image-viewer';
 export type { ImageViewerHandler } from './methods';
 declare const _default: import("react").FC<import("./image-viewer").ImageViewerProps> & {
-    Multi: import("react").FC<import("./image-viewer").MultiImageViewerProps> & {
+    Multi: import("react").ForwardRefExoticComponent<Pick<import("./image-viewer").ImageViewerProps, "visible" | "onClose" | "afterClose" | "getContainer" | "maxZoom"> & {
+        images?: string[] | undefined;
+        defaultIndex?: number | undefined;
+        onIndexChange?: ((index: number) => void) | undefined;
+    } & import("react").RefAttributes<import("./slides").SlidesRef>> & {
         show: typeof showMultiImageViewer;
     };
     show: typeof showImageViewer;

package/2x/es/components/image-viewer/slides.d.ts

@@ -1,8 +1,12 @@
-import { FC } from 'react';
-export declare const Slides: FC<{
+import React from 'react';
+export declare type SlidesType = {
     images: string[];
     onTap: () => void;
     maxZoom: number;
     defaultIndex: number;
     onIndexChange?: (index: number) => void;
-}>;
+};
+export declare type SlidesRef = {
+    swipeTo: (index: number, immediate: boolean) => void;
+};
+export declare const Slides: React.ForwardRefExoticComponent<SlidesType & React.RefAttributes<SlidesRef>>;

package/2x/es/components/image-viewer/slides.js

@@ -1,11 +1,11 @@
-import React, { useRef } from 'react';
+import React, { forwardRef, useImperativeHandle, useRef } from 'react';
 import { useDrag } from '@use-gesture/react';
 import { useSpring, animated } from '@react-spring/web';
 import { Slide } from './slide';
 import { convertPx } from '../../utils/convert-px';
 import { bound } from '../../utils/bound';
 const classPrefix = `adm-image-viewer`;
-export const Slides = props => {
+export const Slides = forwardRef((props, ref) => {
   const slideWidth = window.innerWidth + convertPx(16);
   const [{
     x
@@ -17,10 +17,23 @@ export const Slides = props => {
     }
   }));
   const count = props.images.length;
-  const dragLockRef = useRef(false);
-  const bind = useDrag(state => {
+
+  function swipeTo(index, immediate = false) {
     var _a;
 
+    const i = bound(index, 0, count - 1);
+    (_a = props.onIndexChange) === null || _a === void 0 ? void 0 : _a.call(props, i);
+    api.start({
+      x: i * slideWidth,
+      immediate
+    });
+  }
+
+  useImperativeHandle(ref, () => ({
+    swipeTo
+  }));
+  const dragLockRef = useRef(false);
+  const bind = useDrag(state => {
     if (dragLockRef.current) return;
     const [offsetX] = state.offset;
 
@@ -28,11 +41,7 @@ export const Slides = props => {
       const minIndex = Math.floor(offsetX / slideWidth);
       const maxIndex = minIndex + 1;
       const velocityOffset = Math.min(state.velocity[0] * 2000, slideWidth) * state.direction[0];
-      const index = bound(bound(Math.round((offsetX + velocityOffset) / slideWidth), minIndex, maxIndex), 0, count - 1);
-      (_a = props.onIndexChange) === null || _a === void 0 ? void 0 : _a.call(props, index);
-      api.start({
-        x: index * slideWidth
-      });
+      swipeTo(bound(Math.round((offsetX + velocityOffset) / slideWidth), minIndex, maxIndex));
     } else {
       api.start({
         x: offsetX,
@@ -81,4 +90,4 @@ export const Slides = props => {
     },
     dragLockRef: dragLockRef
   }))));
-};
+});

package/2x/es/components/input/input.css

@@ -1,18 +1,24 @@
-.adm-input-wrapper {
+.adm-input {
   --font-size: 34px;
   --color: var(--adm-color-text);
   --placeholder-color: var(--adm-color-light);
-  --disabled-color: var(--adm-color-weak);
   --text-align: left;
+  --background-color: transparent;
   display: flex;
   justify-content: flex-start;
   align-items: center;
   width: 100%;
   max-width: 100%;
   max-height: 100%;
+  background-color: var(--background-color);
 }
 
-.adm-input {
+.adm-input-disabled {
+  opacity: 0.4;
+  cursor: not-allowed;
+}
+
+.adm-input-element {
   flex: auto;
   display: inline-block;
   box-sizing: border-box;
@@ -32,65 +38,62 @@
   text-align: var(--text-align);
 }
 
-.adm-input::placeholder {
+.adm-input-element::placeholder {
   color: var(--placeholder-color);
   font-family: inherit;
 }
 
-.adm-input:-webkit-autofill {
+.adm-input-element:-webkit-autofill {
   background-color: transparent;
 }
 
-.adm-input:disabled {
-  color: var(--disabled-color);
-  cursor: not-allowed;
-  opacity: 1;
-  -webkit-text-fill-color: var(--disabled-color);
-}
-
-.adm-input:read-only {
+.adm-input-element:read-only {
   cursor: default;
 }
 
-.adm-input:invalid {
+.adm-input-element:invalid {
   box-shadow: none;
 }
 
-.adm-input::-ms-clear {
+.adm-input-element::-ms-clear {
   display: none;
 }
 
-.adm-input::-webkit-search-cancel-button {
+.adm-input-element::-webkit-search-cancel-button {
   display: none;
 }
 
-.adm-input::-webkit-search-decoration {
+.adm-input-element::-webkit-search-decoration {
   display: none;
 }
 
-.adm-input[type='date'],
-.adm-input[type='time'],
-.adm-input[type='datetime-local'] {
+.adm-input-element[type='date'],
+.adm-input-element[type='time'],
+.adm-input-element[type='datetime-local'] {
   min-height: 1.5em;
 }
 
-.adm-input[type='search'] {
+.adm-input-element[type='search'] {
   -webkit-appearance: none;
 }
 
-.adm-input[readonly] {
+.adm-input-element[readonly] {
   pointer-events: none;
 }
 
 .adm-input-clear {
   flex: none;
   margin-left: 16px;
-  color: var(--placeholder-color);
-  padding: 6px;
+  color: var(--adm-color-light);
+  padding: 8px;
   cursor: pointer;
 }
 
+.adm-input-clear:active {
+  color: var(--adm-color-weak);
+}
+
 .adm-input-clear .antd-mobile-icon {
   display: block;
-  font-size: 28px;
+  font-size: 30px;
 }

package/2x/es/components/input/input.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { NativeProps } from '../../utils/native-props';
 declare type NativeInputProps = React.DetailedHTMLProps<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>;
-export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength' | 'max' | 'min' | 'autoComplete' | 'pattern' | 'inputMode' | 'type' | 'onFocus' | 'onBlur' | 'autoCapitalize' | 'autoCorrect' | 'onKeyDown' | 'onKeyUp'> & {
+export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength' | 'max' | 'min' | 'autoComplete' | 'pattern' | 'inputMode' | 'type' | 'onFocus' | 'onBlur' | 'autoCapitalize' | 'autoCorrect' | 'onKeyDown' | 'onKeyUp' | 'onCompositionStart' | 'onCompositionEnd'> & {
     value?: string;
     defaultValue?: string;
     onChange?: (val: string) => void;
@@ -13,13 +13,13 @@ export declare type InputProps = Pick<NativeInputProps, 'maxLength' | 'minLength
     id?: string;
     onEnterPress?: (e: React.KeyboardEvent<HTMLInputElement>) => void;
     enterKeyHint?: 'enter' | 'done' | 'go' | 'next' | 'previous' | 'search' | 'send';
-} & NativeProps<'--font-size' | '--color' | '--placeholder-color' | '--disabled-color' | '--text-align'>;
+} & NativeProps<'--font-size' | '--color' | '--placeholder-color' | '--text-align'>;
 export declare type InputRef = {
     clear: () => void;
     focus: () => void;
     blur: () => void;
 };
-export declare const Input: React.ForwardRefExoticComponent<Pick<React.DetailedHTMLProps<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>, "pattern" | "max" | "min" | "type" | "onFocus" | "onBlur" | "onKeyDown" | "onKeyUp" | "autoCapitalize" | "autoCorrect" | "inputMode" | "autoComplete" | "maxLength" | "minLength"> & {
+export declare const Input: React.ForwardRefExoticComponent<Pick<React.DetailedHTMLProps<React.InputHTMLAttributes<HTMLInputElement>, HTMLInputElement>, "pattern" | "max" | "min" | "type" | "onCompositionEnd" | "onCompositionStart" | "onFocus" | "onBlur" | "onKeyDown" | "onKeyUp" | "autoCapitalize" | "autoCorrect" | "inputMode" | "autoComplete" | "maxLength" | "minLength"> & {
     value?: string | undefined;
     defaultValue?: string | undefined;
     onChange?: ((val: string) => void) | undefined;
@@ -31,5 +31,5 @@ export declare const Input: React.ForwardRefExoticComponent<Pick<React.DetailedH
     id?: string | undefined;
     onEnterPress?: ((e: React.KeyboardEvent<HTMLInputElement>) => void) | undefined;
     enterKeyHint?: "enter" | "search" | "done" | "go" | "next" | "previous" | "send" | undefined;
-} & NativeProps<"--color" | "--font-size" | "--placeholder-color" | "--disabled-color" | "--text-align"> & React.RefAttributes<InputRef>>;
+} & NativeProps<"--color" | "--font-size" | "--placeholder-color" | "--text-align"> & React.RefAttributes<InputRef>>;
 export {};

package/2x/es/components/input/input.js

@@ -3,6 +3,7 @@ import { usePropsValue } from '../../utils/use-props-value';
 import { CloseCircleFill } from 'antd-mobile-icons';
 import { withNativeProps } from '../../utils/native-props';
 import { mergeProps } from '../../utils/with-default-props';
+import classNames from 'classnames';
 const classPrefix = `adm-input`;
 const defaultProps = {
   defaultValue: ''
@@ -50,10 +51,10 @@ export const Input = forwardRef((p, ref) => {
     };
   }, [props.enterKeyHint]);
   return withNativeProps(props, React.createElement("div", {
-    className: `${classPrefix}-wrapper`
+    className: classNames(`${classPrefix}`, props.disabled && `${classPrefix}-disabled`)
   }, React.createElement("input", {
     ref: nativeInputRef,
-    className: classPrefix,
+    className: `${classPrefix}-element`,
     value: value,
     onChange: e => {
       setValue(e.target.value);
@@ -85,8 +86,10 @@ export const Input = forwardRef((p, ref) => {
     autoCapitalize: props.autoCapitalize,
     autoCorrect: props.autoCorrect,
     onKeyDown: handleKeydown,
-    onKeyUp: props.onKeyUp
-  }), props.clearable && !!value && hasFocus && React.createElement("div", {
+    onKeyUp: props.onKeyUp,
+    onCompositionStart: props.onCompositionStart,
+    onCompositionEnd: props.onCompositionEnd
+  }), props.clearable && !!value && React.createElement("div", {
     className: `${classPrefix}-clear`,
     onMouseDown: e => {
       e.preventDefault();

package/2x/es/components/jumbo-tabs/jumbo-tabs.css

@@ -1,4 +1,5 @@
 .adm-jumbo-tabs {
+  --gap: 16px;
   position: relative;
 }
 
@@ -14,6 +15,7 @@
   align-items: center;
   position: relative;
   overflow-x: scroll;
+  padding: 0 var(--gap);
   scrollbar-width: none;
 }
 
@@ -23,7 +25,7 @@
 
 .adm-jumbo-tabs-tab-wrapper {
   flex: auto;
-  padding: 0 24px;
+  padding: 0 calc(var(--gap) / 2);
   text-align: center;
 }
 
@@ -42,6 +44,7 @@
 
 .adm-jumbo-tabs-tab-title {
   line-height: 48px;
+  padding: 0 8px;
 }
 
 .adm-jumbo-tabs-tab-description {

package/2x/es/components/list/list-item.js

@@ -13,7 +13,7 @@ export const ListItem = props => {
   }, props.prefix && React.createElement("div", {
     className: `${classPrefix}-content-prefix`
   }, props.prefix), React.createElement("div", {
-    className: classNames(`${classPrefix}-content-main`, (props.title || props.description) && `${classPrefix}-content-main-multi-row`)
+    className: `${classPrefix}-content-main`
   }, props.title && React.createElement("div", {
     className: `${classPrefix}-title`
   }, props.title), props.children, props.description && React.createElement("div", {

package/2x/es/components/list/list.css

@@ -71,10 +71,6 @@
 
 .adm-list-item-content-main {
   flex: auto;
-  padding: 28px 0;
-}
-
-.adm-list-item-content-main.adm-list-item-content-main-multi-row {
   padding: 24px 0;
 }
 
@@ -103,11 +99,11 @@
   pointer-events: none;
 }
 
-a.adm-list-item:active {
+a.adm-list-item:active:not(.adm-list-item-disabled) {
   background-color: var(--active-background-color);
 }
 
-a.adm-list-item:active::after {
+a.adm-list-item:active:not(.adm-list-item-disabled)::after {
   content: ' ';
   display: block;
   position: absolute;
@@ -115,8 +111,4 @@ a.adm-list-item:active::after {
   bottom: -2px;
   left: 0;
   border-bottom: var(--border-inner);
-}
-
-a.adm-list-item.adm-list-item-disabled:active {
-  background-color: unset;
 }

package/2x/es/components/list/list.d.ts

@@ -3,5 +3,5 @@ import { NativeProps } from '../../utils/native-props';
 export declare type ListProps = {
     header?: ReactNode;
     mode?: 'default' | 'card';
-} & NativeProps<'--header-font-size' | '--prefix-width' | '--prefix-padding-right' | '--align-items' | '--active-background-color' | '--border-inner' | '--border-top' | '--border-bottom' | '--padding-left' | '--font-size'>;
+} & NativeProps<'--header-font-size' | '--prefix-width' | '--prefix-padding-right' | '--align-items' | '--active-background-color' | '--border-inner' | '--border-top' | '--border-bottom' | '--padding-left' | '--padding-right' | '--font-size'>;
 export declare const List: FC<ListProps>;

package/2x/es/components/modal/modal.css

@@ -21,22 +21,33 @@
 
 .adm-modal-main {
   width: 100%;
+  max-height: 70vh;
+  box-sizing: border-box;
   font-size: 28px;
   background-color: white;
   border-radius: 16px;
-  overflow: hidden;
+  overflow-x: hidden;
+  overflow-y: auto;
+  display: flex;
+  flex-direction: column;
+}
+
+.adm-modal-main > * {
+  flex: none;
+}
+
+.adm-modal-main > .adm-modal-image-container {
+  flex: auto;
 }
 
 .adm-modal-main .adm-modal-body {
   padding: 40px 24px 24px;
+  display: flex;
+  flex-direction: column;
 }
 
-.adm-modal-main .adm-modal-body .adm-modal-close {
-  position: absolute;
-  right: 24px;
-  top: 24px;
-  color: var(--adm-color-weak);
-  padding: 4px;
+.adm-modal-main .adm-modal-body > * + * {
+  margin-top: 16px;
 }
 
 .adm-modal-main .adm-modal-body-header-wrapper {
@@ -52,38 +63,47 @@
 }
 
 .adm-modal-main .adm-modal-body-content {
-  max-height: 70vh;
-  overflow-x: hidden;
-  overflow-y: auto;
   font-size: 30px;
   line-height: 1.4;
   color: #333;
 }
 
-.adm-modal-main .adm-modal-footer {
+.adm-modal-main .adm-modal-close {
+  position: absolute;
+  right: 16px;
+  top: 16px;
+  color: var(--adm-color-weak);
+  padding: 8px;
+  font-size: 36px;
+}
+
+.adm-modal-footer {
   user-select: none;
   padding: 16px 24px 24px;
 }
 
-.adm-modal-main .adm-modal-footer .adm-modal-button {
-  font-size: 36px;
-  line-height: 50px;
-  border-right: solid 1px var(--adm-border-color);
+.adm-modal-footer.adm-space {
+  --gap-vertical: 40px;
 }
 
-.adm-modal-main .adm-modal-footer .adm-modal-button:last-child {
-  border-right: none;
+.adm-modal-footer .adm-modal-button {
+  font-size: 36px;
+  line-height: 50px;
 }
 
-.adm-modal-main .adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary) {
+.adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary) {
   padding-top: 0;
   padding-bottom: 0;
 }
 
-.adm-modal-main .adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary)::before {
+.adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary)::before {
   display: none;
 }
 
-.adm-modal-main .adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary):active {
+.adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary):active {
   opacity: 0.7;
+}
+
+.adm-modal-image-container {
+  overflow-y: auto;
 }