Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Bug/v7 merge conflict fix #1324

Merged
merged 31 commits into from
Dec 21, 2018
Merged

Bug/v7 merge conflict fix #1324

merged 31 commits into from
Dec 21, 2018

Conversation

kburd
Copy link
Contributor

@kburd kburd commented Dec 18, 2018 •
edited
Loading

  • [x ] Bug fix
  • New feature
  • Chore
  • Breaking change
  • [x ] There is an open issue which this change addresses
  • [x ] I have read the CONTRIBUTING document.
  • My commits follow the Git Commit Guidelines
  • [x ] My code follows the code style of this project.
  • My change requires a change to the documentation.
    • I have updated the documentation accordingly.
  • I have added tests to cover my changes.
  • [ x] All new and existing tests passed.
  • I used the import statements added in v7 in Popover and Tooltip
  • I used master's code in utils as v7 caused tests to fail
  • I combined the new tests from both branches for TooltipPopoverWrapper

simontong and others added 28 commits September 24, 2018 09:05
@simontong @TheSharpieOne
fix(Dropdown): enter key triggers onClick (reactstrap#1232)
f2528da 
Closes reactstrap#1228
@Ashniu123 @TheSharpieOne
chore(UncontrolledButtonDropdown): Add docs (reactstrap#1235)
bd8b2e0 
Closes reactstrap#1219
@median-man @TheSharpieOne
feat(Button): add close icon support (reactstrap#1206)
02f5e9a 
Closes reactstrap#1182
@Ashniu123 @TheSharpieOne
feat(FormGrid): Add form-row (reactstrap#1237)
205e80d 
Modify <Row /> to have an additional prop `form` type `bool` which
adds class "form-row" instead of "row" when enabled.

Closes reactstrap#1195
@seansfkelley @TheSharpieOne
fix(boundariesElement): add DOMElement to allowed proptypes (reactstr…
cfe7318 
…ap#1238)
@askmike @TheSharpieOne
chore(docs): render spaces around ".clearfix" (reactstrap#1243)
d85f81a
@yagitoshiro @TheSharpieOne
chore(docs): bumped bootstrap version to 4.1.3
5b77a14 
https://www.cvedetails.com/cve/CVE-2018-14041/
@TheSharpieOne
chore(release): adding 6.5.0 (reactstrap#1247)
0dc2acd
@jeff-nz @TheSharpieOne
fix(ie foreach) (reactstrap#1262)
522d4ac 
fix(addMultipleEventListeners): support ie forEach NodeList
@shubham9411 @TheSharpieOne
chore(docs): Update Layout.js (reactstrap#1265)
589ae55
@dcousens @TheSharpieOne
feat(Badge): allow innerRef (reactstrap#1264)
2caaaa5
@Imundy @TheSharpieOne
fix(PopperContent): Use create portal instead of unstable_renderSubtr…
81da8c5 
…eeIntoContainer (reactstrap#1254)

fixes reactstrap#1216
@iamandrewluca @TheSharpieOne
fix(FormGroup): remove .position-relative (reactstrap#1270)
01eb5f9 
User should be responsible of adding that class

Resolves reactstrap#1269
@bestguy @TheSharpieOne
fix(Modal): only show backdrop when prop is true (reactstrap#1271)
07ec4b5 
Fixes reactstrap#1267
@rabbitattack @TheSharpieOne
docs(README): Update reactstrap install command (reactstrap#1273)
13e60ef
@TheSharpieOne
chore: add email to docs
11fbec9 
To prove ownership my email must be added to the docs.
@sharils @TheSharpieOne
chore(docs): Fix alphabetic order (reactstrap#1291)
08de34a
@Psvensso @TheSharpieOne
fix(Dropdown): Null check on children (reactstrap#1294) (reactstrap#1295
dcfde3b 
)

Closes reactstrap#1294
@amiuhle @TheSharpieOne
feat(Table): add innerRef prop (reactstrap#1296)
bb84c85 
`innerRef` prop for `Table`
@bpas247 @TheSharpieOne
docs(Breadcrumb): fix bug in no list example (reactstrap#1302)
0e4e9fb
@charlesvallieres @TheSharpieOne
fix(ie foreach) (reactstrap#1304)
1630bb3 
We need to support IE11 so I implemented PR reactstrap#1262 but I was still getting errors on the `els.forEach` line when els is a NodeList (https://developer.mozilla.org/en-US/docs/Web/API/NodeList/forEach)

reactstrap#1262
@antonhedstrom @TheSharpieOne
docs(typo): Fix misspelling in documentation (Modals) (reactstrap#1305)
1e4823d 
Fix of a minor misspelling in the Modal section of the documentation.
@walker-tx @TheSharpieOne
fix(CarouselIndicators): li key generate from provided item values (r…
fd7506d 
…eactstrap#1311)

Generation of key items for `li` components in `CarouselIndicators` is a
concatenation of specific, optional values (`src`, `caption`, and
`altText`) in each item of the `items` object array. Lacking these
key/value pairs will cause each `li` element to have a key along the
lines of `undefinedundefinedundefined`, resulting two or more of the
`li`'s to be identical and causing an error to log in the console.
While either including any one of the specified keys with a unique
value, or adding a unique `key` field in each of the items objects will
remedy this issue, that solution is not well documented. The proposed
solution is a transparent fix: preventing the aforementioned error while
requiring no change of code for the end-user. The new `key` prop value
for each `li` will be a concatenation of all the values of its
respective item object.

Closes reactstrap#1310
@simontong @TheSharpieOne
fix(Dropdown): enter key triggers onClick -- correction (reactstrap#1306
6b50732 
)
@kinke @TheSharpieOne
fix(Modal): don't propagate handled escape key event (reactstrap#1317)
5d45b26 
E.g., if a modal contains an open nested modal, don't close both
when pressing the escape key.
@eckdanny-osi @TheSharpieOne
fix(Dropdown): improve keyboard ux, WAI-ARIA (reactstrap#1293)
506c46a 
Update event handlers

* wrap next/prev
* handle ctrl+n/ctrl+p
* handle home/end
* manage focus on aria-expand/collapse
* docs(Dropdown): reword action buttons
* return Array<Element> (not NodeList) in getMenuItems
@bpas247 @TheSharpieOne
feat(CardBody): add innerRef to CardBody (reactstrap#1318)
4b0474f 
Fixes reactstrap#1314
fixed merge conflict
0ebae8a
TheSharpieOne
TheSharpieOne requested changes Dec 18, 2018
View reviewed changes
src/utils.js Outdated Show resolved Hide resolved
src/utils.js Outdated Show resolved Hide resolved
src/utils.js Outdated Show resolved Hide resolved
src/TooltipPopoverWrapper.js Outdated Show resolved Hide resolved
@TheSharpieOne
Copy link
Member

Looking good, just a few things. Thanks for taking care of this.

@TheSharpieOne TheSharpieOne merged commit fdbc388 into reactstrap:feature/v7 Dec 21, 2018
juanmaguitar added a commit to juanmaguitar/reactstrap that referenced this pull request Jan 18, 2019
@juanmaguitar
Merge branch 'master' of github.com:reactstrap/reactstrap
41f8a38 
* 'master' of github.com:reactstrap/reactstrap: (81 commits)
  fix(Modal): set Modal.openCount floor to 0 (reactstrap#1368)
  feat(Popover): add default toggleable fade support (reactstrap#1364) (reactstrap#1364)
  chore(release): release 7.1.0
  feat(Popover): add legacy trigger, replacing isInteractive prop
  feat(Popover): backward-compatible Popover behavior (reactstrap#1360)
  Fix(Modal): don't treat clicks on Portal children as backdrop clicks (reactstrap#1359)
  feat(*): support forwardRef components as tag
  fix(NavLink): console error while using @reach/Router (reactstrap#1350)
  feat(Spinner): Add spinner component (reactstrap#1352)
  feat(Switch): Add support for CustomInput type='switch' (reactstrap#1353)
  chore(release): adding 7.0.2
  fix(npm): fix published files
  chore(release): adding 7.0.1
  fix(*): fix release artifacts (reactstrap#1345)
  chore(release): adding 7.0.0 (reactstrap#1342)
  docs(typo): Fix misspelling in documentation (Alerts) (reactstrap#1329)
  docs(Input): static input error (reactstrap#1335)
  fix lint issue
  Bug/v7 merge conflict fix (reactstrap#1324)
  feat(CardBody): add innerRef to CardBody (reactstrap#1318)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@TheSharpieOne TheSharpieOne TheSharpieOne approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.