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.

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

[React 14] remove import of addons from components #1634

Closed
wants to merge 1 commit into from
Closed
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
3 changes: 1 addition & 2 deletions docs/src/app/components/pages/components/menus.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
let React = require('react/addons');
let ReactTransitionGroup = React.addons.TransitionGroup;
let React = require('react');
let Menu = require('menus/menu');
let MenuItem = require('menus/menu-item');
let MenuDivider = require('menus/menu-divider');
Expand Down
8 changes: 6 additions & 2 deletions docs/src/app/components/pages/components/text-fields.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
let React = require('react/addons');
let React = require('react');
const LinkedStateMixin = require('react/lib/LinkedStateMixin');
let { ClearFix, Mixins, SelectField, TextField, Styles } = require('material-ui');
let ComponentDoc = require('../../component-doc');
let { Colors } = Styles;
Expand All @@ -8,7 +9,10 @@ let CodeExample = require('../../code-example/code-example');

let TextFieldsPage = React.createClass({

mixins: [StyleResizable, React.addons.LinkedStateMixin],
mixins: [
StyleResizable,
LinkedStateMixin,
],

getInitialState() {
return {
Expand Down
2 changes: 1 addition & 1 deletion examples/browserify-gulp-example/src/app/app.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(function () {
let React = require('react/addons');
const React = require('react');
let injectTapEventPlugin = require('react-tap-event-plugin');
let Main = require('./components/main.jsx'); // Our custom react component

Expand Down
2 changes: 1 addition & 1 deletion examples/webpack-example/src/app/app.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
(function () {
let React = require('react/addons');
const React = require('react');
let injectTapEventPlugin = require('react-tap-event-plugin');
let Main = require('./components/main.jsx'); // Our custom react component

Expand Down
4 changes: 2 additions & 2 deletions icon-builder/tpl/SvgIcon.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const React = require('react/addons');
const PureRenderMixin = React.addons.PureRenderMixin;
const React = require('react');
const PureRenderMixin = require('react/lib/ReactComponentWithPureRenderMixin');
const SvgIcon = {{{ muiRequireStmt }}};

const {{className}} = React.createClass({
Expand Down
2 changes: 1 addition & 1 deletion src/avatar.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const React = require('react/addons');
const React = require('react');
const StylePropable = require('./mixins/style-propable');
const Colors = require('./styles/colors');
const DefaultRawTheme = require('./styles/raw-themes/light-raw-theme');
Expand Down
2 changes: 1 addition & 1 deletion src/buttons/flat-button-label.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const React = require('react/addons');
const React = require('react');
const ContextPure = require('../mixins/context-pure');
const Styles = require('../utils/styles');
const DefaultRawTheme = require('../styles/raw-themes/light-raw-theme');
Expand Down
4 changes: 2 additions & 2 deletions src/dialog.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const React = require('react/addons');
const React = require('react');
const WindowListenable = require('./mixins/window-listenable');
const CssEvent = require('./utils/css-event');
const KeyCode = require('./utils/key-code');
Expand All @@ -10,7 +10,7 @@ const Paper = require('./paper');
const DefaultRawTheme = require('./styles/raw-themes/light-raw-theme');
const ThemeManager = require('./styles/theme-manager');

const ReactTransitionGroup = React.addons.TransitionGroup;
const ReactTransitionGroup = require('react/lib/ReactTransitionGroup');

const TransitionItem = React.createClass({
mixins: [StylePropable],
Expand Down
4 changes: 2 additions & 2 deletions src/enhanced-button.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const React = require('react/addons');
const PureRenderMixin = React.addons.PureRenderMixin;
const React = require('react');
const PureRenderMixin = require('react/lib/ReactComponentWithPureRenderMixin');
const StylePropable = require('./mixins/style-propable');
const Colors = require('./styles/colors');
const Children = require('./utils/children');
Expand Down
2 changes: 1 addition & 1 deletion src/lists/list-divider.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const React = require('react/addons');
const React = require('react');
const StylePropable = require('../mixins/style-propable');
const DefaultRawTheme = require('../styles/raw-themes/light-raw-theme');
const ThemeManager = require('../styles/theme-manager');
Expand Down
4 changes: 2 additions & 2 deletions src/lists/list-item.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const React = require('react/addons');
const PureRenderMixin = React.addons.PureRenderMixin;
const React = require('react');
const PureRenderMixin = require('react/lib/ReactComponentWithPureRenderMixin');
const ColorManipulator = require('../utils/color-manipulator');
const StylePropable = require('../mixins/style-propable');
const Colors = require('../styles/colors');
Expand Down
4 changes: 2 additions & 2 deletions src/lists/list.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const React = require('react/addons');
const PureRenderMixin = React.addons.PureRenderMixin;
const React = require('react');
const PureRenderMixin = require('react/lib/ReactComponentWithPureRenderMixin');
const PropTypes = require('../utils/prop-types');
const StylePropable = require('../mixins/style-propable');
const Typography = require('../styles/typography');
Expand Down
4 changes: 2 additions & 2 deletions src/menus/icon-menu.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const React = require('react/addons');
const ReactTransitionGroup = React.addons.TransitionGroup;
const React = require('react');
const ReactTransitionGroup = require('react/lib/ReactTransitionGroup');
const ClickAwayable = require('../mixins/click-awayable');
const StylePropable = require('../mixins/style-propable');
const Events = require('../utils/events');
Expand Down
2 changes: 1 addition & 1 deletion src/menus/menu-divider.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const React = require('react/addons');
const React = require('react');
const StylePropable = require('../mixins/style-propable');
const ListDivider = require('../lists/list-divider');
const DefaultRawTheme = require('../styles/raw-themes/light-raw-theme');
Expand Down
4 changes: 2 additions & 2 deletions src/menus/menu-item.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const React = require('react/addons');
const PureRenderMixin = React.addons.PureRenderMixin;
const React = require('react');
const PureRenderMixin = require('react/lib/ReactComponentWithPureRenderMixin');
const StylePropable = require('../mixins/style-propable');
const Colors = require('../styles/colors');
const CheckIcon = require('../svg-icons/navigation/check');
Expand Down
4 changes: 2 additions & 2 deletions src/menus/menu.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const React = require('react/addons');
const update = React.addons.update;
const React = require('react');
const update = require('react/lib/update');
const Controllable = require('../mixins/controllable');
const StylePropable = require('../mixins/style-propable');
const AutoPrefix = require('../styles/auto-prefix');
Expand Down
2 changes: 1 addition & 1 deletion src/mixins/controllable.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
let React = require('react/addons');
const React = require('react');

module.exports = {

Expand Down
4 changes: 2 additions & 2 deletions src/paper.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const React = require('react/addons');
const PureRenderMixin = React.addons.PureRenderMixin;
const React = require('react');
const PureRenderMixin = require('react/lib/ReactComponentWithPureRenderMixin');
const StylePropable = require('./mixins/style-propable');
const PropTypes = require('./utils/prop-types');
const Transitions = require('./styles/transitions');
Expand Down
4 changes: 2 additions & 2 deletions src/ripples/circle-ripple.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const React = require('react/addons');
const PureRenderMixin = React.addons.PureRenderMixin;
const React = require('react');
const PureRenderMixin = require('react/lib/ReactComponentWithPureRenderMixin');
const StylePropable = require('../mixins/style-propable');
const AutoPrefix = require('../styles/auto-prefix');
const Transitions = require('../styles/transitions');
Expand Down
6 changes: 3 additions & 3 deletions src/ripples/focus-ripple.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const React = require('react/addons');
const PureRenderMixin = React.addons.PureRenderMixin;
const React = require('react');
const PureRenderMixin = require('react/lib/ReactComponentWithPureRenderMixin');
const StylePropable = require('../mixins/style-propable');
const AutoPrefix = require('../styles/auto-prefix');
const Colors = require('../styles/colors');
Expand Down Expand Up @@ -117,7 +117,7 @@ const FocusRipple = React.createClass({
// For browsers that don't support endsWith()
if (el.style.top.indexOf('px', el.style.top.length - 2) !== -1) {
oldTop = parseInt(el.style.top);
}
}
el.style.height = size + 'px';
el.style.top = (height / 2) - (size / 2 ) + oldTop + 'px';
},
Expand Down
6 changes: 3 additions & 3 deletions src/ripples/touch-ripple.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const React = require('react/addons');
const PureRenderMixin = React.addons.PureRenderMixin;
const ReactTransitionGroup = React.addons.TransitionGroup;
const React = require('react');
const PureRenderMixin = require('react/lib/ReactComponentWithPureRenderMixin');
const ReactTransitionGroup = require('react/lib/ReactTransitionGroup');
const StylePropable = require('../mixins/style-propable');
const Dom = require('../utils/dom');
const ImmutabilityHelper = require('../utils/immutability-helper');
Expand Down
2 changes: 1 addition & 1 deletion src/tabs/tabs.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const React = require('react/addons');
const React = require('react');
const TabTemplate = require('./tabTemplate');
const InkBar = require('../ink-bar');
const StylePropable = require('../mixins/style-propable');
Expand Down
4 changes: 2 additions & 2 deletions src/transition-groups/scale-in-child.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const React = require('react/addons');
const PureRenderMixin = React.addons.PureRenderMixin;
const React = require('react');
const PureRenderMixin = require('react/lib/ReactComponentWithPureRenderMixin');
const StylePropable = require('../mixins/style-propable');
const AutoPrefix = require('../styles/auto-prefix');
const Transitions = require('../styles/transitions');
Expand Down
6 changes: 3 additions & 3 deletions src/transition-groups/scale-in.jsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const React = require('react/addons');
const PureRenderMixin = React.addons.PureRenderMixin;
const ReactTransitionGroup = React.addons.TransitionGroup;
const React = require('react');
const PureRenderMixin = require('react/lib/ReactComponentWithPureRenderMixin');
const ReactTransitionGroup = require('react/lib/ReactTransitionGroup');
const StylePropable = require('../mixins/style-propable');
const ScaleInChild = require('./scale-in-child');

Expand Down
2 changes: 1 addition & 1 deletion src/transition-groups/slide-in-child.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const React = require('react/addons');
const React = require('react');
const StylePropable = require('../mixins/style-propable');
const AutoPrefix = require('../styles/auto-prefix');
const Transitions = require('../styles/transitions');
Expand Down
4 changes: 2 additions & 2 deletions src/transition-groups/slide-in.jsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const React = require('react/addons');
const ReactTransitionGroup = React.addons.TransitionGroup;
const React = require('react');
const ReactTransitionGroup = require('react/lib/ReactTransitionGroup');
const StylePropable = require('../mixins/style-propable');
const SlideInChild = require('./slide-in-child');

Expand Down
4 changes: 2 additions & 2 deletions src/utils/children.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const React = require('react/addons');
const createFragment = React.addons.createFragment;
const React = require('react');
const createFragment = require('react/lib/ReactFragment').create;

module.exports = {

Expand Down
3 changes: 1 addition & 2 deletions src/utils/immutability-helper.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
const React = require('react/addons');
const update = React.addons.update;
const update = require('react/lib/update');

function mergeSingle(objA, objB) {
if (!objA) return objB;
Expand Down
5 changes: 2 additions & 3 deletions test/checkbox-spec.js
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
import React from 'react/addons';
import React from 'react';
import TestUtils from 'react/lib/ReactTestUtils';
import Checkbox from 'checkbox';
import injectTheme from './fixtures/inject-theme';

const TestUtils = React.addons.TestUtils;


describe('Checkbox', () => {
const CHECKMARK_PATH = 'M19 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.11 0 2-.9 2-2V5c0-1.1-.89-2-2-2zm-9 14l-5-5 1.41-1.41L10 14.17l7.59-7.59L19 8l-9 9z';
Expand Down
6 changes: 3 additions & 3 deletions test/mixin-context-pure-spec.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import React from 'react/addons';
import React from 'react';
import TestUtils from 'react/lib/ReactTestUtils';
import update from 'react/lib/update';
import ContextPure from 'mixins/context-pure';
import ThemeManager from 'styles/theme-manager';
import DefaultRawTheme from 'styles/raw-themes/light-raw-theme';

const TestUtils = React.addons.TestUtils;
const update = React.addons.update;

const GrandChildComponent = React.createClass({
mixins: [ContextPure],
Expand Down