Skip to content
This repository was archived by the owner on Jan 19, 2023. It is now read-only.

Commit f19b1e5

Browse files
committed
Merge branch 'psrebniak-master'
2 parents f5954aa + a4fc8c3 commit f19b1e5

File tree

6 files changed

+18
-4
lines changed

6 files changed

+18
-4
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
"react-hot-loader": "^1.3.0",
6666
"rimraf": "^2.5.3",
6767
"sass-loader": "^4.0.0",
68-
"style-loader": "^0.13.1",
68+
"isomorphic-style-loader": "^2.0.0",
6969
"webpack": "^1.13.1",
7070
"webpack-dev-server": "^1.14.1"
7171
},

src/examples/cats/app.js

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,12 @@ class App extends Component {
9696
this.movePrev = this.movePrev.bind(this);
9797
}
9898

99+
componentDidMount() {
100+
if (window) {
101+
styles._insertCss();
102+
}
103+
}
104+
99105
openLightbox() {
100106
this.setState({ isOpen: true });
101107
}

src/react-image-lightbox.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ class ReactImageLightbox extends Component {
167167

168168
componentDidMount() {
169169
this.mounted = true;
170+
ReactImageLightbox.loadStyles();
170171
this.attachListeners();
171172

172173
this.loadAllImages();
@@ -1218,6 +1219,13 @@ class ReactImageLightbox extends Component {
12181219
};
12191220
}
12201221

1222+
static loadStyles() {
1223+
// Insert component styles
1224+
if (typeof window === 'object') {
1225+
styles._insertCss();
1226+
}
1227+
}
1228+
12211229
render() {
12221230
const {
12231231
animationDisabled,

webpack.config.demo.babel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ module.exports = {
4040
{
4141
test: /\.scss$/,
4242
loaders: [
43-
'style-loader',
43+
'isomorphic-style-loader',
4444
'css-loader?modules&-autoprefixer&importLoaders=1&localIdentName=[local]___[hash:base64:5]',
4545
'postcss-loader',
4646
'sass-loader',

webpack.config.dev.babel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ module.exports = {
4242
{
4343
test: /\.scss$/,
4444
loaders: [
45-
'style-loader',
45+
'isomorphic-style-loader',
4646
'css-loader?modules&-autoprefixer&importLoaders=1&localIdentName=[local]___[hash:base64:5]',
4747
'postcss-loader',
4848
'sass-loader',

webpack.config.umd.babel.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ module.exports = {
4848
{
4949
test: /\.scss$/,
5050
loaders: [
51-
'style-loader',
51+
'isomorphic-style-loader',
5252
'css-loader?modules&-autoprefixer&importLoaders=1&localIdentName=[local]___[hash:base64:5]',
5353
'postcss-loader',
5454
'sass-loader',

0 commit comments

Comments
 (0)