Skip to content

Commit c52d491

Browse files
rcdextarcdexta
authored
Merge pull request #367 from rcdexta/2.2.5
Bug fixes 2.2.5
2 parents 2544b80 + 1b4e067 commit c52d491

File tree

5 files changed

+104
-48
lines changed

5 files changed

+104
-48
lines changed

‎.babelrc

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
}
99
}
1010
],
11-
"@babel/react"
11+
"@babel/preset-react"
1212
],
1313
"plugins": [
1414
"@babel/plugin-transform-template-literals",

‎package.json

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,9 @@
11
{
22
"name": "react-trello",
3+
"version": "2.4.1",
34
"description": "Pluggable components to add a trello like kanban board to your application",
45
"main": "dist/index.js",
5-
"jsnext:main": "src/components/index.js",
6-
"module": "src/components/index.js",
76
"files": [
8-
"src",
97
"dist",
108
"README"
119
],
@@ -75,6 +73,7 @@
7573
"babel-jest": "^23.6.0",
7674
"babel-loader": "^8.0.6",
7775
"babel-plugin-module-resolver": "^3.2.0",
76+
"babel-preset-react": "^6.24.1",
7877
"codecov.io": "^0.1.6",
7978
"commitizen": "^3.1.1",
8079
"cz-conventional-changelog": "^2.1.0",

‎src/styles/Base.js

+25-28
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
import styled, { css, createGlobalStyle } from 'styled-components'
2-
3-
import {
4-
PopoverContainer,
5-
PopoverContent,
6-
PopoverTrigger
7-
} from 'react-popopo'
1+
import {PopoverContainer, PopoverContent} from 'react-popopo'
2+
import styled, {createGlobalStyle, css} from 'styled-components'
83

94
export const GlobalStyle = createGlobalStyle`
105
.comPlainTextContentEditable {
@@ -63,22 +58,23 @@ export const CustomPopoverContent = styled(PopoverContent)`
6358
padding: 5px;
6459
left: 50%;
6560
transform: translateX(-50%);
66-
${props => props.active && `
61+
${props =>
62+
props.active &&
63+
`
6764
visibility: visible;
6865
opacity: 1;
6966
transition-delay: 100ms;
70-
`}
71-
&::before {
67+
`} &::before {
7268
visibility: hidden;
7369
}
7470
a {
7571
color: rgba(255, 255, 255, 0.56);
76-
padding: .5em 1em;
72+
padding: 0.5em 1em;
7773
margin: 0;
7874
text-decoration: none;
7975
&:hover {
8076
background-color: #00bcd4 !important;
81-
color: #37474F;
77+
color: #37474f;
8278
}
8379
}
8480
`
@@ -115,15 +111,16 @@ export const Section = styled.section`
115111

116112
export const LaneHeader = styled(Header)`
117113
margin-bottom: 0px;
118-
${props => props.editLaneTitle && css`
119-
padding: 0px;
120-
line-height: 30px;
121-
`
122-
}
123-
${props => !props.editLaneTitle && css`
124-
padding: 0px 5px;
125-
`
126-
}
114+
${props =>
115+
props.editLaneTitle &&
116+
css`
117+
padding: 0px;
118+
line-height: 30px;
119+
`} ${props =>
120+
!props.editLaneTitle &&
121+
css`
122+
padding: 0px 5px;
123+
`};
127124
`
128125

129126
export const LaneFooter = styled.div`
@@ -280,13 +277,13 @@ export const InlineInput = styled.textarea`
280277
border: 0;
281278
padding: 4px 8px;
282279
outline: 0;
283-
${props => props.border && css`
284-
&:focus {
285-
box-shadow: inset 0 0 0 2px #0079bf;
286-
}
287-
`
288-
}
289-
&:focus {
280+
${props =>
281+
props.border &&
282+
css`
283+
&:focus {
284+
box-shadow: inset 0 0 0 2px #0079bf;
285+
}
286+
`} &:focus {
290287
background-color: white;
291288
}
292289
`

‎tests/__snapshots__/Storyshots.test.js.snap

+14-14
Original file line numberDiff line numberDiff line change
@@ -21578,15 +21578,15 @@ exports[`Storyshots Custom Components NewLaneForm 1`] = `
2157821578

2157921579
.c8 a {
2158021580
color: rgba(255,255,255,0.56);
21581-
padding: .5em 1em;
21581+
padding: 0.5em 1em;
2158221582
margin: 0;
2158321583
-webkit-text-decoration: none;
2158421584
text-decoration: none;
2158521585
}
2158621586

2158721587
.c8 a:hover {
2158821588
background-color: #00bcd4 !important;
21589-
color: #37474F;
21589+
color: #37474f;
2159021590
}
2159121591

2159221592
.c0 {
@@ -22754,15 +22754,15 @@ exports[`Storyshots Custom Components NewLaneSection 1`] = `
2275422754

2275522755
.c8 a {
2275622756
color: rgba(255,255,255,0.56);
22757-
padding: .5em 1em;
22757+
padding: 0.5em 1em;
2275822758
margin: 0;
2275922759
-webkit-text-decoration: none;
2276022760
text-decoration: none;
2276122761
}
2276222762

2276322763
.c8 a:hover {
2276422764
background-color: #00bcd4 !important;
22765-
color: #37474F;
22765+
color: #37474f;
2276622766
}
2276722767

2276822768
.c0 {
@@ -32136,15 +32136,15 @@ exports[`Storyshots Editable Board Add New Lane 1`] = `
3213632136

3213732137
.c8 a {
3213832138
color: rgba(255,255,255,0.56);
32139-
padding: .5em 1em;
32139+
padding: 0.5em 1em;
3214032140
margin: 0;
3214132141
-webkit-text-decoration: none;
3214232142
text-decoration: none;
3214332143
}
3214432144

3214532145
.c8 a:hover {
3214632146
background-color: #00bcd4 !important;
32147-
color: #37474F;
32147+
color: #37474f;
3214832148
}
3214932149

3215032150
.c0 {
@@ -37154,15 +37154,15 @@ exports[`Storyshots Editable Board Inline Edit Lane Title 1`] = `
3715437154

3715537155
.c9 a {
3715637156
color: rgba(255,255,255,0.56);
37157-
padding: .5em 1em;
37157+
padding: 0.5em 1em;
3715837158
margin: 0;
3715937159
-webkit-text-decoration: none;
3716037160
text-decoration: none;
3716137161
}
3716237162

3716337163
.c9 a:hover {
3716437164
background-color: #00bcd4 !important;
37165-
color: #37474F;
37165+
color: #37474f;
3716637166
}
3716737167

3716837168
.c0 {
@@ -38409,15 +38409,15 @@ exports[`Storyshots I18n Custom texts 1`] = `
3840938409

3841038410
.c8 a {
3841138411
color: rgba(255,255,255,0.56);
38412-
padding: .5em 1em;
38412+
padding: 0.5em 1em;
3841338413
margin: 0;
3841438414
-webkit-text-decoration: none;
3841538415
text-decoration: none;
3841638416
}
3841738417

3841838418
.c8 a:hover {
3841938419
background-color: #00bcd4 !important;
38420-
color: #37474F;
38420+
color: #37474f;
3842138421
}
3842238422

3842338423
.c0 {
@@ -39597,15 +39597,15 @@ exports[`Storyshots I18n Flat translation table 1`] = `
3959739597

3959839598
.c8 a {
3959939599
color: rgba(255,255,255,0.56);
39600-
padding: .5em 1em;
39600+
padding: 0.5em 1em;
3960139601
margin: 0;
3960239602
-webkit-text-decoration: none;
3960339603
text-decoration: none;
3960439604
}
3960539605

3960639606
.c8 a:hover {
3960739607
background-color: #00bcd4 !important;
39608-
color: #37474F;
39608+
color: #37474f;
3960939609
}
3961039610

3961139611
.c0 {
@@ -40785,15 +40785,15 @@ exports[`Storyshots I18n Using i18next 1`] = `
4078540785

4078640786
.c8 a {
4078740787
color: rgba(255,255,255,0.56);
40788-
padding: .5em 1em;
40788+
padding: 0.5em 1em;
4078940789
margin: 0;
4079040790
-webkit-text-decoration: none;
4079140791
text-decoration: none;
4079240792
}
4079340793

4079440794
.c8 a:hover {
4079540795
background-color: #00bcd4 !important;
40796-
color: #37474F;
40796+
color: #37474f;
4079740797
}
4079840798

4079940799
.c0 {

‎yarn.lock

+62-2
Original file line numberDiff line numberDiff line change
@@ -2760,6 +2760,15 @@ babel-helper-builder-binary-assignment-operator-visitor@^6.24.1:
27602760
babel-runtime "^6.22.0"
27612761
babel-types "^6.24.1"
27622762

2763+
babel-helper-builder-react-jsx@^6.24.1:
2764+
version "6.26.0"
2765+
resolved "https://registry.yarnpkg.com/babel-helper-builder-react-jsx/-/babel-helper-builder-react-jsx-6.26.0.tgz#39ff8313b75c8b65dceff1f31d383e0ff2a408a0"
2766+
integrity sha1-Of+DE7dci2Xc7/HzHTg+D/KkCKA=
2767+
dependencies:
2768+
babel-runtime "^6.26.0"
2769+
babel-types "^6.26.0"
2770+
esutils "^2.0.2"
2771+
27632772
babel-helper-call-delegate@^6.24.1:
27642773
version "6.24.1"
27652774
resolved "https://registry.yarnpkg.com/babel-helper-call-delegate/-/babel-helper-call-delegate-6.24.1.tgz#ece6aacddc76e41c3461f88bfc575bd0daa2df8d"
@@ -3171,7 +3180,7 @@ babel-plugin-syntax-flow@^6.18.0:
31713180
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-flow/-/babel-plugin-syntax-flow-6.18.0.tgz#4c3ab20a2af26aa20cd25995c398c4eb70310c8d"
31723181
integrity sha1-TDqyCiryaqIM0lmVw5jE63AxDI0=
31733182

3174-
babel-plugin-syntax-jsx@^6.18.0:
3183+
babel-plugin-syntax-jsx@^6.18.0, babel-plugin-syntax-jsx@^6.3.13, babel-plugin-syntax-jsx@^6.8.0:
31753184
version "6.18.0"
31763185
resolved "https://registry.yarnpkg.com/babel-plugin-syntax-jsx/-/babel-plugin-syntax-jsx-6.18.0.tgz#0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"
31773186
integrity sha1-CvMqmm4Tyno/1QaeYtew9Y0NiUY=
@@ -3441,7 +3450,7 @@ babel-plugin-transform-export-extensions@^6.22.0:
34413450
babel-plugin-syntax-export-extensions "^6.8.0"
34423451
babel-runtime "^6.22.0"
34433452

3444-
babel-plugin-transform-flow-strip-types@^6.8.0:
3453+
babel-plugin-transform-flow-strip-types@^6.22.0, babel-plugin-transform-flow-strip-types@^6.8.0:
34453454
version "6.22.0"
34463455
resolved "https://registry.yarnpkg.com/babel-plugin-transform-flow-strip-types/-/babel-plugin-transform-flow-strip-types-6.22.0.tgz#84cb672935d43714fdc32bce84568d87441cf7cf"
34473456
integrity sha1-hMtnKTXUNxT9wyvOhFaNh0Qc988=
@@ -3484,6 +3493,38 @@ babel-plugin-transform-property-literals@^6.9.4:
34843493
dependencies:
34853494
esutils "^2.0.2"
34863495

3496+
babel-plugin-transform-react-display-name@^6.23.0:
3497+
version "6.25.0"
3498+
resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-display-name/-/babel-plugin-transform-react-display-name-6.25.0.tgz#67e2bf1f1e9c93ab08db96792e05392bf2cc28d1"
3499+
integrity sha1-Z+K/Hx6ck6sI25Z5LgU5K/LMKNE=
3500+
dependencies:
3501+
babel-runtime "^6.22.0"
3502+
3503+
babel-plugin-transform-react-jsx-self@^6.22.0:
3504+
version "6.22.0"
3505+
resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-self/-/babel-plugin-transform-react-jsx-self-6.22.0.tgz#df6d80a9da2612a121e6ddd7558bcbecf06e636e"
3506+
integrity sha1-322AqdomEqEh5t3XVYvL7PBuY24=
3507+
dependencies:
3508+
babel-plugin-syntax-jsx "^6.8.0"
3509+
babel-runtime "^6.22.0"
3510+
3511+
babel-plugin-transform-react-jsx-source@^6.22.0:
3512+
version "6.22.0"
3513+
resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx-source/-/babel-plugin-transform-react-jsx-source-6.22.0.tgz#66ac12153f5cd2d17b3c19268f4bf0197f44ecd6"
3514+
integrity sha1-ZqwSFT9c0tF7PBkmj0vwGX9E7NY=
3515+
dependencies:
3516+
babel-plugin-syntax-jsx "^6.8.0"
3517+
babel-runtime "^6.22.0"
3518+
3519+
babel-plugin-transform-react-jsx@^6.24.1:
3520+
version "6.24.1"
3521+
resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-jsx/-/babel-plugin-transform-react-jsx-6.24.1.tgz#840a028e7df460dfc3a2d29f0c0d91f6376e66a3"
3522+
integrity sha1-hAoCjn30YN/DotKfDA2R9jduZqM=
3523+
dependencies:
3524+
babel-helper-builder-react-jsx "^6.24.1"
3525+
babel-plugin-syntax-jsx "^6.8.0"
3526+
babel-runtime "^6.22.0"
3527+
34873528
[email protected]:
34883529
version "0.4.18"
34893530
resolved "https://registry.yarnpkg.com/babel-plugin-transform-react-remove-prop-types/-/babel-plugin-transform-react-remove-prop-types-0.4.18.tgz#85ff79d66047b34288c6f7cc986b8854ab384f8c"
@@ -3575,6 +3616,13 @@ babel-preset-es2015@^6.9.0:
35753616
babel-plugin-transform-es2015-unicode-regex "^6.24.1"
35763617
babel-plugin-transform-regenerator "^6.24.1"
35773618

3619+
babel-preset-flow@^6.23.0:
3620+
version "6.23.0"
3621+
resolved "https://registry.yarnpkg.com/babel-preset-flow/-/babel-preset-flow-6.23.0.tgz#e71218887085ae9a24b5be4169affb599816c49d"
3622+
integrity sha1-5xIYiHCFrpoktb5Baa/7WZgWxJ0=
3623+
dependencies:
3624+
babel-plugin-transform-flow-strip-types "^6.22.0"
3625+
35783626
babel-preset-jest@^23.2.0:
35793627
version "23.2.0"
35803628
resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-23.2.0.tgz#8ec7a03a138f001a1a8fb1e8113652bf1a55da46"
@@ -3645,6 +3693,18 @@ babel-preset-react-app@^6.1.0:
36453693
babel-plugin-macros "2.4.2"
36463694
babel-plugin-transform-react-remove-prop-types "0.4.18"
36473695

3696+
babel-preset-react@^6.24.1:
3697+
version "6.24.1"
3698+
resolved "https://registry.yarnpkg.com/babel-preset-react/-/babel-preset-react-6.24.1.tgz#ba69dfaea45fc3ec639b6a4ecea6e17702c91380"
3699+
integrity sha1-umnfrqRfw+xjm2pOzqbhdwLJE4A=
3700+
dependencies:
3701+
babel-plugin-syntax-jsx "^6.3.13"
3702+
babel-plugin-transform-react-display-name "^6.23.0"
3703+
babel-plugin-transform-react-jsx "^6.24.1"
3704+
babel-plugin-transform-react-jsx-self "^6.22.0"
3705+
babel-plugin-transform-react-jsx-source "^6.22.0"
3706+
babel-preset-flow "^6.23.0"
3707+
36483708
babel-preset-stage-1@^6.5.0:
36493709
version "6.24.1"
36503710
resolved "https://registry.yarnpkg.com/babel-preset-stage-1/-/babel-preset-stage-1-6.24.1.tgz#7692cd7dcd6849907e6ae4a0a85589cfb9e2bfb0"

0 commit comments

Comments
 (0)