@micromag/screen-keypad 0.3.658 → 0.3.659

package/es/index.js

@@ -4,6 +4,7 @@ import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import _objectSpread from '@babel/runtime/helpers/objectSpread2';
 import { animated } from '@react-spring/web';
 import classNames from 'classnames';
+import { isString } from 'lodash';
 import PropTypes from 'prop-types';
 import React, { useRef, useMemo, useState, useCallback, useEffect } from 'react';
 import { PropTypes as PropTypes$1 } from '@micromag/core';
@@ -418,7 +419,7 @@ var KeypadScreen = function KeypadScreen(_ref) {
         _ref15$id = _ref15.id,
         id = _ref15$id === void 0 ? null : _ref15$id,
         _ref15$label = _ref15.label,
-        label = _ref15$label === void 0 ? null : _ref15$label,
+        itemLabel = _ref15$label === void 0 ? null : _ref15$label,
         _ref15$visual = _ref15.visual,
         visual = _ref15$visual === void 0 ? null : _ref15$visual,
         _ref15$textStyle = _ref15.textStyle,
@@ -446,6 +447,14 @@ var KeypadScreen = function KeypadScreen(_ref) {
       var _ref18 = content || {},
         _ref18$body = _ref18.body,
         contentBody = _ref18$body === void 0 ? null : _ref18$body;
+      var finalLabel = isString(itemLabel) ? {
+        body: itemLabel
+      } : itemLabel || {};
+      var _ref19 = finalLabel || {},
+        _ref19$body = _ref19.body,
+        label = _ref19$body === void 0 ? null : _ref19$body,
+        _ref19$buttonStyle = _ref19.buttonStyle,
+        labelButtonStyle = _ref19$buttonStyle === void 0 ? null : _ref19$buttonStyle;
       var key = label || visualUrl || id;
       var isEmpty = label === null && visual === null;
       var isExternalLink = url !== null && !inWebView;
@@ -455,7 +464,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(_objectSpread(_objectSpread({}, getStyleFromBox(buttonBoxStyle)), getStyleFromText(buttonTextStyle)), getStyleFromBox(labelButtonStyle || boxStyle)), getStyleFromText(textStyle)), getStyleFromAlignment(alignment || buttonAlignment, true, 'flex-start')),
         external: isExternalLink,
         href: isExternalLink ? url : null,
         focusable: current,
@@ -488,9 +497,9 @@ var KeypadScreen = function KeypadScreen(_ref) {
         }),
         emptyClassName: classNames([styles.empty, styles.emptyButtonLabel]),
         isEmpty: label === null
-      }, label !== null || !isInteractivePreview ? /*#__PURE__*/React.createElement("div", {
+      }, label !== null || !isInteractivePreview ? /*#__PURE__*/React.createElement(Text, Object.assign({
         className: styles.buttonLabel
-      }, label) : null)));
+      }, finalLabel)) : null)));
     });
   }, [items, screenState, keypadSettings, buttonAlignment, buttonBoxStyle, buttonTextStyle, buttonLayout]);
   useEffect(function () {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@micromag/screen-keypad",
-    "version": "0.3.658",
+    "version": "0.3.659",
     "private": false,
     "description": "",
     "keywords": [
@@ -65,22 +65,22 @@
     },
     "dependencies": {
         "@babel/runtime": "^7.13.10",
-        "@micromag/core": "^0.3.656",
-        "@micromag/element-background": "^0.3.656",
-        "@micromag/element-button": "^0.3.656",
-        "@micromag/element-call-to-action": "^0.3.656",
-        "@micromag/element-container": "^0.3.656",
-        "@micromag/element-footer": "^0.3.656",
-        "@micromag/element-grid": "^0.3.656",
-        "@micromag/element-header": "^0.3.656",
-        "@micromag/element-heading": "^0.3.656",
-        "@micromag/element-keypad": "^0.3.656",
-        "@micromag/element-layout": "^0.3.656",
-        "@micromag/element-scroll": "^0.3.656",
-        "@micromag/element-text": "^0.3.656",
-        "@micromag/element-urbania-author": "^0.3.656",
-        "@micromag/element-visual": "^0.3.656",
-        "@micromag/transforms": "^0.3.656",
+        "@micromag/core": "^0.3.659",
+        "@micromag/element-background": "^0.3.659",
+        "@micromag/element-button": "^0.3.659",
+        "@micromag/element-call-to-action": "^0.3.659",
+        "@micromag/element-container": "^0.3.659",
+        "@micromag/element-footer": "^0.3.659",
+        "@micromag/element-grid": "^0.3.659",
+        "@micromag/element-header": "^0.3.659",
+        "@micromag/element-heading": "^0.3.659",
+        "@micromag/element-keypad": "^0.3.659",
+        "@micromag/element-layout": "^0.3.659",
+        "@micromag/element-scroll": "^0.3.659",
+        "@micromag/element-text": "^0.3.659",
+        "@micromag/element-urbania-author": "^0.3.659",
+        "@micromag/element-visual": "^0.3.659",
+        "@micromag/transforms": "^0.3.659",
         "@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": "ad18a4b8fb478847459579dfff5d249f41cb0dca"
+    "gitHead": "7c13dad69a7e377cd2f900d95cb95694a3a8fcbb"
 }