@hipay/hipay-material-ui 1.0.0-beta.8 → 2.0.0-beta.35

package/es/styles/transitions.js

@@ -1,13 +1,11 @@
-import _Object$keys from 'babel-runtime/core-js/object/keys';
-import _objectWithoutProperties from 'babel-runtime/helpers/objectWithoutProperties';
-import _Number$isNaN from 'babel-runtime/core-js/number/is-nan';
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 
 /* eslint-disable no-param-reassign */
 
-import warning from 'warning';
-
-// Follow https://material.google.com/motion/duration-easing.html#duration-easing-natural-easing-curves
+/* eslint-disable no-restricted-globals */
+import warning from 'warning'; // Follow https://material.google.com/motion/duration-easing.html#duration-easing-natural-easing-curves
 // to learn the context in which each easing should be used.
+
 export const easing = {
   // This is the most common easing curve.
   easeInOut: 'cubic-bezier(0.4, 0, 0.2, 1)',
@@ -18,10 +16,9 @@ export const easing = {
   easeIn: 'cubic-bezier(0.4, 0, 1, 1)',
   // The sharp curve is used by objects that may return to the screen at any time.
   sharp: 'cubic-bezier(0.4, 0, 0.6, 1)'
-};
-
-// Follow https://material.io/guidelines/motion/duration-easing.html#duration-easing-common-durations
+}; // Follow https://material.io/guidelines/motion/duration-easing.html#duration-easing-common-durations
 // to learn when use what timing
+
 export const duration = {
   shortest: 150,
   shorter: 200,
@@ -35,11 +32,9 @@ export const duration = {
   // recommended when something is leaving screen
   leavingScreen: 195
 };
-
 export const formatMs = milliseconds => `${Math.round(milliseconds)}ms`;
 export const isString = value => typeof value === 'string';
-export const isNumber = value => !_Number$isNaN(parseFloat(value));
-
+export const isNumber = value => !isNaN(parseFloat(value));
 /**
  * @param {string|Array} props
  * @param {object} param
@@ -48,33 +43,34 @@ export const isNumber = value => !_Number$isNaN(parseFloat(value));
  * @param {string} param.easing
  * @param {number} param.delay
  */
+
 export default {
   easing,
   duration,
-  create(props = ['all'], options = {}) {
+  create: (props = ['all'], options = {}) => {
     const {
       duration: durationOption = duration.standard,
       easing: easingOption = easing.easeInOut,
       delay = 0
     } = options,
-          other = _objectWithoutProperties(options, ['duration', 'easing', 'delay']);
+          other = _objectWithoutProperties(options, ["duration", "easing", "delay"]);
 
     process.env.NODE_ENV !== "production" ? warning(isString(props) || Array.isArray(props), 'Material-UI: argument "props" must be a string or Array.') : void 0;
     process.env.NODE_ENV !== "production" ? warning(isNumber(durationOption) || isString(durationOption), `Material-UI: argument "duration" must be a number or a string but found ${durationOption}.`) : void 0;
     process.env.NODE_ENV !== "production" ? warning(isString(easingOption), 'Material-UI: argument "easing" must be a string.') : void 0;
     process.env.NODE_ENV !== "production" ? warning(isNumber(delay) || isString(delay), 'Material-UI: argument "delay" must be a number or a string.') : void 0;
-    process.env.NODE_ENV !== "production" ? warning(_Object$keys(other).length === 0, `Material-UI: unrecognized argument(s) [${_Object$keys(other).join(',')}]`) : void 0;
-
+    process.env.NODE_ENV !== "production" ? warning(Object.keys(other).length === 0, `Material-UI: unrecognized argument(s) [${Object.keys(other).join(',')}]`) : void 0;
     return (Array.isArray(props) ? props : [props]).map(animatedProp => `${animatedProp} ${typeof durationOption === 'string' ? durationOption : formatMs(durationOption)} ${easingOption} ${typeof delay === 'string' ? delay : formatMs(delay)}`).join(',');
   },
+
   getAutoHeightDuration(height) {
     if (!height) {
       return 0;
     }
 
-    const constant = height / 36;
+    const constant = height / 36; // https://www.wolframalpha.com/input/?i=(4+%2B+15+*+(x+%2F+36+)+**+0.25+%2B+(x+%2F+36)+%2F+5)+*+10
 
-    // https://www.wolframalpha.com/input/?i=(4+%2B+15+*+(x+%2F+36+)+**+0.25+%2B+(x+%2F+36)+%2F+5)+*+10
-    return Math.round((4 + 15 * Math.pow(constant, 0.25) + constant / 5) * 10);
+    return Math.round((4 + 15 * constant ** 0.25 + constant / 5) * 10);
   }
+
 };

package/es/styles/withStyles.js

@@ -1,8 +1,6 @@
-import _Object$keys from 'babel-runtime/core-js/object/keys';
-import _extends from 'babel-runtime/helpers/extends';
-import _objectWithoutProperties from 'babel-runtime/helpers/objectWithoutProperties';
-import _Map from 'babel-runtime/core-js/map';
-import _Number$MIN_SAFE_INTEGER from 'babel-runtime/core-js/number/min-safe-integer';
+import _extends from "@babel/runtime/helpers/extends";
+import _objectSpread from "@babel/runtime/helpers/objectSpread";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import React from 'react';
 import PropTypes from 'prop-types';
 import warning from 'warning';
@@ -13,18 +11,18 @@ import contextTypes from 'react-jss/lib/contextTypes';
 import { create } from 'jss';
 import * as ns from 'react-jss/lib/ns';
 import jssPreset from './jssPreset';
-import createHiMuiTheme from './createHiMuiTheme';
+import mergeClasses from './mergeClasses';
+import createMuiTheme from './createMuiTheme';
 import themeListener from './themeListener';
 import createGenerateClassName from './createGenerateClassName';
 import getStylesCreator from './getStylesCreator';
+import getThemeProps from './getThemeProps'; // Default JSS instance.
 
-// Default JSS instance.
-const jss = create(jssPreset());
+const jss = create(jssPreset()); // Use a singleton or the provided one by the context.
 
-// Use a singleton or the provided one by the context.
-const generateClassName = createGenerateClassName();
-
-// Global index counter to preserve source order.
+const generateClassName = createGenerateClassName({
+  productionPrefix: 'hi'
+}); // Global index counter to preserve source order.
 // We create the style sheet during at the creation of the component,
 // children are handled after the parents, so the order of style elements would be parent->child.
 // It is a problem though when a parent passes a className
@@ -32,14 +30,13 @@ const generateClassName = createGenerateClassName();
 // StyleSheet of the child has a higher specificity, because of the source order.
 // So our solution is to render sheets them in the reverse order child->sheet, so
 // that parent has a higher specificity.
-let indexCounter = _Number$MIN_SAFE_INTEGER;
 
-export const sheetsManager = new _Map();
+let indexCounter = -10e10; // Exported for test purposes
+
+export const sheetsManager = new Map(); // We use the same empty object to ref count the styles that don't need a theme object.
 
-// We use the same empty object to ref count the styles that don't need a theme object.
-const noopTheme = {};
+const noopTheme = {}; // In order to have self-supporting components, we rely on default theme when not provided.
 
-// In order to have self-supporting components, we rely on default theme when not provided.
 let defaultTheme;
 
 function getDefaultTheme() {
@@ -47,29 +44,37 @@ function getDefaultTheme() {
     return defaultTheme;
   }
 
-  defaultTheme = createHiMuiTheme();
+  defaultTheme = createMuiTheme();
   return defaultTheme;
-}
-
-// Link a style sheet with a component.
+} // Link a style sheet with a component.
 // It does not modify the component passed to it;
 // instead, it returns a new component, with a `classes` property.
+
+
 const withStyles = (stylesOrCreator, options = {}) => Component => {
-  const { withTheme = false, flip = null, name } = options,
-        styleSheetOptions = _objectWithoutProperties(options, ['withTheme', 'flip', 'name']);
+  const {
+    hiComponent = false,
+    withTheme = false,
+    flip = null,
+    name
+  } = options,
+        styleSheetOptions = _objectWithoutProperties(options, ["hiComponent", "withTheme", "flip", "name"]);
+
   const stylesCreator = getStylesCreator(stylesOrCreator);
   const listenToTheme = stylesCreator.themingEnabled || withTheme || typeof name === 'string';
-
   indexCounter += 1;
-  stylesCreator.options.index = indexCounter;
+
+  if (hiComponent) {
+    stylesCreator.options.index = Math.round(indexCounter / 10e4);
+  } else {
+    stylesCreator.options.index = indexCounter;
+  }
 
   process.env.NODE_ENV !== "production" ? warning(indexCounter < 0, ['Material-UI: you might have a memory leak.', 'The indexCounter is not supposed to grow that much.'].join(' ')) : void 0;
 
   class WithStyles extends React.Component {
     constructor(props, context) {
       super(props, context);
-
-      this.state = {};
       this.disableStylesGeneration = false;
       this.jss = null;
       this.sheetOptions = null;
@@ -77,28 +82,38 @@ const withStyles = (stylesOrCreator, options = {}) => Component => {
       this.stylesCreatorSaved = null;
       this.theme = null;
       this.unsubscribeId = null;
-      this.jss = this.context[ns.jss] || jss;
+      this.state = {};
+      this.jss = context[ns.jss] || jss;
+      const {
+        muiThemeProviderOptions
+      } = context;
 
-      const { muiThemeProviderOptions } = this.context;
       if (muiThemeProviderOptions) {
         if (muiThemeProviderOptions.sheetsManager) {
           this.sheetsManager = muiThemeProviderOptions.sheetsManager;
         }
 
         this.disableStylesGeneration = muiThemeProviderOptions.disableStylesGeneration;
-      }
-
-      // Attach the stylesCreator to the instance of the component as in the context
+      } // Attach the stylesCreator to the instance of the component as in the context
       // of react-hot-loader the hooks can be executed in a different closure context:
       // https://github.com/gaearon/react-hot-loader/blob/master/src/patch.dev.js#L107
+
+
       this.stylesCreatorSaved = stylesCreator;
-      this.sheetOptions = _extends({
+      this.sheetOptions = _objectSpread({
         generateClassName
-      }, this.context[ns.sheetOptions]);
-      // We use || as the function call is lazy evaluated.
-      this.theme = listenToTheme ? themeListener.initial(context) || getDefaultTheme() : noopTheme;
+      }, context[ns.sheetOptions]); // We use || as the function call is lazy evaluated.
 
+      this.theme = listenToTheme ? themeListener.initial(context) || getDefaultTheme() : noopTheme;
       this.attach(this.theme);
+      this.cacheClasses = {
+        // Cache for the finalized classes value.
+        value: null,
+        // Cache for the last used classes prop pointer.
+        lastProp: null,
+        // Cache for the last used rendered classes pointer.
+        lastJSS: {}
+      };
     }
 
     componentDidMount() {
@@ -109,17 +124,16 @@ const withStyles = (stylesOrCreator, options = {}) => Component => {
       this.unsubscribeId = themeListener.subscribe(this.context, theme => {
         const oldTheme = this.theme;
         this.theme = theme;
-        this.attach(this.theme);
-
-        // Rerender the component so the underlying component gets the theme update.
+        this.attach(this.theme); // Rerender the component so the underlying component gets the theme update.
         // By theme update we mean receiving and applying the new class names.
+
         this.setState({}, () => {
           this.detach(oldTheme);
         });
       });
     }
 
-    componentWillReceiveProps() {
+    componentDidUpdate() {
       // react-hot-loader specific logic
       if (this.stylesCreatorSaved === stylesCreator || process.env.NODE_ENV === 'production') {
         return;
@@ -128,6 +142,7 @@ const withStyles = (stylesOrCreator, options = {}) => Component => {
       this.detach(this.theme);
       this.stylesCreatorSaved = stylesCreator;
       this.attach(this.theme);
+      this.forceUpdate();
     }
 
     componentWillUnmount() {
@@ -138,6 +153,38 @@ const withStyles = (stylesOrCreator, options = {}) => Component => {
       }
     }
 
+    getClasses() {
+      // Tracks if either the rendered classes or classes prop has changed,
+      // requiring the generation of a new finalized classes object.
+      let generate = false;
+
+      if (!this.disableStylesGeneration) {
+        const sheetManager = this.sheetsManager.get(this.stylesCreatorSaved);
+        const sheetsManagerTheme = sheetManager.get(this.theme);
+
+        if (sheetsManagerTheme.sheet.classes !== this.cacheClasses.lastJSS) {
+          this.cacheClasses.lastJSS = sheetsManagerTheme.sheet.classes;
+          generate = true;
+        }
+      }
+
+      if (this.props.classes !== this.cacheClasses.lastProp) {
+        this.cacheClasses.lastProp = this.props.classes;
+        generate = true;
+      }
+
+      if (generate) {
+        this.cacheClasses.value = mergeClasses({
+          baseClasses: this.cacheClasses.lastJSS,
+          newClasses: this.props.classes,
+          Component,
+          noBase: this.disableStylesGeneration
+        });
+      }
+
+      return this.cacheClasses.value;
+    }
+
     attach(theme) {
       if (this.disableStylesGeneration) {
         return;
@@ -147,7 +194,7 @@ const withStyles = (stylesOrCreator, options = {}) => Component => {
       let sheetManager = this.sheetsManager.get(stylesCreatorSaved);
 
       if (!sheetManager) {
-        sheetManager = new _Map();
+        sheetManager = new Map();
         this.sheetsManager.set(stylesCreatorSaved, sheetManager);
       }
 
@@ -167,27 +214,21 @@ const withStyles = (stylesOrCreator, options = {}) => Component => {
 
         if (process.env.NODE_ENV !== 'production' && !meta) {
           meta = getDisplayName(Component);
+          process.env.NODE_ENV !== "production" ? warning(typeof meta === 'string', ['Material-UI: the component displayName is invalid. It needs to be a string.', `Please fix the following component: ${Component}.`].join('\n')) : void 0;
         }
 
-        let myOptions = _extends({
+        const sheet = this.jss.createStyleSheet(styles, _objectSpread({
           meta,
           classNamePrefix: meta,
           flip: typeof flip === 'boolean' ? flip : theme.direction === 'rtl',
           link: false
         }, this.sheetOptions, stylesCreatorSaved.options, {
           name
-        }, styleSheetOptions);
-
-        if (!myOptions.hasOwnProperty('index') || myOptions.index < 0) {
-          myOptions.index = 50;
-        }
-
-        const sheet = this.jss.createStyleSheet(styles, myOptions);
-
+        }, styleSheetOptions));
         sheetManagerTheme.sheet = sheet;
         sheet.attach();
-
         const sheetsRegistry = this.context[ns.sheetsRegistry];
+
         if (sheetsRegistry) {
           sheetsRegistry.add(sheet);
         }
@@ -203,22 +244,14 @@ const withStyles = (stylesOrCreator, options = {}) => Component => {
 
       const stylesCreatorSaved = this.stylesCreatorSaved;
       const sheetManager = this.sheetsManager.get(stylesCreatorSaved);
-      let sheetManagerTheme = sheetManager.get(theme);
-
-      if (!sheetManagerTheme) {
-        sheetManagerTheme = {
-          refs: 0,
-          sheet: null
-        };
-        sheetManager.set(theme, sheetManagerTheme);
-      }
-
+      const sheetManagerTheme = sheetManager.get(theme);
       sheetManagerTheme.refs -= 1;
 
       if (sheetManagerTheme.refs === 0) {
         sheetManager.delete(theme);
         this.jss.removeStyleSheet(sheetManagerTheme.sheet);
         const sheetsRegistry = this.context[ns.sheetsRegistry];
+
         if (sheetsRegistry) {
           sheetsRegistry.remove(sheetManagerTheme.sheet);
         }
@@ -226,59 +259,43 @@ const withStyles = (stylesOrCreator, options = {}) => Component => {
     }
 
     render() {
-      const _props = this.props,
-            { classes: classesProp, innerRef } = _props,
-            other = _objectWithoutProperties(_props, ['classes', 'innerRef']);
-
-      let classes;
-      let renderedClasses = {};
-
-      if (!this.disableStylesGeneration) {
-        const sheetManager = this.sheetsManager.get(this.stylesCreatorSaved);
-        const sheetsManagerTheme = sheetManager.get(this.theme);
-        renderedClasses = sheetsManagerTheme.sheet.classes;
-      }
-
-      if (classesProp) {
-        classes = _extends({}, renderedClasses, _Object$keys(classesProp).reduce((accumulator, key) => {
-          process.env.NODE_ENV !== "production" ? warning(renderedClasses[key] || this.disableStylesGeneration, [`Material-UI: the key \`${key}\` ` + `provided to the classes property is not implemented in ${getDisplayName(Component)}.`, `You can only override one of the following: ${_Object$keys(renderedClasses).join(',')}`].join('\n')) : void 0;
-
-          process.env.NODE_ENV !== "production" ? warning(!classesProp[key] || typeof classesProp[key] === 'string', [`Material-UI: the key \`${key}\` ` + `provided to the classes property is not valid for ${getDisplayName(Component)}.`, `You need to provide a non empty string instead of: ${classesProp[key]}.`].join('\n')) : void 0;
-
-          if (classesProp[key]) {
-            accumulator[key] = `${renderedClasses[key]} ${classesProp[key]}`;
-          }
-
-          return accumulator;
-        }, {}));
-      } else {
-        classes = renderedClasses;
-      }
-
-      const more = {};
-
-      // Provide the theme to the wrapped component.
+      const _this$props = this.props,
+            {
+        classes,
+        innerRef
+      } = _this$props,
+            other = _objectWithoutProperties(_this$props, ["classes", "innerRef"]);
+
+      const more = getThemeProps({
+        theme: this.theme,
+        name
+      }); // Provide the theme to the wrapped component.
       // So we don't have to use the `withTheme()` Higher-order Component.
+
       if (withTheme) {
         more.theme = this.theme;
       }
 
-      return React.createElement(Component, _extends({ classes: classes }, more, other, { ref: innerRef }));
+      return React.createElement(Component, _extends({}, more, {
+        classes: this.getClasses(),
+        ref: innerRef
+      }, other));
     }
+
   }
 
   WithStyles.propTypes = process.env.NODE_ENV !== "production" ? {
     /**
-     * Useful to extend the style applied to components.
+     * Override or extend the styles applied to the component.
      */
     classes: PropTypes.object,
+
     /**
      * Use that property to pass a ref callback to the decorated component.
      */
-    innerRef: PropTypes.func
+    innerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object])
   } : {};
-
-  WithStyles.contextTypes = _extends({
+  WithStyles.contextTypes = _objectSpread({
     muiThemeProviderOptions: PropTypes.object
   }, contextTypes, listenToTheme ? themeListener.contextTypes : {});
 

package/es/styles/withTheme.js

@@ -1,10 +1,11 @@
-import _extends from 'babel-runtime/helpers/extends';
+import _extends from "@babel/runtime/helpers/extends";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import React from 'react';
+import PropTypes from 'prop-types';
 import hoistNonReactStatics from 'hoist-non-react-statics';
 import wrapDisplayName from 'recompose/wrapDisplayName';
-import createHiMuiTheme from './createHiMuiTheme';
+import createMuiTheme from './createMuiTheme';
 import themeListener from './themeListener';
-
 let defaultTheme;
 
 function getDefaultTheme() {
@@ -12,17 +13,17 @@ function getDefaultTheme() {
     return defaultTheme;
   }
 
-  defaultTheme = createHiMuiTheme();
+  defaultTheme = createMuiTheme();
   return defaultTheme;
-}
+} // Provide the theme object as a property to the input component.
+
 
-// Provide the theme object as a property to the input component.
 const withTheme = () => Component => {
   class WithTheme extends React.Component {
     constructor(props, context) {
-      super(props, context);
-      this.state = {};
+      super();
       this.unsubscribeId = null;
+      this.state = {};
       this.state = {
         // We use || as the function call is lazy evaluated.
         theme: themeListener.initial(context) || getDefaultTheme()
@@ -31,7 +32,9 @@ const withTheme = () => Component => {
 
     componentDidMount() {
       this.unsubscribeId = themeListener.subscribe(this.context, theme => {
-        this.setState({ theme });
+        this.setState({
+          theme
+        });
       });
     }
 
@@ -42,10 +45,26 @@ const withTheme = () => Component => {
     }
 
     render() {
-      return React.createElement(Component, _extends({ theme: this.state.theme }, this.props));
+      const _this$props = this.props,
+            {
+        innerRef
+      } = _this$props,
+            other = _objectWithoutProperties(_this$props, ["innerRef"]);
+
+      return React.createElement(Component, _extends({
+        theme: this.state.theme,
+        ref: innerRef
+      }, other));
     }
+
   }
 
+  WithTheme.propTypes = process.env.NODE_ENV !== "production" ? {
+    /**
+     * Use that property to pass a ref callback to the decorated component.
+     */
+    innerRef: PropTypes.oneOfType([PropTypes.func, PropTypes.object])
+  } : {};
   WithTheme.contextTypes = themeListener.contextTypes;
 
   if (process.env.NODE_ENV !== 'production') {

package/es/styles/zIndex.js

@@ -8,5 +8,4 @@ const zIndex = {
   snackbar: 1400,
   tooltip: 1500
 };
-
 export default zIndex;

package/es/test-utils/createMount.js

@@ -1,15 +1,13 @@
-import _extends from 'babel-runtime/helpers/extends';
-import _objectWithoutProperties from 'babel-runtime/helpers/objectWithoutProperties';
-//  weak
-
+import _objectSpread from "@babel/runtime/helpers/objectSpread";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import { unmountComponentAtNode } from 'react-dom';
+import { mount as enzymeMount } from 'enzyme'; // Generate an enhanced mount function.
 
-import { mount as enzymeMount } from 'enzyme';
-
-// Generate an enhanced mount function.
 export default function createMount(options1 = {}) {
-  const { mount = enzymeMount } = options1,
-        other1 = _objectWithoutProperties(options1, ['mount']);
+  const {
+    mount = enzymeMount
+  } = options1,
+        other1 = _objectWithoutProperties(options1, ["mount"]);
 
   const attachTo = window.document.createElement('div');
   attachTo.className = 'app';
@@ -17,12 +15,13 @@ export default function createMount(options1 = {}) {
   window.document.body.insertBefore(attachTo, window.document.body.firstChild);
 
   const mountWithContext = function mountWithContext(node, options2 = {}) {
-    return mount(node, _extends({
+    return mount(node, _objectSpread({
       attachTo
     }, other1, options2));
   };
 
   mountWithContext.attachTo = attachTo;
+
   mountWithContext.cleanUp = () => {
     unmountComponentAtNode(attachTo);
     attachTo.parentNode.removeChild(attachTo);

package/es/test-utils/createRender.js

@@ -1,15 +1,15 @@
-import _extends from 'babel-runtime/helpers/extends';
-import _objectWithoutProperties from 'babel-runtime/helpers/objectWithoutProperties';
-import { render as enzymeRender } from 'enzyme';
+import _objectSpread from "@babel/runtime/helpers/objectSpread";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
+import { render as enzymeRender } from 'enzyme'; // Generate a render to string function.
 
-
-// Generate a render to string function.
 export default function createRender(options1 = {}) {
-  const { render = enzymeRender } = options1,
-        other1 = _objectWithoutProperties(options1, ['render']);
+  const {
+    render = enzymeRender
+  } = options1,
+        other1 = _objectWithoutProperties(options1, ["render"]);
 
   const renderWithContext = function renderWithContext(node, options2 = {}) {
-    return render(node, _extends({}, other1, options2));
+    return render(node, _objectSpread({}, other1, options2));
   };
 
   return renderWithContext;

package/es/test-utils/createShallow.js

@@ -1,33 +1,33 @@
-import _extends from 'babel-runtime/helpers/extends';
-import _objectWithoutProperties from 'babel-runtime/helpers/objectWithoutProperties';
-//  weak
-
+import _objectSpread from "@babel/runtime/helpers/objectSpread";
+import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
 import { shallow as enzymeShallow } from 'enzyme';
+import until from './until'; // Generate an enhanced shallow function.
 
-import until from './until';
-
-// Generate an enhanced shallow function.
 export default function createShallow(options1 = {}) {
-    const { shallow = enzymeShallow, dive = false, untilSelector = false } = options1,
-          other1 = _objectWithoutProperties(options1, ['shallow', 'dive', 'untilSelector']);
+  const {
+    shallow = enzymeShallow,
+    dive = false,
+    untilSelector = false
+  } = options1,
+        other1 = _objectWithoutProperties(options1, ["shallow", "dive", "untilSelector"]);
 
-    const shallowWithContext = function shallowWithContext(node, options2 = {}) {
-        const options = _extends({}, other1, options2, {
-            context: _extends({}, other1.context, options2.context)
-        });
+  const shallowWithContext = function shallowWithContext(node, options2 = {}) {
+    const options = _objectSpread({}, other1, options2, {
+      context: _objectSpread({}, other1.context, options2.context)
+    });
 
-        const wrapper = shallow(node, options);
+    const wrapper = shallow(node, options);
 
-        if (dive) {
-            return wrapper.dive();
-        }
+    if (dive) {
+      return wrapper.dive();
+    }
 
-        if (untilSelector) {
-            return until.call(wrapper, untilSelector, options);
-        }
+    if (untilSelector) {
+      return until.call(wrapper, untilSelector, options);
+    }
 
-        return wrapper;
-    };
+    return wrapper;
+  };
 
-    return shallowWithContext;
+  return shallowWithContext;
 }