Skip to content
This repository has been archived by the owner on Sep 11, 2024. It is now read-only.

Commit

Permalink
Merge pull request #3404 from matrix-org/t3chguy/react16_10
Browse files Browse the repository at this point in the history
Switch to createReactClass: views/elements & views/groups. React 16 :D
  • Loading branch information
t3chguy authored Sep 6, 2019
2 parents 6dbc9ee + d5db67b commit d8dbe28
Show file tree
Hide file tree
Showing 31 changed files with 70 additions and 52 deletions.
3 changes: 2 additions & 1 deletion src/components/views/elements/ActionButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@ limitations under the License.

import React from 'react';
import PropTypes from 'prop-types';
import createReactClass from 'create-react-class';
import AccessibleButton from './AccessibleButton';
import dis from '../../../dispatcher';
import sdk from '../../../index';
import Analytics from '../../../Analytics';

export default React.createClass({
export default createReactClass({
displayName: 'RoleButton',

propTypes: {
Expand Down
5 changes: 2 additions & 3 deletions src/components/views/elements/AddressSelector.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,14 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

'use strict';

import React from 'react';
import PropTypes from 'prop-types';
import createReactClass from 'create-react-class';
import sdk from '../../../index';
import classNames from 'classnames';
import { UserAddressType } from '../../../UserAddress';

export default React.createClass({
export default createReactClass({
displayName: 'AddressSelector',

propTypes: {
Expand Down
3 changes: 2 additions & 1 deletion src/components/views/elements/AddressTile.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,15 @@ limitations under the License.

import React from 'react';
import PropTypes from 'prop-types';
import createReactClass from 'create-react-class';
import classNames from 'classnames';
import sdk from "../../../index";
import MatrixClientPeg from "../../../MatrixClientPeg";
import { _t } from '../../../languageHandler';
import { UserAddressType } from '../../../UserAddress.js';


export default React.createClass({
export default createReactClass({
displayName: 'AddressTile',

propTypes: {
Expand Down
3 changes: 2 additions & 1 deletion src/components/views/elements/DeviceVerifyButtons.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@ limitations under the License.

import React from 'react';
import PropTypes from 'prop-types';
import createReactClass from 'create-react-class';
import MatrixClientPeg from '../../../MatrixClientPeg';
import sdk from '../../../index';
import Modal from '../../../Modal';
import { _t } from '../../../languageHandler';

export default React.createClass({
export default createReactClass({
displayName: 'DeviceVerifyButtons',

propTypes: {
Expand Down
3 changes: 2 additions & 1 deletion src/components/views/elements/DialogButtons.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,13 @@ limitations under the License.

import React from "react";
import PropTypes from "prop-types";
import createReactClass from 'create-react-class';
import { _t } from '../../../languageHandler';

/**
* Basic container for buttons in modal dialogs.
*/
module.exports = React.createClass({
module.exports = createReactClass({
displayName: "DialogButtons",

propTypes: {
Expand Down
3 changes: 2 additions & 1 deletion src/components/views/elements/EditableText.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,9 @@ limitations under the License.

import React from 'react';
import PropTypes from 'prop-types';
import createReactClass from 'create-react-class';

module.exports = React.createClass({
module.exports = createReactClass({
displayName: 'EditableText',

propTypes: {
Expand Down
5 changes: 3 additions & 2 deletions src/components/views/elements/InlineSpinner.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,10 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

const React = require('react');
import React from "react";
import createReactClass from 'create-react-class';

module.exports = React.createClass({
module.exports = createReactClass({
displayName: 'InlineSpinner',

render: function() {
Expand Down
3 changes: 2 additions & 1 deletion src/components/views/elements/MemberEventListSummary.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@ limitations under the License.

import React from 'react';
import PropTypes from 'prop-types';
import createReactClass from 'create-react-class';
import MemberAvatar from '../avatars/MemberAvatar';
import { _t } from '../../../languageHandler';
import { formatCommaSeparatedList } from '../../../utils/FormattingUtils';

module.exports = React.createClass({
module.exports = createReactClass({
displayName: 'MemberEventListSummary',

propTypes: {
Expand Down
3 changes: 2 additions & 1 deletion src/components/views/elements/MessageSpinner.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ limitations under the License.
*/

import React from 'react';
import createReactClass from 'create-react-class';

module.exports = React.createClass({
module.exports = createReactClass({
displayName: 'MessageSpinner',

render: function() {
Expand Down
3 changes: 2 additions & 1 deletion src/components/views/elements/PersistentApp.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,14 @@ limitations under the License.
*/

import React from 'react';
import createReactClass from 'create-react-class';
import RoomViewStore from '../../../stores/RoomViewStore';
import ActiveWidgetStore from '../../../stores/ActiveWidgetStore';
import WidgetUtils from '../../../utils/WidgetUtils';
import sdk from '../../../index';
import MatrixClientPeg from '../../../MatrixClientPeg';

module.exports = React.createClass({
module.exports = createReactClass({
displayName: 'PersistentApp',

getInitialState: function() {
Expand Down
3 changes: 2 additions & 1 deletion src/components/views/elements/Pill.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from 'react';
import createReactClass from 'create-react-class';
import sdk from '../../../index';
import dis from '../../../dispatcher';
import classNames from 'classnames';
Expand All @@ -31,7 +32,7 @@ const REGEX_MATRIXTO = new RegExp(MATRIXTO_URL_PATTERN);
// HttpUtils transformTags to relative links. This excludes event URLs (with `[^\/]*`)
const REGEX_LOCAL_MATRIXTO = /^#\/(?:user|room|group)\/(([#!@+])[^/]*)$/;

const Pill = React.createClass({
const Pill = createReactClass({
statics: {
isPillUrl: (url) => {
return !!REGEX_MATRIXTO.exec(url);
Expand Down
5 changes: 2 additions & 3 deletions src/components/views/elements/PowerSelector.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,14 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

'use strict';

import React from 'react';
import PropTypes from 'prop-types';
import createReactClass from 'create-react-class';
import * as Roles from '../../../Roles';
import { _t } from '../../../languageHandler';
import Field from "./Field";

module.exports = React.createClass({
module.exports = createReactClass({
displayName: 'PowerSelector',

propTypes: {
Expand Down
7 changes: 3 additions & 4 deletions src/components/views/elements/ProgressBar.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,11 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

'use strict';

const React = require('react');
import React from "react";
import PropTypes from 'prop-types';
import createReactClass from 'create-react-class';

module.exports = React.createClass({
module.exports = createReactClass({
displayName: 'ProgressBar',
propTypes: {
value: PropTypes.number,
Expand Down
3 changes: 2 additions & 1 deletion src/components/views/elements/SettingsFlag.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ limitations under the License.

import React from "react";
import PropTypes from 'prop-types';
import createReactClass from 'create-react-class';
import SettingsStore from "../../../settings/SettingsStore";
import { _t } from '../../../languageHandler';
import ToggleSwitch from "./ToggleSwitch";

module.exports = React.createClass({
module.exports = createReactClass({
displayName: 'SettingsFlag',
propTypes: {
name: PropTypes.string.isRequired,
Expand Down
7 changes: 3 additions & 4 deletions src/components/views/elements/Spinner.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,10 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

'use strict';
import React from "react";
import createReactClass from 'create-react-class';

const React = require('react');

module.exports = React.createClass({
module.exports = createReactClass({
displayName: 'Spinner',

render: function() {
Expand Down
3 changes: 2 additions & 1 deletion src/components/views/elements/TagTile.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.

import React from 'react';
import PropTypes from 'prop-types';
import createReactClass from 'create-react-class';
import classNames from 'classnames';
import { MatrixClient } from 'matrix-js-sdk';
import sdk from '../../../index';
Expand All @@ -34,7 +35,7 @@ import TagOrderStore from '../../../stores/TagOrderStore';
// - Rooms that are part of the group
// - Direct messages with members of the group
// with the intention that this could be expanded to arbitrary tags in future.
export default React.createClass({
export default createReactClass({
displayName: 'TagTile',

propTypes: {
Expand Down
10 changes: 4 additions & 6 deletions src/components/views/elements/TintableSvg.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,12 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

'use strict';

const React = require('react');
const ReactDOM = require("react-dom");
import React from 'react';
import PropTypes from 'prop-types';
const Tinter = require("../../../Tinter");
import createReactClass from 'create-react-class';
import Tinter from "../../../Tinter";

var TintableSvg = React.createClass({
const TintableSvg = createReactClass({
displayName: 'TintableSvg',

propTypes: {
Expand Down
3 changes: 2 additions & 1 deletion src/components/views/elements/Tooltip.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,13 @@ limitations under the License.
import React from 'react';
import ReactDOM from 'react-dom';
import PropTypes from 'prop-types';
import createReactClass from 'create-react-class';
import dis from '../../../dispatcher';
import classNames from 'classnames';

const MIN_TOOLTIP_HEIGHT = 25;

module.exports = React.createClass({
module.exports = createReactClass({
displayName: 'Tooltip',

propTypes: {
Expand Down
3 changes: 2 additions & 1 deletion src/components/views/elements/TooltipButton.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,10 @@ limitations under the License.
*/

import React from 'react';
import createReactClass from 'create-react-class';
import sdk from '../../../index';

module.exports = React.createClass({
module.exports = createReactClass({
displayName: 'TooltipButton',

getInitialState: function() {
Expand Down
3 changes: 2 additions & 1 deletion src/components/views/elements/TruncatedList.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,10 @@ limitations under the License.

import React from 'react';
import PropTypes from 'prop-types';
import createReactClass from 'create-react-class';
import { _t } from '../../../languageHandler';

module.exports = React.createClass({
module.exports = createReactClass({
displayName: 'TruncatedList',

propTypes: {
Expand Down
5 changes: 2 additions & 3 deletions src/components/views/elements/UserSelector.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,12 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

'use strict';

import React from 'react';
import PropTypes from 'prop-types';
import createReactClass from 'create-react-class';
import { _t } from '../../../languageHandler';

module.exports = React.createClass({
module.exports = createReactClass({
displayName: 'UserSelector',

propTypes: {
Expand Down
3 changes: 2 additions & 1 deletion src/components/views/groups/GroupInviteTile.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ limitations under the License.

import React from 'react';
import PropTypes from 'prop-types';
import createReactClass from 'create-react-class';
import { MatrixClient } from 'matrix-js-sdk';
import sdk from '../../../index';
import dis from '../../../dispatcher';
Expand All @@ -25,7 +26,7 @@ import classNames from 'classnames';
import MatrixClientPeg from "../../../MatrixClientPeg";
import {createMenu} from "../../structures/ContextualMenu";

export default React.createClass({
export default createReactClass({
displayName: 'GroupInviteTile',

propTypes: {
Expand Down
5 changes: 3 additions & 2 deletions src/components/views/groups/GroupMemberInfo.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,9 @@ See the License for the specific language governing permissions and
limitations under the License.
*/

import PropTypes from 'prop-types';
import React from 'react';
import PropTypes from 'prop-types';
import createReactClass from 'create-react-class';
import { MatrixClient } from 'matrix-js-sdk';
import dis from '../../../dispatcher';
import Modal from '../../../Modal';
Expand All @@ -26,7 +27,7 @@ import { GroupMemberType } from '../../../groups';
import GroupStore from '../../../stores/GroupStore';
import AccessibleButton from '../elements/AccessibleButton';

module.exports = React.createClass({
module.exports = createReactClass({
displayName: 'GroupMemberInfo',

contextTypes: {
Expand Down
3 changes: 2 additions & 1 deletion src/components/views/groups/GroupMemberList.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import React from 'react';
import createReactClass from 'create-react-class';
import { _t } from '../../../languageHandler';
import sdk from '../../../index';
import dis from '../../../dispatcher';
Expand All @@ -27,7 +28,7 @@ import RightPanel from '../../structures/RightPanel';

const INITIAL_LOAD_NUM_MEMBERS = 30;

export default React.createClass({
export default createReactClass({
displayName: 'GroupMemberList',

propTypes: {
Expand Down
3 changes: 2 additions & 1 deletion src/components/views/groups/GroupMemberTile.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,12 +18,13 @@ limitations under the License.

import React from 'react';
import PropTypes from 'prop-types';
import createReactClass from 'create-react-class';
import { MatrixClient } from 'matrix-js-sdk';
import sdk from '../../../index';
import dis from '../../../dispatcher';
import { GroupMemberType } from '../../../groups';

export default React.createClass({
export default createReactClass({
displayName: 'GroupMemberTile',

propTypes: {
Expand Down
3 changes: 2 additions & 1 deletion src/components/views/groups/GroupPublicityToggle.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,12 @@ limitations under the License.

import React from 'react';
import PropTypes from 'prop-types';
import createReactClass from 'create-react-class';
import sdk from '../../../index';
import GroupStore from '../../../stores/GroupStore';
import ToggleSwitch from "../elements/ToggleSwitch";

export default React.createClass({
export default createReactClass({
displayName: 'GroupPublicityToggle',

propTypes: {
Expand Down
Loading

0 comments on commit d8dbe28

Please sign in to comment.