Merge branch 'with-either-props' into 'dev'

Fix for withEither

See merge request turris/reforis/foris-js!40

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "foris",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "foris",
-  "version": "1.3.1",
+  "version": "1.3.2",
   "description": "Set of components and utils for Foris and its plugins.",
   "author": "CZ.NIC, z.s.p.o.",
   "repository": {

src/bootstrap/Spinner.js

@@ -24,18 +24,18 @@ Spinner.defaultProps = {
 };
 
 export function Spinner({
-    fullScreen, children, className, ...props
+    fullScreen, children, className,
 }) {
     if (!fullScreen) {
         return (
-            <div className={`spinner-wrapper ${className || "my-3 text-center"}`} {...props}>
+            <div className={`spinner-wrapper ${className || "my-3 text-center"}`}>
                 <SpinnerElement>{children}</SpinnerElement>
             </div>
         );
     }
 
     return (
-        <div className="spinner-fs-wrapper" {...props}>
+        <div className="spinner-fs-wrapper">
             <div className="spinner-fs-background">
                 <SpinnerElement>{children}</SpinnerElement>
             </div>

src/utils/conditionalHOCs.js

@@ -14,7 +14,7 @@ import { ErrorMessage } from "./ErrorMessage";
 function withEither(conditionalFn, Either) {
     return (Component) => (props) => {
         if (conditionalFn(props)) {
-            return <Either />;
+            return <Either {...props} />;
         }
         return <Component {...props} />;
     };