Skip to content

Commit e7fbccf

Browse files
yjoseyjose
authored
Merge pull request #44 from yjose/v1.3.0
V1.3.0
2 parents bc93b50 + 4e3c8ff commit e7fbccf

12 files changed

+46
-37
lines changed

‎README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
- Modal, Tooltip, Menu : All in one 🏋️
2626
- Full style customization 👌
2727
- Easy to use. 🚀
28-
- IE Support.
28+
- IE Support.🚀
29+
- TypeScript Support 👌
2930
- All these clocks in at around 3 kB zipped. ⚡️
3031

3132
Requires React >= 16.0

‎docs/src/markdown/componentApi.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ The reactjs-popup API is inspired by semantic popup docs
3131
| contentStyle | | {object} | Custom popup content style |
3232
| overlayStyle | | {object} | Custom overlay style <br/> Note: `top` and `left` property will not be overridden. |
3333
| arrowStyle | | {object} | Custom arrow style <br/> Note: `transform` property will not be overridden. |
34-
| keepTooltipInside | | {bool,string} | html selector, class name or id element that the tooltip must be inside (defaults to `window` if keepTooltipInside = true) default false |
34+
| keepTooltipInside | true | {bool,string} | html selector, class name or id element that the tooltip must be inside (defaults to `window` if keepTooltipInside = true) default false |
3535

3636
### Example : on focus
3737

‎docs/src/markdown/welcome.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ Reactjs-popup is a simple react popup component with a lot of benefits :
1515
- Modal, Tooltip, Menu : All in one 🏋️
1616
- Full style customization 👌
1717
- Easy to use. 🚀
18-
- IE Support.
18+
- IE Support. 🚀
19+
- TypeScript Support 👌
1920
- All these clocks in at around 3 kB zipped. ⚡️
2021

2122
Requires React >= 16.0

‎lib/README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525
- Modal, Tooltip, Menu : All in one 🏋️
2626
- Full style customization 👌
2727
- Easy to use. 🚀
28-
- IE Support.
28+
- IE Support.🚀
29+
- TypeScript Support 👌
2930
- All these clocks in at around 3 kB zipped. ⚡️
3031

3132
Requires React >= 16.0

‎lib/index.d.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ declare module 'reactjs-popup' {
55
type Position = 'top left' | 'top right' | 'bottom right' | 'bottom left' | 'right center' | 'left center' | 'top center' | 'bottom center';
66

77
interface Props {
8-
trigger: JSX.Element | ((isOpen: boolean) => JSX.Element);
8+
trigger?: JSX.Element | ((isOpen: boolean) => JSX.Element);
99
open?: boolean;
1010
defaultOpen?: boolean;
1111
on?: EventType | EventType[];

‎lib/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "reactjs-popup",
3-
"version": "1.2.0",
3+
"version": "1.3.0",
44
"description": "React Popup Component - Modals,Tooltips and Menus —  All in one",
55
"main": "reactjs-popup.cjs.js",
66
"module": "reactjs-popup.es.js",

‎lib/reactjs-popup.cjs.js‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* reactjs-popup v1.2.0
2+
* reactjs-popup v1.3.0
33
* (c) 2018-present Youssouf EL AZIZI <[email protected]>
44
* Released under the MIT License.
55
*/
@@ -384,7 +384,8 @@ function (_React$PureComponent) {
384384
position = _this$props.position,
385385
offsetX = _this$props.offsetX,
386386
offsetY = _this$props.offsetY,
387-
keepTooltipInside = _this$props.keepTooltipInside;
387+
keepTooltipInside = _this$props.keepTooltipInside,
388+
arrowStyle = _this$props.arrowStyle;
388389
var modal = _this.state.modal;
389390
if (modal) return;
390391

@@ -410,8 +411,8 @@ function (_React$PureComponent) {
410411
_this.ArrowEl.style["transform"] = cords.transform;
411412
_this.ArrowEl.style["-ms-transform"] = cords.transform;
412413
_this.ArrowEl.style["-webkit-transform"] = cords.transform;
413-
_this.ArrowEl.style.top = cords.arrowTop;
414-
_this.ArrowEl.style.left = cords.arrowLeft;
414+
_this.ArrowEl.style.top = arrowStyle.top || cords.arrowTop;
415+
_this.ArrowEl.style.left = arrowStyle.left || cords.arrowLeft;
415416
}
416417

417418
if (window.getComputedStyle(_this.TriggerEl, null).getPropertyValue("position") == "static" || window.getComputedStyle(_this.TriggerEl, null).getPropertyValue("position") == "") _this.TriggerEl.style.position = "relative";
@@ -455,6 +456,7 @@ function (_React$PureComponent) {
455456
case "hover":
456457
triggerProps.onMouseEnter = _this.onMouseEnter;
457458
triggerProps.onMouseLeave = _this.onMouseLeave;
459+
break;
458460

459461
case "focus":
460462
triggerProps.onFocus = _this.onMouseEnter;
@@ -535,7 +537,10 @@ function (_React$PureComponent) {
535537
var modal = this.state.modal;
536538
var overlay = this.state.isOpen && !(on.indexOf("hover") >= 0);
537539
var ovStyle = modal ? styles.overlay.modal : styles.overlay.tooltip;
538-
return [this.state.isOpen && React.createElement("div", {
540+
return [!!this.props.trigger && React.createElement(Ref, {
541+
innerRef: this.setTriggerRef,
542+
key: "R"
543+
}, this.renderTrigger()), this.state.isOpen && React.createElement("div", {
539544
key: "H",
540545
style: {
541546
position: "absolute",
@@ -548,10 +553,7 @@ function (_React$PureComponent) {
548553
className: "popup-overlay",
549554
style: Object.assign({}, ovStyle, overlayStyle),
550555
onClick: closeOnDocumentClick ? this.closePopup : undefined
551-
}, modal && this.renderContent()), this.state.isOpen && !modal && this.renderContent(), !!this.props.trigger && React.createElement(Ref, {
552-
innerRef: this.setTriggerRef,
553-
key: "R"
554-
}, this.renderTrigger())];
556+
}, modal && this.renderContent()), this.state.isOpen && !modal && this.renderContent()];
555557
}
556558
}]);
557559

‎lib/reactjs-popup.es.js‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* reactjs-popup v1.2.0
2+
* reactjs-popup v1.3.0
33
* (c) 2018-present Youssouf EL AZIZI <[email protected]>
44
* Released under the MIT License.
55
*/
@@ -380,7 +380,8 @@ function (_React$PureComponent) {
380380
position = _this$props.position,
381381
offsetX = _this$props.offsetX,
382382
offsetY = _this$props.offsetY,
383-
keepTooltipInside = _this$props.keepTooltipInside;
383+
keepTooltipInside = _this$props.keepTooltipInside,
384+
arrowStyle = _this$props.arrowStyle;
384385
var modal = _this.state.modal;
385386
if (modal) return;
386387

@@ -406,8 +407,8 @@ function (_React$PureComponent) {
406407
_this.ArrowEl.style["transform"] = cords.transform;
407408
_this.ArrowEl.style["-ms-transform"] = cords.transform;
408409
_this.ArrowEl.style["-webkit-transform"] = cords.transform;
409-
_this.ArrowEl.style.top = cords.arrowTop;
410-
_this.ArrowEl.style.left = cords.arrowLeft;
410+
_this.ArrowEl.style.top = arrowStyle.top || cords.arrowTop;
411+
_this.ArrowEl.style.left = arrowStyle.left || cords.arrowLeft;
411412
}
412413

413414
if (window.getComputedStyle(_this.TriggerEl, null).getPropertyValue("position") == "static" || window.getComputedStyle(_this.TriggerEl, null).getPropertyValue("position") == "") _this.TriggerEl.style.position = "relative";
@@ -451,6 +452,7 @@ function (_React$PureComponent) {
451452
case "hover":
452453
triggerProps.onMouseEnter = _this.onMouseEnter;
453454
triggerProps.onMouseLeave = _this.onMouseLeave;
455+
break;
454456

455457
case "focus":
456458
triggerProps.onFocus = _this.onMouseEnter;
@@ -531,7 +533,10 @@ function (_React$PureComponent) {
531533
var modal = this.state.modal;
532534
var overlay = this.state.isOpen && !(on.indexOf("hover") >= 0);
533535
var ovStyle = modal ? styles.overlay.modal : styles.overlay.tooltip;
534-
return [this.state.isOpen && React.createElement("div", {
536+
return [!!this.props.trigger && React.createElement(Ref, {
537+
innerRef: this.setTriggerRef,
538+
key: "R"
539+
}, this.renderTrigger()), this.state.isOpen && React.createElement("div", {
535540
key: "H",
536541
style: {
537542
position: "absolute",
@@ -544,10 +549,7 @@ function (_React$PureComponent) {
544549
className: "popup-overlay",
545550
style: Object.assign({}, ovStyle, overlayStyle),
546551
onClick: closeOnDocumentClick ? this.closePopup : undefined
547-
}, modal && this.renderContent()), this.state.isOpen && !modal && this.renderContent(), !!this.props.trigger && React.createElement(Ref, {
548-
innerRef: this.setTriggerRef,
549-
key: "R"
550-
}, this.renderTrigger())];
552+
}, modal && this.renderContent()), this.state.isOpen && !modal && this.renderContent()];
551553
}
552554
}]);
553555

‎lib/reactjs-popup.js‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*!
2-
* reactjs-popup v1.2.0
2+
* reactjs-popup v1.3.0
33
* (c) 2018-present Youssouf EL AZIZI <[email protected]>
44
* Released under the MIT License.
55
*/
@@ -385,7 +385,8 @@
385385
position = _this$props.position,
386386
offsetX = _this$props.offsetX,
387387
offsetY = _this$props.offsetY,
388-
keepTooltipInside = _this$props.keepTooltipInside;
388+
keepTooltipInside = _this$props.keepTooltipInside,
389+
arrowStyle = _this$props.arrowStyle;
389390
var modal = _this.state.modal;
390391
if (modal) return;
391392

@@ -411,8 +412,8 @@
411412
_this.ArrowEl.style["transform"] = cords.transform;
412413
_this.ArrowEl.style["-ms-transform"] = cords.transform;
413414
_this.ArrowEl.style["-webkit-transform"] = cords.transform;
414-
_this.ArrowEl.style.top = cords.arrowTop;
415-
_this.ArrowEl.style.left = cords.arrowLeft;
415+
_this.ArrowEl.style.top = arrowStyle.top || cords.arrowTop;
416+
_this.ArrowEl.style.left = arrowStyle.left || cords.arrowLeft;
416417
}
417418

418419
if (window.getComputedStyle(_this.TriggerEl, null).getPropertyValue("position") == "static" || window.getComputedStyle(_this.TriggerEl, null).getPropertyValue("position") == "") _this.TriggerEl.style.position = "relative";
@@ -456,6 +457,7 @@
456457
case "hover":
457458
triggerProps.onMouseEnter = _this.onMouseEnter;
458459
triggerProps.onMouseLeave = _this.onMouseLeave;
460+
break;
459461

460462
case "focus":
461463
triggerProps.onFocus = _this.onMouseEnter;
@@ -536,7 +538,10 @@
536538
var modal = this.state.modal;
537539
var overlay = this.state.isOpen && !(on.indexOf("hover") >= 0);
538540
var ovStyle = modal ? styles.overlay.modal : styles.overlay.tooltip;
539-
return [this.state.isOpen && React.createElement("div", {
541+
return [!!this.props.trigger && React.createElement(Ref, {
542+
innerRef: this.setTriggerRef,
543+
key: "R"
544+
}, this.renderTrigger()), this.state.isOpen && React.createElement("div", {
540545
key: "H",
541546
style: {
542547
position: "absolute",
@@ -549,10 +554,7 @@
549554
className: "popup-overlay",
550555
style: Object.assign({}, ovStyle, overlayStyle),
551556
onClick: closeOnDocumentClick ? this.closePopup : undefined
552-
}, modal && this.renderContent()), this.state.isOpen && !modal && this.renderContent(), !!this.props.trigger && React.createElement(Ref, {
553-
innerRef: this.setTriggerRef,
554-
key: "R"
555-
}, this.renderTrigger())];
557+
}, modal && this.renderContent()), this.state.isOpen && !modal && this.renderContent()];
556558
}
557559
}]);
558560

0 commit comments

Comments
 (0)