Skip to content
This repository was archived by the owner on Sep 14, 2023. It is now read-only.

Chore misc fixes #51

Merged
merged 4 commits into from
Apr 21, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
language: node_js

node_js:
- "4"
- "5"
- "6"
- "7"
- "8"
- "node"

before_script:
- npm run build

after_success:
- npm run coverage
- test $TRAVIS_NODE_VERSION = 7 && npm run coveralls
- test $TRAVIS_NODE_VERSION = 8 && npm run coveralls

notifications:
email: false
Expand All @@ -32,4 +31,4 @@ deploy:
2eFZClyuJi/5nJ1fBBAenRS0PBqLg=
on:
tags: true
node: "7"
node: "8"
13 changes: 11 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,19 @@

<!-- END doctoc generated TOC please keep comment here to allow auto update -->

### v0.9.0-dev

- Add react 16 to supported versions [issue #40, PR #51]
- Removed BrowserModal indirection and merged BrowserModal w/ Modal [issue #35, PR #51]
- Added prop `className` to `Modal` [issue #50, PR #51]
- Added prop `modalClassName` to `Modal.Dialog`
- Added prop `wrapperClassName` to `Modal`
- Added node 9 to supported development engines

### v0.8.0

- :exclamation: Drop support for react `0.14`
- Replace react-remarkable with react-markdown in examples [issue #44, PR #48 by @kaspar92]
- Ensure all our css classes begin w/ `tg-modal` [issue #30, PR #47]
- :exclamation: Ensure all our css classes begin w/ `tg-modal` [issue #30, PR #47]
- Modal: dialogClassName default changed to `tg-modal-dialog`
- Modal: transitionName default changed to `tg-modal-fade`
- Modal.Header, Modal.Body, Modal.Backdrop, Modal.Dialog:
Expand All @@ -50,6 +58,7 @@
- Keyframe `scaleOut` -> `tg-modal-scale-out`
- `.fade-enter` -> `.tg-modal-fade-enter`
- `.fade-exit` -> `.tg-modal-fade-exit`
- Replace react-remarkable with react-markdown in examples [issue #44, PR #48 by @kaspar92]
- Added tests [PR #26 by @dmtrm and @Jyrno42]
- Support Node 8 and NPM 5 in devEngines [PR #37 by @raunofreiberg]
- Add warning if `Modal.Header` is manually added [issue #33, PR #41 by @metsavaht]
Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@ This will render a static modal, which cannot be hidden by the user.
| onToggle | func | Function called after the modal is toggled. `function (isOpen, props) { }`
| transitionName | string | Name of animation to use for open/close (to see how to define custom ones, see default styles) [default: tg-modal-fade]
| transitionDuration | int | Duration of the transition in milliseconds [default: 300]
| className | string | Extra classnames to use for modal [default: ``]
| dialogClassName | string | Classname to use for `ModalDialog` [default: tg-modal-dialog]
| wrapperClassName | string | Extra classnames to use for modal wrapper [default: ``]

Props not specified here are considered internal, and are prone to change.

Expand Down
2 changes: 1 addition & 1 deletion collect.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ var fs = require('fs');
*/
function transformFile(contents) {
// Show prettier import paths
contents = contents.replace('../../../src/browser', 'tg-modal');
contents = contents.replace('../../../src/components/Modal', 'tg-modal');

return contents;
}
Expand Down
2 changes: 1 addition & 1 deletion examples/components/Serverside.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import PropTypes from 'prop-types';

import Modal from '../../src/browser';
import Modal from '../../src/components/Modal';


// Kiosk is like store+actions in the same class
Expand Down
2 changes: 1 addition & 1 deletion examples/components/examples/Basic.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';

import Modal from '../../../src/browser';
import Modal from '../../../src/components/Modal';


class BasicModalExample extends Component {
Expand Down
2 changes: 1 addition & 1 deletion examples/components/examples/BasicConfirm.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';

import Modal from '../../../src/browser';
import Modal from '../../../src/components/Modal';


class BasicConfirmModalExample extends Component {
Expand Down
2 changes: 1 addition & 1 deletion examples/components/examples/Confirm.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';

import Modal from '../../../src/browser';
import Modal from '../../../src/components/Modal';


class ConfirmModalExample extends Component {
Expand Down
2 changes: 1 addition & 1 deletion examples/components/examples/Long.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';

import Modal from '../../../src/browser';
import Modal from '../../../src/components/Modal';


class LongModalExample extends Component {
Expand Down
2 changes: 1 addition & 1 deletion examples/components/examples/Markdown.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import ReactMarkdown from 'react-markdown';

import theMarkdown from '../../files/example.md';

import Modal from '../../../src/browser';
import Modal from '../../../src/components/Modal';


class MarkdownModalExample extends Component {
Expand Down
2 changes: 1 addition & 1 deletion examples/components/examples/NestedLong.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';

import classNames from 'classnames';

import Modal from '../../../src/browser';
import Modal from '../../../src/components/Modal';


class LongNestedModalExample extends Component {
Expand Down
2 changes: 1 addition & 1 deletion examples/components/examples/ReduxModal.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import PropTypes from 'prop-types';
import { connect, Provider } from 'react-redux';
import { createStore } from 'redux';

import Modal from '../../../src/browser';
import Modal from '../../../src/components/Modal';


// redux actions and types
Expand Down
2 changes: 1 addition & 1 deletion examples/components/examples/Simple.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types';

import Modal from '../../../src/browser';
import Modal from '../../../src/components/Modal';


class SimpleModalExample extends Component {
Expand Down
2 changes: 1 addition & 1 deletion examples/components/examples/WithComponents.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import React, { Component } from 'react';
import PropTypes from 'prop-types'

import Modal from '../../../src/browser';
import Modal from '../../../src/components/Modal';


class WithComponentsModalExample extends Component {
Expand Down
Loading