@woosmap/ui 3.90.0 → 3.91.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@woosmap/ui",
-  "version": "3.90.0",
+  "version": "3.91.0",
   "repository": {
     "type": "git",
     "url": "git+https://github.com/WebGeoServices/ui.git"

package/src/components/Demo/MerchantDemo.styl

@@ -8,7 +8,8 @@
 		width 100%
 		zoom .9
 		padding 2rem
-		background-color #d5eaff
+		background #31436C
+		background radial-gradient(circle, #31436C 0%, #262D3E 100%)
 	&__mobilewrapper
 		trans()
 		position relative
@@ -68,9 +69,8 @@
 					.merchant__mobile--details--dirty &
 						opacity 1
 				&__button
-					sq(3)
 					position absolute
-					background-color transparent
+					background-color transparent !important
 					left -.6rem
 					padding 0
 					display flex
@@ -78,7 +78,7 @@
 					justify-content center
 					flex-shrink 0
 					&:hover
-						background-color $dark30
+						background-color $dark30 !important
 
 		&__section
 			padding 1.4rem 2rem

package/src/components/Demo/skeletondemo.styl

@@ -20,6 +20,9 @@
 		position relative
 		// box-shadow 0 0 3rem rgba($logo2, .15)
 		box-shadow 0 .3rem 1rem rgba($secondary, .15)
+		.demo--merchant &
+			border .1rem solid $light
+			
 	&__showcase
 	&__data
 		display flex

package/src/components/ServiceMessage/ServiceMessage.js

@@ -42,6 +42,6 @@ ServiceMessage.defaultProps = {
 
 ServiceMessage.propTypes = {
     type: PropTypes.oneOf([undefined, 'success', 'error', 'warning', 'info']),
-    text: PropTypes.string,
+    text: PropTypes.oneOfType([PropTypes.string, PropTypes.node]),
     testId: PropTypes.string,
 };

package/src/components/ServiceMessage/ServiceMessage.test.js

@@ -4,16 +4,33 @@ import { act } from 'react-dom/test-utils';
 import '@testing-library/jest-dom/extend-expect';
 import ServiceMessage from './ServiceMessage';
 
-it('renders a ServiceMessage component ', () => {
-    const ref = React.createRef();
-    const { container } = render(
-        <div>
-            <ServiceMessage text="my message" ref={ref} />
-        </div>
-    );
-    act(() => {
-        ref.current.open();
-    });
+describe('<ServiceMessage />', () => {
+    it('renders a ServiceMessage component ', () => {
+        const ref = React.createRef();
+        const { container } = render(
+            <div>
+                <ServiceMessage text="my message" ref={ref} />
+            </div>
+        );
+        act(() => {
+            ref.current.open();
+        });
 
-    expect(container.firstChild).toHaveTextContent('my message');
+        expect(container.firstChild).toHaveTextContent('my message');
+    });
+    it('does not throw a proptype error if text is node', () => {
+        const ref = React.createRef();
+        const errorSpy = jest.spyOn(console, 'error');
+        const warnSpy = jest.spyOn(console, 'warn');
+        render(
+            <div>
+                <ServiceMessage text={<div>Some node</div>} ref={ref} />
+            </div>
+        );
+        act(() => {
+            ref.current.open();
+        });
+        expect(errorSpy).not.toHaveBeenCalled();
+        expect(warnSpy).not.toHaveBeenCalled();
+    });
 });