@enact/ui 4.6.1 → 4.7.0

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 (168) hide show
  1. package/AnnounceDecorator/Announce.js +27 -15
  2. package/AnnounceDecorator/AnnounceDecorator.d.ts +64 -0
  3. package/AnnounceDecorator/AnnounceDecorator.js +15 -6
  4. package/AnnounceDecorator/useAnnounce.js +1 -2
  5. package/BodyText/BodyText.d.ts +66 -0
  6. package/BodyText/BodyText.js +14 -6
  7. package/Button/Button.d.ts +125 -0
  8. package/Button/Button.js +18 -10
  9. package/CHANGELOG.md +14 -0
  10. package/Cancelable/Cancelable.d.ts +64 -0
  11. package/Cancelable/Cancelable.js +17 -9
  12. package/Cancelable/tests/Cancelable-specs.js +3 -1
  13. package/Changeable/Changeable.d.ts +54 -0
  14. package/Changeable/Changeable.js +15 -9
  15. package/ComponentOverride/ComponentOverride.d.ts +52 -0
  16. package/ComponentOverride/ComponentOverride.js +18 -5
  17. package/FloatingLayer/FloatingLayer.js +14 -13
  18. package/FloatingLayer/FloatingLayerContainer.js +3 -1
  19. package/FloatingLayer/FloatingLayerDecorator.js +11 -6
  20. package/FloatingLayer/Scrim.js +4 -2
  21. package/FloatingLayer/index.d.ts +100 -0
  22. package/FloatingLayer/tests/useFloatingLayerDecorator-specs.js +3 -1
  23. package/FloatingLayer/useFloatingLayer.js +2 -2
  24. package/ForwardRef/ForwardRef.d.ts +22 -0
  25. package/ForwardRef/ForwardRef.js +13 -7
  26. package/GridListImageItem/GridListImageItem.d.ts +85 -0
  27. package/GridListImageItem/GridListImageItem.js +16 -7
  28. package/Group/Group.d.ts +107 -0
  29. package/Group/Group.js +17 -6
  30. package/Group/GroupItem.js +16 -10
  31. package/Heading/Heading.d.ts +89 -0
  32. package/Heading/Heading.js +22 -9
  33. package/Icon/Icon.d.ts +88 -0
  34. package/Icon/Icon.js +15 -6
  35. package/IconButton/IconButton.d.ts +115 -0
  36. package/IconButton/IconButton.js +26 -11
  37. package/Image/Image.d.ts +113 -0
  38. package/Image/Image.js +16 -6
  39. package/ImageItem/ImageItem.d.ts +83 -0
  40. package/ImageItem/ImageItem.js +12 -2
  41. package/ImageItem/tests/ImageItem-specs.js +3 -1
  42. package/Item/Item.d.ts +64 -0
  43. package/Item/Item.js +17 -7
  44. package/LabeledIcon/LabeledIcon.d.ts +130 -0
  45. package/LabeledIcon/LabeledIcon.js +16 -6
  46. package/Layout/Cell.js +30 -5
  47. package/Layout/Layout.d.ts +284 -0
  48. package/Layout/Layout.js +181 -36
  49. package/Layout/Layout.module.css +8 -0
  50. package/Layout/tests/Layout-specs.js +44 -3
  51. package/Marquee/MarqueeBase.js +3 -1
  52. package/Marquee/MarqueeController.js +54 -2
  53. package/Marquee/MarqueeDecorator.js +44 -4
  54. package/Marquee/index.d.ts +258 -0
  55. package/Marquee/tests/Marquee-specs.js +3 -1
  56. package/Measurable/Measurable.d.ts +26 -0
  57. package/Measurable/Measurable.js +16 -10
  58. package/Measurable/tests/Measurable-specs.js +8 -6
  59. package/Media/Media.d.ts +99 -0
  60. package/Media/Media.js +36 -27
  61. package/Placeholder/PlaceholderControllerDecorator.js +13 -10
  62. package/Placeholder/PlaceholderDecorator.js +11 -10
  63. package/Placeholder/index.d.ts +53 -0
  64. package/ProgressBar/ProgressBar.d.ts +92 -0
  65. package/ProgressBar/ProgressBar.js +14 -1
  66. package/README.md +1 -1
  67. package/RadioDecorator/RadioControllerDecorator.js +4 -2
  68. package/RadioDecorator/RadioDecorator.d.ts +35 -0
  69. package/RadioDecorator/RadioDecorator.js +17 -9
  70. package/Repeater/Repeater.d.ts +82 -0
  71. package/Repeater/Repeater.js +16 -10
  72. package/Repeater/tests/Repeater-specs.js +3 -1
  73. package/Resizable/Resizable.d.ts +31 -0
  74. package/Resizable/Resizable.js +16 -10
  75. package/Routable/Link.js +12 -10
  76. package/Routable/Routable.d.ts +148 -0
  77. package/Routable/Routable.js +17 -8
  78. package/Routable/Router.js +14 -12
  79. package/Routable/tests/Routable-specs.js +5 -3
  80. package/Scrollable/ScrollAnimator.js +3 -1
  81. package/Scrollable/ScrollThumb.js +10 -9
  82. package/Scrollable/Scrollable.d.ts +0 -0
  83. package/Scrollable/Scrollable.js +27 -3
  84. package/Scrollable/ScrollableNative.js +16 -2
  85. package/Scrollable/Scrollbar.js +4 -2
  86. package/Scroller/Scroller.d.ts +276 -0
  87. package/Scroller/Scroller.js +10 -1
  88. package/Scroller/ScrollerBasic.js +12 -11
  89. package/Scroller/UiScrollerBase.js +15 -14
  90. package/Skinnable/Skinnable.d.ts +94 -0
  91. package/Skinnable/Skinnable.js +20 -6
  92. package/Skinnable/tests/Skinnable-specs.js +3 -1
  93. package/Skinnable/tests/useSkins-specs.js +3 -1
  94. package/Skinnable/useSkins.js +1 -2
  95. package/Slider/Knob.js +8 -6
  96. package/Slider/PositionDecorator.js +4 -2
  97. package/Slider/Slider.d.ts +202 -0
  98. package/Slider/Slider.js +18 -9
  99. package/SlotItem/SlotItem.d.ts +118 -0
  100. package/SlotItem/SlotItem.js +20 -6
  101. package/Slottable/Slottable.d.ts +22 -0
  102. package/Slottable/Slottable.js +16 -8
  103. package/Slottable/useSlots.js +3 -1
  104. package/Spinner/Spinner.d.ts +95 -0
  105. package/Spinner/Spinner.js +24 -7
  106. package/ToggleIcon/ToggleIcon.d.ts +90 -0
  107. package/ToggleIcon/ToggleIcon.js +21 -7
  108. package/ToggleItem/ToggleItem.d.ts +132 -0
  109. package/ToggleItem/ToggleItem.js +17 -2
  110. package/ToggleItem/tests/ToggleItem-specs.js +3 -1
  111. package/Toggleable/Toggle.js +4 -2
  112. package/Toggleable/Toggleable.d.ts +103 -0
  113. package/Toggleable/Toggleable.js +13 -7
  114. package/Toggleable/useToggle.js +1 -2
  115. package/Touchable/ClickAllow.js +3 -1
  116. package/Touchable/Drag.js +6 -3
  117. package/Touchable/Flick.js +6 -2
  118. package/Touchable/Hold.js +6 -2
  119. package/Touchable/Pinch.js +6 -3
  120. package/Touchable/Touch.js +6 -4
  121. package/Touchable/Touchable.d.ts +217 -0
  122. package/Touchable/Touchable.js +10 -1
  123. package/Touchable/config.js +3 -1
  124. package/Touchable/tests/useTouch-specs.js +3 -1
  125. package/Touchable/useTouch.js +5 -4
  126. package/Transition/Transition.d.ts +194 -0
  127. package/Transition/Transition.js +22 -4
  128. package/Transition/tests/Transition-specs.js +5 -3
  129. package/ViewManager/Arranger.js +6 -1
  130. package/ViewManager/TransitionGroup.js +8 -5
  131. package/ViewManager/View.js +7 -4
  132. package/ViewManager/ViewManager.d.ts +191 -0
  133. package/ViewManager/ViewManager.js +29 -11
  134. package/ViewManager/tests/ViewManager-specs.js +47 -1
  135. package/VirtualList/UiVirtualListBase.js +9 -3
  136. package/VirtualList/VirtualList.d.ts +528 -0
  137. package/VirtualList/VirtualList.js +13 -1
  138. package/VirtualList/VirtualListBasic.js +9 -3
  139. package/VirtualList/tests/VirtualGridList-native-specs.js +3 -1
  140. package/VirtualList/tests/VirtualGridList-specs.js +3 -1
  141. package/VirtualList/tests/VirtualList-native-specs.js +3 -1
  142. package/VirtualList/tests/VirtualList-specs.js +3 -1
  143. package/index.d.ts +0 -0
  144. package/internal/IdProvider/IdProvider.d.ts +0 -0
  145. package/internal/IdProvider/IdProvider.js +8 -7
  146. package/internal/IdProvider/Provider.js +3 -1
  147. package/internal/IdProvider/tests/IdProvider-specs.js +3 -1
  148. package/internal/IdProvider/tests/useId-specs.js +4 -3
  149. package/internal/IdProvider/useId.js +0 -1
  150. package/internal/Pure/Pure.d.ts +0 -0
  151. package/internal/Pure/Pure.js +15 -9
  152. package/internal/Pure/tests/Pure-specs.js +4 -2
  153. package/internal/localized-fonts/localized-fonts.d.ts +53 -0
  154. package/internal/localized-fonts/localized-fonts.js +2 -2
  155. package/internal/selection/selection.d.ts +0 -0
  156. package/internal/validators/validators.d.ts +0 -0
  157. package/package.json +2 -2
  158. package/resolution/ResolutionDecorator.js +40 -9
  159. package/resolution/index.d.ts +187 -0
  160. package/resolution/resolution.js +23 -7
  161. package/useControlledState/tests/useControlledState-specs.js +2 -2
  162. package/useControlledState/useControlledState.d.ts +0 -0
  163. package/useControlledState/useControlledState.js +2 -2
  164. package/useScroll/ScrollAnimator.js +3 -1
  165. package/useScroll/Scrollbar.js +6 -4
  166. package/useScroll/ScrollbarTrack.js +8 -6
  167. package/useScroll/useScroll.d.ts +0 -0
  168. package/useScroll/useScroll.js +80 -52
@@ -16,13 +16,14 @@ var _jsxRuntime = require("react/jsx-runtime");
16
16
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
17
17
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
18
18
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
19
- function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
20
- /**
21
- * Default config for {@link ui/IdProvider.IdProvider}
22
- *
23
- * @hocconfig
24
- * @memberof ui/IdProvider.IdProvider
25
- */
19
+ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
20
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
21
+ function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } /**
22
+ * Default config for {@link ui/IdProvider.IdProvider}
23
+ *
24
+ * @hocconfig
25
+ * @memberof ui/IdProvider.IdProvider
26
+ */
26
27
  var defaultConfig = {
27
28
  /**
28
29
  * Prop to pass the identifier generation function
@@ -5,8 +5,10 @@ Object.defineProperty(exports, "__esModule", {
5
5
  });
6
6
  exports["default"] = exports.Provider = void 0;
7
7
  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
8
- function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
8
+ function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
9
9
  function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
10
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
11
+ function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
10
12
  var GlobalId = 0;
11
13
  var ID_KEY = '$$ID$$';
12
14
  var Provider = /*#__PURE__*/function () {
@@ -7,7 +7,9 @@ var _jsxRuntime = require("react/jsx-runtime");
7
7
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
8
8
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
9
9
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
10
- function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
10
+ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
11
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
12
+ function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
11
13
  describe('IdProvider', function () {
12
14
  test('should pass id to wrapped component', function () {
13
15
  var Base = function Base(props) {
@@ -7,14 +7,15 @@ var _jsxRuntime = require("react/jsx-runtime");
7
7
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
8
8
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
9
9
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
10
- function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
10
+ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
11
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
12
+ function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
11
13
  describe('useId', function () {
12
14
  var data = [];
13
15
  function Base(props) {
14
16
  data.push(props);
15
17
  return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
16
- id: data.id,
17
- generateid: data.generateId
18
+ id: data.id
18
19
  });
19
20
  }
20
21
  function Component(_ref) {
@@ -25,7 +25,6 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
25
25
  * @property {Function} [generateId] The function to generate id.
26
26
  * @private
27
27
  */
28
-
29
28
  /**
30
29
  * Generate globally-unique identifiers
31
30
  *
File without changes
@@ -10,23 +10,29 @@ var _jsxRuntime = require("react/jsx-runtime");
10
10
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
11
11
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
12
12
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
13
- function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
13
+ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
14
14
  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
15
- function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
15
+ function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
16
16
  function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
17
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
18
+ function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
17
19
  function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
18
20
  function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
19
21
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
20
22
  function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
21
23
  function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
22
24
  function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
23
- function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
24
- /**
25
- * Default config for {@link ui/internal/Pure.Pure}.
26
- *
27
- * @memberof ui/internal/Pure.Pure
28
- * @hocconfig
29
- */
25
+ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } /**
26
+ * Exports the {@link ui/internal/Pure.Pure} higher-order component (HOC).
27
+ *
28
+ * @module ui/internal/Pure
29
+ * @private
30
+ */ /**
31
+ * Default config for {@link ui/internal/Pure.Pure}.
32
+ *
33
+ * @memberof ui/internal/Pure.Pure
34
+ * @hocconfig
35
+ */
30
36
  var defaultConfig = {
31
37
  /**
32
38
  * Configures the comparators used to test for prop changes
@@ -9,10 +9,12 @@ var _jsxRuntime = require("react/jsx-runtime");
9
9
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
10
10
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
11
11
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
12
- function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
12
+ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
13
13
  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
14
- function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
14
+ function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
15
15
  function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
16
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
17
+ function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
16
18
  function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
17
19
  function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
18
20
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
@@ -0,0 +1,53 @@
1
+ /**
2
+ * Generates locale-specific font rules allowing any locale to have its own custom font. Each
3
+ locale-font from the configuration block (defined in this file) is generated at run-time. If the
4
+ locale you're currently in is in the locale-font list an additional `@font-face` rule will be
5
+ generated that will override the standard font.
6
+ *
7
+ * In addition to the standard override-font being generated, named region-specific fonts are also
8
+ generated. This lets you incorporate language specific fonts when you're outside of one of those
9
+ regions; useful in a language list context where you want the name of each language to be
10
+ represented by that language's designated font.
11
+ *
12
+ * Below is example genarated-output of the Urdu ("ur") locale-font.
13
+ * ```
14
+ &#64;font-face {
15
+ font-family: 'Custom Font ur';
16
+ font-weight: 500;
17
+ src: local('CustomFont_Urdu');
18
+ unicode-range: U+0600-U+06FF, U+FE70-U+FEFE, U+FB50-U+FDFF;
19
+ }
20
+ &#64;font-face {
21
+ font-family: 'Custom Font ur Bold';
22
+ font-weight: 700;
23
+ src: local('CustomFont_Urdu');
24
+ unicode-range: U+0600-U+06FF, U+FE70-U+FEFE, U+FB50-U+FDFF;
25
+ }
26
+ &#64;font-face {
27
+ font-family: 'Custom Font ur Light';
28
+ font-weight: 300;
29
+ src: local('CustomFont_Urdu');
30
+ unicode-range: U+0600-U+06FF, U+FE70-U+FEFE, U+FB50-U+FDFF;
31
+ }
32
+ ```
33
+ */
34
+ function generateFontRules(locale: string): string;
35
+ /**
36
+ * Adds a localed font to the font map
37
+ * ```
38
+ addLocalizedFont('My Theme Font', {
39
+ 'ur': {
40
+ regular: 'My Theme Urdu',
41
+ unicodeRange:
42
+ 'U+600-6FF,' +
43
+ 'U+FE70-FEFE,' +
44
+ 'U+FB50-FDFF'
45
+ }
46
+ })
47
+ ```
48
+ */
49
+ function addLocalizedFont(name: string, fonts: object): void;
50
+ /**
51
+ * Removes a localized font from the font map
52
+ */
53
+ function removeLocalizedFont(name: string): void;
@@ -3,8 +3,8 @@
3
3
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
4
4
  function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
5
5
  function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
6
- function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
7
- function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
6
+ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
7
+ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
8
8
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
9
9
  var fontMap = {};
10
10
  var currentLocale = null;
File without changes
File without changes
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@enact/ui",
3
- "version": "4.6.1",
3
+ "version": "4.7.0",
4
4
  "description": "A collection of simplified unstyled cross-platform UI components for Enact",
5
5
  "repository": {
6
6
  "type": "git",
@@ -31,7 +31,7 @@
31
31
  }
32
32
  },
33
33
  "dependencies": {
34
- "@enact/core": "^4.6.1",
34
+ "@enact/core": "^4.7.0",
35
35
  "classnames": "^2.3.2",
36
36
  "direction": "^1.0.4",
37
37
  "invariant": "^2.2.4",
@@ -13,23 +13,28 @@ var _jsxRuntime = require("react/jsx-runtime");
13
13
  function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
14
14
  function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
15
15
  function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
16
- function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
16
+ function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
17
17
  function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
18
- function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
18
+ function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, _toPropertyKey(descriptor.key), descriptor); } }
19
19
  function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
20
+ function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
21
+ function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
20
22
  function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
21
23
  function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
22
24
  function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; }
23
25
  function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
24
26
  function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
25
27
  function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
26
- function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
27
- /**
28
- * Default config for `ResolutionDecorator`.
29
- *
30
- * @memberof ui/resolution.ResolutionDecorator
31
- * @hocconfig
32
- */
28
+ function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } /*
29
+ * Exports the {@link ui/resolution.ResolutionDecorator} higher-order component (HOC).
30
+ *
31
+ * not jsdoc module on purpose
32
+ */ /**
33
+ * Default config for `ResolutionDecorator`.
34
+ *
35
+ * @memberof ui/resolution.ResolutionDecorator
36
+ * @hocconfig
37
+ */
33
38
  var defaultConfig = {
34
39
  /**
35
40
  * Attaches an event listener to the window to listen for resize events.
@@ -40,6 +45,30 @@ var defaultConfig = {
40
45
  * @memberof ui/resolution.ResolutionDecorator.defaultConfig
41
46
  */
42
47
  dynamic: true,
48
+ /**
49
+ * Determines how to calculate font-size.
50
+ * When set to `scale` and the screen is in `landscape` orientation,
51
+ * calculates font-size linearly based on screen resolution.
52
+ * When set to `normal`, the font-size will be the pxPerRem value of the best match screen type.
53
+ *
54
+ * @type {('normal'|'scale')}
55
+ * @default 'normal'
56
+ * @private
57
+ * @memberof ui/resolution.ResolutionDecorator.defaultConfig
58
+ */
59
+ intermediateScreenHandling: 'normal',
60
+ /**
61
+ * Determines how to get the best match screen type of current resolution.
62
+ * When set to `true`, the matched screen type will be the one that is smaller and
63
+ * the closest to the screen resolution.
64
+ * When set to `false`, the matched screen type will be the one that is greater and
65
+ * the closest to the screen resolution.
66
+ *
67
+ * @type {Boolean}
68
+ * @private
69
+ * @memberof ui/resolution.ResolutionDecorator.defaultConfig
70
+ */
71
+ matchSmallerScreenType: false,
43
72
  /**
44
73
  * An array of objects containing declarations for screen types to add to the list of known
45
74
  * screen types.
@@ -94,6 +123,8 @@ var ResolutionDecorator = (0, _hoc["default"])(defaultConfig, function (config,
94
123
  });
95
124
  }
96
125
  };
126
+ _resolution.config.intermediateScreenHandling = config.intermediateScreenHandling;
127
+ _resolution.config.matchSmallerScreenType = config.matchSmallerScreenType;
97
128
  (0, _resolution.init)({
98
129
  measurementNode: typeof window !== 'undefined' && window
99
130
  });
@@ -0,0 +1,187 @@
1
+ // Type definitions for ui/resolution
2
+
3
+ type Omit<T, K extends keyof T> = Pick<T, Exclude<keyof T, K>>;
4
+ type Merge<M, N> = Omit<M, Extract<keyof M, keyof N>> & N;
5
+
6
+ export interface ResolutionDecoratorConfig extends Object {
7
+ /**
8
+ * Attaches an event listener to the window to listen for resize events.
9
+ */
10
+ dynamic?: boolean;
11
+ /**
12
+ * An array of objects containing declarations for screen types to add to the list of known
13
+ screen types.
14
+ */
15
+ screenTypes?: object[];
16
+ }
17
+ export interface ResolutionDecoratorProps {}
18
+ export function ResolutionDecorator<P>(
19
+ config: ResolutionDecoratorConfig,
20
+ Component: React.ComponentType<P> | string
21
+ ): React.ComponentType<P & ResolutionDecoratorProps>;
22
+
23
+ export function ResolutionDecorator<P>(
24
+ Component: React.ComponentType<P> | string
25
+ ): React.ComponentType<P & ResolutionDecoratorProps>;
26
+
27
+ /**
28
+ * Object that stores all of the pixel conversion factors to each keyed unit.
29
+ */
30
+ export declare const unitToPixelFactors: object;
31
+ /**
32
+ * Sets up screen resolution scaling capabilities by defining an array of all the screens
33
+ being used.
34
+ *
35
+ * These should be listed in order from smallest to largest, according to
36
+ width.
37
+ *
38
+ * The `name` , `pxPerRem` , `width` , and `aspectRatioName` properties are required for
39
+ each screen type in the array. Setting `base: true` on a screen type marks it as the
40
+ default resolution, upon which everything else will be based.
41
+ *
42
+ * Executing this method also initializes the rest of the resolution-independence code.
43
+ *
44
+ * Example:
45
+ * ```
46
+ import ri from 'enact/ui/resolution';
47
+
48
+ ri.defineScreenTypes([
49
+ {name: 'vga', pxPerRem: 8, width: 640, height: 480, aspectRatioName: 'standard'},
50
+ {name: 'xga', pxPerRem: 16, width: 1024, height: 768, aspectRatioName: 'standard'},
51
+ {name: 'hd', pxPerRem: 16, width: 1280, height: 720, aspectRatioName: 'hdtv'},
52
+ {name: 'fhd', pxPerRem: 24, width: 1920, height: 1080, aspectRatioName: 'hdtv', base: true},
53
+ {name: 'uw-uxga', pxPerRem: 24, width: 2560, height: 1080, aspectRatioName: 'cinema'},
54
+ {name: 'uhd', pxPerRem: 48, width: 3840, height: 2160, aspectRatioName: 'hdtv'}
55
+ ]);
56
+ ```
57
+ */
58
+ export function defineScreenTypes(types: object[]): void;
59
+ /**
60
+ * Fetches the name of the screen type that best matches the current screen size.
61
+ *
62
+ * The best match is defined as the screen type that is the closest to the screen resolution without
63
+ going over. ("The Price is Right" style.)
64
+ */
65
+ export function getScreenType(rez: object): string;
66
+ /**
67
+ * Calculate the base rem font size.
68
+ *
69
+ * This is how the magic happens. This accepts an optional `screenType` name. If one isn't provided,
70
+ the currently detected screen type is used. This uses the config option `orientationHandling` ,
71
+ which when set to "scale" and the screen is in portrait orientation, will dynamically calculate
72
+ what the base font size should be, if the width were proportionally scaled down to fit in the portrait space.
73
+ *
74
+ * To use, put the following in your application code:
75
+ * ```
76
+ import ri from '@enact/ui/resolution';
77
+
78
+ ri.config.orientationHandling = 'scale';
79
+ ri.init();
80
+ ```
81
+
82
+ * This has no effect if the screen is in landscape, or if `orientationHandling` is unset.
83
+ */
84
+ export function calculateFontSize(type: string): string;
85
+ /**
86
+ * Returns the CSS classes for the given `type` .
87
+ */
88
+ export function getResolutionClasses(type: string): string;
89
+ /**
90
+ * Returns the ratio of pixels per rem for the given `type` to the pixels per rem for the base type.
91
+ */
92
+ export function getRiRatio(type: string): number;
93
+ /**
94
+ * Returns the pixels per rem for the given `type` .
95
+ */
96
+ export function getUnitToPixelFactors(type: string): number;
97
+ /**
98
+ * Calculates the aspect ratio of the specified screen type.
99
+ *
100
+ * If no screen type is provided, the current screen type is used.
101
+ */
102
+ export function getAspectRatio(type: string): number;
103
+ /**
104
+ * Returns the name of the aspect ratio for a specified screen type, or for the default
105
+ screen type if none is provided.
106
+ */
107
+ export function getAspectRatioName(type: string): string;
108
+ /**
109
+ * Takes a provided pixel value and performs a scaling operation based on the current
110
+ screen type.
111
+ */
112
+ export function scale(px: number): number;
113
+ /**
114
+ * Convert to various unit formats.
115
+ *
116
+ * Useful for converting pixels to a resolution-independent
117
+ measurement method, like "rem". Other units are available if defined in the
118
+ object.
119
+ *
120
+ * Example:
121
+ * ```
122
+ import ri from '@enact/ui/resolution';
123
+
124
+ // Do calculations and get back the desired CSS unit.
125
+ var frameWidth = 250,
126
+ frameWithMarginInches = ri.unit( 10 + frameWidth + 10, 'in' ), // '2.8125in' == frameWithMarginInches
127
+ frameWithMarginRems = ri.unit( 10 + frameWidth + 10, 'rem' ); // '22.5rem' == frameWithMarginRems
128
+ ```
129
+ */
130
+ export function unit(pixels: string | number, toUnit: string): string | void;
131
+ /**
132
+ * Shorthand for when you know you need to scale some pixel value and have it converted to "rem" for
133
+ proper scaling.
134
+ *
135
+ * This runs and together.
136
+ */
137
+ export function scaleToRem(pixels: number): string | void;
138
+ /**
139
+ * The default configurable options for . Additional resolutions
140
+ may be added.
141
+ */
142
+ export interface selectSrcOptions {
143
+ /**
144
+ * HD / 720p Resolution image asset source URI/URL
145
+ */
146
+ hd?: string
147
+ /**
148
+ * FHD / 1080p Resolution image asset source URI/URL
149
+ */;
150
+ fhd?: string
151
+ /**
152
+ * UHD / 4K Resolution image asset source URI/URL
153
+ */;
154
+ uhd?: string;
155
+ }
156
+ /**
157
+ * Selects the ideal image asset from a set of assets, based on various screen
158
+ resolutions: HD (720p), FHD (1080p), UHD (4k).
159
+ *
160
+ * When a `src` argument is provided, `selectSrc()` will choose the best image with
161
+ respect to the current screen resolution. `src` may be either the traditional
162
+ string, which will pass straight through, or a hash/object of screen types and
163
+ their asset sources (keys:screen and values:src). The image sources will be used
164
+ when the screen resolution is less than or equal to the provided screen types.
165
+ *
166
+ * Example:
167
+ * ```
168
+ // Take advantage of the multi-res mode
169
+ import {Image} from '@enact/ui/Image';
170
+
171
+ const src = {
172
+ 'hd': 'http://lorempixel.com/64/64/city/1/',
173
+ 'fhd': 'http://lorempixel.com/128/128/city/1/',
174
+ 'uhd': 'http://lorempixel.com/256/256/city/1/'
175
+ };
176
+ ...
177
+ <Image src={src} ... />
178
+ ...
179
+ ```
180
+ */
181
+ export function selectSrc(
182
+ src: string | ui_resolution_selectSrcSrcOptions
183
+ ): string;
184
+ /**
185
+ * This will need to be re-run any time the screen size changes, so all the values can be re-cached.
186
+ */
187
+ export function init(args: object): void;
@@ -51,6 +51,8 @@ var unitToPixelFactors = {
51
51
  };
52
52
  exports.unitToPixelFactors = unitToPixelFactors;
53
53
  var configDefaults = {
54
+ intermediateScreenHandling: 'normal',
55
+ matchSmallerScreenType: false,
54
56
  orientationHandling: 'normal'
55
57
  };
56
58
 
@@ -160,7 +162,7 @@ function defineScreenTypes(types) {
160
162
  function getScreenType(rez) {
161
163
  rez = rez || workspaceBounds;
162
164
  var types = screenTypes;
163
- var bestMatch = types[types.length - 1].name; // Blindly set the first screen type, in case no matches are found later.
165
+ var bestMatch = config.matchSmallerScreenType ? types[0].name : types[types.length - 1].name; // Blindly set the first screen type, in case no matches are found later.
164
166
 
165
167
  orientation = 'landscape';
166
168
  if (rez.height > rez.width) {
@@ -169,14 +171,24 @@ function getScreenType(rez) {
169
171
  rez.width = rez.height;
170
172
  rez.height = swap;
171
173
  }
172
-
173
- // Loop through resolutions, last->first, largest->smallest
174
- for (var i = types.length - 1; i >= 0; i--) {
175
- // Does the current resolution fit inside this screenType definition? If so, save it as the current best match.
176
- if (rez.height <= types[i].height && rez.width <= types[i].width) {
177
- bestMatch = types[i].name;
174
+ if (config.matchSmallerScreenType) {
175
+ // Loop through resolutions, first->last, smallest->largest
176
+ for (var i = 0; i <= types.length - 1; i++) {
177
+ // Does this screenType definition fit inside the current resolution? If so, save it as the current best match.
178
+ if (rez.height >= types[i].height && rez.width >= types[i].width) {
179
+ bestMatch = types[i].name;
180
+ }
181
+ }
182
+ } else {
183
+ // Loop through resolutions, last->first, largest->smallest
184
+ for (var _i = types.length - 1; _i >= 0; _i--) {
185
+ // Does the current resolution fit inside this screenType definition? If so, save it as the current best match.
186
+ if (rez.height <= types[_i].height && rez.width <= types[_i].width) {
187
+ bestMatch = types[_i].name;
188
+ }
178
189
  }
179
190
  }
191
+
180
192
  // Return the name of the closest fitting set of dimensions.
181
193
  return bestMatch;
182
194
  }
@@ -208,11 +220,15 @@ function getScreenType(rez) {
208
220
  */
209
221
  function calculateFontSize(type) {
210
222
  var scrObj = getScreenTypeObject(type);
223
+ var shouldScaleFontSize = config.intermediateScreenHandling === 'scale' && (config.matchSmallerScreenType ? workspaceBounds.width > scrObj.width && workspaceBounds.height > scrObj.height : workspaceBounds.width < scrObj.width && workspaceBounds.height < scrObj.height);
211
224
  var size;
212
225
  if (orientation === 'portrait' && config.orientationHandling === 'scale') {
213
226
  size = scrObj.height / scrObj.width * scrObj.pxPerRem;
214
227
  } else {
215
228
  size = scrObj.pxPerRem;
229
+ if (orientation === 'landscape' && shouldScaleFontSize) {
230
+ size = parseInt(workspaceBounds.height * scrObj.pxPerRem / scrObj.height);
231
+ }
216
232
  }
217
233
  return size + 'px';
218
234
  }
@@ -8,8 +8,8 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
8
8
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
9
9
  function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
10
10
  function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
11
- function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
12
- function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
11
+ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
12
+ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
13
13
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
14
14
  describe('useControlledState', function () {
15
15
  var data;
File without changes
@@ -9,8 +9,8 @@ var _react = require("react");
9
9
  function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
10
10
  function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
11
11
  function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
12
- function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
13
- function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
12
+ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
13
+ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i["return"] && (_r = _i["return"](), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
14
14
  function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
15
15
  function nop() {}
16
16