@douyinfe/semi-ui 2.10.4 → 2.10.5

package/lib/es/modal/ModalContent.d.ts

@@ -14,6 +14,7 @@ export default class ModalContent extends BaseComponent<ModalContentReactProps,
         contentClassName: PropTypes.Requireable<string>;
         maskClassName: PropTypes.Requireable<string>;
         onAnimationEnd: PropTypes.Requireable<(...args: any[]) => any>;
+        preventScroll: PropTypes.Requireable<boolean>;
     };
     static defaultProps: {
         close: (...args: any[]) => void;

package/lib/es/modal/ModalContent.js

@@ -257,6 +257,9 @@ export default class ModalContent extends BaseComponent {
       },
       getMouseState: () => this.state.dialogMouseDown,
       modalDialogFocus: () => {
+        const {
+          preventScroll
+        } = this.props;
         let activeElementInDialog;
 
         if (this.modalDialogRef) {
@@ -265,7 +268,9 @@ export default class ModalContent extends BaseComponent {
         }
 
         if (!activeElementInDialog) {
-          this.modalDialogRef && this.modalDialogRef.current.focus();
+          this.modalDialogRef && this.modalDialogRef.current.focus({
+            preventScroll
+          });
         }
       },
       modalDialogBlur: () => {
@@ -275,10 +280,15 @@ export default class ModalContent extends BaseComponent {
         const {
           prevFocusElement
         } = this.state;
+        const {
+          preventScroll
+        } = this.props;
 
         const focus = _get(prevFocusElement, 'focus');
 
-        _isFunction(focus) && prevFocusElement.focus();
+        _isFunction(focus) && prevFocusElement.focus({
+          preventScroll
+        });
       }
     });
   }
@@ -333,7 +343,8 @@ ModalContent.propTypes = {
   getContainerContext: PropTypes.func,
   contentClassName: PropTypes.string,
   maskClassName: PropTypes.string,
-  onAnimationEnd: PropTypes.func
+  onAnimationEnd: PropTypes.func,
+  preventScroll: PropTypes.bool
 };
 ModalContent.defaultProps = {
   close: _noop,

package/lib/es/modal/confirm.d.ts

@@ -48,6 +48,7 @@ export declare function withInfo(props: ModalReactProps): {
     keepDOM?: boolean;
     direction?: any;
     fullScreen?: boolean;
+    preventScroll?: boolean;
     type: "info";
 };
 export declare function withSuccess(props: ModalReactProps): {
@@ -90,6 +91,7 @@ export declare function withSuccess(props: ModalReactProps): {
     keepDOM?: boolean;
     direction?: any;
     fullScreen?: boolean;
+    preventScroll?: boolean;
     type: "success";
 };
 export declare function withWarning(props: ModalReactProps): {
@@ -132,6 +134,7 @@ export declare function withWarning(props: ModalReactProps): {
     keepDOM?: boolean;
     direction?: any;
     fullScreen?: boolean;
+    preventScroll?: boolean;
     type: "warning";
 };
 export declare function withError(props: ModalReactProps): {
@@ -174,6 +177,7 @@ export declare function withError(props: ModalReactProps): {
     keepDOM?: boolean;
     direction?: any;
     fullScreen?: boolean;
+    preventScroll?: boolean;
     type: "error";
 };
 export declare function withConfirm(props: ModalReactProps): {
@@ -216,5 +220,6 @@ export declare function withConfirm(props: ModalReactProps): {
     keepDOM?: boolean;
     direction?: any;
     fullScreen?: boolean;
+    preventScroll?: boolean;
     type: "confirm";
 };

package/lib/es/radio/radio.d.ts

@@ -29,6 +29,10 @@ export declare type RadioProps = {
     addonClassName?: string;
     type?: RadioType;
     'aria-label'?: React.AriaAttributes['aria-label'];
+    addonId?: string;
+    extraId?: string;
+    name?: string;
+    preventScroll?: boolean;
 };
 export interface RadioState {
     hover?: boolean;
@@ -55,6 +59,7 @@ declare class Radio extends BaseComponent<RadioProps, RadioState> {
         addonClassName: PropTypes.Requireable<string>;
         type: PropTypes.Requireable<"default" | "button" | "card" | "pureCard">;
         'aria-label': PropTypes.Requireable<string>;
+        preventScroll: PropTypes.Requireable<boolean>;
     };
     static defaultProps: Partial<RadioProps>;
     radioEntity: RadioInner;

package/lib/es/radio/radio.js

@@ -199,7 +199,8 @@ Radio.propTypes = {
   addonStyle: PropTypes.object,
   addonClassName: PropTypes.string,
   type: PropTypes.oneOf([strings.TYPE_DEFAULT, strings.TYPE_BUTTON, strings.TYPE_CARD, strings.TYPE_PURECARD]),
-  'aria-label': PropTypes.string
+  'aria-label': PropTypes.string,
+  preventScroll: PropTypes.bool
 };
 Radio.defaultProps = {
   autoFocus: false,

package/lib/es/radio/radioInner.d.ts

@@ -17,6 +17,10 @@ export interface RadioInnerProps extends BaseProps {
     addonId?: string;
     extraId?: string;
     'aria-label'?: React.AriaAttributes['aria-label'];
+    focusInner?: boolean;
+    onInputFocus?: (e: any) => void;
+    onInputBlur?: (e: any) => void;
+    preventScroll?: boolean;
 }
 interface RadioInnerState {
     checked?: boolean;
@@ -30,6 +34,10 @@ declare class RadioInner extends BaseComponent<RadioInnerProps, RadioInnerState>
         onChange: PropTypes.Requireable<(...args: any[]) => any>;
         mode: PropTypes.Requireable<string>;
         'aria-label': PropTypes.Requireable<string>;
+        focusInner: PropTypes.Requireable<boolean>;
+        onInputFocus: PropTypes.Requireable<(...args: any[]) => any>;
+        onInputBlur: PropTypes.Requireable<(...args: any[]) => any>;
+        preventScroll: PropTypes.Requireable<boolean>;
     };
     static defaultProps: {
         onChange: (...args: any[]) => void;

package/lib/es/radio/radioInner.js

@@ -54,7 +54,12 @@ class RadioInner extends BaseComponent {
   }
 
   focus() {
-    this.inputEntity.focus();
+    const {
+      preventScroll
+    } = this.props;
+    this.inputEntity.focus({
+      preventScroll
+    });
   }
 
   onChange(e) {
@@ -116,7 +121,11 @@ RadioInner.propTypes = {
   isButtonRadio: PropTypes.bool,
   onChange: PropTypes.func,
   mode: PropTypes.oneOf(['advanced', '']),
-  'aria-label': PropTypes.string
+  'aria-label': PropTypes.string,
+  focusInner: PropTypes.bool,
+  onInputFocus: PropTypes.func,
+  onInputBlur: PropTypes.func,
+  preventScroll: PropTypes.bool
 };
 RadioInner.defaultProps = {
   onChange: _noop,

package/lib/es/rating/index.d.ts

@@ -34,6 +34,7 @@ export interface RatingProps {
     size?: 'small' | 'default' | number;
     tooltips?: string[];
     id?: string;
+    preventScroll?: boolean;
 }
 export interface RatingState {
     value: number;
@@ -70,6 +71,7 @@ export default class Rating extends BaseComponent<RatingProps, RatingState> {
         size: PropTypes.Requireable<number | "default" | "small">;
         tooltips: PropTypes.Requireable<string[]>;
         id: PropTypes.Requireable<string>;
+        preventScroll: PropTypes.Requireable<boolean>;
     };
     static defaultProps: {
         defaultValue: number;

package/lib/es/rating/index.js

@@ -48,11 +48,14 @@ export default class Rating extends BaseComponent {
 
     this.focus = () => {
       const {
-        disabled
+        disabled,
+        preventScroll
       } = this.props;
 
       if (!disabled) {
-        this.rate.focus();
+        this.rate.focus({
+          preventScroll
+        });
       }
     };
 
@@ -99,11 +102,14 @@ export default class Rating extends BaseComponent {
     return _Object$assign(_Object$assign({}, super.adapter), {
       focus: () => {
         const {
-          disabled
+          disabled,
+          preventScroll
         } = this.props;
 
         if (!disabled) {
-          this.rate.focus();
+          this.rate.focus({
+            preventScroll
+          });
         }
       },
       getStarDOM: index => {
@@ -279,7 +285,8 @@ Rating.propTypes = {
   autoFocus: PropTypes.bool,
   size: PropTypes.oneOfType([PropTypes.oneOf(strings.SIZE_SET), PropTypes.number]),
   tooltips: PropTypes.arrayOf(PropTypes.string),
-  id: PropTypes.string
+  id: PropTypes.string,
+  preventScroll: PropTypes.bool
 };
 Rating.defaultProps = {
   defaultValue: 0,

package/lib/es/rating/item.d.ts

@@ -16,6 +16,13 @@ export interface RatingItemProps {
     count: number;
     size: number | ArrayElement<typeof strings.SIZE_SET>;
     'aria-describedby'?: React.AriaAttributes['aria-describedby'];
+    onFocus?: (e: React.FocusEvent) => void;
+    onBlur?: (e: React.FocusEvent) => void;
+    preventScroll?: boolean;
+}
+export interface RatingItemState {
+    firstStarFocus: boolean;
+    secondStarFocus: boolean;
 }
 export default class Item extends PureComponent<RatingItemProps> {
     static propTypes: {
@@ -31,6 +38,9 @@ export default class Item extends PureComponent<RatingItemProps> {
         count: PropTypes.Requireable<number>;
         size: PropTypes.Requireable<number | "default" | "small">;
         'aria-describedby': PropTypes.Requireable<string>;
+        onFocus: PropTypes.Requireable<(...args: any[]) => any>;
+        onBlur: PropTypes.Requireable<(...args: any[]) => any>;
+        preventScroll: PropTypes.Requireable<boolean>;
     };
     onHover: React.MouseEventHandler;
     onClick: React.MouseEventHandler;

package/lib/es/rating/item.js

@@ -115,5 +115,8 @@ Item.propTypes = {
   disabled: PropTypes.bool,
   count: PropTypes.number,
   size: PropTypes.oneOfType([PropTypes.oneOf(strings.SIZE_SET), PropTypes.number]),
-  'aria-describedby': PropTypes.string
+  'aria-describedby': PropTypes.string,
+  onFocus: PropTypes.func,
+  onBlur: PropTypes.func,
+  preventScroll: PropTypes.bool
 };

package/lib/es/select/index.d.ts

@@ -122,6 +122,7 @@ export declare type SelectProps = {
     onBlur?: (e: React.FocusEvent) => void;
     onListScroll?: (e: React.UIEvent<HTMLDivElement>) => void;
     children?: React.ReactNode;
+    preventScroll?: boolean;
 } & Pick<TooltipProps, 'spacing' | 'getPopupContainer' | 'motion' | 'autoAdjustOverflow' | 'mouseLeaveDelay' | 'mouseEnterDelay' | 'stopPropagation'> & React.RefAttributes<any>;
 export interface SelectState {
     isOpen: boolean;
@@ -214,6 +215,7 @@ declare class Select extends BaseComponent<SelectProps, SelectState> {
         renderOptionItem: PropTypes.Requireable<(...args: any[]) => any>;
         onListScroll: PropTypes.Requireable<(...args: any[]) => any>;
         arrowIcon: PropTypes.Requireable<PropTypes.ReactNodeLike>;
+        preventScroll: PropTypes.Requireable<boolean>;
     };
     static defaultProps: Partial<SelectProps>;
     inputRef: React.RefObject<HTMLInputElement>;

package/lib/es/select/index.js

@@ -129,8 +129,14 @@ class Select extends BaseComponent {
         });
       },
       focusInput: () => {
+        const {
+          preventScroll
+        } = this.props;
+
         if (this.inputRef && this.inputRef.current) {
-          this.inputRef.current.focus();
+          this.inputRef.current.focus({
+            preventScroll
+          });
         }
       }
     };
@@ -282,8 +288,13 @@ class Select extends BaseComponent {
       },
       focusTrigger: () => {
         try {
+          const {
+            preventScroll
+          } = this.props;
           const el = this.triggerRef.current;
-          el.focus();
+          el.focus({
+            preventScroll
+          });
         } catch (error) {}
       },
       updateScrollTop: index => {
@@ -1080,7 +1091,8 @@ Select.propTypes = {
   virtualize: PropTypes.object,
   renderOptionItem: PropTypes.func,
   onListScroll: PropTypes.func,
-  arrowIcon: PropTypes.node // open: PropTypes.bool,
+  arrowIcon: PropTypes.node,
+  preventScroll: PropTypes.bool // open: PropTypes.bool,
   // tagClosable: PropTypes.bool,
 
 };

package/lib/es/tabs/index.d.ts

@@ -33,6 +33,7 @@ declare class Tabs extends BaseComponent<TabsProps, TabsState> {
         tabPosition: PropTypes.Requireable<string>;
         type: PropTypes.Requireable<string>;
         onTabClose: PropTypes.Requireable<(...args: any[]) => any>;
+        preventScroll: PropTypes.Requireable<boolean>;
     };
     static defaultProps: TabsProps;
     contentRef: RefObject<HTMLDivElement>;

package/lib/es/tabs/index.js

@@ -358,7 +358,8 @@ Tabs.propTypes = {
   tabPaneMotion: PropTypes.oneOfType([PropTypes.bool, PropTypes.object, PropTypes.func]),
   tabPosition: PropTypes.oneOf(strings.POSITION_MAP),
   type: PropTypes.oneOf(strings.TYPE_MAP),
-  onTabClose: PropTypes.func
+  onTabClose: PropTypes.func,
+  preventScroll: PropTypes.bool
 };
 Tabs.defaultProps = {
   children: [],

package/lib/es/tabs/interface.d.ts

@@ -32,6 +32,7 @@ export interface TabsProps {
     tabPosition?: TabPosition;
     type?: TabType;
     onTabClose?: (tabKey: string) => void;
+    preventScroll?: boolean;
 }
 export interface TabBarProps {
     activeKey?: string;

package/lib/es/tagInput/index.d.ts

@@ -43,6 +43,7 @@ export interface TagInputProps {
     value?: string[] | undefined;
     autoFocus?: boolean;
     'aria-label'?: string;
+    preventScroll?: boolean;
 }
 export interface TagInputState {
     tagsArray?: string[];
@@ -86,6 +87,7 @@ declare class TagInput extends BaseComponent<TagInputProps, TagInputState> {
         prefix: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         suffix: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         'aria-label': PropTypes.Requireable<string>;
+        preventScroll: PropTypes.Requireable<boolean>;
     };
     static defaultProps: {
         showClear: boolean;

package/lib/es/tagInput/index.js

@@ -144,11 +144,14 @@ class TagInput extends BaseComponent {
   componentDidMount() {
     const {
       disabled,
-      autoFocus
+      autoFocus,
+      preventScroll
     } = this.props;
 
     if (!disabled && autoFocus) {
-      this.inputRef.current.focus();
+      this.inputRef.current.focus({
+        preventScroll
+      });
     }
   }
 
@@ -298,7 +301,12 @@ class TagInput extends BaseComponent {
   }
 
   focus() {
-    this.inputRef.current.focus();
+    const {
+      preventScroll
+    } = this.props;
+    this.inputRef.current.focus({
+      preventScroll
+    });
   }
 
   render() {
@@ -398,7 +406,8 @@ TagInput.propTypes = {
   validateStatus: PropTypes.oneOf(strings.STATUS),
   prefix: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
   suffix: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
-  'aria-label': PropTypes.string
+  'aria-label': PropTypes.string,
+  preventScroll: PropTypes.bool
 };
 TagInput.defaultProps = {
   showClear: false,

package/lib/es/timePicker/TimeInput.d.ts

@@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
 import BaseComponent, { BaseProps } from '../_base/baseComponent';
 import InputFoundation, { TimeInputAdapter } from '@douyinfe/semi-foundation/lib/es/timePicker/inputFoundation';
 import { TimePickerProps } from './TimePicker';
-export declare type TimeInputProps = Pick<TimePickerProps, 'value' | 'format' | 'prefixCls' | 'placeholder' | 'clearText' | 'inputReadOnly' | 'disabled' | 'type' | 'timeZone' | 'defaultOpen' | 'disabledHours' | 'disabledMinutes' | 'disabledSeconds' | 'dateFnsLocale' | 'onFocus' | 'onBlur' | 'focusOnOpen' | 'locale' | 'localeCode' | 'insetLabel' | 'validateStatus'> & BaseProps & {
+export declare type TimeInputProps = Pick<TimePickerProps, 'value' | 'format' | 'prefixCls' | 'placeholder' | 'clearText' | 'inputReadOnly' | 'disabled' | 'type' | 'timeZone' | 'defaultOpen' | 'disabledHours' | 'disabledMinutes' | 'disabledSeconds' | 'dateFnsLocale' | 'onFocus' | 'onBlur' | 'focusOnOpen' | 'locale' | 'localeCode' | 'insetLabel' | 'validateStatus' | 'preventScroll'> & BaseProps & {
     onChange?: (value: string) => void;
     onEsc?: () => void;
     onClick?: React.MouseEventHandler;
@@ -38,6 +38,7 @@ declare class TimeInput extends BaseComponent<TimeInputProps, any> {
         localeCode: PropTypes.Requireable<string>;
         insetLabel: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         validateStatus: PropTypes.Requireable<string>;
+        preventScroll: PropTypes.Requireable<boolean>;
     };
     static defaultProps: {
         inputReadOnly: boolean;

package/lib/es/timePicker/TimeInput.js

@@ -48,7 +48,8 @@ class TimeInput extends BaseComponent {
   componentDidMount() {
     super.componentDidMount();
     const {
-      focusOnOpen
+      focusOnOpen,
+      preventScroll
     } = this.props;
 
     if (focusOnOpen) {
@@ -57,7 +58,9 @@ class TimeInput extends BaseComponent {
         const inputNode = this.adapter.getCache('inputNode');
 
         if (inputNode) {
-          inputNode.focus();
+          inputNode.focus({
+            preventScroll
+          });
           inputNode.select();
         }
       });
@@ -186,7 +189,8 @@ TimeInput.propTypes = {
   locale: PropTypes.object,
   localeCode: PropTypes.string,
   insetLabel: PropTypes.node,
-  validateStatus: PropTypes.string
+  validateStatus: PropTypes.string,
+  preventScroll: PropTypes.bool
 };
 TimeInput.defaultProps = {
   inputReadOnly: false,

package/lib/es/timePicker/TimePicker.d.ts

@@ -54,6 +54,7 @@ export declare type TimePickerProps = {
     popupStyle?: React.CSSProperties;
     position?: Position;
     prefixCls?: string;
+    preventScroll?: boolean;
     rangeSeparator?: string;
     scrollItemProps?: ScrollItemProps<any>;
     secondStep?: number;
@@ -88,6 +89,7 @@ export default class TimePicker extends BaseComponent<TimePickerProps, TimePicke
     static contextType: React.Context<import("../configProvider/context").ContextValue>;
     static propTypes: {
         inputStyle: PropTypes.Requireable<object>;
+        preventScroll: PropTypes.Requireable<boolean>;
         panelHeader: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         panelFooter: PropTypes.Requireable<PropTypes.ReactNodeLike>;
         'aria-labelledby': PropTypes.Requireable<string>;

package/lib/es/timePicker/TimePicker.js

@@ -441,7 +441,8 @@ TimePicker.propTypes = _Object$assign(_Object$assign({
   motion: PropTypes.oneOfType([PropTypes.bool, PropTypes.func, PropTypes.object]),
   autoAdjustOverflow: PropTypes.bool
 }, PanelShape), {
-  inputStyle: PropTypes.object
+  inputStyle: PropTypes.object,
+  preventScroll: PropTypes.bool
 });
 TimePicker.defaultProps = _Object$assign({
   autoAdjustOverflow: true,

package/lib/es/timePicker/index.d.ts

@@ -9,6 +9,7 @@ export declare type LocalePickerProps = BasePickerProps;
 export default class LocaleTimePicker extends React.PureComponent<LocalePickerProps> {
     static propTypes: {
         inputStyle: import("prop-types").Requireable<object>;
+        preventScroll: import("prop-types").Requireable<boolean>;
         panelHeader: import("prop-types").Requireable<import("prop-types").ReactNodeLike>;
         panelFooter: import("prop-types").Requireable<import("prop-types").ReactNodeLike>;
         'aria-labelledby': import("prop-types").Requireable<string>;

package/lib/es/tooltip/index.d.ts

@@ -53,6 +53,8 @@ export interface TooltipProps extends BaseProps {
     guardFocus?: boolean;
     returnFocusOnClose?: boolean;
     onEscKeyDown?: (e: React.KeyboardEvent) => void;
+    wrapperId?: string;
+    preventScroll?: boolean;
 }
 interface TooltipState {
     visible: boolean;
@@ -108,6 +110,7 @@ export default class Tooltip extends BaseComponent<TooltipProps, TooltipState> {
         wrapWhenSpecial: PropTypes.Requireable<boolean>;
         guardFocus: PropTypes.Requireable<boolean>;
         returnFocusOnClose: PropTypes.Requireable<boolean>;
+        preventScroll: PropTypes.Requireable<boolean>;
     };
     static defaultProps: {
         arrowBounding: {

package/lib/es/tooltip/index.js

@@ -554,10 +554,16 @@ export default class Tooltip extends BaseComponent {
         return getActiveElement();
       },
       setInitialFocus: () => {
+        const {
+          preventScroll
+        } = this.props;
+
         const focusRefNode = _get(this, 'initialFocusRef.current');
 
         if (focusRefNode && 'focus' in focusRefNode) {
-          focusRefNode.focus();
+          focusRefNode.focus({
+            preventScroll
+          });
         }
       },
       notifyEscKeydown: event => {
@@ -707,7 +713,8 @@ Tooltip.propTypes = {
   role: PropTypes.string,
   wrapWhenSpecial: PropTypes.bool,
   guardFocus: PropTypes.bool,
-  returnFocusOnClose: PropTypes.bool
+  returnFocusOnClose: PropTypes.bool,
+  preventScroll: PropTypes.bool
 };
 Tooltip.defaultProps = {
   arrowBounding: numbers.ARROW_BOUNDING,

package/lib/es/tree/index.d.ts

@@ -73,6 +73,7 @@ declare class Tree extends BaseComponent<TreeProps, TreeState> {
         labelEllipsis: PropTypes.Requireable<boolean>;
         checkRelation: PropTypes.Requireable<string>;
         'aria-label': PropTypes.Requireable<string>;
+        preventScroll: PropTypes.Requireable<boolean>;
     };
     static defaultProps: {
         showClear: boolean;

package/lib/es/tree/index.js

@@ -424,8 +424,14 @@ class Tree extends BaseComponent {
         });
       },
       focusInput: () => {
+        const {
+          preventScroll
+        } = this.props;
+
         if (this.inputRef && this.inputRef.current) {
-          this.inputRef.current.focus();
+          this.inputRef.current.focus({
+            preventScroll
+          });
         }
       }
     };
@@ -731,7 +737,8 @@ Tree.propTypes = {
   onDrop: PropTypes.func,
   labelEllipsis: PropTypes.bool,
   checkRelation: PropTypes.string,
-  'aria-label': PropTypes.string
+  'aria-label': PropTypes.string,
+  preventScroll: PropTypes.bool
 };
 Tree.defaultProps = {
   showClear: true,

package/lib/es/typography/title.d.ts

@@ -37,7 +37,7 @@ export default class Title extends PureComponent<TitleProps> {
         underline: PropTypes.Requireable<boolean>;
         strong: PropTypes.Requireable<boolean>;
         type: PropTypes.Requireable<"warning" | "success" | "primary" | "tertiary" | "secondary" | "danger" | "quaternary">;
-        heading: PropTypes.Requireable<1 | 2 | 3 | 4 | 5 | 6>;
+        heading: PropTypes.Requireable<4 | 2 | 1 | 3 | 5 | 6>;
         style: PropTypes.Requireable<object>;
         className: PropTypes.Requireable<string>;
         component: PropTypes.Requireable<string>;

package/modal/ModalContent.tsx

@@ -30,7 +30,8 @@ export default class ModalContent extends BaseComponent<ModalContentReactProps,
         getContainerContext: PropTypes.func,
         contentClassName: PropTypes.string,
         maskClassName: PropTypes.string,
-        onAnimationEnd: PropTypes.func
+        onAnimationEnd: PropTypes.func,
+        preventScroll: PropTypes.bool,
     };
 
     static defaultProps = {
@@ -86,13 +87,14 @@ export default class ModalContent extends BaseComponent<ModalContentReactProps,
             },
             getMouseState: () => this.state.dialogMouseDown,
             modalDialogFocus: () => {
+                const { preventScroll } = this.props;
                 let activeElementInDialog;
                 if (this.modalDialogRef) {
                     const activeElement = getActiveElement();
                     activeElementInDialog = this.modalDialogRef.current.contains(activeElement);
                 }
                 if (!activeElementInDialog) {
-                    this.modalDialogRef && this.modalDialogRef.current.focus();
+                    this.modalDialogRef && this.modalDialogRef.current.focus({ preventScroll });
                 }
             },
             modalDialogBlur: () => {
@@ -100,8 +102,9 @@ export default class ModalContent extends BaseComponent<ModalContentReactProps,
             },
             prevFocusElementReFocus: () => {
                 const { prevFocusElement } = this.state;
+                const { preventScroll } = this.props;
                 const focus = get(prevFocusElement, 'focus');
-                isFunction(focus) && prevFocusElement.focus();
+                isFunction(focus) && prevFocusElement.focus({ preventScroll });
             }
         };
     }