Skip to content

Commit

Permalink
Merge branch 'next' into tech/api-package
Browse files Browse the repository at this point in the history
# Conflicts:
#	yarn.lock
  • Loading branch information
ndelangen committed Mar 15, 2019
2 parents d689cdc + 58d90e6 commit 11e8a43
Show file tree
Hide file tree
Showing 11 changed files with 256 additions and 66 deletions.
2 changes: 1 addition & 1 deletion app/react-native-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"commander": "^2.19.0",
"global": "^4.3.2",
"react": "^16.6.0",
"react-dom": "^16.6.0",
"react-dom": "^16.8.4",
"uuid": "^3.3.2",
"webpack": "^4.23.1",
"ws": "^6.1.0"
Expand Down
2 changes: 1 addition & 1 deletion examples/angular-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
},
"devDependencies": {
"@angular-devkit/build-angular": "^0.13.4",
"@angular/cli": "^7.3.3",
"@angular/cli": "^7.3.6",
"@angular/compiler-cli": "^7.2.6",
"@storybook/addon-actions": "5.1.0-alpha.6",
"@storybook/addon-backgrounds": "5.1.0-alpha.6",
Expand Down
2 changes: 1 addition & 1 deletion examples/cra-kitchen-sink/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"global": "^4.3.2",
"prop-types": "^15.7.2",
"react": "^16.8.4",
"react-dom": "^16.8.3",
"react-dom": "^16.8.4",
"react-lifecycles-compat": "^3.0.4"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion examples/cra-ts-kitchen-sink/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
},
"dependencies": {
"react": "^16.8.4",
"react-dom": "^16.8.3"
"react-dom": "^16.8.4"
},
"devDependencies": {
"@storybook/addon-actions": "5.1.0-alpha.6",
Expand Down
2 changes: 1 addition & 1 deletion examples/official-storybook/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
"paths.macro": "^2.0.2",
"prop-types": "^15.7.2",
"react": "^16.8.4",
"react-dom": "^16.8.3",
"react-dom": "^16.8.4",
"storybook-chromatic": "^1.2.6",
"ts-loader": "^5.3.3",
"uuid": "^3.3.2",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8388,6 +8388,7 @@ exports[`Storyshots UI|Sidebar/Sidebar loading 1`] = `
<a
class="emotion-1"
href="./"
target=""
>
<svg
class="emotion-0"
Expand Down Expand Up @@ -9813,6 +9814,7 @@ exports[`Storyshots UI|Sidebar/Sidebar simple 1`] = `
<a
class="emotion-1"
href="./"
target=""
>
<svg
class="emotion-0"
Expand Down Expand Up @@ -10393,6 +10395,7 @@ exports[`Storyshots UI|Sidebar/SidebarHeading customBrandImage 1`] = `
<a
class="emotion-1"
href="https://example.com"
target="_blank"
>
<img
alt="My Title"
Expand Down Expand Up @@ -10693,6 +10696,7 @@ exports[`Storyshots UI|Sidebar/SidebarHeading linkAndText 1`] = `
<a
class="emotion-0"
href="https://example.com"
target="_blank"
>
My title
</a>
Expand Down Expand Up @@ -11300,6 +11304,7 @@ exports[`Storyshots UI|Sidebar/SidebarHeading menuHighlighted 1`] = `
<a
class="emotion-1"
href="./"
target=""
>
<svg
class="emotion-0"
Expand Down Expand Up @@ -11930,6 +11935,7 @@ exports[`Storyshots UI|Sidebar/SidebarHeading standard 1`] = `
<a
class="emotion-1"
href="./"
target=""
>
<svg
class="emotion-0"
Expand Down
2 changes: 1 addition & 1 deletion lib/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"polished": "^3.0.0",
"prop-types": "^15.7.2",
"react": "^16.8.4",
"react-dom": "^16.8.3",
"react-dom": "^16.8.4",
"react-focus-lock": "^1.18.3",
"react-helmet-async": "^0.2.0",
"react-popper-tooltip": "^2.8.0",
Expand Down
2 changes: 1 addition & 1 deletion lib/ui/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"prop-types": "^15.7.2",
"qs": "^6.6.0",
"react": "^16.8.4",
"react-dom": "^16.8.3",
"react-dom": "^16.8.4",
"react-draggable": "^3.1.1",
"react-helmet-async": "^0.2.0",
"react-hotkeys": "2.0.0-pre4",
Expand Down
11 changes: 8 additions & 3 deletions lib/ui/src/components/sidebar/SidebarHeading.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,13 @@ const Head = styled.div({
});

const Brand = withTheme(({ theme: { brand: { title = 'Storybook', url = './', image } } }) => {
const targetValue = url === './' ? '' : '_blank';
if (image === undefined && url === null) {
return <Logo alt={title} />;
}
if (image === undefined && url) {
return (
<LogoLink href={url}>
<LogoLink href={url} target={targetValue}>
<Logo alt={title} />
</LogoLink>
);
Expand All @@ -79,14 +80,18 @@ const Brand = withTheme(({ theme: { brand: { title = 'Storybook', url = './', im
return title;
}
if (image === null && url) {
return <LogoLink href={url}>{title}</LogoLink>;
return (
<LogoLink href={url} target={targetValue}>
{title}
</LogoLink>
);
}
if (image && url === null) {
return <Img src={image} alt={title} />;
}
if (image && url) {
return (
<LogoLink href={url}>
<LogoLink href={url} target={targetValue}>
<Img src={image} alt={title} />
</LogoLink>
);
Expand Down
6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,7 @@
"eslint-config-airbnb": "^17.0.0",
"eslint-config-prettier": "^4.0.0",
"eslint-plugin-import": "^2.16.0",
"eslint-plugin-jest": "^22.3.0",
"eslint-plugin-jest": "^22.3.2",
"eslint-plugin-json": "^1.4.0",
"eslint-plugin-jsx-a11y": "^6.2.1",
"eslint-plugin-prettier": "^3.0.1",
Expand All @@ -138,7 +138,7 @@
"jest-config": "^24.0.0",
"jest-diff": "^24.0.0",
"jest-emotion": "^10.0.7",
"jest-environment-jsdom": "^24.0.0",
"jest-environment-jsdom": "^24.5.0",
"jest-enzyme": "^7.0.0",
"jest-image-snapshot": "^2.6.0",
"jest-jasmine2": "^24.1.0",
Expand All @@ -154,7 +154,7 @@
"prettier": "^1.16.4",
"raf": "^3.4.0",
"react": "^16.8.4",
"react-dom": "^16.8.3",
"react-dom": "^16.8.4",
"react-test-renderer": "^16.8.4",
"regenerator-runtime": "^0.12.1",
"remark-cli": "^6.0.1",
Expand Down
Loading

0 comments on commit 11e8a43

Please sign in to comment.