@micromag/screen-keypad 0.3.659 → 0.3.661

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (2) hide show
  1. package/es/index.js +7 -7
  2. package/package.json +18 -18
package/es/index.js CHANGED
@@ -11,7 +11,7 @@ import { PropTypes as PropTypes$1 } from '@micromag/core';
11
11
  import { ScreenElement, PlaceholderButton, Close } from '@micromag/core/components';
12
12
  import { usePlaybackContext, usePlaybackMediaRef, useScreenState, useScreenSize, useViewerContext, useViewerWebView, useViewerInteraction, useScreenRenderContext } from '@micromag/core/contexts';
13
13
  import { useTrackScreenEvent, useDimensionObserver, useDragProgress } from '@micromag/core/hooks';
14
- import { isHeaderFilled, isFooterFilled, getFooterProps, isTextFilled, camelCase, getStyleFromBox, getStyleFromText, getStyleFromAlignment } from '@micromag/core/utils';
14
+ import { isHeaderFilled, isFooterFilled, getFooterProps, isTextFilled, camelCase, getStyleFromBox, getStyleFromAlignment, getStyleFromText } from '@micromag/core/utils';
15
15
  import Background from '@micromag/element-background';
16
16
  import Button from '@micromag/element-button';
17
17
  import CallToAction from '@micromag/element-call-to-action';
@@ -422,8 +422,6 @@ var KeypadScreen = function KeypadScreen(_ref) {
422
422
  itemLabel = _ref15$label === void 0 ? null : _ref15$label,
423
423
  _ref15$visual = _ref15.visual,
424
424
  visual = _ref15$visual === void 0 ? null : _ref15$visual,
425
- _ref15$textStyle = _ref15.textStyle,
426
- textStyle = _ref15$textStyle === void 0 ? null : _ref15$textStyle,
427
425
  _ref15$boxStyle = _ref15.boxStyle,
428
426
  boxStyle = _ref15$boxStyle === void 0 ? null : _ref15$boxStyle,
429
427
  _ref15$alignment = _ref15.alignment,
@@ -453,8 +451,8 @@ var KeypadScreen = function KeypadScreen(_ref) {
453
451
  var _ref19 = finalLabel || {},
454
452
  _ref19$body = _ref19.body,
455
453
  label = _ref19$body === void 0 ? null : _ref19$body,
456
- _ref19$buttonStyle = _ref19.buttonStyle,
457
- labelButtonStyle = _ref19$buttonStyle === void 0 ? null : _ref19$buttonStyle;
454
+ _ref19$textStyle = _ref19.textStyle,
455
+ textStyle = _ref19$textStyle === void 0 ? null : _ref19$textStyle;
458
456
  var key = label || visualUrl || id;
459
457
  var isEmpty = label === null && visual === null;
460
458
  var isExternalLink = url !== null && !inWebView;
@@ -464,7 +462,7 @@ var KeypadScreen = function KeypadScreen(_ref) {
464
462
  className: styles.item
465
463
  }, /*#__PURE__*/React.createElement(Button, {
466
464
  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)]),
467
- style: _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, getStyleFromBox(buttonBoxStyle)), getStyleFromText(buttonTextStyle)), getStyleFromBox(labelButtonStyle || boxStyle)), getStyleFromText(textStyle)), getStyleFromAlignment(alignment || buttonAlignment, true, 'flex-start')),
465
+ style: _objectSpread(_objectSpread(_objectSpread({}, getStyleFromBox(buttonBoxStyle)), getStyleFromBox(boxStyle)), getStyleFromAlignment(alignment || buttonAlignment, true, 'flex-start')),
468
466
  external: isExternalLink,
469
467
  href: isExternalLink ? url : null,
470
468
  focusable: current,
@@ -499,7 +497,9 @@ var KeypadScreen = function KeypadScreen(_ref) {
499
497
  isEmpty: label === null
500
498
  }, label !== null || !isInteractivePreview ? /*#__PURE__*/React.createElement(Text, Object.assign({
501
499
  className: styles.buttonLabel
502
- }, finalLabel)) : null)));
500
+ }, finalLabel, {
501
+ textStyle: _objectSpread(_objectSpread({}, getStyleFromText(buttonTextStyle)), getStyleFromText(textStyle))
502
+ })) : null)));
503
503
  });
504
504
  }, [items, screenState, keypadSettings, buttonAlignment, buttonBoxStyle, buttonTextStyle, buttonLayout]);
505
505
  useEffect(function () {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@micromag/screen-keypad",
3
- "version": "0.3.659",
3
+ "version": "0.3.661",
4
4
  "private": false,
5
5
  "description": "",
6
6
  "keywords": [
@@ -65,22 +65,22 @@
65
65
  },
66
66
  "dependencies": {
67
67
  "@babel/runtime": "^7.13.10",
68
- "@micromag/core": "^0.3.659",
69
- "@micromag/element-background": "^0.3.659",
70
- "@micromag/element-button": "^0.3.659",
71
- "@micromag/element-call-to-action": "^0.3.659",
72
- "@micromag/element-container": "^0.3.659",
73
- "@micromag/element-footer": "^0.3.659",
74
- "@micromag/element-grid": "^0.3.659",
75
- "@micromag/element-header": "^0.3.659",
76
- "@micromag/element-heading": "^0.3.659",
77
- "@micromag/element-keypad": "^0.3.659",
78
- "@micromag/element-layout": "^0.3.659",
79
- "@micromag/element-scroll": "^0.3.659",
80
- "@micromag/element-text": "^0.3.659",
81
- "@micromag/element-urbania-author": "^0.3.659",
82
- "@micromag/element-visual": "^0.3.659",
83
- "@micromag/transforms": "^0.3.659",
68
+ "@micromag/core": "^0.3.660",
69
+ "@micromag/element-background": "^0.3.660",
70
+ "@micromag/element-button": "^0.3.660",
71
+ "@micromag/element-call-to-action": "^0.3.660",
72
+ "@micromag/element-container": "^0.3.660",
73
+ "@micromag/element-footer": "^0.3.660",
74
+ "@micromag/element-grid": "^0.3.660",
75
+ "@micromag/element-header": "^0.3.660",
76
+ "@micromag/element-heading": "^0.3.660",
77
+ "@micromag/element-keypad": "^0.3.660",
78
+ "@micromag/element-layout": "^0.3.660",
79
+ "@micromag/element-scroll": "^0.3.660",
80
+ "@micromag/element-text": "^0.3.660",
81
+ "@micromag/element-urbania-author": "^0.3.660",
82
+ "@micromag/element-visual": "^0.3.660",
83
+ "@micromag/transforms": "^0.3.660",
84
84
  "@react-spring/core": "^9.6.1",
85
85
  "@react-spring/web": "^9.6.1",
86
86
  "@use-gesture/react": "^10.3.0",
@@ -95,5 +95,5 @@
95
95
  "access": "public",
96
96
  "registry": "https://registry.npmjs.org/"
97
97
  },
98
- "gitHead": "7c13dad69a7e377cd2f900d95cb95694a3a8fcbb"
98
+ "gitHead": "401e86fc965f18b2ec28c1d0306d53846f71c308"
99
99
  }