Skip to content

Commit 6b558bc

Browse files
author
nobo
committed
Merge branch 'master' of https://github.com/react-widget/trigger 
2 parents 7a61014 + 5e27555 commit 6b558bc

16 files changed

+61
-292
lines changed

‎docs/index.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,11 @@
1515
overflow: auto;
1616
}
1717
</style>
18-
<link href="static\css\vendors.e646e3e1.css" rel="stylesheet"><link href="static\css\index.336e1b0f.css" rel="stylesheet"></head>
18+
<link href="static\css\vendors.e646e3e1.css" rel="stylesheet"><link href="static\css\index.1f40c003.css" rel="stylesheet"></head>
1919

2020
<body style="background:#F5F5F5">
2121
<div class="demo" id="demo">
2222
</div>
23-
<script src="static\js\vendors.f4094383.chunk.js"></script><script src="static\js\index.0c1fb6f3.js"></script></body>
23+
<script src="static\js\vendors.db7aeff8.chunk.js"></script><script src="static\js\index.228bcd76.js"></script></body>
2424

2525
</html>

docs/static/css/index.336e1b0f.css renamed to docs/static/css/index.1f40c003.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/static/css/index.336e1b0f.css.map renamed to docs/static/css/index.1f40c003.css.map

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/static/js/index.0c1fb6f3.js.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

docs/static/js/index.0c1fb6f3.js renamed to docs/static/js/index.228bcd76.js

Lines changed: 4 additions & 192 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/static/js/index.228bcd76.js.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/static/js/vendors.f4094383.chunk.js renamed to docs/static/js/vendors.db7aeff8.chunk.js

Lines changed: 38 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29583,6 +29583,8 @@ var _objectWithoutProperties2 = _interopRequireDefault(__webpack_require__(/*! @
2958329583

2958429584
var _extends2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime-corejs2/helpers/extends */ "./node_modules/@babel/runtime-corejs2/helpers/extends.js"));
2958529585

29586+
var _isArray = _interopRequireDefault(__webpack_require__(/*! @babel/runtime-corejs2/core-js/array/is-array */ "./node_modules/@babel/runtime-corejs2/core-js/array/is-array.js"));
29587+
2958629588
var _classCallCheck2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime-corejs2/helpers/classCallCheck */ "./node_modules/@babel/runtime-corejs2/helpers/classCallCheck.js"));
2958729589

2958829590
var _createClass2 = _interopRequireDefault(__webpack_require__(/*! @babel/runtime-corejs2/helpers/createClass */ "./node_modules/@babel/runtime-corejs2/helpers/createClass.js"));
@@ -29617,6 +29619,10 @@ var _object = _interopRequireDefault(__webpack_require__(/*! object.omit */ "./n
2961729619

2961829620
var _bplokjsDeferred = _interopRequireDefault(__webpack_require__(/*! bplokjs-deferred */ "./node_modules/bplokjs-deferred/index.js"));
2961929621

29622+
var _addClass = _interopRequireDefault(__webpack_require__(/*! dom-helpers/class/addClass */ "./node_modules/dom-helpers/class/addClass.js"));
29623+
29624+
var _removeClass = _interopRequireDefault(__webpack_require__(/*! dom-helpers/class/removeClass */ "./node_modules/dom-helpers/class/removeClass.js"));
29625+
2962029626
function noop() {}
2962129627

2962229628
function isPromiseLike(promise) {
@@ -29668,6 +29674,7 @@ var propTypes = {
2966829674
maskProps: _propTypes.default.object,
2966929675
placement: _propTypes.default.any,
2967029676
// object func
29677+
setDirectionClassName: _propTypes.default.bool,
2967129678
//translaton
2967229679
timeout: _propTypes.default.any,
2967329680
addEndListener: _propTypes.default.func,
@@ -29742,13 +29749,29 @@ function (_React$Component) {
2974229749
of = of(popup);
2974329750
}
2974429751

29752+
if ((0, _isArray.default)(of)) {
29753+
of = {
29754+
pageX: of[0],
29755+
pageY: of[1]
29756+
};
29757+
}
29758+
29759+
var directionMap = {
29760+
'left': 'right',
29761+
'right': 'top',
29762+
'bottom': 'top',
29763+
'top': 'bottom',
29764+
'center': 'center'
29765+
};
2974529766
var config = {
2974629767
of: of,
2974729768
using: function using(pos, feedback) {
2974829769
if (_using) {
2974929770
_using(pos, feedback);
2975029771
}
2975129772

29773+
console.log(feedback);
29774+
result.direction = directionMap[feedback[feedback.important]];
2975229775
result.pos = pos;
2975329776
result.feedback = feedback;
2975429777
}
@@ -29777,8 +29800,20 @@ function (_React$Component) {
2977729800
key: "setPosition",
2977829801
value: function setPosition() {
2977929802
var pos = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
29803+
var direction = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : '';
2978029804
var popup = this.getPopupDOM();
2978129805

29806+
if (this.props.setDirectionClassName) {
29807+
(0, _removeClass.default)(popup, "".concat(this.props.prefixCls, "-direction-top"));
29808+
(0, _removeClass.default)(popup, "".concat(this.props.prefixCls, "-direction-bottom"));
29809+
(0, _removeClass.default)(popup, "".concat(this.props.prefixCls, "-direction-left"));
29810+
(0, _removeClass.default)(popup, "".concat(this.props.prefixCls, "-direction-right"));
29811+
29812+
if (direction) {
29813+
(0, _addClass.default)(popup, "".concat(this.props.prefixCls, "-direction-").concat(direction));
29814+
}
29815+
}
29816+
2978229817
if ('left' in pos) {
2978329818
popup.style.left = pos.left.toFixed() + 'px';
2978429819
}
@@ -29821,7 +29856,7 @@ function (_React$Component) {
2982129856
} else {
2982229857
var _position = _this2.getPosition(opts);
2982329858

29824-
_this2.setPosition(_position.pos);
29859+
_this2.setPosition(_position.pos, _position.direction);
2982529860
}
2982629861

2982729862
_this2._hasSetPosition = true;
@@ -30089,6 +30124,7 @@ function (_React$Component) {
3008930124
mountOnEnter: true,
3009030125
unmountOnExit: true,
3009130126
// destroyOnHide
30127+
setDirectionClassName: true,
3009230128
mask: false,
3009330129
fixed: false,
3009430130
// 禁用每次刷新更新位置
@@ -34147,4 +34183,4 @@ if (!self.fetch) {
3414734183
/***/ })
3414834184

3414934185
}]);
34150-
//# sourceMappingURL=vendors.f4094383.chunk.js.map
34186+
//# sourceMappingURL=vendors.db7aeff8.chunk.js.map

‎docs/static/js/vendors.db7aeff8.chunk.js.map‎

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎docs/static/js/vendors.f4094383.chunk.js.map‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎examples/DemoList.js‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,11 @@
11
import Demo1 from './demos/demo1';
2-
import Demo2 from './demos/Demo2';
2+
// import Demo2 from './demos/Demo2';
33
// import Demo3 from './demos/Demo3';
44
// import Demo4 from './demos/Demo4';
55

66
export default [
77
{
88
label: '基本功能',
99
component: Demo1
10-
},
11-
{
12-
label: '自定义',
13-
component: Demo2
1410
}
1511
]

0 commit comments

Comments
 (0)