Skip to content

Commit 2c15cc6

Browse files
committed
Replace Object.assign with direct property assignment
Resolves #256 - v5 doesn't work in IE11 anymore
1 parent 5801c2b commit 2c15cc6

File tree

3 files changed

+19
-9
lines changed

3 files changed

+19
-9
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
"predist": "rm -rf ./build",
2121
"dist": "NODE_ENV=production webpack-cli --config ./webpack/dist.config.js && NODE_ENV=production webpack-cli --config ./webpack/min.config.js",
2222
"preghPages": "yarn pub",
23-
"ghPages": "gh-pages --dist ./pub --repo git@github.com:nkbt/react-collapse.git --user nik@butenko.me --branch gh-pages --message 'Publish examples' ",
23+
"ghPages": "gh-pages --dist ./pub --repo git@github.com:nkbt/react-collapse.git --user nik@butenko.me --branch gh-pages --message 'Publish examples'",
2424
"prelib": "rm -rf ./lib",
2525
"lib": "NODE_ENV=production babel src --out-dir lib",
2626
"lint": "eslint .",

src/Collapse.js

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -153,16 +153,21 @@ export class Collapse extends React.Component {
153153
};
154154

155155

156+
onRefContainer = container => {
157+
this.container = container;
158+
};
159+
160+
161+
onRefContent = content => {
162+
this.content = content;
163+
};
164+
165+
156166
render() {
157167
const {theme, children} = this.props;
158168
return (
159-
<div
160-
ref={container => Object.assign(this, {container})}
161-
className={theme.collapse}
162-
style={this.initialStyle}>
163-
<div
164-
ref={content => Object.assign(this, {content})}
165-
className={theme.content}>
169+
<div ref={this.onRefContainer} className={theme.collapse} style={this.initialStyle}>
170+
<div ref={this.onRefContent} className={theme.content}>
166171
{children}
167172
</div>
168173
</div>

src/index.js

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,10 @@ const {Collapse} = require('./Collapse');
22
const {UnmountClosed} = require('./UnmountClosed');
33

44

5-
Object.assign(UnmountClosed, {Collapse, UnmountClosed});
5+
// Default export
66
module.exports = UnmountClosed;
7+
8+
9+
// Extra "named exports"
10+
UnmountClosed.Collapse = Collapse;
11+
UnmountClosed.UnmountClosed = UnmountClosed;

0 commit comments

Comments
 (0)