@micromag/screen-keypad 0.3.733 → 0.3.737

package/es/index.js

@@ -12,7 +12,7 @@ import { PropTypes as PropTypes$1 } from '@micromag/core';
 import { ScreenElement, PlaceholderButton, Close } from '@micromag/core/components';
 import { usePlaybackContext, usePlaybackMediaRef, useScreenState, useScreenSize, useViewerContext, useViewerWebView, useViewerInteraction, useScreenRenderContext } from '@micromag/core/contexts';
 import { useTrackScreenEvent, useDimensionObserver, useDragProgress } from '@micromag/core/hooks';
-import { isHeaderFilled, isFooterFilled, getFooterProps, isTextFilled, camelCase, getStyleFromBox, getStyleFromAlignment, getStyleFromText } from '@micromag/core/utils';
+import { isHeaderFilled, isFooterFilled, getFooterProps, isTextFilled, camelCase, getStyleFromBox, getStyleFromAlignment } from '@micromag/core/utils';
 import Background from '@micromag/element-background';
 import Button from '@micromag/element-button';
 import CallToAction from '@micromag/element-call-to-action';
@@ -476,16 +476,17 @@ var KeypadScreen = function KeypadScreen(_ref) {
         _ref18$body = _ref18.body,
         label = _ref18$body === void 0 ? null : _ref18$body,
         _ref18$textStyle = _ref18.textStyle,
-        textStyle = _ref18$textStyle === void 0 ? null : _ref18$textStyle;
+        finalLabelTextStyle = _ref18$textStyle === void 0 ? null : _ref18$textStyle;
       var key = label || visualUrl || id;
-      var isEmpty = label === null && visual === null;
+      var itemIsEmpty = label === null && visual === null;
       var isExternalLink = url !== null && !inWebView;
       var isPopupEmpty = (heading === null || headingBody === null || headingBody === '') && (content === null || contentBody === null || contentBody === '') && popupLargeVisual === null;
+      var finalTextStyle = _objectSpread(_objectSpread({}, buttonTextStyle), finalLabelTextStyle);
       return /*#__PURE__*/React.createElement("div", {
         key: key,
         className: styles.item
       }, /*#__PURE__*/React.createElement(Button, {
-        className: classNames([styles.button, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, styles.layoutLabelBottom, buttonLayout === 'label-bottom'), styles.layoutLabelTop, buttonLayout === 'label-top'), styles.layoutNoLabel, buttonLayout === 'no-label'), styles.layoutLabelOver, buttonLayout === 'label-over'), styles.fillImage, fillImage === true), styles.isEmpty, isEmpty), styles.isLink, url !== null), styles.disableHover, isPopupEmpty && url === null)]),
+        className: classNames([styles.button, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, styles.layoutLabelBottom, buttonLayout === 'label-bottom'), styles.layoutLabelTop, buttonLayout === 'label-top'), styles.layoutNoLabel, buttonLayout === 'no-label'), styles.layoutLabelOver, buttonLayout === 'label-over'), styles.fillImage, fillImage === true), styles.isEmpty, itemIsEmpty), styles.isLink, url !== null), styles.disableHover, isPopupEmpty && url === null)]),
         style: _objectSpread(_objectSpread(_objectSpread({}, getStyleFromBox(buttonBoxStyle)), getStyleFromBox(boxStyle)), getStyleFromAlignment(alignment || buttonAlignment, true, 'flex-start')),
         external: isExternalLink,
         href: isExternalLink ? url : null,
@@ -522,7 +523,7 @@ var KeypadScreen = function KeypadScreen(_ref) {
       }, label !== null || !isInteractivePreview ? /*#__PURE__*/React.createElement(Text, Object.assign({
         className: styles.buttonLabel
       }, finalLabel, {
-        textStyle: _objectSpread(_objectSpread({}, getStyleFromText(buttonTextStyle)), getStyleFromText(textStyle))
+        textStyle: finalTextStyle
       })) : null)));
     });
   }, [items, screenState, keypadSettings, buttonAlignment, buttonBoxStyle, buttonTextStyle, buttonLayout]);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/screen-keypad",
-    "version": "0.3.733",
+    "version": "0.3.737",
     "private": false,
     "description": "",
     "keywords": [
@@ -65,22 +65,22 @@
     },
     "dependencies": {
         "@babel/runtime": "^7.13.10",
-        "@micromag/core": "^0.3.733",
-        "@micromag/element-background": "^0.3.733",
-        "@micromag/element-button": "^0.3.733",
-        "@micromag/element-call-to-action": "^0.3.733",
-        "@micromag/element-container": "^0.3.733",
-        "@micromag/element-footer": "^0.3.733",
-        "@micromag/element-grid": "^0.3.733",
-        "@micromag/element-header": "^0.3.733",
-        "@micromag/element-heading": "^0.3.733",
-        "@micromag/element-keypad": "^0.3.733",
-        "@micromag/element-layout": "^0.3.733",
-        "@micromag/element-scroll": "^0.3.733",
-        "@micromag/element-text": "^0.3.733",
-        "@micromag/element-urbania-author": "^0.3.733",
-        "@micromag/element-visual": "^0.3.733",
-        "@micromag/transforms": "^0.3.733",
+        "@micromag/core": "^0.3.736",
+        "@micromag/element-background": "^0.3.736",
+        "@micromag/element-button": "^0.3.736",
+        "@micromag/element-call-to-action": "^0.3.736",
+        "@micromag/element-container": "^0.3.736",
+        "@micromag/element-footer": "^0.3.736",
+        "@micromag/element-grid": "^0.3.736",
+        "@micromag/element-header": "^0.3.736",
+        "@micromag/element-heading": "^0.3.736",
+        "@micromag/element-keypad": "^0.3.736",
+        "@micromag/element-layout": "^0.3.736",
+        "@micromag/element-scroll": "^0.3.736",
+        "@micromag/element-text": "^0.3.736",
+        "@micromag/element-urbania-author": "^0.3.736",
+        "@micromag/element-visual": "^0.3.736",
+        "@micromag/transforms": "^0.3.736",
         "@react-spring/core": "^9.6.1",
         "@react-spring/web": "^9.6.1",
         "@use-gesture/react": "^10.3.0",
@@ -95,5 +95,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "9dae26b19bddd5767d8c65c62aad0e51d5a90680"
+    "gitHead": "357ff7c95c7a25f250304c26a5d8a611a717d341"
 }