@jetshop/ui 5.12.0 → 5.12.3

package/Image/B2BImage.d.ts

@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { PropsWithChildren } from 'react';
 import { ProductImageSize } from '@jetshop/core/types';
 export declare type ImageSrcType = string | ProductImageSize[];
 export declare type BreakpointValues = string[];
@@ -46,5 +46,5 @@ interface ImageProps extends ImageParameters {
     className?: string;
     badges?: React.ReactElement<any>;
 }
-declare function B2BImage(props: ImageProps): JSX.Element;
+declare function B2BImage(props: PropsWithChildren<ImageProps>): JSX.Element;
 export default B2BImage;

package/Image/B2BImage.js.map

@@ -1 +1 @@
-{"version":3,"file":"B2BImage.js","sourceRoot":"","sources":["B2BImage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAUxD,MAAM,CAAC,MAAM,kBAAkB,GAC7B,oHAAoH,CAAC;AA4CvH,SAAS,KAAK;IACZ,OAAO,CACL,6BACE,KAAK,EAAE;YACL,UAAU,EAAE,SAAS;YACrB,OAAO,EAAE,MAAM;YACf,cAAc,EAAE,QAAQ;YACxB,UAAU,EAAE,QAAQ;YACpB,QAAQ,EAAE,UAAU;YACpB,GAAG,EAAE,CAAC;YACN,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,MAAM;SACf,sBAGG,CACP,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,KAAiB;IACjC,MAAM,EACJ,OAAO,EACP,IAAI,EACJ,GAAG,EAAE,WAAW,EAChB,KAAK,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC,EACvB,MAAM,EACN,OAAO,EACP,QAAQ,EACR,YAAY,EACb,GAAG,KAAK,CAAC;IAEV,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,GACzD,iBAAiB,CAAC;QAChB,OAAO;QACP,IAAI;QACJ,GAAG,EAAE,WAAW;QAChB,KAAK,EAAE,UAAU;QACjB,MAAM;QACN,OAAO;QACP,QAAQ;QACR,YAAY;QACZ,WAAW,EAAE;YACX,EAAE,EAAE,OAAO;YACX,EAAE,EAAE,OAAO;YACX,EAAE,EAAE,OAAO;YACX,EAAE,EAAE,OAAO;YACX,EAAE,EAAE,OAAO;SACZ;QACD,OAAO,EAAE,EAAE;KACZ,CAAC,CAAC;IAEL,OAAO,CACL,oBAAC,KAAK,oBACA,KAAK,IACT,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,KAAK,IACZ,CACH,CAAC;AACJ,CAAC;AAED,eAAe,QAAQ,CAAC"}
+{"version":3,"file":"B2BImage.js","sourceRoot":"","sources":["B2BImage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,KAA4B,MAAM,OAAO,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAUxD,MAAM,CAAC,MAAM,kBAAkB,GAC7B,oHAAoH,CAAC;AA4CvH,SAAS,KAAK;IACZ,OAAO,CACL,6BACE,KAAK,EAAE;YACL,UAAU,EAAE,SAAS;YACrB,OAAO,EAAE,MAAM;YACf,cAAc,EAAE,QAAQ;YACxB,UAAU,EAAE,QAAQ;YACpB,QAAQ,EAAE,UAAU;YACpB,GAAG,EAAE,CAAC;YACN,IAAI,EAAE,CAAC;YACP,KAAK,EAAE,MAAM;YACb,MAAM,EAAE,MAAM;SACf,sBAGG,CACP,CAAC;AACJ,CAAC;AAED,SAAS,QAAQ,CAAC,KAAoC;IACpD,MAAM,EACJ,OAAO,EACP,IAAI,EACJ,GAAG,EAAE,WAAW,EAChB,KAAK,EAAE,UAAU,GAAG,CAAC,CAAC,CAAC,EACvB,MAAM,EACN,OAAO,EACP,QAAQ,EACR,YAAY,EACb,GAAG,KAAK,CAAC;IAEV,MAAM,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,GACzD,iBAAiB,CAAC;QAChB,OAAO;QACP,IAAI;QACJ,GAAG,EAAE,WAAW;QAChB,KAAK,EAAE,UAAU;QACjB,MAAM;QACN,OAAO;QACP,QAAQ;QACR,YAAY;QACZ,WAAW,EAAE;YACX,EAAE,EAAE,OAAO;YACX,EAAE,EAAE,OAAO;YACX,EAAE,EAAE,OAAO;YACX,EAAE,EAAE,OAAO;YACX,EAAE,EAAE,OAAO;SACZ;QACD,OAAO,EAAE,EAAE;KACZ,CAAC,CAAC;IAEL,OAAO,CACL,oBAAC,KAAK,oBACA,KAAK,IACT,GAAG,EAAE,GAAG,EACR,WAAW,EAAE,WAAW,EACxB,IAAI,EAAE,IAAI,EACV,KAAK,EAAE,KAAK,EACZ,MAAM,EAAE,MAAM,EACd,UAAU,EAAE,UAAU,EACtB,KAAK,EAAE,KAAK,IACZ,CACH,CAAC;AACJ,CAAC;AAED,eAAe,QAAQ,CAAC"}

package/Modal/Drawer/DrawerTarget.d.ts

@@ -2,5 +2,5 @@ import * as React from 'react';
 import { ModalState } from '../ModalContext';
 export declare const DrawerTarget: React.SFC<{
     id: string;
-    children(args: ModalState): any;
+    children: (args: Partial<ModalState>) => React.ReactNode;
 }>;

package/Modal/Drawer/DrawerTarget.js

@@ -1,12 +1,12 @@
 import * as React from 'react';
 import ModalContext from '../ModalContext';
-import TargetWrapper from '../TargetWrapper';
 export const DrawerTarget = ({ id, children }) => {
-    return (React.createElement(ModalContext.Consumer, null, ({ modalId, isOpen, hideTarget, modalType }) => {
+    return (React.createElement(ModalContext.Consumer, null, ({ modals, hideTarget }) => {
+        const { modalId, isOpen } = modals.find(({ modalId }) => modalId === id) || {};
         // For drawers, the child should always render.
         // Drawers implement their own hide/show behaviour that relies
         // on `isOpen` being toggled to trigger the animation
-        return (React.createElement(TargetWrapper, { modalType: modalType, hideTarget: hideTarget, isOpen: isOpen && modalId === id, preventOverflow: false }, children));
+        return children({ hideTarget, isOpen: isOpen && modalId === id });
     }));
 };
 //# sourceMappingURL=DrawerTarget.js.map

package/Modal/Drawer/DrawerTarget.js.map

@@ -1 +1 @@
-{"version":3,"file":"DrawerTarget.js","sourceRoot":"","sources":["DrawerTarget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,YAA4B,MAAM,iBAAiB,CAAC;AAC3D,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAE7C,MAAM,CAAC,MAAM,YAAY,GAGpB,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;IACxB,OAAO,CACL,oBAAC,YAAY,CAAC,QAAQ,QACnB,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,EAAE,EAAE;QAC9C,+CAA+C;QAC/C,8DAA8D;QAC9D,qDAAqD;QACrD,OAAO,CACL,oBAAC,aAAa,IACZ,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,UAAU,EACtB,MAAM,EAAE,MAAM,IAAI,OAAO,KAAK,EAAE,EAChC,eAAe,EAAE,KAAK,IAErB,QAAQ,CACK,CACjB,CAAC;IACJ,CAAC,CACqB,CACzB,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"DrawerTarget.js","sourceRoot":"","sources":["DrawerTarget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,YAA4B,MAAM,iBAAiB,CAAC;AAE3D,MAAM,CAAC,MAAM,YAAY,GAGpB,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,EAAE,EAAE;IACxB,OAAO,CACL,oBAAC,YAAY,CAAC,QAAQ,QACnB,CAAC,EAAE,MAAM,EAAE,UAAU,EAAE,EAAE,EAAE;QAC1B,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,GACvB,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC;QACrD,+CAA+C;QAC/C,8DAA8D;QAC9D,qDAAqD;QACrD,OAAO,QAAQ,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC,CAAC;IACpE,CAAC,CACqB,CACzB,CAAC;AACJ,CAAC,CAAC"}

package/Modal/Drawer/DrawerTarget.test.js

@@ -24,54 +24,44 @@ xdescribe('DrawerTarget', () => {
     it('no matter what the context state is', () => {
       const DrawerTarget = target({
         ...defaultContext,
-        modalType: 'drawer',
-        isOpen: false
+        modals: [
+          {
+            modalType: 'drawer',
+            isOpen: false
+          }
+        ]
       });
       wrapper = mount(<DrawerTarget>{reachableChild}</DrawerTarget>);
     });
 
     it('with `isOpen` prop passed', () => {
       expect(
-        wrapper
-          .children()
-          .children()
-          .props().isOpen
+        wrapper.children().children().props().modals[0].isOpen
       ).toBeDefined();
     });
 
     it('with `modalType` prop passed', () => {
-      expect(
-        wrapper
-          .children()
-          .children()
-          .props().modalType
-      ).toBe('drawer');
+      expect(wrapper.children().children().props().modals[0].modalType).toBe(
+        'drawer'
+      );
     });
 
     it('with `hideTarget` func passed', () => {
-      expect(
-        wrapper
-          .children()
-          .children()
-          .props().hideTarget
-      ).toBe(defaultContext.hideTarget);
+      expect(wrapper.children().children().props().hideTarget).toBe(
+        defaultContext.hideTarget
+      );
     });
 
     describe('with `isOpen` prop set to `true`', () => {
       it('when `isOpen` is true and `modalId` matches `id`', () => {
         const DrawerTarget = target({
           ...defaultContext,
-          modalType: 'drawer',
-          isOpen: true,
-          modalId: 'foo'
+          modals: [{ modalType: 'drawer', isOpen: true, modalId: 'foo' }]
         });
         wrapper = mount(<DrawerTarget id="foo">{reachableChild}</DrawerTarget>);
-        expect(
-          wrapper
-            .children()
-            .children()
-            .props().isOpen
-        ).toBe(true);
+        expect(wrapper.children().children().props().modals[0].isOpen).toBe(
+          true
+        );
       });
     });
 
@@ -79,33 +69,23 @@ xdescribe('DrawerTarget', () => {
       it('when `isOpen` is false', () => {
         const DrawerTarget = target({
           ...defaultContext,
-          modalType: 'drawer',
-          isOpen: false,
-          modalId: 'foo'
+          modals: [{ modalType: 'drawer', isOpen: false, modalId: 'foo' }]
         });
         wrapper = mount(<DrawerTarget id="foo">{reachableChild}</DrawerTarget>);
-        expect(
-          wrapper
-            .children()
-            .children()
-            .props().isOpen
-        ).toBe(false);
+        expect(wrapper.children().children().props().modals[0].isOpen).toBe(
+          false
+        );
       });
 
       it('when received `modalId` does not match `id` prop', () => {
         const DrawerTarget = target({
           ...defaultContext,
-          modalType: 'drawer',
-          isOpen: true,
-          modalId: 'bar'
+          modals: [{ modalType: 'drawer', isOpen: true, modalId: 'bar' }]
         });
         wrapper = mount(<DrawerTarget id="foo">{reachableChild}</DrawerTarget>);
-        expect(
-          wrapper
-            .children()
-            .children()
-            .props().isOpen
-        ).toBe(false);
+        expect(wrapper.children().children().props().modals[0].isOpen).toBe(
+          false
+        );
       });
     });
   });

package/Modal/Drawer/DrawerTrigger.d.ts

@@ -4,6 +4,8 @@ export declare const DrawerTrigger: React.SFC<{
     id: string;
     /** Whether to show a clickable semi-opaque Cover behind the flyout */
     showCover: boolean;
+    /** Whether to prevent the body from scrolling when flyout is open */
+    canCloseOnEsc?: boolean;
     coverStyles?: {};
     children: (args: Partial<ModalState>) => React.ReactNode;
 }>;

package/Modal/Drawer/DrawerTrigger.js

@@ -1,11 +1,15 @@
 import * as React from 'react';
 import ModalContext from '../ModalContext';
-export const DrawerTrigger = ({ id, children, showCover = true, coverStyles }) => {
-    return (React.createElement(ModalContext.Consumer, null, ({ showTarget, modalId, hideTarget }) => {
+export const DrawerTrigger = ({ id, children, showCover = true, canCloseOnEsc = true, coverStyles }) => {
+    return (React.createElement(ModalContext.Consumer, null, ({ showTarget, hideTarget, modals }) => {
         return children({
-            showTarget: () => showTarget(null, 'drawer', id, { showCover, coverStyles }),
+            showTarget: () => showTarget(null, 'drawer', id, {
+                showCover,
+                coverStyles,
+                canCloseOnEsc
+            }),
             hideTarget,
-            isOpen: modalId === id
+            isOpen: modals.some(({ modalId }) => modalId === id)
         });
     }));
 };

package/Modal/Drawer/DrawerTrigger.js.map

@@ -1 +1 @@
-{"version":3,"file":"DrawerTrigger.js","sourceRoot":"","sources":["DrawerTrigger.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,YAA4B,MAAM,iBAAiB,CAAC;AAE3D,MAAM,CAAC,MAAM,aAAa,GAMrB,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,SAAS,GAAG,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE;IACvD,OAAO,CACL,oBAAC,YAAY,CAAC,QAAQ,QACnB,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE;QACvC,OAAO,QAAQ,CAAC;YACd,UAAU,EAAE,GAAG,EAAE,CACf,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE,EAAE,SAAS,EAAE,WAAW,EAAE,CAAC;YAC5D,UAAU;YACV,MAAM,EAAE,OAAO,KAAK,EAAE;SACvB,CAAC,CAAC;IACL,CAAC,CACqB,CACzB,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"DrawerTrigger.js","sourceRoot":"","sources":["DrawerTrigger.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,YAA4B,MAAM,iBAAiB,CAAC;AAE3D,MAAM,CAAC,MAAM,aAAa,GAQrB,CAAC,EACJ,EAAE,EACF,QAAQ,EACR,SAAS,GAAG,IAAI,EAChB,aAAa,GAAG,IAAI,EACpB,WAAW,EACZ,EAAE,EAAE;IACH,OAAO,CACL,oBAAC,YAAY,CAAC,QAAQ,QACnB,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE;QACtC,OAAO,QAAQ,CAAC;YACd,UAAU,EAAE,GAAG,EAAE,CACf,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE;gBAC7B,SAAS;gBACT,WAAW;gBACX,aAAa;aACd,CAAC;YACJ,UAAU;YACV,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,KAAK,EAAE,CAAC;SACrD,CAAC,CAAC;IACL,CAAC,CACqB,CACzB,CAAC;AACJ,CAAC,CAAC"}

package/Modal/Flyout/FlyoutTarget.d.ts

@@ -2,7 +2,7 @@ import * as React from 'react';
 import { ModalState } from '../ModalContext';
 export interface FlyoutTargetProps {
     id: string;
-    children: (args: Partial<ModalState>) => any;
+    children: (args: Partial<ModalState>) => React.ReactNode;
 }
 export declare class FlyoutTarget extends React.Component<FlyoutTargetProps, any> {
     render(): JSX.Element;

package/Modal/Flyout/FlyoutTarget.js

@@ -1,11 +1,13 @@
 import * as React from 'react';
 import ModalContext from '../ModalContext';
-import TargetWrapper from '../TargetWrapper';
 export class FlyoutTarget extends React.Component {
     render() {
         const { id, children } = this.props;
-        return (React.createElement(ModalContext.Consumer, null, ({ modalId, isOpen, hideTarget, modalType, props }) => {
-            return isOpen && modalId === id && modalType === 'flyout' ? (React.createElement(TargetWrapper, { isOpen: isOpen, modalType: modalType, hideTarget: hideTarget, preventOverflow: props.preventOverflow }, children)) : null;
+        return (React.createElement(ModalContext.Consumer, null, ({ modals }) => {
+            const { modalId, isOpen, modalType, hideTarget } = modals.find(({ modalId }) => modalId === id) || {};
+            return isOpen && modalId === id && modalType === 'flyout'
+                ? children({ hideTarget, isOpen })
+                : null;
         }));
     }
 }

package/Modal/Flyout/FlyoutTarget.js.map

@@ -1 +1 @@
-{"version":3,"file":"FlyoutTarget.js","sourceRoot":"","sources":["FlyoutTarget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,YAA4B,MAAM,iBAAiB,CAAC;AAC3D,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAO7C,MAAM,OAAO,YAAa,SAAQ,KAAK,CAAC,SAAiC;IACvE,MAAM;QACJ,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACpC,OAAO,CACL,oBAAC,YAAY,CAAC,QAAQ,QACnB,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,EAAE;YACrD,OAAO,MAAM,IAAI,OAAO,KAAK,EAAE,IAAI,SAAS,KAAK,QAAQ,CAAC,CAAC,CAAC,CAC1D,oBAAC,aAAa,IACZ,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,SAAS,EACpB,UAAU,EAAE,UAAU,EACtB,eAAe,EAAE,KAAK,CAAC,eAAe,IAErC,QAAQ,CACK,CACjB,CAAC,CAAC,CAAC,IAAI,CAAC;QACX,CAAC,CACqB,CACzB,CAAC;IACJ,CAAC;CACF;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"FlyoutTarget.js","sourceRoot":"","sources":["FlyoutTarget.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,YAA4B,MAAM,iBAAiB,CAAC;AAO3D,MAAM,OAAO,YAAa,SAAQ,KAAK,CAAC,SAAiC;IACvE,MAAM;QACJ,MAAM,EAAE,EAAE,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACpC,OAAO,CACL,oBAAC,YAAY,CAAC,QAAQ,QACnB,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE;YACd,MAAM,EAAE,OAAO,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,GAC9C,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,KAAK,EAAE,CAAC,IAAI,EAAE,CAAC;YACrD,OAAO,MAAM,IAAI,OAAO,KAAK,EAAE,IAAI,SAAS,KAAK,QAAQ;gBACvD,CAAC,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC;gBAClC,CAAC,CAAC,IAAI,CAAC;QACX,CAAC,CACqB,CACzB,CAAC;IACJ,CAAC;CACF;AAED,eAAe,YAAY,CAAC"}

package/Modal/Flyout/FlyoutTarget.test.js

@@ -28,8 +28,12 @@ xdescribe('FlyoutTarget', () => {
     it('when isOpen is true but ID prop does not match modalId', () => {
       const FlyoutTarget = target({
         ...defaultContext,
-        isOpen: true,
-        modalId: 'bar'
+        modals: [
+          {
+            isOpen: true,
+            modalId: 'bar'
+          }
+        ]
       });
       wrapper = mount(<FlyoutTarget id="foo">{unreachableChild}</FlyoutTarget>);
     });
@@ -37,9 +41,7 @@ xdescribe('FlyoutTarget', () => {
     it('when isOpen is true and ID matches, but `modalType` is not `flyout`', () => {
       const FlyoutTarget = target({
         ...defaultContext,
-        isOpen: true,
-        modalId: 'foo',
-        modalType: 'modal'
+        modals: [{ isOpen: true, modalId: 'foo', modalType: 'modal' }]
       });
       wrapper = mount(<FlyoutTarget id="foo">{unreachableChild}</FlyoutTarget>);
     });
@@ -53,9 +55,7 @@ xdescribe('FlyoutTarget', () => {
     beforeEach(() => {
       FlyoutTarget = target({
         ...defaultContext,
-        isOpen: true,
-        modalId: 'foo',
-        modalType: 'flyout'
+        modals: [{ isOpen: true, modalId: 'foo', modalType: 'flyout' }]
       });
     });
 
@@ -68,28 +68,17 @@ xdescribe('FlyoutTarget', () => {
       expect(wrapper.children().text()).toBe('Hello from the inside!');
     });
     it('with `isOpen` prop passed', () => {
-      expect(
-        wrapper
-          .children()
-          .children()
-          .props().isOpen
-      ).toBe(true);
+      expect(wrapper.children().children().props().modals[0].isOpen).toBe(true);
     });
     it('with `modalType` prop passed', () => {
-      expect(
-        wrapper
-          .children()
-          .children()
-          .props().modalType
-      ).toBe('flyout');
+      expect(wrapper.children().children().props().modals[0].modalType).toBe(
+        'flyout'
+      );
     });
     it('with `hideTarget` func passed', () => {
-      expect(
-        wrapper
-          .children()
-          .children()
-          .props().hideTarget
-      ).toBe(defaultContext.hideTarget);
+      expect(wrapper.children().children().props().hideTarget).toBe(
+        defaultContext.hideTarget
+      );
     });
   });
 });

package/Modal/Flyout/FlyoutTrigger.d.ts

@@ -6,6 +6,8 @@ export declare const FlyoutTrigger: React.SFC<{
     showCover?: boolean;
     /** Whether to prevent the body from scrolling when flyout is open */
     preventOverflow?: boolean;
+    /** Whether to able to close modal via Escape button */
+    canCloseOnEsc?: boolean;
     coverStyles?: {};
     children: (args: Pick<ModalState, 'hideTarget' | 'isOpen'> & {
         showTarget: () => void;

package/Modal/Flyout/FlyoutTrigger.js

@@ -1,16 +1,17 @@
 import * as React from 'react';
 import ModalContext from '../ModalContext';
-export const FlyoutTrigger = ({ id, children, showCover = true, coverStyles, preventOverflow = false }) => {
-    return (React.createElement(ModalContext.Consumer, null, ({ showTarget, modalId, hideTarget }) => {
+export const FlyoutTrigger = ({ id, children, showCover = true, preventOverflow = false, canCloseOnEsc = true, coverStyles }) => {
+    return (React.createElement(ModalContext.Consumer, null, ({ showTarget, hideTarget, modals }) => {
         const open = () => showTarget(null, 'flyout', id, {
             showCover,
             coverStyles,
-            preventOverflow
+            preventOverflow,
+            canCloseOnEsc
         });
         return children({
             showTarget: open,
             hideTarget,
-            isOpen: modalId === id
+            isOpen: modals.some(({ modalId }) => modalId === id)
         });
     }));
 };

package/Modal/Flyout/FlyoutTrigger.js.map

@@ -1 +1 @@
-{"version":3,"file":"FlyoutTrigger.js","sourceRoot":"","sources":["FlyoutTrigger.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,YAA4B,MAAM,iBAAiB,CAAC;AAE3D,MAAM,CAAC,MAAM,aAAa,GAUrB,CAAC,EACJ,EAAE,EACF,QAAQ,EACR,SAAS,GAAG,IAAI,EAChB,WAAW,EACX,eAAe,GAAG,KAAK,EACxB,EAAE,EAAE;IACH,OAAO,CACL,oBAAC,YAAY,CAAC,QAAQ,QACnB,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE;QACvC,MAAM,IAAI,GAAG,GAAG,EAAE,CAChB,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE;YAC7B,SAAS;YACT,WAAW;YACX,eAAe;SAChB,CAAC,CAAC;QACL,OAAO,QAAQ,CAAC;YACd,UAAU,EAAE,IAAI;YAChB,UAAU;YACV,MAAM,EAAE,OAAO,KAAK,EAAE;SACvB,CAAC,CAAC;IACL,CAAC,CACqB,CACzB,CAAC;AACJ,CAAC,CAAC"}
+{"version":3,"file":"FlyoutTrigger.js","sourceRoot":"","sources":["FlyoutTrigger.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,YAA4B,MAAM,iBAAiB,CAAC;AAE3D,MAAM,CAAC,MAAM,aAAa,GAYrB,CAAC,EACJ,EAAE,EACF,QAAQ,EACR,SAAS,GAAG,IAAI,EAChB,eAAe,GAAG,KAAK,EACvB,aAAa,GAAG,IAAI,EACpB,WAAW,EACZ,EAAE,EAAE;IACH,OAAO,CACL,oBAAC,YAAY,CAAC,QAAQ,QACnB,CAAC,EAAE,UAAU,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE;QACtC,MAAM,IAAI,GAAG,GAAG,EAAE,CAChB,UAAU,CAAC,IAAI,EAAE,QAAQ,EAAE,EAAE,EAAE;YAC7B,SAAS;YACT,WAAW;YACX,eAAe;YACf,aAAa;SACd,CAAC,CAAC;QACL,OAAO,QAAQ,CAAC;YACd,UAAU,EAAE,IAAI;YAChB,UAAU;YACV,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,KAAK,EAAE,CAAC;SACrD,CAAC,CAAC;IACL,CAAC,CACqB,CACzB,CAAC;AACJ,CAAC,CAAC"}

package/Modal/ModalContext.d.ts

@@ -9,11 +9,18 @@ export interface ModalState {
     /** Called when a modal is requested */
     showTarget(...args: any[]): void;
     /** Called when a modal is dismissed */
-    hideTarget(): void;
+    hideTarget(...args: any[]): void;
     /** Whether a modal is open */
     isOpen: boolean;
     /** props to be passed on to the displayed modalComponent */
     props?: any;
 }
-declare const ModalContext: React.Context<ModalState>;
+export interface ModalContextProps {
+    /** Called when a modal is requested */
+    showTarget(...args: any[]): void;
+    /** Called when a modal is dismissed */
+    hideTarget(...args: any[]): void;
+    modals: ModalState[];
+}
+declare const ModalContext: React.Context<ModalContextProps>;
 export default ModalContext;

package/Modal/ModalContext.js

@@ -1,12 +1,8 @@
 import { createContext } from 'react';
 const initialModalState = {
-    modalComponent: null,
-    modalType: null,
-    modalId: null,
-    isOpen: false,
     showTarget: null,
     hideTarget: null,
-    props: {}
+    modals: []
 };
 const ModalContext = createContext(initialModalState);
 export default ModalContext;

package/Modal/ModalContext.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModalContext.js","sourceRoot":"","sources":["ModalContext.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AAmB7C,MAAM,iBAAiB,GAAe;IACpC,cAAc,EAAE,IAAI;IACpB,SAAS,EAAE,IAAI;IACf,OAAO,EAAE,IAAI;IACb,MAAM,EAAE,KAAK;IACb,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,IAAI;IAChB,KAAK,EAAE,EAAE;CACV,CAAC;AAEF,MAAM,YAAY,GAAG,aAAa,CAAC,iBAAiB,CAAC,CAAC;AAEtD,eAAe,YAAY,CAAC"}
+{"version":3,"file":"ModalContext.js","sourceRoot":"","sources":["ModalContext.ts"],"names":[],"mappings":"AAAA,OAAc,EAAE,aAAa,EAAE,MAAM,OAAO,CAAC;AA2B7C,MAAM,iBAAiB,GAAsB;IAC3C,UAAU,EAAE,IAAI;IAChB,UAAU,EAAE,IAAI;IAChB,MAAM,EAAE,EAAE;CACX,CAAC;AAEF,MAAM,YAAY,GAAG,aAAa,CAAC,iBAAiB,CAAC,CAAC;AAEtD,eAAe,YAAY,CAAC"}

package/Modal/ModalProvider.d.ts

@@ -1,11 +1,5 @@
-import React, { Component } from 'react';
-import { ModalState } from './ModalContext';
-declare class ModalProvider extends Component<any, ModalState> {
-    componentDidMount(): void;
-    showTarget: (modalComponent: React.ReactNode, modalType: 'modal' | 'flyout' | 'drawer', modalId: string, props?: {}) => void;
-    hideTarget: () => void;
-    initialState: ModalState;
-    state: ModalState;
-    render(): JSX.Element;
-}
+import React from 'react';
+declare const ModalProvider: ({ children }: {
+    children: React.ReactNode;
+}) => JSX.Element;
 export default ModalProvider;

package/Modal/ModalProvider.js

@@ -1,38 +1,83 @@
-import React, { Component } from 'react';
+import React, { useEffect, useState, useCallback } from 'react';
 import ModalContext from './ModalContext';
 import ReactModal from 'react-modal';
-class ModalProvider extends Component {
-    constructor() {
-        super(...arguments);
-        this.showTarget = (modalComponent, modalType, modalId, props = {}) => {
-            this.setState(this.initialState, () => {
-                this.setState({
-                    modalComponent,
-                    modalId,
-                    modalType,
-                    isOpen: true,
-                    props
-                });
-            });
-        };
-        this.hideTarget = () => this.setState(this.initialState);
-        this.initialState = {
-            modalComponent: null,
-            modalType: null,
-            modalId: null,
-            isOpen: false,
-            props: {},
-            showTarget: this.showTarget,
-            hideTarget: this.hideTarget
-        };
-        this.state = this.initialState;
+import { css } from 'linaria';
+const preventBodyScrollStyle = css `
+  overflow: hidden;
+`;
+const ModalProvider = ({ children }) => {
+    const [modals, setModals] = useState([]);
+    function showTarget(modalComponent, modalType, modalId, props = {}) {
+        setModals((prevModals) => {
+            const newModals = [...prevModals];
+            const modalProps = {
+                modalComponent,
+                modalId,
+                modalType,
+                isOpen: true,
+                props,
+                showTarget,
+                hideTarget: () => hideTarget(modalId)
+            };
+            // Check if modal with same id already exists
+            const matchIndex = newModals.findIndex((modal) => modal.modalId === modalId);
+            if (matchIndex >= 0)
+                newModals[matchIndex] = modalProps;
+            else
+                newModals.push(modalProps);
+            return newModals;
+        });
     }
-    componentDidMount() {
-        ReactModal.setAppElement('#root');
-    }
-    render() {
-        return (React.createElement(ModalContext.Provider, { value: this.state }, this.props.children));
+    function hideTarget(modalId) {
+        setModals((prevModals) => {
+            const newModals = [...prevModals];
+            // Calling hideTarget directly from a MouseEvent passes down an event
+            // object. Therefore we have to check if the passed prop is a string.
+            if (modalId && typeof modalId === 'string') {
+                // Removing the modal based on modalId if opened
+                const matchIndex = newModals.findIndex((modal) => modal.modalId === modalId);
+                if (matchIndex >= 0)
+                    newModals.splice(matchIndex, 1);
+            }
+            else {
+                // Removing the last opened modal
+                newModals.pop();
+            }
+            return newModals;
+        });
     }
-}
+    // Handling modal close on Escape button
+    const handleKeydown = useCallback((e) => {
+        if (e.key !== 'Escape' || modals.length === 0)
+            return;
+        const lastModal = modals[modals.length - 1];
+        if (!lastModal.props.canCloseOnEsc)
+            return;
+        hideTarget();
+    }, [modals]);
+    useEffect(() => {
+        ReactModal.setAppElement('#root');
+    }, []);
+    useEffect(() => {
+        document.addEventListener('keydown', handleKeydown);
+        return () => document.removeEventListener('keydown', handleKeydown);
+    }, [handleKeydown]);
+    // Disabling scrolling when relevant
+    useEffect(() => {
+        const preventOverflow = modals.some((modal) => modal.props.preventOverflow ||
+            (modal.modalType === 'drawer' && modal.isOpen));
+        if (preventOverflow)
+            document.body.classList.add(preventBodyScrollStyle);
+        else
+            document.body.classList.remove(preventBodyScrollStyle);
+        return () => document.body.classList.remove(preventBodyScrollStyle);
+    }, [modals]);
+    const initialState = {
+        showTarget,
+        hideTarget,
+        modals
+    };
+    return (React.createElement(ModalContext.Provider, { value: initialState }, children));
+};
 export default ModalProvider;
 //# sourceMappingURL=ModalProvider.js.map

package/Modal/ModalProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModalProvider.js","sourceRoot":"","sources":["ModalProvider.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AACzC,OAAO,YAA4B,MAAM,gBAAgB,CAAC;AAC1D,OAAO,UAAU,MAAM,aAAa,CAAC;AAErC,MAAM,aAAc,SAAQ,SAA0B;IAAtD;;QAIE,eAAU,GAAG,CACX,cAA+B,EAC/B,SAAwC,EACxC,OAAe,EACf,KAAK,GAAG,EAAE,EACV,EAAE;YACF,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,EAAE,GAAG,EAAE;gBACpC,IAAI,CAAC,QAAQ,CAAC;oBACZ,cAAc;oBACd,OAAO;oBACP,SAAS;oBACT,MAAM,EAAE,IAAI;oBACZ,KAAK;iBACN,CAAC,CAAC;YACL,CAAC,CAAC,CAAC;QACL,CAAC,CAAC;QACF,eAAU,GAAG,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAEpD,iBAAY,GAAe;YACzB,cAAc,EAAE,IAAI;YACpB,SAAS,EAAE,IAAI;YACf,OAAO,EAAE,IAAI;YACb,MAAM,EAAE,KAAK;YACb,KAAK,EAAE,EAAE;YACT,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,UAAU,EAAE,IAAI,CAAC,UAAU;SAC5B,CAAC;QAEF,UAAK,GAAG,IAAI,CAAC,YAAY,CAAC;IAS5B,CAAC;IAxCC,iBAAiB;QACf,UAAU,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IACpC,CAAC;IA+BD,MAAM;QACJ,OAAO,CACL,oBAAC,YAAY,CAAC,QAAQ,IAAC,KAAK,EAAE,IAAI,CAAC,KAAK,IACrC,IAAI,CAAC,KAAK,CAAC,QAAQ,CACE,CACzB,CAAC;IACJ,CAAC;CACF;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"ModalProvider.js","sourceRoot":"","sources":["ModalProvider.tsx"],"names":[],"mappings":"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"}

package/Modal/ModalProvider.test.js

@@ -21,9 +21,6 @@ xdescribe('ModalProvider', () => {
     it('mirrors the component state', () => {
       const wrapper = shallow(<ModalProvider />);
       expect(wrapper.prop('value')).toEqual(wrapper.instance().initialState);
-
-      wrapper.setState({ isOpen: true });
-      expect(wrapper.prop('value').isOpen).toBe(true);
     });
   });
 });

package/Modal/ModalRoot.d.ts

@@ -1,3 +1,3 @@
-import * as React from 'react';
-declare const ModalRoot: React.SFC;
+/// <reference types="react" />
+declare const ModalRoot: () => JSX.Element;
 export default ModalRoot;

package/Modal/ModalRoot.js

@@ -12,21 +12,25 @@ const Cover = styled('div') `
   background: rgba(0, 0, 0, 0.2);
 `;
 Cover.displayName = 'Cover';
-const ModalRoot = () => (React.createElement(ModalContext.Consumer, null, ({ modalComponent, isOpen, modalType, hideTarget, props }) => {
+const ModalRoot = () => {
+    const { modals } = React.useContext(ModalContext);
+    return (React.createElement(React.Fragment, null, modals.map((modalProps) => (React.createElement(Modal, Object.assign({ key: modalProps.modalId }, modalProps))))));
+};
+const Modal = ({ modalComponent, isOpen, modalType, hideTarget, props }) => {
     /** Do not render anything if there is no active modal */
     if (!isOpen)
         return null;
     const Component = modalComponent;
     if (Component && isOpen && modalType === 'modal') {
         /** A modal has been requested, from somewhere in the app  */
-        return (React.createElement(ReactModal, { className: props.modalStyles, 
+        return (React.createElement(ReactModal, Object.assign({ className: props.modalStyles }, props.modalProps, { 
             /** isOpen should always be true here, since this is only rendered when a modal is requested */
             isOpen: true, 
             /**
              * react-modal requires an onRequestClose prop that takes a func to call when the modal is closed
              * We use this to make sure the context is updated
              */
-            onRequestClose: hideTarget },
+            onRequestClose: hideTarget }),
             React.createElement(Component, Object.assign({ hideTarget: hideTarget }, props))));
     }
     if (isOpen && props.showCover) {
@@ -34,6 +38,7 @@ const ModalRoot = () => (React.createElement(ModalContext.Consumer, null, ({ mod
         /** Inject a clickable 'cover' behind flyouts */
         return React.createElement(Cover, { onClick: hideTarget, style: coverStyles });
     }
-}));
+    return null;
+};
 export default ModalRoot;
 //# sourceMappingURL=ModalRoot.js.map

package/Modal/ModalRoot.js.map

@@ -1 +1 @@
-{"version":3,"file":"ModalRoot.js","sourceRoot":"","sources":["ModalRoot.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,YAA4B,MAAM,gBAAgB,CAAC;AAC1D,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;;;;;;;;CAQ1B,CAAC;AACF,KAAK,CAAC,WAAW,GAAG,OAAO,CAAC;AAE5B,MAAM,SAAS,GAAc,GAAG,EAAE,CAAC,CACjC,oBAAC,YAAY,CAAC,QAAQ,QACnB,CAAC,EAAE,cAAc,EAAE,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,KAAK,EAAc,EAAE,EAAE;IACxE,yDAAyD;IACzD,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAEzB,MAAM,SAAS,GAAG,cAA2B,CAAC;IAE9C,IAAI,SAAS,IAAI,MAAM,IAAI,SAAS,KAAK,OAAO,EAAE;QAChD,6DAA6D;QAC7D,OAAO,CACL,oBAAC,UAAU,IACT,SAAS,EAAE,KAAK,CAAC,WAAW;YAC5B,+FAA+F;YAC/F,MAAM;YACN;;;eAGG;YACH,cAAc,EAAE,UAAU;YAE1B,oBAAC,SAAS,kBAAC,UAAU,EAAE,UAAU,IAAM,KAAK,EAAI,CACrC,CACd,CAAC;KACH;IAED,IAAI,MAAM,IAAI,KAAK,CAAC,SAAS,EAAE;QAC7B,MAAM,WAAW,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,CAAC;QAEvC,gDAAgD;QAChD,OAAO,oBAAC,KAAK,IAAC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,WAAW,GAAI,CAAC;KAC3D;AACH,CAAC,CACqB,CACzB,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"ModalRoot.js","sourceRoot":"","sources":["ModalRoot.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAC/B,OAAO,YAA4B,MAAM,gBAAgB,CAAC;AAC1D,OAAO,UAAU,MAAM,aAAa,CAAC;AACrC,OAAO,EAAE,MAAM,EAAE,MAAM,eAAe,CAAC;AAEvC,MAAM,KAAK,GAAG,MAAM,CAAC,KAAK,CAAC,CAAA;;;;;;;;CAQ1B,CAAC;AACF,KAAK,CAAC,WAAW,GAAG,OAAO,CAAC;AAE5B,MAAM,SAAS,GAAG,GAAG,EAAE;IACrB,MAAM,EAAE,MAAM,EAAE,GAAG,KAAK,CAAC,UAAU,CAAC,YAAY,CAAC,CAAC;IAClD,OAAO,CACL,0CACG,MAAM,CAAC,GAAG,CAAC,CAAC,UAAsB,EAAE,EAAE,CAAC,CACtC,oBAAC,KAAK,kBAAC,GAAG,EAAE,UAAU,CAAC,OAAO,IAAM,UAAU,EAAI,CACnD,CAAC,CACD,CACJ,CAAC;AACJ,CAAC,CAAC;AAEF,MAAM,KAAK,GAAG,CAAC,EACb,cAAc,EACd,MAAM,EACN,SAAS,EACT,UAAU,EACV,KAAK,EACM,EAAE,EAAE;IACf,yDAAyD;IACzD,IAAI,CAAC,MAAM;QAAE,OAAO,IAAI,CAAC;IAEzB,MAAM,SAAS,GAAG,cAA2B,CAAC;IAE9C,IAAI,SAAS,IAAI,MAAM,IAAI,SAAS,KAAK,OAAO,EAAE;QAChD,6DAA6D;QAC7D,OAAO,CACL,oBAAC,UAAU,kBACT,SAAS,EAAE,KAAK,CAAC,WAAW,IACxB,KAAK,CAAC,UAAU;YACpB,+FAA+F;YAC/F,MAAM;YACN;;;eAGG;YACH,cAAc,EAAE,UAAU;YAE1B,oBAAC,SAAS,kBAAC,UAAU,EAAE,UAAU,IAAM,KAAK,EAAI,CACrC,CACd,CAAC;KACH;IAED,IAAI,MAAM,IAAI,KAAK,CAAC,SAAS,EAAE;QAC7B,MAAM,WAAW,GAAG,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,WAAW,CAAC;QAEvC,gDAAgD;QAChD,OAAO,oBAAC,KAAK,IAAC,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,WAAW,GAAI,CAAC;KAC3D;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/Modal/ModalRoot.test.js

@@ -24,9 +24,13 @@ xdescribe('ModalRoot', () => {
   it('renders a `Modal` when Component, isOpen and modalType is `modal`', () => {
     const Comp = () => <div>Component being rendered inside Modal</div>;
     const ModalRoot = modalRoot({
-      modalComponent: Comp,
-      isOpen: true,
-      modalType: 'modal'
+      modals: [
+        {
+          modalComponent: Comp,
+          isOpen: true,
+          modalType: 'modal'
+        }
+      ]
     });
     const wrapper = mount(<ModalRoot>{funcAsChild}</ModalRoot>);
     expect(wrapper.find('Modal')).toHaveLength(1);
@@ -37,10 +41,14 @@ xdescribe('ModalRoot', () => {
     const hideTarget = jest.fn();
 
     const ModalRoot = modalRoot({
-      hideTarget: hideTarget,
-      isOpen: true,
-      modalType: 'flyout',
-      props: { showCover: true }
+      modals: [
+        {
+          hideTarget: hideTarget,
+          isOpen: true,
+          modalType: 'flyout',
+          props: { showCover: true }
+        }
+      ]
     });
     const wrapper = mount(<ModalRoot>{funcAsChild}</ModalRoot>);
     const Cover = wrapper.find('Cover');
@@ -48,4 +56,25 @@ xdescribe('ModalRoot', () => {
     expect(Cover).toHaveLength(1);
     expect(Cover.prop('onClick')).toBe(hideTarget);
   });
+
+  it('renders multiple `Modal` when Component, isOpen and modalType is `modal`', () => {
+    const Comp = () => <div>Component being rendered inside Modal</div>;
+    const ModalRoot = modalRoot({
+      modals: [
+        {
+          modalComponent: Comp,
+          isOpen: true,
+          modalType: 'modal'
+        },
+        {
+          modalComponent: Comp,
+          isOpen: true,
+          modalType: 'modal'
+        }
+      ]
+    });
+    const wrapper = mount(<ModalRoot>{funcAsChild}</ModalRoot>);
+    expect(wrapper.find('Modal')).toHaveLength(2);
+    expect(wrapper.text()).toContain('Component being rendered');
+  });
 });

package/Modal/__test_utils__/getComponentWithModalContext.js

@@ -1,9 +1,5 @@
 export const defaultContext = {
-  modalComponent: null,
-  modalType: 'flyout',
-  modalId: 'foo',
-  isOpen: true,
-  props: {},
+  modals: [],
   showTarget: jest.fn(),
   hideTarget: jest.fn()
 };
@@ -17,7 +13,7 @@ const getComponentWithModalContext = (targetPath, moduleToExport = null) => {
     // Mock out ModalContext Consumer (used by all modals)
     jest.doMock('../ModalContext', () => {
       return {
-        Consumer: props => props.children(context)
+        Consumer: (props) => props.children(context)
       };
     });
 

package/ScrollRestorationHandler/useScrollRestore.js

@@ -9,6 +9,11 @@ export function useScrollRestore({ location, ignoreForRouteTypes, prevLocation }
         if (!prevLocation && location.hash !== '') {
             return;
         }
+        if (prevLocation &&
+            prevLocation.pathname === location.pathname &&
+            prevLocation.search === location.search) {
+            return;
+        }
         window.scrollTo(0, 0);
     }, [ignoreForRouteTypes, location, prevLocation]);
 }

package/ScrollRestorationHandler/useScrollRestore.js.map

@@ -1 +1 @@
-{"version":3,"file":"useScrollRestore.js","sourceRoot":"","sources":["useScrollRestore.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElC,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,UAAU,gBAAgB,CAAC,EAC/B,QAAQ,EACR,mBAAmB,EACnB,YAAY,EAKb;IACC,SAAS,CAAC,GAAG,EAAE;QACb,IACE,mBAAmB;YACnB,qBAAqB,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,mBAAmB,EAAE,CAAC,EACpE;YACA,OAAO;SACR;QAED,IAAI,CAAC,YAAY,IAAI,QAAQ,CAAC,IAAI,KAAK,EAAE,EAAE;YACzC,OAAO;SACR;QAED,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACxB,CAAC,EAAE,CAAC,mBAAmB,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;AACpD,CAAC"}
+{"version":3,"file":"useScrollRestore.js","sourceRoot":"","sources":["useScrollRestore.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,OAAO,CAAC;AAElC,OAAO,EAAE,qBAAqB,EAAE,MAAM,yBAAyB,CAAC;AAEhE,MAAM,UAAU,gBAAgB,CAAC,EAC/B,QAAQ,EACR,mBAAmB,EACnB,YAAY,EAKb;IACC,SAAS,CAAC,GAAG,EAAE;QACb,IACE,mBAAmB;YACnB,qBAAqB,CAAC,EAAE,QAAQ,EAAE,UAAU,EAAE,mBAAmB,EAAE,CAAC,EACpE;YACA,OAAO;SACR;QAED,IAAI,CAAC,YAAY,IAAI,QAAQ,CAAC,IAAI,KAAK,EAAE,EAAE;YACzC,OAAO;SACR;QAGD,IAAI,YAAY;YACd,YAAY,CAAC,QAAQ,KAAK,QAAQ,CAAC,QAAQ;YAC3C,YAAY,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,EAAE;YACzC,OAAO;SACR;QAED,MAAM,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IACxB,CAAC,EAAE,CAAC,mBAAmB,EAAE,QAAQ,EAAE,YAAY,CAAC,CAAC,CAAC;AACpD,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jetshop/ui",
-  "version": "5.12.0",
+  "version": "5.12.3",
   "license": "MIT",
   "files": [
     "**/*.js",

package/Modal/TargetWrapper.d.ts

@@ -1,31 +0,0 @@
-import React from 'react';
-import { ModalState } from '@jetshop/ui/Modal/ModalContext';
-/** Function to hide the target modal */
-export declare type hideTarget = () => void;
-export declare type isOpen = boolean;
-export declare type childProps = {
-    hideTarget: hideTarget;
-    isOpen: isOpen;
-};
-export interface TargetWrapperProps {
-    /** React child-as-function */
-    children: (args: Partial<ModalState>) => React.ReactNode;
-    hideTarget: hideTarget;
-    isOpen: isOpen;
-    modalType: 'modal' | 'flyout' | 'drawer';
-    /** Whether to prevent the body from scrolling when flyout is open */
-    preventOverflow: boolean;
-}
-/**
- * Wraps target's children and supplies lifecycle hooks
- * to close on esc
- */
-declare class TargetWrapper extends React.Component<TargetWrapperProps> {
-    componentDidMount(): void;
-    componentDidUpdate(prevProps: TargetWrapperProps): void;
-    componentWillUnmount(): void;
-    cleanup: () => void;
-    handleKeydown: (e: any) => void;
-    render(): React.ReactNode;
-}
-export default TargetWrapper;

package/Modal/TargetWrapper.js

@@ -1,45 +0,0 @@
-import React from 'react';
-import { css } from 'linaria';
-const preventBodyScrollStyle = css `
-  overflow: hidden;
-`;
-/**
- * Wraps target's children and supplies lifecycle hooks
- * to close on esc
- */
-class TargetWrapper extends React.Component {
-    constructor() {
-        super(...arguments);
-        this.cleanup = () => {
-            document.removeEventListener('keydown', this.handleKeydown);
-            document.body.classList.remove(preventBodyScrollStyle);
-        };
-        this.handleKeydown = (e) => e.key === 'Escape' && this.props.hideTarget();
-    }
-    componentDidMount() {
-        document.addEventListener('keydown', this.handleKeydown);
-        if (this.props.preventOverflow) {
-            document.body.classList.add(preventBodyScrollStyle);
-        }
-    }
-    componentDidUpdate(prevProps) {
-        // If we're opening a drawer, add event handlers and prevent body scroll
-        if (this.props.modalType === 'drawer' && this.props.isOpen) {
-            document.addEventListener('keydown', this.handleKeydown);
-            document.body.classList.add(preventBodyScrollStyle);
-        }
-        // If we have just closed a drawer, clean it up
-        if (prevProps.modalType === 'drawer' && !this.props.isOpen) {
-            this.cleanup();
-        }
-    }
-    componentWillUnmount() {
-        this.cleanup();
-    }
-    render() {
-        const { hideTarget, isOpen } = this.props;
-        return this.props.children({ hideTarget, isOpen });
-    }
-}
-export default TargetWrapper;
-//# sourceMappingURL=TargetWrapper.js.map

package/Modal/TargetWrapper.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"TargetWrapper.js","sourceRoot":"","sources":["TargetWrapper.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;AAsB9B,MAAM,sBAAsB,GAAG,GAAG,CAAA;;CAEjC,CAAC;AAEF;;;GAGG;AACH,MAAM,aAAc,SAAQ,KAAK,CAAC,SAA6B;IAA/D;;QA0BE,YAAO,GAAG,GAAG,EAAE;YACb,QAAQ,CAAC,mBAAmB,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;YAC5D,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,sBAAsB,CAAC,CAAC;QACzD,CAAC,CAAC;QAEF,kBAAa,GAAG,CAAC,CAAM,EAAE,EAAE,CAAC,CAAC,CAAC,GAAG,KAAK,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,CAAC;IAM5E,CAAC;IApCC,iBAAiB;QACf,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;QAEzD,IAAI,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE;YAC9B,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;SACrD;IACH,CAAC;IAED,kBAAkB,CAAC,SAA6B;QAC9C,wEAAwE;QACxE,IAAI,IAAI,CAAC,KAAK,CAAC,SAAS,KAAK,QAAQ,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YAC1D,QAAQ,CAAC,gBAAgB,CAAC,SAAS,EAAE,IAAI,CAAC,aAAa,CAAC,CAAC;YACzD,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,sBAAsB,CAAC,CAAC;SACrD;QAED,+CAA+C;QAC/C,IAAI,SAAS,CAAC,SAAS,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE;YAC1D,IAAI,CAAC,OAAO,EAAE,CAAC;SAChB;IACH,CAAC;IAED,oBAAoB;QAClB,IAAI,CAAC,OAAO,EAAE,CAAC;IACjB,CAAC;IASD,MAAM;QACJ,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QAC1C,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,MAAM,EAAE,CAAC,CAAC;IACrD,CAAC;CACF;AAED,eAAe,aAAa,CAAC"}

package/Modal/TargetWrapper.test.js

@@ -1,81 +0,0 @@
-import React from 'react';
-import TargetWrapper from './TargetWrapper';
-
-xdescribe('TargetWrapper', () => {
-  let mountedTargetWrapper;
-  let props;
-  let childFunc = () => <div>hello</div>;
-
-  /** @returns {ShallowWrapper} */
-  const targetWrapper = (child = childFunc) =>
-    (mountedTargetWrapper = !mountedTargetWrapper
-      ? (mountedTargetWrapper = shallow(
-          <TargetWrapper {...props}>{child}</TargetWrapper>
-        ))
-      : mountedTargetWrapper);
-
-  beforeEach(() => {
-    props = {
-      hideTarget: jest.fn(),
-      isOpen: false
-    };
-    mountedTargetWrapper = undefined;
-  });
-
-  describe('on mount', () => {
-    const spy = jest.spyOn(TargetWrapper.prototype, 'handleKeydown');
-
-    it('adds a keydown event listener to window', () => {
-      targetWrapper();
-
-      var event = new KeyboardEvent('keydown', { key: 'Escape' });
-      document.dispatchEvent(event);
-
-      expect(spy).toHaveBeenCalled();
-      targetWrapper().unmount();
-    });
-    it('removes keydown event listener when unmounted', () => {
-      targetWrapper().unmount();
-
-      var event = new KeyboardEvent('keydown', { key: 'Escape' });
-      document.dispatchEvent(event);
-
-      // handleKeyDown should have been called only once, in the previous test
-      expect(spy).toHaveBeenCalledTimes(1);
-    });
-    describe('if `drawer` is given for `modalType` prop', () => {
-      beforeEach(() => {
-        props.modalType = 'drawer';
-      });
-      it('adds a class to body', () => {
-        targetWrapper();
-        expect(document.body.classList.length).toBe(1);
-      });
-      it('removes the class when unmounted', () => {
-        targetWrapper().unmount();
-        expect(document.body.classList.length).toBe(0);
-      });
-    });
-    describe('if `modalType` is not `drawer`', () => {
-      it('no class is added to body', () => {
-        targetWrapper();
-        expect(document.body.classList.length).toBe(0);
-      });
-    });
-  });
-  describe('it executes the child prop', () => {
-    const funcAsChild = jest.fn();
-
-    it('on mount', () => {
-      targetWrapper(funcAsChild);
-      expect(funcAsChild).toBeCalled();
-    });
-    it('with `hideTarget` and `isOpen` props passed as args', () => {
-      targetWrapper(funcAsChild);
-      expect(funcAsChild).toHaveBeenLastCalledWith({
-        hideTarget: props.hideTarget,
-        isOpen: props.isOpen
-      });
-    });
-  });
-});