Skip to content

Commit

Permalink
Merge branch 'master' into angular-modulemetadata-decorator
Browse files Browse the repository at this point in the history
  • Loading branch information
Hypnosphi authored Feb 19, 2018
2 parents 613b4cb + 4f545e8 commit 4f135ec
Show file tree
Hide file tree
Showing 5 changed files with 45 additions and 0 deletions.
16 changes: 16 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Storybook comes with a lot of [addons](https://storybook.js.org/addons/introduct
- [Supported Frameworks](#supported-frameworks)
- [Sub Projects](#sub-projects)
- [Addons](#addons)
- [Live Examples](#live-examples) 💪
- [Contributing](#contributing)
- [Development scripts](#development-scripts)
- [Backers](#backers)
Expand Down Expand Up @@ -91,6 +92,21 @@ For additional help, join us [in our Slack](https://now-examples-slackin-rrirkqo

See [Addon / Framework Support Table](ADDONS_SUPPORT.md)

## Live Examples

### 3.4.alpha
> Note, this is an Alpha version. Some of the features still might not be released
- [React Official](https://storybooks-official.netlify.com)
- [Vue](https://storybooks-vue.netlify.com/)
- [Angular](https://storybooks-angular.netlify.com/)
- [Polymer](https://storybooks-polymer.netlify.com/)

### 3.3
- [React Official](https://release-3-3--storybooks-official.netlify.com)
- [Vue](https://release-3-3--storybooks-vue.netlify.com/)
- [Angular](https://release-3-3--storybooks-angular.netlify.com/)

## Contributing

We welcome contributions to Storybook!
Expand Down
7 changes: 7 additions & 0 deletions addons/jest/src/components/Result.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,13 @@ const createSubgroup = (acc, item, i, list) => {

// on last iteration inject at detected injectionpoint, and group
if (i === list.length - 1) {
// Provide a "safety net" when Jest returns a partially recognized "group"
// (recognized by acc.startTrigger but acc.endTrigger was never found) and
// it's the only group in output for a test result. In that case, acc.list
// will be empty, so return whatever was found, even if it will be unstyled
// and prevent next createSubgroup calls from throwing due to empty lists.
acc.list.push(null);

return acc.list.reduce((eacc, el, ei) => {
switch (true) {
case acc.injectionPoint === 0 && ei === 0: {
Expand Down
1 change: 1 addition & 0 deletions docs/gatsby-config.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ module.exports = {
'/basics/exporting-storybook/',
'/basics/faq/',
'/basics/community/',
'/basics/live-examples/',
],
configurations: [
'/configurations/default-config/',
Expand Down
3 changes: 3 additions & 0 deletions docs/src/components/Homepage/MainLinks/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ class MainLinks extends React.Component {
<li>
<Link to="/basics/writing-stories/">Writing stories</Link>
</li>
<li>
<Link to="/basics/live-examples/">Live Examples</Link>
</li>
</ul>
</div>

Expand Down
18 changes: 18 additions & 0 deletions docs/src/pages/basics/live-examples/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
id: 'live-examples'
title: 'Live Examples'
---

### 3.4.alpha

> Note, this is an Alpha version. Some of the features still might not be released
- [React Official](https://storybooks-official.netlify.com)
- [Vue](https://storybooks-vue.netlify.com/)
- [Angular](https://storybooks-angular.netlify.com/)
- [Polymer](https://storybooks-polymer.netlify.com/)

### 3.3
- [React Official](https://release-3-3--storybooks-official.netlify.com)
- [Vue](https://release-3-3--storybooks-vue.netlify.com/)
- [Angular](https://release-3-3--storybooks-angular.netlify.com/)

0 comments on commit 4f135ec

Please sign in to comment.