@woosmap/ui 3.89.0 → 3.92.0

package/package.json

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

package/src/components/Icon/Icon.js

@@ -426,7 +426,8 @@ const Icons = {
 class Icon extends Component {
     render() {
         const { icon, size, className, title, testId } = this.props;
-        const IconComponent = Icons[icon];
+        const IconComponent = Object.keys(Icons).includes(icon) ? Icons[icon] : Woosmap;
+
         return (
             <IconComponent
                 className={cl('icon', className)}

package/src/components/Icon/Icon.stories.js

@@ -32,3 +32,4 @@ export const All = () => <div className="flex-wrap">{Object.keys(Icons).map(draw
 export const Website = () => <div className="flex-wrap">{Object.keys(WebsiteIcons).map(drawIcon)}</div>;
 export const Console = () => <div className="flex-wrap">{Object.keys(ConsoleIcons).map(drawIcon)}</div>;
 export const Products = () => <div className="flex-wrap">{Object.keys(ProductsIcons).map(drawIcon)}</div>;
+export const NotExisting = () => <div className="flex-wrap">{drawIcon('not-existing-icon')}</div>;

package/src/components/Icon/Icon.test.js

@@ -40,3 +40,13 @@ it('renders all icon components', () => {
     const { Icons } = Icon;
     Object.keys(Icons).forEach(isIconRendered);
 });
+
+it('renders woosmap icon component when using bad icon name', () => {
+    const { getByTestId } = render(<Icon icon="no-existing-icon" size={64} />);
+
+    const result = getByTestId('icon-no-existing-icon');
+
+    expect(result).toHaveClass('icon');
+    expect(result).toHaveAttribute('width', '64');
+    expect(result).toHaveTextContent('woosmap');
+});

package/src/components/Map/drawOnMap.js

@@ -86,45 +86,7 @@ export const woosmapBoundsFromViewport = function woosmapBoundsFromViewport(view
 
 export const createWoosmapMap = (node) => {
     try {
-        return new window.woosmap.map.Map(node, {
-            styles: [
-                {
-                    featureType: 'administrative',
-                    elementType: 'all',
-                    stylers: [{ visibility: 'on' }, { saturation: -100 }, { lightness: 20 }],
-                },
-                {
-                    featureType: 'road',
-                    elementType: 'all',
-                    stylers: [{ visibility: 'on' }, { saturation: -100 }, { lightness: 40 }],
-                },
-                {
-                    featureType: 'water',
-                    elementType: 'all',
-                    stylers: [{ visibility: 'on' }, { saturation: -10 }, { lightness: 30 }],
-                },
-                {
-                    featureType: 'landscape.man_made',
-                    elementType: 'all',
-                    stylers: [{ visibility: 'simplified' }, { saturation: -60 }, { lightness: 10 }],
-                },
-                {
-                    featureType: 'landscape.natural',
-                    elementType: 'all',
-                    stylers: [{ visibility: 'simplified' }, { saturation: -60 }, { lightness: 60 }],
-                },
-                {
-                    featureType: 'poi',
-                    elementType: 'all',
-                    stylers: [{ visibility: 'off' }, { saturation: -100 }, { lightness: 60 }],
-                },
-                {
-                    featureType: 'transit',
-                    elementType: 'all',
-                    stylers: [{ visibility: 'off' }, { saturation: -100 }, { lightness: 60 }],
-                },
-            ],
-        });
+        return new window.woosmap.map.Map(node);
     } catch (e) {
         console.error('Cound not instantiate a Map');
         console.error(e);

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();
+    });
 });