@micromag/screen-keypad 0.3.373 → 0.3.379

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 (3) hide show
  1. package/es/index.js +2 -9
  2. package/lib/index.js +1 -8
  3. 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 } 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, getStyleFromText, getStyleFromBox } from '@micromag/core/utils';
14
+ import { isHeaderFilled, isFooterFilled, getFooterProps, isTextFilled, getStyleFromBox, 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';
@@ -192,7 +192,6 @@ var KeypadScreen = function KeypadScreen(_ref) {
192
192
  var _ref2 = title || {},
193
193
  _ref2$textStyle = _ref2.textStyle,
194
194
  titleTextStyle = _ref2$textStyle === void 0 ? null : _ref2$textStyle;
195
- _objectSpread({}, getStyleFromText(titleTextStyle));
196
195
  var _useDimensionObserver = useDimensionObserver(),
197
196
  headerRef = _useDimensionObserver.ref,
198
197
  _useDimensionObserver2 = _useDimensionObserver.height,
@@ -424,7 +423,7 @@ var KeypadScreen = function KeypadScreen(_ref) {
424
423
  var key = label || visualUrl || id;
425
424
  var isEmpty = label === null && visual === null;
426
425
  var isExternalLink = url !== null && !inWebView;
427
- var isPopupEmpty = (heading === null || headingBody === '') && (content === null || contentBody === '') && popupLargeVisual === null;
426
+ var isPopupEmpty = (heading === null || headingBody === null || headingBody === '') && (content === null || contentBody === null || contentBody === '') && popupLargeVisual === null;
428
427
  return /*#__PURE__*/React.createElement("div", {
429
428
  key: key,
430
429
  className: styles.item
@@ -621,7 +620,6 @@ var KeypadScreen = function KeypadScreen(_ref) {
621
620
  isEmpty: !hasPopupContent
622
621
  }, hasPopupContent ? /*#__PURE__*/React.createElement(Text, Object.assign({
623
622
  className: styles.popupContent
624
- // @TODO: There's a styles clash here, check if there's more elsewhere
625
623
  }, popupContent, {
626
624
  textStyle: _objectSpread(_objectSpread({}, contentTextStyle), popupContentTextStyle)
627
625
  })) : null), /*#__PURE__*/React.createElement(ScreenElement, {
@@ -658,11 +656,6 @@ var KeypadScreen = function KeypadScreen(_ref) {
658
656
  openWebView: openWebView,
659
657
  type: "click",
660
658
  boxStyle: _objectSpread(_objectSpread({}, popupButtonsBoxStyle), popupButtonBoxStyle)
661
- // style={{
662
- // ...getStyleFromText(popupButtonsTextStyle),
663
- // ...getStyleFromBox(popupButtonsBoxStyle),
664
- // ...getStyleFromBox(popupButtonBoxStyle),
665
- // }}
666
659
  }) : null))))) : null)));
667
660
  };
668
661
  KeypadScreen.propTypes = propTypes;
package/lib/index.js CHANGED
@@ -218,7 +218,6 @@ var KeypadScreen = function KeypadScreen(_ref) {
218
218
  var _ref2 = title || {},
219
219
  _ref2$textStyle = _ref2.textStyle,
220
220
  titleTextStyle = _ref2$textStyle === void 0 ? null : _ref2$textStyle;
221
- _objectSpread__default["default"]({}, utils.getStyleFromText(titleTextStyle));
222
221
  var _useDimensionObserver = hooks.useDimensionObserver(),
223
222
  headerRef = _useDimensionObserver.ref,
224
223
  _useDimensionObserver2 = _useDimensionObserver.height,
@@ -450,7 +449,7 @@ var KeypadScreen = function KeypadScreen(_ref) {
450
449
  var key = label || visualUrl || id;
451
450
  var isEmpty = label === null && visual === null;
452
451
  var isExternalLink = url !== null && !inWebView;
453
- var isPopupEmpty = (heading === null || headingBody === '') && (content === null || contentBody === '') && popupLargeVisual === null;
452
+ var isPopupEmpty = (heading === null || headingBody === null || headingBody === '') && (content === null || contentBody === null || contentBody === '') && popupLargeVisual === null;
454
453
  return /*#__PURE__*/React__default["default"].createElement("div", {
455
454
  key: key,
456
455
  className: styles.item
@@ -647,7 +646,6 @@ var KeypadScreen = function KeypadScreen(_ref) {
647
646
  isEmpty: !hasPopupContent
648
647
  }, hasPopupContent ? /*#__PURE__*/React__default["default"].createElement(Text__default["default"], Object.assign({
649
648
  className: styles.popupContent
650
- // @TODO: There's a styles clash here, check if there's more elsewhere
651
649
  }, popupContent, {
652
650
  textStyle: _objectSpread__default["default"](_objectSpread__default["default"]({}, contentTextStyle), popupContentTextStyle)
653
651
  })) : null), /*#__PURE__*/React__default["default"].createElement(components.ScreenElement, {
@@ -684,11 +682,6 @@ var KeypadScreen = function KeypadScreen(_ref) {
684
682
  openWebView: openWebView,
685
683
  type: "click",
686
684
  boxStyle: _objectSpread__default["default"](_objectSpread__default["default"]({}, popupButtonsBoxStyle), popupButtonBoxStyle)
687
- // style={{
688
- // ...getStyleFromText(popupButtonsTextStyle),
689
- // ...getStyleFromBox(popupButtonsBoxStyle),
690
- // ...getStyleFromBox(popupButtonBoxStyle),
691
- // }}
692
685
  }) : null))))) : null)));
693
686
  };
694
687
  KeypadScreen.propTypes = propTypes;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@micromag/screen-keypad",
3
- "version": "0.3.373",
3
+ "version": "0.3.379",
4
4
  "description": "",
5
5
  "keywords": [
6
6
  "javascript"
@@ -54,22 +54,22 @@
54
54
  },
55
55
  "dependencies": {
56
56
  "@babel/runtime": "^7.13.10",
57
- "@micromag/core": "^0.3.373",
58
- "@micromag/element-background": "^0.3.373",
59
- "@micromag/element-button": "^0.3.373",
60
- "@micromag/element-call-to-action": "^0.3.373",
61
- "@micromag/element-container": "^0.3.373",
62
- "@micromag/element-footer": "^0.3.373",
63
- "@micromag/element-grid": "^0.3.373",
64
- "@micromag/element-header": "^0.3.373",
65
- "@micromag/element-heading": "^0.3.373",
66
- "@micromag/element-keypad": "^0.3.373",
67
- "@micromag/element-layout": "^0.3.373",
68
- "@micromag/element-scroll": "^0.3.373",
69
- "@micromag/element-text": "^0.3.373",
70
- "@micromag/element-urbania-author": "^0.3.373",
71
- "@micromag/element-visual": "^0.3.373",
72
- "@micromag/transforms": "^0.3.373",
57
+ "@micromag/core": "^0.3.379",
58
+ "@micromag/element-background": "^0.3.379",
59
+ "@micromag/element-button": "^0.3.379",
60
+ "@micromag/element-call-to-action": "^0.3.379",
61
+ "@micromag/element-container": "^0.3.379",
62
+ "@micromag/element-footer": "^0.3.379",
63
+ "@micromag/element-grid": "^0.3.379",
64
+ "@micromag/element-header": "^0.3.379",
65
+ "@micromag/element-heading": "^0.3.379",
66
+ "@micromag/element-keypad": "^0.3.379",
67
+ "@micromag/element-layout": "^0.3.379",
68
+ "@micromag/element-scroll": "^0.3.379",
69
+ "@micromag/element-text": "^0.3.379",
70
+ "@micromag/element-urbania-author": "^0.3.379",
71
+ "@micromag/element-visual": "^0.3.379",
72
+ "@micromag/transforms": "^0.3.379",
73
73
  "@react-spring/core": "^9.6.1",
74
74
  "@react-spring/web": "^9.6.1",
75
75
  "@use-gesture/react": "^10.2.4",
@@ -84,5 +84,5 @@
84
84
  "publishConfig": {
85
85
  "access": "public"
86
86
  },
87
- "gitHead": "072c8a8e64514933e9d13e4ad99778c2cbcc6968"
87
+ "gitHead": "74875407db738009dda84849ce467adfd4508e4e"
88
88
  }