@woosmap/ui 3.20.0 → 3.24.0

package/package.json

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

package/src/components/Demo/SkeletonDemo.js

@@ -160,13 +160,13 @@ export default class SkeletonDemo extends Component {
     };
 
     render() {
-        const { result, request, response, renderCode, withMap, mainContent } = this.props;
+        const { result, request, response, renderCode, withMap, mainContent, className } = this.props;
         const { copied } = this.state;
         const filters = this.renderHeaderFilters();
         const filters2 = this.renderFooterFilters();
         const tagLine = this.renderHeaderTagline();
         return (
-            <article className="demo">
+            <article className={cl('demo', className)}>
                 <div className="demo__content">
                     <div className="demo__showcase">
                         {(tagLine || filters || filters2) && (
@@ -176,10 +176,12 @@ export default class SkeletonDemo extends Component {
                                 {filters2}
                             </div>
                         )}
-                        <div className="demo__map">
-                            {withMap && <div className="map" ref={this.mapDivRef} />}
-                            {mainContent}
-                        </div>
+                        {withMap && (
+                            <div className="demo__map">
+                                <div className="map" ref={this.mapDivRef} />
+                            </div>
+                        )}
+                        {mainContent && <div className="demo__content">{mainContent}</div>}
                     </div>
                     <div className="demo__data">
                         {result && (
@@ -249,6 +251,7 @@ SkeletonDemo.defaultProps = {
     body: '',
     method: '',
     withMap: false,
+    className: '',
 };
 SkeletonDemo.propTypes = {
     renderCode: PropTypes.func,
@@ -264,4 +267,5 @@ SkeletonDemo.propTypes = {
     body: PropTypes.string,
     method: PropTypes.string,
     response: PropTypes.oneOfType([PropTypes.object, PropTypes.array]),
+    className: PropTypes.string,
 };

package/src/components/Dropdown/Dropdown.js

@@ -10,13 +10,17 @@ function mapChildrenWithProps(children, childrenRefs, closeCb) {
     if (children) {
         return React.Children.map(children, (child, index) => {
             if (React.isValidElement(child)) {
+                // only add ref to non functional components
                 return React.cloneElement(child, {
                     ...child.props,
                     closeCb,
-                    ref: (elem) => {
-                        // eslint-disable-next-line no-param-reassign
-                        childrenRefs[index] = elem;
-                    },
+                    ref:
+                        !child.type.prototype || (child.type.prototype && child.type.prototype.render)
+                            ? (elem) => {
+                                  // eslint-disable-next-line no-param-reassign
+                                  childrenRefs[index] = elem;
+                              }
+                            : undefined,
                 });
             }
             return child;
@@ -351,7 +355,7 @@ class Dropdown extends Component {
 
         return (
             <div
-                ref={this.clickOutsideRef}
+                ref={openOnMouseEnter ? null : this.clickOutsideRef}
                 className={cl('dropdown', { open }, `dropdown--${size}`, className)}
                 {...rest}
                 onMouseEnter={this.onMouseEnter}

package/src/styles/next-website/MerchantDemo.styl

@@ -3,6 +3,8 @@
 		trans()
 		display flex
 		justify-content center
+		align-items center
+		height 100%
 		width 100%
 		zoom .9
 		padding 2rem
@@ -10,7 +12,6 @@
 	&__mobilewrapper
 		trans()
 		position relative
-		height 100%
 		margin 3rem
 	&__mobilecontainer
 		position relative

package/src/styles/next-website/demo.styl

@@ -251,4 +251,6 @@
 			border-bottom .1rem solid rgba($secondary, .1)
 			border-right 0
 		&__map
-			height 32rem
+			height 32rem
+			.demo--merchant &
+				height auto