@micromag/screen-urbania-horoscope 0.3.103 → 0.3.104

package/es/index.js

@@ -4,7 +4,7 @@ import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import classNames from 'classnames';
 import PropTypes from 'prop-types';
-import React, { useCallback, useState, useEffect } from 'react';
+import React, { useCallback, useState, useMemo, useEffect } from 'react';
 import { TransitionGroup, CSSTransition } from 'react-transition-group';
 import { PropTypes as PropTypes$1 } from '@micromag/core';
 import { ScreenElement, PlaceholderTitle, TransitionsStagger } from '@micromag/core/components';
@@ -619,7 +619,7 @@ var defaultProps = {
 };
 
 var Horoscope = function Horoscope(_ref) {
-  var _ref2;
+  var _ref3;
 
   var defaultSigns = _ref.defaultSigns,
       signsValue = _ref.signs,
@@ -644,9 +644,14 @@ var Horoscope = function Horoscope(_ref) {
       hasPopup = _useState2[0],
       setHasPopup = _useState2[1];
 
-  var signs = defaultSigns.map(function (sign, index) {
-    return _objectSpread(_objectSpread({}, sign), signsValue !== null && signsValue[index] ? signsValue[index] || null : null);
-  });
+  var signs = useMemo(function () {
+    return defaultSigns.map(function (defaultSign, index) {
+      return _objectSpread(_objectSpread({}, signsValue !== null ? signsValue.find(function (_ref2) {
+        var signValueId = _ref2.id;
+        return signValueId === defaultSign.id;
+      }) || signsValue[index] : null), defaultSign);
+    });
+  }, []);
 
   var _useState3 = useState(null),
       _useState4 = _slicedToArray(_useState3, 2),
@@ -792,7 +797,7 @@ var Horoscope = function Horoscope(_ref) {
     return el !== null;
   });
   return /*#__PURE__*/React.createElement("div", {
-    className: classNames([styles.container, (_ref2 = {}, _defineProperty(_ref2, className, className !== null), _defineProperty(_ref2, styles.isPlaceholder, isPlaceholder), _ref2)]),
+    className: classNames([styles.container, (_ref3 = {}, _defineProperty(_ref3, className, className !== null), _defineProperty(_ref3, styles.isPlaceholder, isPlaceholder), _ref3)]),
     "data-screen-ready": true
   }, !isPlaceholder ? /*#__PURE__*/React.createElement(Background, {
     background: background,

package/lib/index.js

@@ -653,7 +653,7 @@ var defaultProps = {
 };
 
 var Horoscope = function Horoscope(_ref) {
-  var _ref2;
+  var _ref3;
 
   var defaultSigns = _ref.defaultSigns,
       signsValue = _ref.signs,
@@ -678,9 +678,14 @@ var Horoscope = function Horoscope(_ref) {
       hasPopup = _useState2[0],
       setHasPopup = _useState2[1];
 
-  var signs = defaultSigns.map(function (sign, index) {
-    return _objectSpread__default["default"](_objectSpread__default["default"]({}, sign), signsValue !== null && signsValue[index] ? signsValue[index] || null : null);
-  });
+  var signs = React.useMemo(function () {
+    return defaultSigns.map(function (defaultSign, index) {
+      return _objectSpread__default["default"](_objectSpread__default["default"]({}, signsValue !== null ? signsValue.find(function (_ref2) {
+        var signValueId = _ref2.id;
+        return signValueId === defaultSign.id;
+      }) || signsValue[index] : null), defaultSign);
+    });
+  }, []);
 
   var _useState3 = React.useState(null),
       _useState4 = _slicedToArray__default["default"](_useState3, 2),
@@ -826,7 +831,7 @@ var Horoscope = function Horoscope(_ref) {
     return el !== null;
   });
   return /*#__PURE__*/React__default["default"].createElement("div", {
-    className: classNames__default["default"]([styles.container, (_ref2 = {}, _defineProperty__default["default"](_ref2, className, className !== null), _defineProperty__default["default"](_ref2, styles.isPlaceholder, isPlaceholder), _ref2)]),
+    className: classNames__default["default"]([styles.container, (_ref3 = {}, _defineProperty__default["default"](_ref3, className, className !== null), _defineProperty__default["default"](_ref3, styles.isPlaceholder, isPlaceholder), _ref3)]),
     "data-screen-ready": true
   }, !isPlaceholder ? /*#__PURE__*/React__default["default"].createElement(Background__default["default"], {
     background: background,

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/screen-urbania-horoscope",
-    "version": "0.3.103",
+    "version": "0.3.104",
     "description": "",
     "keywords": [
         "javascript"
@@ -72,5 +72,5 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "660b2ada7b03941feb841470abf5cd2cc6e3e68f"
+    "gitHead": "e9ac79a1679f44a86f15bc3f4f6a8f3e318f1aed"
 }