Skip to content

Commit

Permalink
feat(tooltip): Adds className, id, and style passthrough
Browse files Browse the repository at this point in the history
- Upgrade to latest version of React Bootstrap

[Finishes #98913250]
  • Loading branch information
Caroline Taymor and Geoff Pleiss authored and Kenny Wang committed Jul 27, 2015
1 parent 54b27a0 commit ae06ad1
Show file tree
Hide file tree
Showing 9 changed files with 20 additions and 9 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
"q": "^1.0.1",
"react": "0.13.3",
"react-a11y": "pivotal-cf/react-a11y#dist",
"react-bootstrap": "0.23.3",
"react-bootstrap": "pivotal-cf/react-bootstrap#pui-dist",
"react-fa": "^3.0.0",
"require-dir": "^0.3.0",
"run-sequence": "^1.0.2",
Expand Down
13 changes: 12 additions & 1 deletion spec/pivotal-ui-react/tooltip/tooltip_spec.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,18 @@
require('../spec_helper');
import {itPropagatesAttributes} from '../support/shared_examples';

describe('tooltip', function() {
var props = {
className: 'test-class',
id: 'test-id',
style: {
opacity: '0.5'
}
};

beforeEach(function() {
var Tooltip = require('../../../src/pivotal-ui-react/tooltip/tooltip').Tooltip;
React.render((<Tooltip><div className="tooltip-text">Hello World</div></Tooltip>), root);
React.render((<Tooltip {...props}><div className="tooltip-text">Hello World</div></Tooltip>), root);
});

afterEach(function() {
Expand All @@ -13,4 +22,6 @@ describe('tooltip', function() {
it('works', function() {
expect('.tooltip-text').toExist();
});

itPropagatesAttributes('#root #test-id', props);
});
2 changes: 1 addition & 1 deletion src/pivotal-ui-react/alerts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "React components to display flash messages to the user",
"homepage": "https://styleguide.pivotal.io/react.html#alerts_react",
"dependencies": {
"react-bootstrap": "0.23.3",
"react-bootstrap": "pivotal-cf/react-bootstrap#pui-dist",
"pui-css-alerts": "1.10.0",
"pui-css-iconography": "1.10.0",
"pui-react-media": "1.10.0"
Expand Down
2 changes: 1 addition & 1 deletion src/pivotal-ui-react/collapse/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "React components providing accordions for showing and hiding content",
"homepage": "https://styleguide.pivotal.io/react.html#collapse_react",
"dependencies": {
"react-bootstrap": "0.23.3",
"react-bootstrap": "pivotal-cf/react-bootstrap#pui-dist",
"classnames": "^1.2.0",
"pui-css-collapse": "1.10.0",
"pui-css-iconography": "1.10.0",
Expand Down
2 changes: 1 addition & 1 deletion src/pivotal-ui-react/dropdowns/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "A React dropdown component",
"homepage": "https://styleguide.pivotal.io/react.html#dropdown_react",
"dependencies": {
"react-bootstrap": "0.23.3",
"react-bootstrap": "pivotal-cf/react-bootstrap#pui-dist",
"pui-css-dropdowns": "1.10.0",
"pui-css-iconography": "1.10.0",
"pui-css-buttons": "1.10.0",
Expand Down
2 changes: 1 addition & 1 deletion src/pivotal-ui-react/grids/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,6 @@
"dependencies": {
"pui-css-grids": "1.10.0",
"classnames": "^1.2.0",
"react-bootstrap": "0.23.3"
"react-bootstrap": "pivotal-cf/react-bootstrap#pui-dist"
}
}
2 changes: 1 addition & 1 deletion src/pivotal-ui-react/overlay-trigger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"version": "1.10.0",
"description": "A React component for displaying a tooltip or popover on user action",
"dependencies": {
"react-bootstrap": "0.23.3"
"react-bootstrap": "pivotal-cf/react-bootstrap#pui-dist"
},
"homepage": "https://styleguide.pivotal.io/react.html#tooltips_react"
}
2 changes: 1 addition & 1 deletion src/pivotal-ui-react/tabs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "React components for tab-based content toggling",
"homepage": "https://styleguide.pivotal.io/react.html#tabs_react",
"dependencies": {
"react-bootstrap": "0.23.3",
"react-bootstrap": "pivotal-cf/react-bootstrap#pui-dist",
"pui-css-tabs": "1.10.0"
}
}
2 changes: 1 addition & 1 deletion src/pivotal-ui-react/tooltip/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "A React component that provides styled tooltips",
"homepage": "https://styleguide.pivotal.io/react.html#tooltips_react",
"dependencies": {
"react-bootstrap": "0.23.3",
"react-bootstrap": "pivotal-cf/react-bootstrap#pui-dist",
"pui-css-tooltips": "1.10.0"
}
}

0 comments on commit ae06ad1

Please sign in to comment.