antd-mobile 5.0.0-rc.19 → 5.0.0-rc.22

package/2x/README.md

@@ -30,7 +30,7 @@ If you have some question about how to use ant-mobile, you can start a [discussi
 
 Feel free to join our DingDing group:
 
-<img src="https://gw.alipayobjects.com/mdn/rms_25513e/afts/img/A*wy8nQLwxbKYAAAAAAAAAAAAAARQnAQ" alt="ding-group" width="360" /><img src="https://gw.alipayobjects.com/mdn/rms_25513e/afts/img/A*fo-tQ5wRk5QAAAAAAAAAAAAAARQnAQ" alt="ding-group" width="360" />
+<img src="https://gw.alipayobjects.com/mdn/rms_25513e/afts/img/A*hBjlR4nUWjkAAAAAAAAAAAAAARQnAQ" alt="ding-group" width="250" />
 
 ---
 

package/2x/cjs/components/avatar/avatar.d.ts

@@ -5,5 +5,5 @@ export declare type AvatarProps = {
     src: string;
     fallback?: ReactNode;
     fit?: 'contain' | 'cover' | 'fill' | 'none' | 'scale-down';
-} & Pick<ImageProps, 'alt' | 'lazy' | 'onClick' | 'onError'> & NativeProps<'--size'>;
+} & Pick<ImageProps, 'alt' | 'lazy' | 'onClick' | 'onError'> & NativeProps<'--size' | '--border-radius'>;
 export declare const Avatar: FC<AvatarProps>;

package/2x/cjs/components/badge/badge.css

@@ -14,7 +14,7 @@
   border-radius: 200px;
   padding: 0 8px;
   font-size: 18px;
-  line-height: 1.2;
+  line-height: 28px;
   white-space: nowrap;
   background-color: var(--color);
   --right: 0;

package/2x/cjs/components/button/button.css

@@ -30,8 +30,9 @@
 
 .adm-button::before {
   position: absolute;
-  top: calc(var(--border-width) * -1);
-  left: calc(var(--border-width) * -1);
+  top: 0;
+  left: 0;
+  transform: translate(calc(var(--border-width) * -1), calc(var(--border-width) * -1));
   width: 100%;
   height: 100%;
   background-color: #000;
@@ -53,7 +54,7 @@
 
 .adm-button-default.adm-button-fill-none {
   --background-color: transparent;
-  --border-color: transparent;
+  --border-width: 0;
 }
 
 .adm-button:not(.adm-button-default) {

package/2x/cjs/components/calendar/calendar.js

@@ -21,12 +21,16 @@ var _arrowLeftDouble = require("./arrow-left-double");
 
 var _configProvider = require("../config-provider");
 
+var _isoWeek = _interopRequireDefault(require("dayjs/plugin/isoWeek"));
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
+_dayjs.default.extend(_isoWeek.default);
+
 const classPrefix = 'adm-calendar';
 const defaultProps = {
   weekStartsOn: 'Sunday'

package/2x/cjs/components/capsule-tabs/capsule-tabs.css

@@ -33,7 +33,7 @@
   margin: 0 auto;
   border-radius: 40px;
   cursor: pointer;
-  font-size: var(--adm-font-size-main);
+  font-size: 30px;
   text-align: center;
   white-space: nowrap;
   background-color: #f5f5f5;

package/2x/cjs/components/check-list/check-list.css

@@ -1,7 +1,3 @@
-.adm-check-list-item .adm-list-item-content-main {
-  padding: 24px 0;
-}
-
 .adm-check-list-item-extra {
   font-size: 32px;
   line-height: 1;

package/2x/cjs/components/checkbox/checkbox.css

@@ -15,7 +15,7 @@
 
 .adm-checkbox .adm-checkbox-icon {
   flex: none;
-  border: 2px solid #ccc;
+  border: 2px solid var(--adm-color-light);
   border-radius: var(--icon-size);
   box-sizing: border-box;
   display: flex;
@@ -45,22 +45,13 @@
 }
 
 .adm-checkbox.adm-checkbox-disabled .adm-checkbox-content {
-  color: var(--adm-color-weak);
+  opacity: 0.4;
 }
 
-.adm-checkbox.adm-checkbox-disabled.adm-checkbox-indeterminate .adm-checkbox-icon {
-  color: #ccc;
-  border-color: #ccc;
-  background-color: #ebedf0;
-}
-
-.adm-checkbox.adm-checkbox-disabled.adm-checkbox-checked .adm-checkbox-icon {
-  color: #ccc;
-}
-
-.adm-checkbox.adm-checkbox-disabled .adm-checkbox-icon {
-  border-color: #ccc;
-  background-color: #ebedf0;
+.adm-checkbox.adm-checkbox-disabled .adm-checkbox-icon.adm-checkbox-icon {
+  color: #b7b7b7;
+  border-color: var(--adm-color-light);
+  background-color: #f5f5f5;
 }
 
 .adm-checkbox .adm-checkbox-custom-icon {
@@ -68,7 +59,6 @@
 }
 
 .adm-checkbox.adm-checkbox-indeterminate .adm-checkbox-icon {
-  border-color: var(--adm-color-primary);
   background-color: #ffffff;
   color: var(--adm-color-primary);
 }

package/2x/cjs/components/checkbox/checkbox.js

@@ -94,7 +94,7 @@ const Checkbox = p => {
 
   return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("label", {
     className: (0, _classnames.default)(classPrefix, {
-      [`${classPrefix}-checked`]: checked,
+      [`${classPrefix}-checked`]: checked && !props.indeterminate,
       [`${classPrefix}-indeterminate`]: props.indeterminate,
       [`${classPrefix}-disabled`]: disabled,
       [`${classPrefix}-block`]: props.block

package/2x/cjs/components/date-picker/date-picker.d.ts

@@ -3,8 +3,8 @@ import type { PickerProps } from '../picker';
 import { NativeProps } from '../../utils/native-props';
 import type { Precision, DatePickerFilter } from './date-picker-utils';
 export declare type DatePickerProps = Pick<PickerProps, 'onCancel' | 'onClose' | 'visible' | 'confirmText' | 'cancelText' | 'getContainer' | 'afterShow' | 'afterClose' | 'onClick' | 'title' | 'stopPropagation'> & {
-    value?: Date;
-    defaultValue?: Date;
+    value?: Date | null;
+    defaultValue?: Date | null;
     onSelect?: (value: Date) => void;
     onConfirm?: (value: Date) => void;
     min?: Date;

package/2x/cjs/components/dialog/dialog-action-button.js

@@ -49,6 +49,7 @@ const DialogActionButton = props => {
       'adm-dialog-button-bold': action.bold
     }),
     fill: 'none',
+    shape: 'rectangular',
     block: true,
     color: action.danger ? 'danger' : 'primary',
     loading: loading,

package/2x/cjs/components/dialog/dialog.css

@@ -20,10 +20,21 @@
 
 .adm-dialog-main {
   width: 100%;
+  max-height: 70vh;
   font-size: 28px;
   background-color: white;
   border-radius: 16px;
   overflow: hidden;
+  display: flex;
+  flex-direction: column;
+}
+
+.adm-dialog-main > * {
+  flex: none;
+}
+
+.adm-dialog-main > .adm-dialog-image-container {
+  flex: auto;
 }
 
 .adm-dialog-main .adm-dialog-body {
@@ -79,4 +90,8 @@
 
 .adm-dialog-main .adm-dialog-footer .adm-dialog-action-row > .adm-dialog-button:last-child {
   border-right: none;
+}
+
+.adm-dialog-image-container {
+  overflow-y: auto;
 }

package/2x/cjs/components/dialog/dialog.js

@@ -97,11 +97,13 @@ const Dialog = p => {
     style: Object.assign({}, style),
     onClick: e => e.stopPropagation(),
     className: `${classPrefix}-main`
-  }, !!props.image && _react.default.createElement(_image.default, {
+  }, !!props.image && _react.default.createElement("div", {
+    className: `${classPrefix}-image-container`
+  }, _react.default.createElement(_image.default, {
     src: props.image,
     alt: 'dialog header image',
     width: '100%'
-  }), _react.default.createElement("div", {
+  })), _react.default.createElement("div", {
     style: props.bodyStyle,
     className: (0, _classnames.default)(`${classPrefix}-body`, props.bodyClassName)
   }, _react.default.createElement(_space.default, {

package/2x/cjs/components/error-block/error-block.d.ts

@@ -6,5 +6,5 @@ export declare type ErrorBlockProps = {
     image?: string | ReactElement;
     description?: ReactNode;
     fullPage?: boolean;
-} & NativeProps<'--image-height' | '--image-height-full-page'>;
+} & NativeProps<'--image-height' | '--image-height-full-page' | '--image-width' | '--image-width-full-page'>;
 export declare const ErrorBlock: FC<ErrorBlockProps>;

package/2x/cjs/components/floating-panel/floating-panel.d.ts

@@ -3,6 +3,7 @@ import { NativeProps } from '../../utils/native-props';
 export declare type FloatingPanelProps = {
     anchors: number[];
     children: ReactNode;
+    onHeightChange?: (height: number, animating: boolean) => void;
 } & NativeProps<'--border-radius' | '--z-index'>;
 export declare type FloatingPanelRef = {
     setHeight: (height: number, options?: {
@@ -12,4 +13,5 @@ export declare type FloatingPanelRef = {
 export declare const FloatingPanel: React.ForwardRefExoticComponent<{
     anchors: number[];
     children: ReactNode;
+    onHeightChange?: ((height: number, animating: boolean) => void) | undefined;
 } & NativeProps<"--z-index" | "--border-radius"> & React.RefAttributes<FloatingPanelRef>>;

package/2x/cjs/components/floating-panel/floating-panel.js

@@ -44,6 +44,11 @@ const FloatingPanel = (0, _react.forwardRef)((props, ref) => {
     y: bounds.bottom,
     config: {
       tension: 300
+    },
+    onChange: result => {
+      var _a;
+
+      (_a = props.onHeightChange) === null || _a === void 0 ? void 0 : _a.call(props, result.value.y, y.isAnimating);
     }
   }));
   (0, _react2.useDrag)(state => {

package/2x/cjs/components/form/form-item.css

@@ -35,6 +35,11 @@
   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/cjs/components/form/form.css

@@ -1,5 +1,15 @@
 .adm-form .adm-list.adm-list {
   --padding-left: 40px;
+  --padding-right: 40px;
+}
+
+.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 {

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

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

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

@@ -1,5 +1,15 @@
 .adm-form .adm-list.adm-list {
   --padding-left: 40px;
+  --padding-right: 40px;
+}
+
+.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 {
@@ -43,6 +53,11 @@
   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/cjs/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/cjs/components/image/image.js

@@ -61,8 +61,11 @@ const Image = (0, _stagedComponents.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/cjs/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/cjs/components/input/input.d.ts

@@ -13,7 +13,7 @@ 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;
@@ -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/cjs/components/input/input.js

@@ -15,6 +15,10 @@ var _nativeProps = require("../../utils/native-props");
 
 var _withDefaultProps = require("../../utils/with-default-props");
 
+var _classnames = _interopRequireDefault(require("classnames"));
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
@@ -66,10 +70,10 @@ const Input = (0, _react.forwardRef)((p, ref) => {
     };
   }, [props.enterKeyHint]);
   return (0, _nativeProps.withNativeProps)(props, _react.default.createElement("div", {
-    className: `${classPrefix}-wrapper`
+    className: (0, _classnames.default)(`${classPrefix}`, props.disabled && `${classPrefix}-disabled`)
   }, _react.default.createElement("input", {
     ref: nativeInputRef,
-    className: classPrefix,
+    className: `${classPrefix}-element`,
     value: value,
     onChange: e => {
       setValue(e.target.value);
@@ -102,7 +106,7 @@ const Input = (0, _react.forwardRef)((p, ref) => {
     autoCorrect: props.autoCorrect,
     onKeyDown: handleKeydown,
     onKeyUp: props.onKeyUp
-  }), props.clearable && !!value && hasFocus && _react.default.createElement("div", {
+  }), props.clearable && !!value && _react.default.createElement("div", {
     className: `${classPrefix}-clear`,
     onMouseDown: e => {
       e.preventDefault();

package/2x/cjs/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/cjs/components/list/list-item.js

@@ -28,7 +28,7 @@ const ListItem = props => {
   }, props.prefix && _react.default.createElement("div", {
     className: `${classPrefix}-content-prefix`
   }, props.prefix), _react.default.createElement("div", {
-    className: (0, _classnames.default)(`${classPrefix}-content-main`, (props.title || props.description) && `${classPrefix}-content-main-multi-row`)
+    className: `${classPrefix}-content-main`
   }, props.title && _react.default.createElement("div", {
     className: `${classPrefix}-title`
   }, props.title), props.children, props.description && _react.default.createElement("div", {

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

@@ -8,6 +8,7 @@
   --border-top: solid 2px var(--adm-border-color);
   --border-bottom: solid 2px var(--adm-border-color);
   --padding-left: 24px;
+  --padding-right: 24px;
   --font-size: 34px;
 }
 
@@ -15,6 +16,7 @@
   color: var(--adm-color-weak);
   font-size: var(--header-font-size);
   padding-left: var(--padding-left);
+  padding-right: var(--padding-right);
   margin: 32px 0 8px;
 }
 
@@ -57,8 +59,8 @@
   display: flex;
   align-items: var(--align-items);
   justify-content: flex-start;
-  padding: 0 24px;
   border-top: var(--border-inner);
+  padding-right: var(--padding-right);
 }
 
 .adm-list-item-content-prefix {
@@ -69,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;
 }
 

package/2x/cjs/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/cjs/components/modal/modal.css

@@ -21,10 +21,21 @@
 
 .adm-modal-main {
   width: 100%;
+  max-height: 70vh;
   font-size: 28px;
   background-color: white;
   border-radius: 16px;
   overflow: hidden;
+  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 {
@@ -86,4 +97,8 @@
 
 .adm-modal-main .adm-modal-footer .adm-modal-button:not(.adm-modal-button-primary):active {
   opacity: 0.7;
+}
+
+.adm-modal-image-container {
+  overflow-y: auto;
 }

package/2x/cjs/components/modal/modal.js

@@ -100,11 +100,13 @@ const Modal = p => {
     style: Object.assign({}, style),
     onClick: e => e.stopPropagation(),
     className: `${classPrefix}-main`
-  }, !!props.image && _react.default.createElement(_image.default, {
+  }, !!props.image && _react.default.createElement("div", {
+    className: `${classPrefix}-image-container`
+  }, _react.default.createElement(_image.default, {
     src: props.image,
     alt: 'modal header image',
     width: '100%'
-  }), _react.default.createElement("div", {
+  })), _react.default.createElement("div", {
     style: props.bodyStyle,
     className: (0, _classnames.default)(`${classPrefix}-body`, props.bodyClassName)
   }, props.showCloseButton && _react.default.createElement("a", {

package/2x/cjs/components/nav-bar/nav-bar.css

@@ -24,14 +24,14 @@
 .adm-nav-bar-back {
   display: flex;
   align-items: center;
-  margin-right: 24px;
+  margin-right: 32px;
   padding: 12px 0;
   cursor: pointer;
 }
 
 .adm-nav-bar-back-arrow {
-  font-size: 36px;
-  margin-right: 12px;
+  font-size: 48px;
+  margin-right: 8px;
 }
 
 .adm-nav-bar-left {