GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-05 06:41:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into fix-1307-invalid-node-type-to-props

Browse Source
This commit is contained in:
Norbert de Langen 2017-06-23 15:45:07 +02:00 committed by GitHub
commit 51f4c9de71
2 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
addons/info/src/components/Story.js
View File

@ -125,11 +125,7 @@ export default class Story extends React.Component {
_renderInline() {
return (
<div>
<div style={this.state.stylesheet.infoPage}>
<div style={this.state.stylesheet.infoBody}>
{this._getInfoHeader()}
</div>
</div>
{this._renderInlineHeader()}
<div>
{this._renderStory()}
</div>
@ -145,6 +141,19 @@ export default class Story extends React.Component {
);
}
_renderInlineHeader() {
const infoHeader = this._getInfoHeader();
return (
infoHeader &&
<div style={this.state.stylesheet.infoPage}>
<div style={this.state.stylesheet.infoBody}>
{infoHeader}
</div>
</div>
);
}
_renderOverlay() {
const linkStyle = {
...stylesheet.link.base,

8
app/react-native/src/server/index.js vendored
View File

@ -12,14 +12,12 @@ export default class Server {
this.expressApp.use(storybook(options));
this.httpServer.on('request', this.expressApp);
this.wsServer = new ws.Server({ server: this.httpServer });
this.wsServer.on('connection', s => this.handleWS(s));
this.wsServer.on('connection', (s, req) => this.handleWS(s, req));
}
handleWS(socket) {
handleWS(socket, req) {
if (this.options.manualId) {
const params = socket.upgradeReq && socket.upgradeReq.url
? querystring.parse(socket.upgradeReq.url.substr(1))
: {};
const params = req.url ? querystring.parse(req.url.substr(1)) : {};
if (params.pairedId) {
socket.pairedId = params.pairedId; // eslint-disable-line