react-focus-on 3.7.0 → 3.8.1

package/dist/es2015/UI.js

@@ -5,15 +5,16 @@ import ReactFocusLock from 'react-focus-lock/UI';
 import { effectCar } from './medium';
 export var FocusOn = React.forwardRef(function (props, parentRef) {
     var _a = React.useState(false), lockProps = _a[0], setLockProps = _a[1];
-    var children = props.children, autoFocus = props.autoFocus, shards = props.shards, _b = props.enabled, enabled = _b === void 0 ? true : _b, _c = props.scrollLock, scrollLock = _c === void 0 ? true : _c, _d = props.focusLock, focusLock = _d === void 0 ? true : _d, _e = props.returnFocus, returnFocus = _e === void 0 ? true : _e, inert = props.inert, allowPinchZoom = props.allowPinchZoom, sideCar = props.sideCar, className = props.className, shouldIgnore = props.shouldIgnore, preventScrollOnFocus = props.preventScrollOnFocus, style = props.style, as = props.as, rest = __rest(props, ["children", "autoFocus", "shards", "enabled", "scrollLock", "focusLock", "returnFocus", "inert", "allowPinchZoom", "sideCar", "className", "shouldIgnore", "preventScrollOnFocus", "style", "as"]);
+    var children = props.children, autoFocus = props.autoFocus, shards = props.shards, _b = props.enabled, enabled = _b === void 0 ? true : _b, _c = props.scrollLock, scrollLock = _c === void 0 ? true : _c, _d = props.focusLock, focusLock = _d === void 0 ? true : _d, _e = props.returnFocus, returnFocus = _e === void 0 ? true : _e, inert = props.inert, allowPinchZoom = props.allowPinchZoom, sideCar = props.sideCar, className = props.className, shouldIgnore = props.shouldIgnore, preventScrollOnFocus = props.preventScrollOnFocus, style = props.style, as = props.as, gapMode = props.gapMode, rest = __rest(props, ["children", "autoFocus", "shards", "enabled", "scrollLock", "focusLock", "returnFocus", "inert", "allowPinchZoom", "sideCar", "className", "shouldIgnore", "preventScrollOnFocus", "style", "as", "gapMode"]);
     var SideCar = sideCar;
     var onActivation = lockProps.onActivation, onDeactivation = lockProps.onDeactivation, restProps = __rest(lockProps, ["onActivation", "onDeactivation"]);
-    var appliedLockProps = __assign(__assign({}, restProps), { sideCar: sideCar,
+    var appliedLockProps = __assign(__assign({}, restProps), { as: as,
+        style: style,
+        sideCar: sideCar,
         shards: shards,
         allowPinchZoom: allowPinchZoom,
-        as: as,
-        inert: inert,
-        style: style, enabled: enabled && scrollLock });
+        gapMode: gapMode,
+        inert: inert, enabled: enabled && scrollLock });
     return (React.createElement(React.Fragment, null,
         React.createElement(ReactFocusLock, { ref: parentRef, sideCar: sideCar, disabled: !(lockProps && enabled && focusLock), returnFocus: returnFocus, autoFocus: autoFocus, shards: shards, onActivation: onActivation, onDeactivation: onDeactivation, className: className, whiteList: shouldIgnore, lockProps: appliedLockProps, focusOptions: preventScrollOnFocus ? { preventScroll: true } : undefined, as: RemoveScroll }, children),
         enabled && (React.createElement(SideCar, __assign({}, rest, { sideCar: effectCar, setLockProps: setLockProps, shards: shards })))));

package/dist/es2015/types.d.ts

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import ReactFocusLock from 'react-focus-lock/UI';
 import { ComponentProps } from "react";
+export declare type GapMode = 'padding' | 'margin';
 export interface LockProps {
     onMouseDown?: ((e: React.MouseEvent) => void) | undefined;
     onTouchStart?: ((e: React.TouchEvent) => void) | undefined;
@@ -42,6 +43,12 @@ export interface CommonProps {
      * @see https://github.com/theKashey/react-remove-scroll#usage
      */
     allowPinchZoom?: boolean | undefined;
+    /**
+     * [scroll-lock] Controls how body scroll removal is supported. Possible values - `margin` or `padding`
+     * @default 'margin'
+     * @see https://github.com/theKashey/react-remove-scroll-bar#gapmode
+     */
+    gapMode?: GapMode;
     /**
      * a list of elements which should be considered as a part of the lock
      */

package/dist/es5/UI.js

@@ -8,15 +8,16 @@ var UI_2 = require("react-focus-lock/UI");
 var medium_1 = require("./medium");
 exports.FocusOn = React.forwardRef(function (props, parentRef) {
     var _a = React.useState(false), lockProps = _a[0], setLockProps = _a[1];
-    var children = props.children, autoFocus = props.autoFocus, shards = props.shards, _b = props.enabled, enabled = _b === void 0 ? true : _b, _c = props.scrollLock, scrollLock = _c === void 0 ? true : _c, _d = props.focusLock, focusLock = _d === void 0 ? true : _d, _e = props.returnFocus, returnFocus = _e === void 0 ? true : _e, inert = props.inert, allowPinchZoom = props.allowPinchZoom, sideCar = props.sideCar, className = props.className, shouldIgnore = props.shouldIgnore, preventScrollOnFocus = props.preventScrollOnFocus, style = props.style, as = props.as, rest = tslib_1.__rest(props, ["children", "autoFocus", "shards", "enabled", "scrollLock", "focusLock", "returnFocus", "inert", "allowPinchZoom", "sideCar", "className", "shouldIgnore", "preventScrollOnFocus", "style", "as"]);
+    var children = props.children, autoFocus = props.autoFocus, shards = props.shards, _b = props.enabled, enabled = _b === void 0 ? true : _b, _c = props.scrollLock, scrollLock = _c === void 0 ? true : _c, _d = props.focusLock, focusLock = _d === void 0 ? true : _d, _e = props.returnFocus, returnFocus = _e === void 0 ? true : _e, inert = props.inert, allowPinchZoom = props.allowPinchZoom, sideCar = props.sideCar, className = props.className, shouldIgnore = props.shouldIgnore, preventScrollOnFocus = props.preventScrollOnFocus, style = props.style, as = props.as, gapMode = props.gapMode, rest = tslib_1.__rest(props, ["children", "autoFocus", "shards", "enabled", "scrollLock", "focusLock", "returnFocus", "inert", "allowPinchZoom", "sideCar", "className", "shouldIgnore", "preventScrollOnFocus", "style", "as", "gapMode"]);
     var SideCar = sideCar;
     var onActivation = lockProps.onActivation, onDeactivation = lockProps.onDeactivation, restProps = tslib_1.__rest(lockProps, ["onActivation", "onDeactivation"]);
-    var appliedLockProps = tslib_1.__assign(tslib_1.__assign({}, restProps), { sideCar: sideCar,
+    var appliedLockProps = tslib_1.__assign(tslib_1.__assign({}, restProps), { as: as,
+        style: style,
+        sideCar: sideCar,
         shards: shards,
         allowPinchZoom: allowPinchZoom,
-        as: as,
-        inert: inert,
-        style: style, enabled: enabled && scrollLock });
+        gapMode: gapMode,
+        inert: inert, enabled: enabled && scrollLock });
     return (React.createElement(React.Fragment, null,
         React.createElement(UI_2.default, { ref: parentRef, sideCar: sideCar, disabled: !(lockProps && enabled && focusLock), returnFocus: returnFocus, autoFocus: autoFocus, shards: shards, onActivation: onActivation, onDeactivation: onDeactivation, className: className, whiteList: shouldIgnore, lockProps: appliedLockProps, focusOptions: preventScrollOnFocus ? { preventScroll: true } : undefined, as: UI_1.RemoveScroll }, children),
         enabled && (React.createElement(SideCar, tslib_1.__assign({}, rest, { sideCar: medium_1.effectCar, setLockProps: setLockProps, shards: shards })))));

package/dist/es5/types.d.ts

@@ -1,6 +1,7 @@
 import * as React from 'react';
 import ReactFocusLock from 'react-focus-lock/UI';
 import { ComponentProps } from "react";
+export declare type GapMode = 'padding' | 'margin';
 export interface LockProps {
     onMouseDown?: ((e: React.MouseEvent) => void) | undefined;
     onTouchStart?: ((e: React.TouchEvent) => void) | undefined;
@@ -42,6 +43,12 @@ export interface CommonProps {
      * @see https://github.com/theKashey/react-remove-scroll#usage
      */
     allowPinchZoom?: boolean | undefined;
+    /**
+     * [scroll-lock] Controls how body scroll removal is supported. Possible values - `margin` or `padding`
+     * @default 'margin'
+     * @see https://github.com/theKashey/react-remove-scroll-bar#gapmode
+     */
+    gapMode?: GapMode;
     /**
      * a list of elements which should be considered as a part of the lock
      */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-focus-on",
-  "version": "3.7.0",
+  "version": "3.8.1",
   "description": "The final solution for WAI ARIA compatible modal dialogs or full-screen tasks.",
   "main": "dist/es5/index.js",
   "scripts": {
@@ -46,7 +46,7 @@
   "dependencies": {
     "aria-hidden": "^1.2.2",
     "react-focus-lock": "^2.9.2",
-    "react-remove-scroll": "^2.5.5",
+    "react-remove-scroll": "^2.5.6",
     "react-style-singleton": "^2.2.0",
     "tslib": "^2.3.1",
     "use-callback-ref": "^1.3.0",