@micromag/screen-keypad 0.3.660 → 0.3.663

package/es/index.js

@@ -11,7 +11,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, getStyleFromText, getStyleFromAlignment } from '@micromag/core/utils';
+import { isHeaderFilled, isFooterFilled, getFooterProps, isTextFilled, camelCase, getStyleFromBox, getStyleFromAlignment, getStyleFromText } from '@micromag/core/utils';
 import Background from '@micromag/element-background';
 import Button from '@micromag/element-button';
 import CallToAction from '@micromag/element-call-to-action';
@@ -422,8 +422,6 @@ var KeypadScreen = function KeypadScreen(_ref) {
         itemLabel = _ref15$label === void 0 ? null : _ref15$label,
         _ref15$visual = _ref15.visual,
         visual = _ref15$visual === void 0 ? null : _ref15$visual,
-        _ref15$textStyle = _ref15.textStyle,
-        textStyle = _ref15$textStyle === void 0 ? null : _ref15$textStyle,
         _ref15$boxStyle = _ref15.boxStyle,
         boxStyle = _ref15$boxStyle === void 0 ? null : _ref15$boxStyle,
         _ref15$alignment = _ref15.alignment,
@@ -452,7 +450,9 @@ var KeypadScreen = function KeypadScreen(_ref) {
       } : itemLabel || {};
       var _ref19 = finalLabel || {},
         _ref19$body = _ref19.body,
-        label = _ref19$body === void 0 ? null : _ref19$body;
+        label = _ref19$body === void 0 ? null : _ref19$body,
+        _ref19$textStyle = _ref19.textStyle,
+        textStyle = _ref19$textStyle === void 0 ? null : _ref19$textStyle;
       var key = label || visualUrl || id;
       var isEmpty = label === null && visual === null;
       var isExternalLink = url !== null && !inWebView;
@@ -462,7 +462,7 @@ var KeypadScreen = function KeypadScreen(_ref) {
         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)]),
-        style: _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, getStyleFromBox(buttonBoxStyle)), getStyleFromText(buttonTextStyle)), getStyleFromBox(boxStyle)), getStyleFromText(textStyle)), getStyleFromAlignment(alignment || buttonAlignment, true, 'flex-start')),
+        style: _objectSpread(_objectSpread(_objectSpread({}, getStyleFromBox(buttonBoxStyle)), getStyleFromBox(boxStyle)), getStyleFromAlignment(alignment || buttonAlignment, true, 'flex-start')),
         external: isExternalLink,
         href: isExternalLink ? url : null,
         focusable: current,
@@ -497,7 +497,9 @@ var KeypadScreen = function KeypadScreen(_ref) {
         isEmpty: label === null
       }, label !== null || !isInteractivePreview ? /*#__PURE__*/React.createElement(Text, Object.assign({
         className: styles.buttonLabel
-      }, finalLabel)) : null)));
+      }, finalLabel, {
+        textStyle: _objectSpread(_objectSpread({}, getStyleFromText(buttonTextStyle)), getStyleFromText(textStyle))
+      })) : null)));
     });
   }, [items, screenState, keypadSettings, buttonAlignment, buttonBoxStyle, buttonTextStyle, buttonLayout]);
   useEffect(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/screen-keypad",
-    "version": "0.3.660",
+    "version": "0.3.663",
     "private": false,
     "description": "",
     "keywords": [
@@ -72,7 +72,7 @@
         "@micromag/element-container": "^0.3.660",
         "@micromag/element-footer": "^0.3.660",
         "@micromag/element-grid": "^0.3.660",
-        "@micromag/element-header": "^0.3.660",
+        "@micromag/element-header": "^0.3.663",
         "@micromag/element-heading": "^0.3.660",
         "@micromag/element-keypad": "^0.3.660",
         "@micromag/element-layout": "^0.3.660",
@@ -95,5 +95,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "584698bf4ef786f8fd35853328977554367515d9"
+    "gitHead": "7bb0a6ff3488b29b413b4614c774edc7ca1540f7"
 }