@enact/ui 4.6.2 → 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.
- package/AnnounceDecorator/Announce.js +27 -17
- package/AnnounceDecorator/AnnounceDecorator.js +14 -7
- package/AnnounceDecorator/useAnnounce.js +1 -2
- package/BodyText/BodyText.js +14 -8
- package/Button/Button.js +16 -10
- package/CHANGELOG.md +10 -0
- package/Cancelable/Cancelable.js +13 -7
- package/Changeable/Changeable.js +11 -7
- package/ComponentOverride/ComponentOverride.js +18 -7
- package/FloatingLayer/FloatingLayer.js +10 -11
- package/FloatingLayer/FloatingLayerDecorator.js +9 -6
- package/ForwardRef/ForwardRef.js +11 -7
- package/GridListImageItem/GridListImageItem.js +16 -9
- package/Group/Group.js +17 -8
- package/Group/GroupItem.js +14 -10
- package/Heading/Heading.js +20 -9
- package/Icon/Icon.js +15 -8
- package/IconButton/IconButton.js +22 -9
- package/Image/Image.js +16 -8
- package/ImageItem/ImageItem.js +9 -1
- package/Item/Item.js +17 -9
- package/LabeledIcon/LabeledIcon.js +16 -8
- package/Layout/Cell.js +27 -4
- package/Layout/Layout.d.ts +22 -5
- package/Layout/Layout.js +154 -32
- package/Layout/Layout.module.css +8 -0
- package/Layout/tests/Layout-specs.js +39 -0
- package/Marquee/MarqueeController.js +50 -0
- package/Marquee/MarqueeDecorator.js +40 -2
- package/Measurable/Measurable.js +11 -7
- package/Media/Media.js +30 -23
- package/Placeholder/PlaceholderControllerDecorator.js +9 -8
- package/Placeholder/PlaceholderDecorator.js +7 -8
- package/ProgressBar/ProgressBar.js +12 -1
- package/RadioDecorator/RadioDecorator.js +13 -7
- package/Repeater/Repeater.js +14 -10
- package/Resizable/Resizable.js +12 -8
- package/Routable/Link.js +8 -8
- package/Routable/Routable.js +15 -8
- package/Routable/Router.js +10 -10
- package/Scrollable/ScrollThumb.js +8 -9
- package/Scrollable/Scrollable.js +23 -1
- package/Scrollable/ScrollableNative.js +12 -0
- package/Scroller/Scroller.js +8 -1
- package/Scroller/ScrollerBasic.js +8 -9
- package/Scroller/UiScrollerBase.js +11 -12
- package/Skinnable/Skinnable.js +19 -7
- package/Skinnable/useSkins.js +1 -2
- package/Slider/Knob.js +8 -8
- package/Slider/Slider.js +16 -9
- package/SlotItem/SlotItem.js +20 -8
- package/Slottable/Slottable.js +14 -8
- package/Spinner/Spinner.js +24 -9
- package/ToggleIcon/ToggleIcon.js +21 -9
- package/ToggleItem/ToggleItem.js +14 -1
- package/Toggleable/Toggleable.js +11 -7
- package/Toggleable/useToggle.js +0 -1
- package/Touchable/Drag.js +2 -1
- package/Touchable/Flick.js +2 -0
- package/Touchable/Hold.js +2 -0
- package/Touchable/Pinch.js +2 -1
- package/Touchable/Touch.js +3 -3
- package/Touchable/Touchable.js +7 -0
- package/Touchable/useTouch.js +0 -1
- package/Transition/Transition.js +19 -3
- package/ViewManager/Arranger.js +4 -1
- package/ViewManager/TransitionGroup.js +5 -4
- package/ViewManager/View.js +3 -2
- package/ViewManager/ViewManager.js +25 -9
- package/ViewManager/tests/ViewManager-specs.js +44 -0
- package/VirtualList/UiVirtualListBase.js +4 -0
- package/VirtualList/VirtualList.js +11 -1
- package/VirtualList/VirtualListBasic.js +4 -0
- package/internal/IdProvider/IdProvider.js +6 -7
- package/internal/IdProvider/useId.js +0 -1
- package/internal/Pure/Pure.js +11 -7
- package/package.json +2 -2
- package/resolution/ResolutionDecorator.js +36 -7
- package/resolution/resolution.js +23 -7
- package/useScroll/ScrollbarTrack.js +8 -8
- package/useScroll/useScroll.js +17 -1
|
@@ -31,6 +31,29 @@ var _View = require("./View");
|
|
|
31
31
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
32
32
|
var _excluded = ["arranger", "childProps", "children", "duration", "index", "noAnimation", "enteringDelay", "enteringProp", "rtl"];
|
|
33
33
|
var _class;
|
|
34
|
+
/**
|
|
35
|
+
* A component that manages the transitions of views.
|
|
36
|
+
*
|
|
37
|
+
* @module ui/ViewManager
|
|
38
|
+
* @exports shape
|
|
39
|
+
* @exports SlideArranger
|
|
40
|
+
* @exports SlideBottomArranger
|
|
41
|
+
* @exports SlideLeftArranger
|
|
42
|
+
* @exports SlideRightArranger
|
|
43
|
+
* @exports SlideTopArranger
|
|
44
|
+
* @exports ViewManager
|
|
45
|
+
* @exports ViewManagerBase
|
|
46
|
+
* @exports ViewManagerDecorator
|
|
47
|
+
*/
|
|
48
|
+
/**
|
|
49
|
+
* The base `ViewManager` component, without
|
|
50
|
+
* {@link ui/ViewManager.ViewManagerDecorator|ViewManagerDecorator} applied.
|
|
51
|
+
*
|
|
52
|
+
* @class ViewManagerBase
|
|
53
|
+
* @memberof ui/ViewManager
|
|
54
|
+
* @ui
|
|
55
|
+
* @public
|
|
56
|
+
*/
|
|
34
57
|
function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
|
|
35
58
|
function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
|
|
36
59
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
@@ -51,15 +74,6 @@ function _possibleConstructorReturn(self, call) { if (call && (typeof call === "
|
|
|
51
74
|
function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
|
|
52
75
|
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; } }
|
|
53
76
|
function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
|
|
54
|
-
/**
|
|
55
|
-
* The base `ViewManager` component, without
|
|
56
|
-
* {@link ui/ViewManager.ViewManagerDecorator|ViewManagerDecorator} applied.
|
|
57
|
-
*
|
|
58
|
-
* @class ViewManagerBase
|
|
59
|
-
* @memberof ui/ViewManager
|
|
60
|
-
* @ui
|
|
61
|
-
* @public
|
|
62
|
-
*/
|
|
63
77
|
var ViewManagerBase = (_class = /*#__PURE__*/function (_Component) {
|
|
64
78
|
_inherits(ViewManagerBase, _Component);
|
|
65
79
|
var _super = _createSuper(ViewManagerBase);
|
|
@@ -138,6 +152,8 @@ var ViewManagerBase = (_class = /*#__PURE__*/function (_Component) {
|
|
|
138
152
|
value: function getDerivedStateFromProps(props, state) {
|
|
139
153
|
if (props.reverseTransition != null) {
|
|
140
154
|
return {
|
|
155
|
+
index: props.index,
|
|
156
|
+
prevIndex: state.index,
|
|
141
157
|
reverseTransition: !!props.reverseTransition
|
|
142
158
|
};
|
|
143
159
|
} else if (props.index !== state.index) {
|
|
@@ -4,6 +4,7 @@ require("@testing-library/jest-dom");
|
|
|
4
4
|
var _react = require("@testing-library/react");
|
|
5
5
|
var _react2 = require("react");
|
|
6
6
|
var _ = _interopRequireDefault(require("../"));
|
|
7
|
+
var _Arranger = require("../Arranger");
|
|
7
8
|
var _testUtils = require("./test-utils");
|
|
8
9
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
9
10
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
@@ -837,4 +838,47 @@ describe('ViewManager', function () {
|
|
|
837
838
|
expect(actual).toMatchObject(expected);
|
|
838
839
|
spy.mockRestore();
|
|
839
840
|
});
|
|
841
|
+
test('should not remove view immediately after `index` change if an arranger is present even for multiple views', function () {
|
|
842
|
+
var _render19 = (0, _react.render)( /*#__PURE__*/(0, _jsxRuntime.jsxs)(_["default"], {
|
|
843
|
+
arranger: _Arranger.SlideTopArranger,
|
|
844
|
+
"data-testid": "viewManager",
|
|
845
|
+
end: 2,
|
|
846
|
+
index: 0,
|
|
847
|
+
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
848
|
+
children: "View 1"
|
|
849
|
+
}, "view1"), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
850
|
+
children: "View 2"
|
|
851
|
+
}, "view2"), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
852
|
+
children: "View 3"
|
|
853
|
+
}, "view3"), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
854
|
+
children: "View 4"
|
|
855
|
+
}, "view4"), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
856
|
+
children: "View 5"
|
|
857
|
+
}, "view5")]
|
|
858
|
+
})),
|
|
859
|
+
rerender = _render19.rerender;
|
|
860
|
+
var actual = _react.screen.getByTestId('viewManager').children.length;
|
|
861
|
+
var expected = 3;
|
|
862
|
+
expect(actual).toBe(expected);
|
|
863
|
+
rerender( /*#__PURE__*/(0, _jsxRuntime.jsxs)(_["default"], {
|
|
864
|
+
arranger: _Arranger.SlideTopArranger,
|
|
865
|
+
"data-testid": "viewManager",
|
|
866
|
+
end: 3,
|
|
867
|
+
index: 1,
|
|
868
|
+
children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
869
|
+
children: "View 1"
|
|
870
|
+
}, "view1"), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
871
|
+
children: "View 2"
|
|
872
|
+
}, "view2"), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
873
|
+
children: "View 3"
|
|
874
|
+
}, "view3"), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
875
|
+
children: "View 4"
|
|
876
|
+
}, "view4"), /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
|
|
877
|
+
children: "View 5"
|
|
878
|
+
}, "view5")]
|
|
879
|
+
}));
|
|
880
|
+
actual = _react.screen.getByTestId('viewManager').children.length;
|
|
881
|
+
expected = 4;
|
|
882
|
+
expect(actual).toBe(expected);
|
|
883
|
+
});
|
|
840
884
|
});
|
|
@@ -417,6 +417,8 @@ var VirtualListBaseFactory = function VirtualListBaseFactory(type) {
|
|
|
417
417
|
});
|
|
418
418
|
}
|
|
419
419
|
}
|
|
420
|
+
|
|
421
|
+
// For individually sized item
|
|
420
422
|
}, {
|
|
421
423
|
key: "getGridPosition",
|
|
422
424
|
value: function getGridPosition(index) {
|
|
@@ -453,6 +455,8 @@ var VirtualListBaseFactory = function VirtualListBaseFactory(type) {
|
|
|
453
455
|
}
|
|
454
456
|
|
|
455
457
|
// For individually sized item
|
|
458
|
+
|
|
459
|
+
// For individually sized item
|
|
456
460
|
}, {
|
|
457
461
|
key: "emitUpdateItems",
|
|
458
462
|
value: function emitUpdateItems() {
|
|
@@ -47,7 +47,17 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
|
|
|
47
47
|
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; }
|
|
48
48
|
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; }
|
|
49
49
|
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
50
|
-
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); }
|
|
50
|
+
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); } /**
|
|
51
|
+
* Unstyled virtual list components and behaviors to be customized by a theme or application.
|
|
52
|
+
*
|
|
53
|
+
* @module ui/VirtualList
|
|
54
|
+
* @exports gridListImageSizeShape
|
|
55
|
+
* @exports itemSizesShape
|
|
56
|
+
* @exports VirtualGridList
|
|
57
|
+
* @exports VirtualList
|
|
58
|
+
* @exports VirtualListBase
|
|
59
|
+
* @exports VirtualListBasic
|
|
60
|
+
*/
|
|
51
61
|
var nop = function nop() {};
|
|
52
62
|
|
|
53
63
|
/**
|
|
@@ -474,6 +474,8 @@ var VirtualListBasic = /*#__PURE__*/function (_Component) {
|
|
|
474
474
|
this.scrollToPositionTarget = -1;
|
|
475
475
|
}
|
|
476
476
|
}
|
|
477
|
+
|
|
478
|
+
// For individually sized item
|
|
477
479
|
}, {
|
|
478
480
|
key: "getGridPosition",
|
|
479
481
|
value: function getGridPosition(index) {
|
|
@@ -510,6 +512,8 @@ var VirtualListBasic = /*#__PURE__*/function (_Component) {
|
|
|
510
512
|
}
|
|
511
513
|
|
|
512
514
|
// For individually sized item
|
|
515
|
+
|
|
516
|
+
// For individually sized item
|
|
513
517
|
}, {
|
|
514
518
|
key: "emitUpdateItems",
|
|
515
519
|
value: function emitUpdateItems() {
|
|
@@ -18,13 +18,12 @@ function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (O
|
|
|
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
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
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
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
*/
|
|
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
|
+
*/
|
|
28
27
|
var defaultConfig = {
|
|
29
28
|
/**
|
|
30
29
|
* Prop to pass the identifier generation function
|
package/internal/Pure/Pure.js
CHANGED
|
@@ -22,13 +22,17 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
|
|
|
22
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); }
|
|
23
23
|
function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
|
|
24
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; } }
|
|
25
|
-
function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
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
|
+
*/
|
|
32
36
|
var defaultConfig = {
|
|
33
37
|
/**
|
|
34
38
|
* Configures the comparators used to test for prop changes
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@enact/ui",
|
|
3
|
-
"version": "4.
|
|
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.
|
|
34
|
+
"@enact/core": "^4.7.0",
|
|
35
35
|
"classnames": "^2.3.2",
|
|
36
36
|
"direction": "^1.0.4",
|
|
37
37
|
"invariant": "^2.2.4",
|
|
@@ -25,13 +25,16 @@ function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflec
|
|
|
25
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); }
|
|
26
26
|
function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
|
|
27
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; } }
|
|
28
|
-
function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
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
|
+
*/
|
|
35
38
|
var defaultConfig = {
|
|
36
39
|
/**
|
|
37
40
|
* Attaches an event listener to the window to listen for resize events.
|
|
@@ -42,6 +45,30 @@ var defaultConfig = {
|
|
|
42
45
|
* @memberof ui/resolution.ResolutionDecorator.defaultConfig
|
|
43
46
|
*/
|
|
44
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,
|
|
45
72
|
/**
|
|
46
73
|
* An array of objects containing declarations for screen types to add to the list of known
|
|
47
74
|
* screen types.
|
|
@@ -96,6 +123,8 @@ var ResolutionDecorator = (0, _hoc["default"])(defaultConfig, function (config,
|
|
|
96
123
|
});
|
|
97
124
|
}
|
|
98
125
|
};
|
|
126
|
+
_resolution.config.intermediateScreenHandling = config.intermediateScreenHandling;
|
|
127
|
+
_resolution.config.matchSmallerScreenType = config.matchSmallerScreenType;
|
|
99
128
|
(0, _resolution.init)({
|
|
100
129
|
measurementNode: typeof window !== 'undefined' && window
|
|
101
130
|
});
|
package/resolution/resolution.js
CHANGED
|
@@ -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
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
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
|
}
|
|
@@ -10,14 +10,6 @@ var _react = require("react");
|
|
|
10
10
|
var _ScrollbarTrackModule = _interopRequireDefault(require("./ScrollbarTrack.module.css"));
|
|
11
11
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
12
12
|
var _excluded = ["vertical"];
|
|
13
|
-
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
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
|
-
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) { 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
|
-
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); }
|
|
19
|
-
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
|
|
20
|
-
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
|
|
21
13
|
/**
|
|
22
14
|
* An unstyled scroll track without any behavior.
|
|
23
15
|
*
|
|
@@ -26,6 +18,14 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
|
|
|
26
18
|
* @ui
|
|
27
19
|
* @private
|
|
28
20
|
*/
|
|
21
|
+
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
22
|
+
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; }
|
|
23
|
+
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; }
|
|
24
|
+
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; }
|
|
25
|
+
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
26
|
+
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); }
|
|
27
|
+
function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
|
|
28
|
+
function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
|
|
29
29
|
var ScrollbarTrack = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
30
30
|
var vertical = props.vertical,
|
|
31
31
|
rest = _objectWithoutProperties(props, _excluded),
|
package/useScroll/useScroll.js
CHANGED
|
@@ -24,6 +24,18 @@ var _useScrollModule = _interopRequireDefault(require("./useScroll.module.css"))
|
|
|
24
24
|
var _jsxRuntime = require("react/jsx-runtime");
|
|
25
25
|
var _excluded = ["componentRef"],
|
|
26
26
|
_excluded2 = ["childProps", "children", "className", "clientSize", "assignProperties", "dataSize", "direction", "horizontalScrollbar", "horizontalScrollbarHandle", "itemRenderer", "itemSize", "itemSizes", "noScrollByDrag", "noScrollByWheel", "overhang", "overscrollEffectOn", "pageScroll", "role", "rtl", "scrollContainerRef", "scrollContentHandle", "scrollContentRef", "scrollMode", "setScrollContainerHandle", "snapToCenter", "spacing", "spotlightContainerDisabled", "verticalScrollbar", "verticalScrollbarHandle", "wrap"];
|
|
27
|
+
/* global ResizeObserver */
|
|
28
|
+
/**
|
|
29
|
+
* Unstyled scrollable hook and behaviors to be customized by a theme or application.
|
|
30
|
+
*
|
|
31
|
+
* @module ui/useScroll
|
|
32
|
+
* @exports assignPropertiesOf
|
|
33
|
+
* @exports constants
|
|
34
|
+
* @exports useScroll
|
|
35
|
+
* @exports useScrollBase
|
|
36
|
+
* @private
|
|
37
|
+
*/
|
|
38
|
+
// scrollMode 'native'
|
|
27
39
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
28
40
|
function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
|
|
29
41
|
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."); }
|
|
@@ -178,6 +190,7 @@ var useScrollBase = function useScrollBase(props) {
|
|
|
178
190
|
// status
|
|
179
191
|
deferScrollTo: true,
|
|
180
192
|
isScrollAnimationTargetAccumulated: false,
|
|
193
|
+
rtl: rtl,
|
|
181
194
|
// overscroll
|
|
182
195
|
lastInputType: null,
|
|
183
196
|
overscrollStatus: {
|
|
@@ -266,7 +279,7 @@ var useScrollBase = function useScrollBase(props) {
|
|
|
266
279
|
mutableRef.current.lastInputType = val;
|
|
267
280
|
},
|
|
268
281
|
get rtl() {
|
|
269
|
-
return rtl;
|
|
282
|
+
return mutableRef.current.rtl;
|
|
270
283
|
},
|
|
271
284
|
get scrollBounds() {
|
|
272
285
|
return getScrollBounds();
|
|
@@ -296,6 +309,9 @@ var useScrollBase = function useScrollBase(props) {
|
|
|
296
309
|
if (mutableRef.current.animator == null) {
|
|
297
310
|
mutableRef.current.animator = new _ScrollAnimator["default"]();
|
|
298
311
|
}
|
|
312
|
+
if (mutableRef.current.rtl !== rtl) {
|
|
313
|
+
mutableRef.current.rtl = rtl;
|
|
314
|
+
}
|
|
299
315
|
(0, _react.useLayoutEffect)(function () {
|
|
300
316
|
/* istanbul ignore next */
|
|
301
317
|
if (setScrollContainerHandle) {
|