Skip to content

Commit 9117549

Browse files
TrySoundjquense
authored andcommitted
feat: upgrade react-overlays (jquense#1421)
* Upgrade react-overlays The new version is much smaller. Nice job! The placement=bottom seems does not work. Dunno how to fix this. * Reuse style passed from overlay * Update size snapshot
1 parent 61e1a1e commit 9117549

File tree

7 files changed

+55
-50
lines changed

7 files changed

+55
-50
lines changed

.size-snapshot.json

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,25 @@
11
{
22
"./dist/react-big-calendar.js": {
3-
"bundled": 547082,
4-
"minified": 166843,
5-
"gzipped": 49280
3+
"bundled": 515736,
4+
"minified": 152579,
5+
"gzipped": 46117
66
},
77
"./dist/react-big-calendar.min.js": {
8-
"bundled": 483366,
9-
"minified": 147427,
10-
"gzipped": 44622
8+
"bundled": 453423,
9+
"minified": 133762,
10+
"gzipped": 41767
1111
},
1212
"dist/react-big-calendar.esm.js": {
13-
"bundled": 167312,
14-
"minified": 79854,
15-
"gzipped": 19815,
13+
"bundled": 168400,
14+
"minified": 80493,
15+
"gzipped": 19902,
1616
"treeshaked": {
1717
"rollup": {
18-
"code": 57644,
18+
"code": 58244,
1919
"import_statements": 1590
2020
},
2121
"webpack": {
22-
"code": 62083
22+
"code": 62696
2323
}
2424
}
2525
}

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@
130130
"lodash-es": "^4.17.11",
131131
"memoize-one": "^4.0.3",
132132
"prop-types": "^15.6.2",
133-
"react-overlays": "^1.2.0",
134-
"uncontrollable": "^6.2.3",
133+
"react-overlays": "^2.0.0-0",
134+
"uncontrollable": "^7.0.0",
135135
"warning": "^4.0.2"
136136
},
137137
"resolutions": {

src/Month.js

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -187,20 +187,27 @@ class MonthView extends React.Component {
187187

188188
renderOverlay() {
189189
let overlay = (this.state && this.state.overlay) || {}
190-
let { accessors, localizer, components, getters, selected } = this.props
190+
let {
191+
accessors,
192+
localizer,
193+
components,
194+
getters,
195+
selected,
196+
popupOffset,
197+
} = this.props
191198

192199
return (
193200
<Overlay
194201
rootClose
195202
placement="bottom"
196-
container={this}
197203
show={!!overlay.position}
198204
onHide={() => this.setState({ overlay: null })}
199205
target={() => overlay.target}
200206
>
201207
{({ props }) => (
202208
<Popup
203209
{...props}
210+
popupOffset={popupOffset}
204211
accessors={accessors}
205212
getters={getters}
206213
selected={selected}

src/Popup.js

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,18 +44,22 @@ class Popup extends React.Component {
4444
popperRef,
4545
} = this.props
4646

47-
let { left, width, top } = this.props.position,
47+
let { width } = this.props.position,
4848
topOffset = (this.state || {}).topOffset || 0,
4949
leftOffset = (this.state || {}).leftOffset || 0
5050

5151
let style = {
52-
top: Math.max(0, top - topOffset),
53-
left: left - leftOffset,
52+
top: -topOffset,
53+
left: -leftOffset,
5454
minWidth: width + width / 2,
5555
}
5656

5757
return (
58-
<div style={style} className="rbc-overlay" ref={popperRef}>
58+
<div
59+
style={{ ...this.props.style, ...style }}
60+
className="rbc-overlay"
61+
ref={popperRef}
62+
>
5963
<div className="rbc-overlay-header">
6064
{localizer.format(slotStart, 'dayHeaderFormat')}
6165
</div>

src/sass/event.scss

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
.rbc-event {
44
border: none;
5+
box-sizing: border-box;
56
box-shadow: none;
67
margin: 0;
78
padding: $event-padding;

stories/Calendar.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ storiesOf('Big Calendar', module)
1616
.add('demo', () => (
1717
<Calendar
1818
popup
19+
popupOffset={{ x: -10, y: -20 }}
1920
events={demoEvents}
2021
onSelectEvent={action('event selected')}
2122
defaultDate={new Date(2015, 3, 1)}

yarn.lock

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1177,6 +1177,11 @@
11771177
react-lifecycles-compat "^3.0.4"
11781178
warning "^3.0.0"
11791179

1180+
"@restart/hooks@^0.3.12":
1181+
version "0.3.12"
1182+
resolved "https://registry.yarnpkg.com/@restart/hooks/-/hooks-0.3.12.tgz#c68e6b4048d80ab51f6694cb6921bd091318f80f"
1183+
integrity sha512-nltMFo5JkYcnntf0Cs3Kq7jskrKeGcftAKOqbEEa74sxlx0bfO3RjBly2aiRb7hnsYJCB8/99l+acQcl2lnq1w==
1184+
11801185
"@samverschueren/stream-to-observable@^0.3.0":
11811186
version "0.3.0"
11821187
resolved "https://registry.yarnpkg.com/@samverschueren/stream-to-observable/-/stream-to-observable-0.3.0.tgz#ecdf48d532c58ea477acfcab80348424f8d0662f"
@@ -9697,7 +9702,7 @@ polished@^2.3.3:
96979702
dependencies:
96989703
"@babel/runtime" "^7.2.0"
96999704

9700-
popper.js@^1.14.4:
9705+
popper.js@^1.14.4, popper.js@^1.15.0:
97019706
version "1.15.0"
97029707
resolved "https://registry.yarnpkg.com/popper.js/-/popper.js-1.15.0.tgz#5560b99bbad7647e9faa475c6b8056621f5a4ff2"
97039708
integrity sha512-w010cY1oCUmI+9KwwlWki+r5jxKfTFDVoadl7MSrIujHU5MJ5OR6HTDj6Xo8aoR/QsA56x8jKjA59qGH4ELtrA==
@@ -10249,7 +10254,7 @@ prompts@^0.1.9:
1024910254
kleur "^2.0.1"
1025010255
sisteransi "^0.1.1"
1025110256

10252-
prop-types-extra@^1.0.1, prop-types-extra@^1.1.0:
10257+
prop-types-extra@^1.0.1:
1025310258
version "1.1.0"
1025410259
resolved "https://registry.yarnpkg.com/prop-types-extra/-/prop-types-extra-1.1.0.tgz#32609910ea2dcf190366bacd3490d5a6412a605f"
1025510260
integrity sha512-QFyuDxvMipmIVKD2TwxLVPzMnO4e5oOf1vr3tJIomL8E7d0lr6phTHd5nkPhFIzTD1idBLLEPeylL9g+rrTzRg==
@@ -10491,11 +10496,6 @@ react-clientside-effect@^1.2.0:
1049110496
"@babel/runtime" "^7.0.0"
1049210497
shallowequal "^1.1.0"
1049310498

10494-
react-context-toolbox@^2.0.2:
10495-
version "2.0.2"
10496-
resolved "https://registry.yarnpkg.com/react-context-toolbox/-/react-context-toolbox-2.0.2.tgz#35637287cb23f801e6ed802c2bb7a97e1f04e3fb"
10497-
integrity sha512-tY4j0imkYC3n5ZlYSgFkaw7fmlCp3IoQQ6DxpqeNHzcD0hf+6V+/HeJxviLUZ1Rv1Yn3N3xyO2EhkkZwHn0m1A==
10498-
1049910499
react-dev-utils@^7.0.0, react-dev-utils@^7.0.1:
1050010500
version "7.0.5"
1050110501
resolved "https://registry.yarnpkg.com/react-dev-utils/-/react-dev-utils-7.0.5.tgz#cb95375d01ae71ca27b3c7616006ef7a77d14e8e"
@@ -10648,19 +10648,18 @@ react-overlays@^0.8.0:
1064810648
react-transition-group "^2.2.0"
1064910649
warning "^3.0.0"
1065010650

10651-
react-overlays@^1.2.0:
10652-
version "1.2.0"
10653-
resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-1.2.0.tgz#205368eeb0a5fb0b7f9b717fa7a12d518500abdb"
10654-
integrity sha512-i/FCV8wR6aRaI+Kz/dpJhOdyx+ah2tN1RhT9InPrexyC4uzf3N4bNayFTGtUeQVacj57j1Mqh1CwV60/5153Iw==
10651+
react-overlays@^2.0.0-0:
10652+
version "2.0.0-0"
10653+
resolved "https://registry.yarnpkg.com/react-overlays/-/react-overlays-2.0.0-0.tgz#b05e9eabdfd94be62408a872f8da5c644fd7e2a0"
10654+
integrity sha512-6wTjpIE0NmXkzpgttpKMIzEOBSjdzHa6ZYoz3xCN0ibKXOW7JvIAUVxvivpCJEzzkhQdAgt3zQyvJMDX28AArw==
1065510655
dependencies:
10656-
classnames "^2.2.6"
10656+
"@babel/runtime" "^7.4.5"
10657+
"@restart/hooks" "^0.3.12"
1065710658
dom-helpers "^3.4.0"
10658-
prop-types "^15.6.2"
10659-
prop-types-extra "^1.1.0"
10660-
react-context-toolbox "^2.0.2"
10661-
react-popper "^1.3.2"
10662-
uncontrollable "^6.0.0"
10663-
warning "^4.0.2"
10659+
popper.js "^1.15.0"
10660+
prop-types "^15.7.2"
10661+
uncontrollable "^7.0.0"
10662+
warning "^4.0.3"
1066410663

1066510664
react-popper-tooltip@^2.8.0:
1066610665
version "2.8.2"
@@ -10670,7 +10669,7 @@ react-popper-tooltip@^2.8.0:
1067010669
"@babel/runtime" "^7.4.3"
1067110670
react-popper "^1.3.3"
1067210671

10673-
react-popper@^1.3.2, react-popper@^1.3.3:
10672+
react-popper@^1.3.3:
1067410673
version "1.3.3"
1067510674
resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-1.3.3.tgz#2c6cef7515a991256b4f0536cd4bdcb58a7b6af6"
1067610675
integrity sha512-ynMZBPkXONPc5K4P5yFWgZx5JGAUIP3pGGLNs58cfAPgK67olx7fmLp+AdpZ0+GoQ+ieFDa/z4cdV6u7sioH6w==
@@ -12653,17 +12652,10 @@ uncontrollable@^5.0.0:
1265312652
dependencies:
1265412653
invariant "^2.2.4"
1265512654

12656-
uncontrollable@^6.0.0:
12657-
version "6.1.0"
12658-
resolved "https://registry.yarnpkg.com/uncontrollable/-/uncontrollable-6.1.0.tgz#45dcf54b76bf07e0ddf7c1a669caf935d2e101d5"
12659-
integrity sha512-2TzEm0pLKauMBZfAZXsgQvLpZHEp95891frCZdGDrSG7dWYaIQhedwLAzi0X8pR8KHNqlmuYEb2cEgbQzr050A==
12660-
dependencies:
12661-
invariant "^2.2.4"
12662-
12663-
uncontrollable@^6.2.3:
12664-
version "6.2.3"
12665-
resolved "https://registry.yarnpkg.com/uncontrollable/-/uncontrollable-6.2.3.tgz#e7dba0d746e075122ed178f27ad2354d343196c7"
12666-
integrity sha512-VgOAoBU2ptCL2bfTG2Mra0I8i1u6Aq84AFonD5tmCAYSfs3hWvr2Rlw0q2ntoxXTHjcQOmZOh3FKaN+UZVyREQ==
12655+
uncontrollable@^7.0.0:
12656+
version "7.0.0"
12657+
resolved "https://registry.yarnpkg.com/uncontrollable/-/uncontrollable-7.0.0.tgz#6aa0b972e3aa6b7ea100e67e20c1ee1c7fbe0803"
12658+
integrity sha512-HFhKHDACiAsTYoV3el/LP4PqcLzqyWrNRHE6nMdr0h8f7qbvTPXIN2S4q+tdfc64PHEXaSFBs/fKVB2+UwSYOA==
1266712659
dependencies:
1266812660
"@babel/runtime" "^7.4.5"
1266912661
invariant "^2.2.4"
@@ -12969,7 +12961,7 @@ warning@^3.0.0:
1296912961
dependencies:
1297012962
loose-envify "^1.0.0"
1297112963

12972-
warning@^4.0.2:
12964+
warning@^4.0.2, warning@^4.0.3:
1297312965
version "4.0.3"
1297412966
resolved "https://registry.yarnpkg.com/warning/-/warning-4.0.3.tgz#16e9e077eb8a86d6af7d64aa1e05fd85b4678ca3"
1297512967
integrity sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==

0 commit comments

Comments
 (0)