Skip to content

Commit 1fb5e43

Browse files
committed
Switch all components to "manual namespacing", meaning we don't do any ReactElement post-processing.
1 parent f3a9fed commit 1fb5e43

3 files changed

Lines changed: 20 additions & 20 deletions

File tree

demo/react/app/ui/ConversationPanel.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@ const ns = require('../util/css-ns')(__filename);
77
class SingleMessage extends React.Component {
88

99
render() {
10-
return ns(
11-
<div className={{ message: true, mine: Math.random() > 0.5 }}>
10+
return (
11+
<div className={ns({ message: true, mine: Math.random() > 0.5 })}>
1212
{this.props.message}
1313
</div>
1414
);
@@ -19,8 +19,8 @@ class SingleMessage extends React.Component {
1919
export default class ConversationPanel extends React.Component {
2020

2121
render() {
22-
return ns(
23-
<Panel className="this">
22+
return (
23+
<Panel className={ns('this')}>
2424
{getRandomMessages().map((message, index) => (
2525
<SingleMessage key={index} message={message} />
2626
))}

demo/react/app/ui/ReactDemoApp.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ const ns = require('../util/css-ns')(__filename);
99
export default class ReactDemoApp extends React.Component {
1010

1111
render() {
12-
return ns(
13-
<div className="this">
12+
return (
13+
<div className={ns('this')}>
1414
<ThreadListPanel />
1515
<ConversationPanel />
1616
</div>

demo/react/app/ui/ThreadListPanel.js

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,12 @@ const colors = getRandomColors();
1010

1111
// This remains disabled for now, since react-addons-perf can't count instances of stateless functional components (...yet?)
1212
/*
13-
const SingleThread = props => ns(
14-
<div className="thread">
15-
<div className="badge" style={{ background: colors[props.index] }}>{props.name.substr(0, 1)}</div>
16-
<div className="details">
17-
<div className="name">{props.name}</div>
18-
<div className="message">{messages[props.index]}</div>
13+
const SingleThread = props => (
14+
<div className={ns('thread')}>
15+
<div className={ns('badge')} style={{ background: colors[props.index] }}>{props.name.substr(0, 1)}</div>
16+
<div className={ns('details')}>
17+
<div className={ns('name')}>{props.name}</div>
18+
<div className={ns('message')}>{messages[props.index]}</div>
1919
</div>
2020
</div>
2121
);
@@ -24,12 +24,12 @@ const SingleThread = props => ns(
2424
class SingleThread extends React.Component {
2525

2626
render() {
27-
return ns(
28-
<div className="thread">
29-
<div className="badge" style={{ background: colors[this.props.index] }}>{this.props.name.substr(0, 1)}</div>
30-
<div className="details">
31-
<div className="name">{this.props.name}</div>
32-
<div className="message">{messages[this.props.index]}</div>
27+
return (
28+
<div className={ns('thread')}>
29+
<div className={ns('badge')} style={{ background: colors[this.props.index] }}>{this.props.name.substr(0, 1)}</div>
30+
<div className={ns('details')}>
31+
<div className={ns('name')}>{this.props.name}</div>
32+
<div className={ns('message')}>{messages[this.props.index]}</div>
3333
<div /><div /><div /><div /><div />{/* this cruft is here just to increase (non-namespaced) node count for perf tests */}
3434
</div>
3535
</div>
@@ -41,8 +41,8 @@ class SingleThread extends React.Component {
4141
export default class ThreadListPanel extends React.Component {
4242

4343
render() {
44-
return ns(
45-
<Panel className="this" header="Your conversations" bsStyle="primary">
44+
return (
45+
<Panel className={ns('this')} header="Your conversations" bsStyle="primary">
4646
{names.map((name, index) => (
4747
<SingleThread key={index} index={index} name={name} />
4848
))}

0 commit comments

Comments
 (0)