@cashub/ui 0.48.12 → 0.48.14

package/map/GoogleReverseGeolocation.js

@@ -11,9 +11,7 @@ var _GoogleMapContainer = _interopRequireDefault(require("./subComponent/GoogleM
 var _Searchbox = _interopRequireDefault(require("../form/Searchbox"));
 var _map_icon = _interopRequireDefault(require("../assets/icons/map_icon4.png"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _templateObject;
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, { raw: { value: Object.freeze(t) } })); }
 const GoogleReverseGeolocation = _ref => {
   let {
     apiKey,
@@ -193,5 +191,10 @@ const Map = _ref2 => {
     })]
   });
 };
-const MapSearchBoxControl = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  position: absolute;\n  top: var(--spacing-s);\n  right: var(--spacing-s);\n  z-index: 1;\n"])));
+const MapSearchBoxControl = _styledComponents.default.div`
+  position: absolute;
+  top: var(--spacing-s);
+  right: var(--spacing-s);
+  z-index: 1;
+`;
 var _default = exports.default = GoogleReverseGeolocation;

package/map/LeafletMap.js

@@ -59,7 +59,7 @@ const LeafletMap = _ref => {
     }
     const tooltips = event.target._panes.popupPane.getElementsByClassName('leaflet-draw-tooltip');
     for (let index = 0; index < tooltips.length; index += 1) {
-      tooltips[index].textContent = "Radius: ".concat(parseInt(radius, 10));
+      tooltips[index].textContent = `Radius: ${parseInt(radius, 10)}`;
     }
     if (eventHandlers.edit) {
       eventHandlers.edit(radius);
@@ -154,7 +154,7 @@ const LeafletMap = _ref => {
         maxClusterRadius: 120,
         iconCreateFunction: cluster => {
           return _leaflet.default.divIcon({
-            html: "<div><span>".concat(cluster.getChildCount(), "</span></div>"),
+            html: `<div><span>${cluster.getChildCount()}</span></div>`,
             className: 'marker-cluster',
             iconSize: _leaflet.default.point(40, 40)
           });

package/map/subComponent/GoogleMapContainer.js

@@ -5,13 +5,25 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _styledComponents = _interopRequireDefault(require("styled-components"));
-var _templateObject;
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, { raw: { value: Object.freeze(t) } })); }
-const GoogleMapContainer = _styledComponents.default.div(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  height: ", "px;\n  border: 1px solid transparent;\n  border-radius: var(--border-radius);\n\n  &:focus {\n    border-color: var(--border-color);\n    box-shadow: var(--box-shadow);\n  }\n\n  .google-popup-content-wrapper {\n    position: absolute;\n    transform: translate(-50%, -100%);\n  }\n"])), _ref => {
+const GoogleMapContainer = _styledComponents.default.div`
+  height: ${_ref => {
   let {
     height
   } = _ref;
   return height;
-});
+}}px;
+  border: 1px solid transparent;
+  border-radius: var(--border-radius);
+
+  &:focus {
+    border-color: var(--border-color);
+    box-shadow: var(--box-shadow);
+  }
+
+  .google-popup-content-wrapper {
+    position: absolute;
+    transform: translate(-50%, -100%);
+  }
+`;
 var _default = exports.default = GoogleMapContainer;

package/map/subComponent/GoogleMapPopup.js

@@ -4,9 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 // custom popup
 // https://developers.google.com/maps/documentation/javascript/examples/overlay-popup
 class GoogleMapPopup {
@@ -14,6 +11,10 @@ class GoogleMapPopup {
     // wrap class to prevent cannot reference maps during runtime
     // because google map library will load after render map only
     class MapPopup extends window.google.maps.OverlayView {
+      position;
+      containerDiv;
+      offset = 16;
+      justRendered = false;
       constructor() {
         let {
           maxWidth,
@@ -22,14 +23,10 @@ class GoogleMapPopup {
         super();
 
         // This zero-height div is positioned at the bottom of the tip.
-        _defineProperty(this, "position", void 0);
-        _defineProperty(this, "containerDiv", void 0);
-        _defineProperty(this, "offset", 16);
-        _defineProperty(this, "justRendered", false);
         this.containerDiv = document.createElement('div');
         this.containerDiv.classList.add('google-popup-content-wrapper');
         if (maxWidth) {
-          this.containerDiv.style.maxWidth = "".concat(maxWidth, "px");
+          this.containerDiv.style.maxWidth = `${maxWidth}px`;
         }
         if (offset) {
           this.offset = offset;
@@ -60,8 +57,8 @@ class GoogleMapPopup {
             this.fitMap();
             this.justRendered = false;
           }
-          this.containerDiv.style.left = "".concat(divPosition.x, "px");
-          this.containerDiv.style.top = "".concat(divPosition.y - this.offset, "px");
+          this.containerDiv.style.left = `${divPosition.x}px`;
+          this.containerDiv.style.top = `${divPosition.y - this.offset}px`;
         }
       }
       setPosition(position) {

package/map/subComponent/GoogleMapWrapper.js

@@ -7,21 +7,13 @@ exports.default = void 0;
 var _react = require("react");
 var _reactWrapper = require("@googlemaps/react-wrapper");
 var _jsxRuntime = require("react/jsx-runtime");
-const _excluded = ["children", "apiKey", "onError"];
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
 const GoogleMapWrapper = _ref => {
   let {
-      children,
-      apiKey,
-      onError
-    } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded);
+    children,
+    apiKey,
+    onError,
+    ...props
+  } = _ref;
   const render = status => {
     switch (status) {
       case _reactWrapper.Status.LOADING:
@@ -39,9 +31,10 @@ const GoogleMapWrapper = _ref => {
     style: {
       position: 'relative'
     },
-    children: /*#__PURE__*/(0, _react.cloneElement)(children, _objectSpread(_objectSpread({}, props), {}, {
+    children: /*#__PURE__*/(0, _react.cloneElement)(children, {
+      ...props,
       onError
-    }))
+    })
   });
 };
 var _default = exports.default = GoogleMapWrapper;

package/map/subComponent/LeafletDrawControl.js

@@ -13,11 +13,8 @@ var _fastDeepEqual = _interopRequireDefault(require("fast-deep-equal"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); } // eslint-disable-line
+// eslint-disable-line
+
 const eventHandlers = {
   onEdited: 'draw:edited',
   onDrawStart: 'draw:drawstart',
@@ -109,13 +106,18 @@ const createDrawElement = (props, layerContainer) => {
   };
   if (draw !== undefined) {
     if (typeof draw === 'object') {
-      options.draw = _objectSpread({}, draw);
+      options.draw = {
+        ...draw
+      };
     } else {
       options.draw = draw;
     }
   }
   if (edit) {
-    options.edit = _objectSpread(_objectSpread({}, options.edit), edit);
+    options.edit = {
+      ...options.edit,
+      ...edit
+    };
   }
   if (position) {
     options.position = position;

package/map/subComponent/LeafletMapContainer.js

@@ -6,13 +6,168 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _styledComponents = _interopRequireDefault(require("styled-components"));
 var _reactLeaflet = require("react-leaflet");
-var _templateObject;
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, { raw: { value: Object.freeze(t) } })); }
-const LeafletMapContainer = (0, _styledComponents.default)(_reactLeaflet.MapContainer)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  width: 100%;\n  height: ", "px;\n  border: 1px solid transparent;\n  border-radius: var(--border-radius);\n  z-index: 1;\n\n  &:focus {\n    border-color: var(--border-color);\n    box-shadow: var(--box-shadow);\n  }\n\n  .leaflet-control-container {\n    .leaflet-control-zoom {\n      box-shadow: var(--box-shadow);\n      border-radius: var(--border-radius);\n\n      a {\n        background: transparent;\n        border-bottom: 1px solid var(--border-color);\n        color: var(--font-on-background);\n\n        &:last-child {\n          border-bottom: none;\n        }\n\n        &.leaflet-disabled {\n          opacity: 0.5;\n        }\n      }\n    }\n\n    .leaflet-draw {\n      box-shadow: var(--box-shadow);\n      border-radius: var(--border-radius);\n\n      a {\n        background-color: var(--color-background1);\n      }\n\n      .leaflet-draw-draw-polyline {\n        background-position: -3px -3px;\n      }\n\n      .leaflet-draw-draw-polygon {\n        background-position: -32px -3px;\n      }\n\n      .leaflet-draw-draw-rectangle {\n        background-position: -63px -3px;\n      }\n\n      .leaflet-draw-draw-circle {\n        background-position: -93px -3px;\n      }\n\n      .leaflet-draw-draw-marker {\n        background-position: -123px -3px;\n      }\n\n      .leaflet-draw-draw-circlemarker {\n        background-position: -273px -3px;\n      }\n\n      .leaflet-draw-edit-edit {\n        background-position: -213px -3px;\n      }\n\n      .leaflet-draw-edit-remove {\n        background-position: -243px -3px;\n      }\n    }\n\n    .leaflet-left .leaflet-control {\n      margin-left: var(--spacing-s);\n    }\n\n    .leaflet-right .leaflet-control {\n      margin-right: var(--spacing-s);\n    }\n\n    .leaflet-top .leaflet-control {\n      margin-top: var(--spacing-s);\n    }\n\n    .leaflet-control {\n      font-weight: bold;\n      background: var(--color-background1);\n\n      &.leaflet-control-attribution {\n        background: var(--color-white);\n        color: var(--color-dark);\n        margin: 0;\n      }\n    }\n  }\n\n  .leaflet-edit-move {\n    border-radius: 50px;\n    border-color: var(--border-color);\n  }\n\n  .leaflet-edit-resize {\n    border-radius: 50px;\n    border-color: var(--border-color);\n  }\n\n  &.leaflet-touch {\n    .leaflet-bar {\n      border: none;\n\n      a {\n        width: 24px;\n        height: 24px;\n        line-height: 24px;\n      }\n    }\n\n    .leaflet-left .leaflet-control {\n      margin-left: var(--spacing-s);\n    }\n\n    .leaflet-right .leaflet-control {\n      margin-right: var(--spacing-s);\n    }\n\n    .leaflet-top .leaflet-control {\n      margin-top: var(--spacing-s);\n    }\n  }\n\n  .marker-cluster {\n    background: var(--color-primary) a1;\n\n    div {\n      background: var(--color-primary);\n      color: var(--font-on-primary);\n    }\n  }\n\n  .leaflet-popup-content-wrapper {\n    background: transparent;\n    box-shadow: unset;\n  }\n\n  .leaflet-popup-content p {\n    margin: 0;\n    margin-bottom: var(--spacing-s);\n  }\n\n  .leaflet-popup-tip {\n    display: none;\n  }\n\n  .sr-only {\n    display: none;\n  }\n"])), _ref => {
+const LeafletMapContainer = (0, _styledComponents.default)(_reactLeaflet.MapContainer)`
+  width: 100%;
+  height: ${_ref => {
   let {
     height
   } = _ref;
   return height;
-});
+}}px;
+  border: 1px solid transparent;
+  border-radius: var(--border-radius);
+  z-index: 1;
+
+  &:focus {
+    border-color: var(--border-color);
+    box-shadow: var(--box-shadow);
+  }
+
+  .leaflet-control-container {
+    .leaflet-control-zoom {
+      box-shadow: var(--box-shadow);
+      border-radius: var(--border-radius);
+
+      a {
+        background: transparent;
+        border-bottom: 1px solid var(--border-color);
+        color: var(--font-on-background);
+
+        &:last-child {
+          border-bottom: none;
+        }
+
+        &.leaflet-disabled {
+          opacity: 0.5;
+        }
+      }
+    }
+
+    .leaflet-draw {
+      box-shadow: var(--box-shadow);
+      border-radius: var(--border-radius);
+
+      a {
+        background-color: var(--color-background1);
+      }
+
+      .leaflet-draw-draw-polyline {
+        background-position: -3px -3px;
+      }
+
+      .leaflet-draw-draw-polygon {
+        background-position: -32px -3px;
+      }
+
+      .leaflet-draw-draw-rectangle {
+        background-position: -63px -3px;
+      }
+
+      .leaflet-draw-draw-circle {
+        background-position: -93px -3px;
+      }
+
+      .leaflet-draw-draw-marker {
+        background-position: -123px -3px;
+      }
+
+      .leaflet-draw-draw-circlemarker {
+        background-position: -273px -3px;
+      }
+
+      .leaflet-draw-edit-edit {
+        background-position: -213px -3px;
+      }
+
+      .leaflet-draw-edit-remove {
+        background-position: -243px -3px;
+      }
+    }
+
+    .leaflet-left .leaflet-control {
+      margin-left: var(--spacing-s);
+    }
+
+    .leaflet-right .leaflet-control {
+      margin-right: var(--spacing-s);
+    }
+
+    .leaflet-top .leaflet-control {
+      margin-top: var(--spacing-s);
+    }
+
+    .leaflet-control {
+      font-weight: bold;
+      background: var(--color-background1);
+
+      &.leaflet-control-attribution {
+        background: var(--color-white);
+        color: var(--color-dark);
+        margin: 0;
+      }
+    }
+  }
+
+  .leaflet-edit-move {
+    border-radius: 50px;
+    border-color: var(--border-color);
+  }
+
+  .leaflet-edit-resize {
+    border-radius: 50px;
+    border-color: var(--border-color);
+  }
+
+  &.leaflet-touch {
+    .leaflet-bar {
+      border: none;
+
+      a {
+        width: 24px;
+        height: 24px;
+        line-height: 24px;
+      }
+    }
+
+    .leaflet-left .leaflet-control {
+      margin-left: var(--spacing-s);
+    }
+
+    .leaflet-right .leaflet-control {
+      margin-right: var(--spacing-s);
+    }
+
+    .leaflet-top .leaflet-control {
+      margin-top: var(--spacing-s);
+    }
+  }
+
+  .marker-cluster {
+    background: var(--color-primary) a1;
+
+    div {
+      background: var(--color-primary);
+      color: var(--font-on-primary);
+    }
+  }
+
+  .leaflet-popup-content-wrapper {
+    background: transparent;
+    box-shadow: unset;
+  }
+
+  .leaflet-popup-content p {
+    margin: 0;
+    margin-bottom: var(--spacing-s);
+  }
+
+  .leaflet-popup-tip {
+    display: none;
+  }
+
+  .sr-only {
+    display: none;
+  }
+`;
 var _default = exports.default = LeafletMapContainer;

package/modal/StateModal.js

@@ -15,24 +15,14 @@ var _ButtonGroup = _interopRequireDefault(require("../button/ButtonGroup"));
 var _Button = _interopRequireDefault(require("../button/Button"));
 var _ModalBackdrop = _interopRequireDefault(require("../backdrop/ModalBackdrop"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5;
-const _excluded = ["onClose"];
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-function _taggedTemplateLiteral(e, t) { return t || (t = e.slice(0)), Object.freeze(Object.defineProperties(e, { raw: { value: Object.freeze(t) } })); }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _objectWithoutProperties(e, t) { if (null == e) return {}; var o, r, i = _objectWithoutPropertiesLoose(e, t); if (Object.getOwnPropertySymbols) { var s = Object.getOwnPropertySymbols(e); for (r = 0; r < s.length; r++) o = s[r], t.includes(o) || {}.propertyIsEnumerable.call(e, o) && (i[o] = e[o]); } return i; }
-function _objectWithoutPropertiesLoose(r, e) { if (null == r) return {}; var t = {}; for (var n in r) if ({}.hasOwnProperty.call(r, n)) { if (e.includes(n)) continue; t[n] = r[n]; } return t; }
 const StateModal = _ref => {
   let {
-      onClose
-    } = _ref,
-    props = _objectWithoutProperties(_ref, _excluded);
+    onClose,
+    ...props
+  } = _ref;
   const rootElement = (0, _utils.appendElementTo)('StateModalContainer');
   const Container = document.createElement('div');
   rootElement.appendChild(Container);
@@ -42,9 +32,10 @@ const StateModal = _ref => {
     Container.remove();
     if (onClose) onClose();
   };
-  _reactDom.default.render(/*#__PURE__*/(0, _jsxRuntime.jsx)(ModalContent, _objectSpread(_objectSpread({}, props), {}, {
+  _reactDom.default.render(/*#__PURE__*/(0, _jsxRuntime.jsx)(ModalContent, {
+    ...props,
     onClose: handleClose
-  })), Container);
+  }), Container);
 };
 const ModalContent = _ref2 => {
   let {
@@ -85,7 +76,7 @@ const ModalContent = _ref2 => {
     ref: refWrapper,
     onClick: handleDismiss,
     role: "dialog",
-    "aria-labelledby": "".concat(id, "-Title"),
+    "aria-labelledby": `${id}-Title`,
     children: /*#__PURE__*/(0, _jsxRuntime.jsxs)(Container, {
       children: [/*#__PURE__*/(0, _jsxRuntime.jsxs)(Body, {
         type: type,
@@ -98,28 +89,51 @@ const ModalContent = _ref2 => {
         })]
       }), (showCancelButton === true || showConfirmButton === true) && /*#__PURE__*/(0, _jsxRuntime.jsxs)(_ButtonGroup.default, {
         alignRight: true,
-        children: [showCancelButton === true && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, _objectSpread(_objectSpread(_objectSpread({}, cancelButtonType === 'danger' && {
-          danger: true
-        }), cancelButtonType === 'warning' && {
-          warning: true
-        }), {}, {
+        children: [showCancelButton === true && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+          ...(cancelButtonType === 'danger' && {
+            danger: true
+          }),
+          ...(cancelButtonType === 'warning' && {
+            warning: true
+          }),
           onClick: handleCancel,
           children: cancelButtonText || 'Cancel'
-        })), showConfirmButton === true && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, _objectSpread(_objectSpread(_objectSpread({}, confirmButtonType === 'success' && {
-          success: true
-        }), confirmButtonType === 'warning' && {
-          warning: true
-        }), {}, {
+        }), showConfirmButton === true && /*#__PURE__*/(0, _jsxRuntime.jsx)(_Button.default, {
+          ...(confirmButtonType === 'success' && {
+            success: true
+          }),
+          ...(confirmButtonType === 'warning' && {
+            warning: true
+          }),
           onClick: handleConfirm,
           children: confirmButtonText || 'Confirm'
-        }))]
+        })]
       })]
     })
   });
 };
-const Wrapper = (0, _styledComponents.default)(_ModalBackdrop.default)(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n  z-index: 90;\n"])));
-const Container = _styledComponents.default.div(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n  width: 500px;\n  max-width: 90%;\n  background: var(--color-background2);\n  box-shadow: var(--box-shadow);\n  padding: var(--spacing);\n  border-radius: var(--border-radius);\n  color: var(--font-on-background);\n  border: var(--border-width) solid var(--border-color);\n  text-align: center;\n"])));
-const Body = _styledComponents.default.div(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n  margin-bottom: var(--spacing);\n\n  > svg {\n    font-size: 120px;\n    margin-bottom: var(--spacing);\n\n    ", "\n  }\n"])), _ref3 => {
+const Wrapper = (0, _styledComponents.default)(_ModalBackdrop.default)`
+  z-index: 90;
+`;
+const Container = _styledComponents.default.div`
+  width: 500px;
+  max-width: 90%;
+  background: var(--color-background2);
+  box-shadow: var(--box-shadow);
+  padding: var(--spacing);
+  border-radius: var(--border-radius);
+  color: var(--font-on-background);
+  border: var(--border-width) solid var(--border-color);
+  text-align: center;
+`;
+const Body = _styledComponents.default.div`
+  margin-bottom: var(--spacing);
+
+  > svg {
+    font-size: 120px;
+    margin-bottom: var(--spacing);
+
+    ${_ref3 => {
   let {
     type
   } = _ref3;
@@ -132,7 +146,16 @@ const Body = _styledComponents.default.div(_templateObject3 || (_templateObject3
     default:
       return 'color: var(--color-success);';
   }
-});
-const Title = _styledComponents.default.h2(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n  font-size: var(--font-body1);\n  font-weight: var(--font-bold);\n  margin-bottom: var(--spacing-s);\n"])));
-const Message = _styledComponents.default.p(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\n  font-size: var(--font-body1);\n  white-space: pre-line;\n"])));
+}}
+  }
+`;
+const Title = _styledComponents.default.h2`
+  font-size: var(--font-body1);
+  font-weight: var(--font-bold);
+  margin-bottom: var(--spacing-s);
+`;
+const Message = _styledComponents.default.p`
+  font-size: var(--font-body1);
+  white-space: pre-line;
+`;
 var _default = exports.default = StateModal;