Skip to content

Commit

Permalink
Merge branch 'master' into patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
ndelangen authored Apr 20, 2017
2 parents 1f2dae8 + 54bcb7e commit fdcdf61
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Storybook is a development environment for React UI components. It allows you to

Storybook runs outside of your app. This allows you to develop UI components in isolation, which can improve component reuse, testability, and development speed. You can build quickly without having to worry about application-specific dependencies.

Storybook comes with a lot of [addons](https://storybooks.js.org) for component design, documentation, testing, interactivity, and so on. Storybook's easy-to-use API makes it easy to configure and extend in various ways. It has even been extended to support React Native development for mobile.
Storybook comes with a lot of [addons](https://storybooks.js.org/docs/react-storybook/addons/introduction) for component design, documentation, testing, interactivity, and so on. Storybook's easy-to-use API makes it easy to configure and extend in various ways. It has even been extended to support React Native development for mobile.

## Getting Started

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import webpack from 'webpack';
import autoprefixer from 'autoprefixer';
import { includePaths } from '../utils';
import { includePaths, excludePaths } from '../utils';

// Add a default custom config which is similar to what React Create App does.
module.exports = storybookBaseConfig => {
Expand Down Expand Up @@ -57,12 +58,6 @@ module.exports = storybookBaseConfig => {
},
];

newConfig.postcss = () => [
autoprefixer({
browsers: ['>1%', 'last 4 versions', 'Firefox ESR', 'not ie < 9'],
}),
];

newConfig.resolve.alias = {
...storybookBaseConfig.resolve.alias,
// This is to support NPM2
Expand Down
1 change: 1 addition & 0 deletions packages/storybook-ui/src/modules/api/actions/api.js
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ export function ensureStory(storyKinds, selectedKind, selectedStory) {
const found = kindInfo.stories.find(item => item === selectedStory);
if (found) return found;

// if the selected story is non-existant, select the first story
return kindInfo.stories[0];
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ export function updateStore(queryParams, actions) {
...customQueryParams
} = queryParams;

if (selectedKind && selectedStory) {
if (selectedKind) {
actions.api.selectStory(selectedKind, selectedStory);
}

Expand Down

0 comments on commit fdcdf61

Please sign in to comment.