@pingux/astro 2.172.0 → 2.172.1-alpha.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.
|
@@ -54,7 +54,7 @@ var PopoverMenu = /*#__PURE__*/(0, _react.forwardRef)(function (props, ref) {
|
|
|
54
54
|
var _useMenuTrigger = (0, _reactAria.useMenuTrigger)({}, state, triggerRef),
|
|
55
55
|
menuTriggerProps = _useMenuTrigger.menuTriggerProps,
|
|
56
56
|
menuProps = _useMenuTrigger.menuProps;
|
|
57
|
-
var trigger = /*#__PURE__*/_react["default"].isValidElement(menuTrigger) ? /*#__PURE__*/_react["default"].cloneElement(menuTrigger, _objectSpread(_objectSpread({}, menuTriggerProps), {}, {
|
|
57
|
+
var trigger = /*#__PURE__*/_react["default"].isValidElement(menuTrigger) ? /*#__PURE__*/_react["default"].cloneElement(menuTrigger, _objectSpread(_objectSpread({}, (0, _reactAria.mergeProps)(menuTrigger.props, menuTriggerProps)), {}, {
|
|
58
58
|
ref: triggerRef
|
|
59
59
|
})) : menuTrigger;
|
|
60
60
|
|
|
@@ -13,7 +13,7 @@ import _concatInstanceProperty from "@babel/runtime-corejs3/core-js-stable/insta
|
|
|
13
13
|
function ownKeys(e, r) { var t = _Object$keys(e); if (_Object$getOwnPropertySymbols) { var o = _Object$getOwnPropertySymbols(e); r && (o = _filterInstanceProperty(o).call(o, function (r) { return _Object$getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
|
|
14
14
|
function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var _context2, _context3; var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? _forEachInstanceProperty(_context2 = ownKeys(Object(t), !0)).call(_context2, function (r) { _defineProperty(e, r, t[r]); }) : _Object$getOwnPropertyDescriptors ? _Object$defineProperties(e, _Object$getOwnPropertyDescriptors(t)) : _forEachInstanceProperty(_context3 = ownKeys(Object(t))).call(_context3, function (r) { _Object$defineProperty(e, r, _Object$getOwnPropertyDescriptor(t, r)); }); } return e; }
|
|
15
15
|
import React, { forwardRef, useRef } from 'react';
|
|
16
|
-
import { DismissButton, FocusScope, OverlayContainer, useMenuTrigger } from 'react-aria';
|
|
16
|
+
import { DismissButton, FocusScope, mergeProps, OverlayContainer, useMenuTrigger } from 'react-aria';
|
|
17
17
|
import { useMenuTriggerState } from 'react-stately';
|
|
18
18
|
import { PressResponder } from '@react-aria/interactions';
|
|
19
19
|
import { MenuContext } from '../../context/MenuContext';
|
|
@@ -44,7 +44,7 @@ var PopoverMenu = /*#__PURE__*/forwardRef(function (props, ref) {
|
|
|
44
44
|
var _useMenuTrigger = useMenuTrigger({}, state, triggerRef),
|
|
45
45
|
menuTriggerProps = _useMenuTrigger.menuTriggerProps,
|
|
46
46
|
menuProps = _useMenuTrigger.menuProps;
|
|
47
|
-
var trigger = /*#__PURE__*/React.isValidElement(menuTrigger) ? /*#__PURE__*/React.cloneElement(menuTrigger, _objectSpread(_objectSpread({}, menuTriggerProps), {}, {
|
|
47
|
+
var trigger = /*#__PURE__*/React.isValidElement(menuTrigger) ? /*#__PURE__*/React.cloneElement(menuTrigger, _objectSpread(_objectSpread({}, mergeProps(menuTrigger.props, menuTriggerProps)), {}, {
|
|
48
48
|
ref: triggerRef
|
|
49
49
|
})) : menuTrigger;
|
|
50
50
|
|