@opentiny/vue-hooks 2.19.0 → 2.20.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/index.js +48 -21
- package/package.json +2 -2
package/index.js
CHANGED
|
@@ -497,7 +497,7 @@ function computeCoordsFromPlacement(_ref, placement, rtl) {
|
|
|
497
497
|
}
|
|
498
498
|
var computePosition$1 = /* @__PURE__ */ function() {
|
|
499
499
|
var _ref2 = _asyncToGenerator(/* @__PURE__ */ _regeneratorRuntime().mark(function _callee(reference, floating, config) {
|
|
500
|
-
var _config$placement, placement, _config$strategy, strategy, _config$middleware, middleware, platform2, validMiddleware, rtl, rects, _computeCoordsFromPla, x, y, statefulPlacement, middlewareData, resetCount, i, _extends2, _validMiddleware$
|
|
500
|
+
var _config$placement, placement, _config$strategy, strategy, _config$middleware, middleware, platform2, validMiddleware, rtl, rects, _computeCoordsFromPla, x, y, statefulPlacement, middlewareData, resetCount, i, _extends2, _validMiddleware$i, name, fn, _yield$fn, nextX, nextY, data, reset, _computeCoordsFromPla2;
|
|
501
501
|
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
502
502
|
while (1)
|
|
503
503
|
switch (_context.prev = _context.next) {
|
|
@@ -526,7 +526,7 @@ var computePosition$1 = /* @__PURE__ */ function() {
|
|
|
526
526
|
_context.next = 45;
|
|
527
527
|
break;
|
|
528
528
|
}
|
|
529
|
-
_validMiddleware$
|
|
529
|
+
_validMiddleware$i = validMiddleware[i], name = _validMiddleware$i.name, fn = _validMiddleware$i.fn;
|
|
530
530
|
_context.next = 17;
|
|
531
531
|
return fn({
|
|
532
532
|
x,
|
|
@@ -543,11 +543,11 @@ var computePosition$1 = /* @__PURE__ */ function() {
|
|
|
543
543
|
}
|
|
544
544
|
});
|
|
545
545
|
case 17:
|
|
546
|
-
_yield$
|
|
547
|
-
nextX = _yield$
|
|
548
|
-
nextY = _yield$
|
|
549
|
-
data = _yield$
|
|
550
|
-
reset = _yield$
|
|
546
|
+
_yield$fn = _context.sent;
|
|
547
|
+
nextX = _yield$fn.x;
|
|
548
|
+
nextY = _yield$fn.y;
|
|
549
|
+
data = _yield$fn.data;
|
|
550
|
+
reset = _yield$fn.reset;
|
|
551
551
|
x = nextX != null ? nextX : x;
|
|
552
552
|
y = nextY != null ? nextY : y;
|
|
553
553
|
middlewareData = _extends({}, middlewareData, (_extends2 = {}, _extends2[name] = _extends({}, middlewareData[name], data), _extends2));
|
|
@@ -1506,6 +1506,28 @@ function getBoundingClientRect(element, includeScale, isFixedStrategy, offsetPar
|
|
|
1506
1506
|
y
|
|
1507
1507
|
});
|
|
1508
1508
|
}
|
|
1509
|
+
function getWindowScrollBarX(element, rect) {
|
|
1510
|
+
var leftScroll = getNodeScroll(element).scrollLeft;
|
|
1511
|
+
if (!rect) {
|
|
1512
|
+
return getBoundingClientRect(getDocumentElement(element)).left + leftScroll;
|
|
1513
|
+
}
|
|
1514
|
+
return rect.left + leftScroll;
|
|
1515
|
+
}
|
|
1516
|
+
function getHTMLOffset(documentElement, scroll, ignoreScrollbarX) {
|
|
1517
|
+
if (ignoreScrollbarX === void 0) {
|
|
1518
|
+
ignoreScrollbarX = false;
|
|
1519
|
+
}
|
|
1520
|
+
var htmlRect = documentElement.getBoundingClientRect();
|
|
1521
|
+
var x = htmlRect.left + scroll.scrollLeft - (ignoreScrollbarX ? 0 : (
|
|
1522
|
+
// RTL <body> scrollbar.
|
|
1523
|
+
getWindowScrollBarX(documentElement, htmlRect)
|
|
1524
|
+
));
|
|
1525
|
+
var y = htmlRect.top + scroll.scrollTop;
|
|
1526
|
+
return {
|
|
1527
|
+
x,
|
|
1528
|
+
y
|
|
1529
|
+
};
|
|
1530
|
+
}
|
|
1509
1531
|
function convertOffsetParentRelativeRectToViewportRelativeRect(_ref) {
|
|
1510
1532
|
var elements = _ref.elements, rect = _ref.rect, offsetParent = _ref.offsetParent, strategy = _ref.strategy;
|
|
1511
1533
|
var isFixed = strategy === "fixed";
|
|
@@ -1532,19 +1554,17 @@ function convertOffsetParentRelativeRectToViewportRelativeRect(_ref) {
|
|
|
1532
1554
|
offsets.y = offsetRect.y + offsetParent.clientTop;
|
|
1533
1555
|
}
|
|
1534
1556
|
}
|
|
1557
|
+
var htmlOffset = documentElement && !isOffsetParentAnElement && !isFixed ? getHTMLOffset(documentElement, scroll, true) : createCoords(0);
|
|
1535
1558
|
return {
|
|
1536
1559
|
width: rect.width * scale.x,
|
|
1537
1560
|
height: rect.height * scale.y,
|
|
1538
|
-
x: rect.x * scale.x - scroll.scrollLeft * scale.x + offsets.x,
|
|
1539
|
-
y: rect.y * scale.y - scroll.scrollTop * scale.y + offsets.y
|
|
1561
|
+
x: rect.x * scale.x - scroll.scrollLeft * scale.x + offsets.x + htmlOffset.x,
|
|
1562
|
+
y: rect.y * scale.y - scroll.scrollTop * scale.y + offsets.y + htmlOffset.y
|
|
1540
1563
|
};
|
|
1541
1564
|
}
|
|
1542
1565
|
function getClientRects(element) {
|
|
1543
1566
|
return Array.from(element.getClientRects());
|
|
1544
1567
|
}
|
|
1545
|
-
function getWindowScrollBarX(element) {
|
|
1546
|
-
return getBoundingClientRect(getDocumentElement(element)).left + getNodeScroll(element).scrollLeft;
|
|
1547
|
-
}
|
|
1548
1568
|
function getDocumentRect(element) {
|
|
1549
1569
|
var html = getDocumentElement(element);
|
|
1550
1570
|
var scroll = getNodeScroll(element);
|
|
@@ -1613,10 +1633,12 @@ function getClientRectFromClippingAncestor(element, clippingAncestor, strategy)
|
|
|
1613
1633
|
rect = getInnerBoundingClientRect(clippingAncestor, strategy);
|
|
1614
1634
|
} else {
|
|
1615
1635
|
var visualOffsets = getVisualOffsets(element);
|
|
1616
|
-
rect =
|
|
1636
|
+
rect = {
|
|
1617
1637
|
x: clippingAncestor.x - visualOffsets.x,
|
|
1618
|
-
y: clippingAncestor.y - visualOffsets.y
|
|
1619
|
-
|
|
1638
|
+
y: clippingAncestor.y - visualOffsets.y,
|
|
1639
|
+
width: clippingAncestor.width,
|
|
1640
|
+
height: clippingAncestor.height
|
|
1641
|
+
};
|
|
1620
1642
|
}
|
|
1621
1643
|
return rectToClientRect(rect);
|
|
1622
1644
|
}
|
|
@@ -1706,8 +1728,9 @@ function getRectRelativeToOffsetParent(element, offsetParent, strategy) {
|
|
|
1706
1728
|
offsets.x = getWindowScrollBarX(documentElement);
|
|
1707
1729
|
}
|
|
1708
1730
|
}
|
|
1709
|
-
var
|
|
1710
|
-
var
|
|
1731
|
+
var htmlOffset = documentElement && !isOffsetParentAnElement && !isFixed ? getHTMLOffset(documentElement, scroll) : createCoords(0);
|
|
1732
|
+
var x = rect.left + scroll.scrollLeft - offsets.x - htmlOffset.x;
|
|
1733
|
+
var y = rect.top + scroll.scrollTop - offsets.y - htmlOffset.y;
|
|
1711
1734
|
return {
|
|
1712
1735
|
x,
|
|
1713
1736
|
y,
|
|
@@ -1725,7 +1748,11 @@ function getTrueOffsetParent(element, polyfill) {
|
|
|
1725
1748
|
if (polyfill) {
|
|
1726
1749
|
return polyfill(element);
|
|
1727
1750
|
}
|
|
1728
|
-
|
|
1751
|
+
var rawOffsetParent = element.offsetParent;
|
|
1752
|
+
if (getDocumentElement(element) === rawOffsetParent) {
|
|
1753
|
+
rawOffsetParent = rawOffsetParent.ownerDocument.body;
|
|
1754
|
+
}
|
|
1755
|
+
return rawOffsetParent;
|
|
1729
1756
|
}
|
|
1730
1757
|
function getOffsetParent(element, polyfill) {
|
|
1731
1758
|
var win = getWindow(element);
|
|
@@ -2024,7 +2051,7 @@ var updatePopper = function updatePopper2(state) {
|
|
|
2024
2051
|
var _state$_last;
|
|
2025
2052
|
var x = _ref.x, y = _ref.y, placement = _ref.placement, strategy = _ref.strategy, middlewareData = _ref.middlewareData;
|
|
2026
2053
|
if (state.autoHide && state._last.show) {
|
|
2027
|
-
var timestamp =
|
|
2054
|
+
var timestamp = (/* @__PURE__ */ new Date()).getTime();
|
|
2028
2055
|
if (timestamp > state._last.timestamp + 300) {
|
|
2029
2056
|
state.show = false;
|
|
2030
2057
|
return;
|
|
@@ -2063,7 +2090,7 @@ var updatePopper = function updatePopper2(state) {
|
|
|
2063
2090
|
}
|
|
2064
2091
|
if (state.arrowVisible) {
|
|
2065
2092
|
var _arrowStyle;
|
|
2066
|
-
var _middlewareData$
|
|
2093
|
+
var _middlewareData$arrow = middlewareData.arrow, arrowX = _middlewareData$arrow.x, arrowY = _middlewareData$arrow.y;
|
|
2067
2094
|
var arrowElement = state._last.arrowEl;
|
|
2068
2095
|
var staticSide = oppositeSidesMap[placement.split("-")[0]];
|
|
2069
2096
|
var arrowStyle = (_arrowStyle = {
|
|
@@ -2226,7 +2253,7 @@ var useFloating = function useFloating2(option) {
|
|
|
2226
2253
|
state._last.reference = state.reference;
|
|
2227
2254
|
state._last.show = state.show && state.popper && state.reference;
|
|
2228
2255
|
state._last.appendToBody = state.appendToBody;
|
|
2229
|
-
state._last.timestamp =
|
|
2256
|
+
state._last.timestamp = (/* @__PURE__ */ new Date()).getTime();
|
|
2230
2257
|
};
|
|
2231
2258
|
watch$1(state, watchState, {
|
|
2232
2259
|
immediate: true
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opentiny/vue-hooks",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.20.0",
|
|
4
4
|
"description": "",
|
|
5
5
|
"module": "./lib/index.js",
|
|
6
6
|
"main": "./lib/index.js",
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
},
|
|
10
10
|
"dependencies": {
|
|
11
11
|
"@floating-ui/dom": "^1.6.9",
|
|
12
|
-
"@opentiny/vue-common": "~2.
|
|
12
|
+
"@opentiny/vue-common": "~2.20.0"
|
|
13
13
|
},
|
|
14
14
|
"keywords": [],
|
|
15
15
|
"author": "",
|