Skip to content
This repository was archived by the owner on Oct 21, 2024. It is now read-only.

Commit c3d0c7b

Browse files
committed
Merge PR clauderic#506 - Update @storybook/react to version 5
2 parents 929fff4 + f4c66c3 commit c3d0c7b

File tree

9 files changed

+2967
-1857
lines changed

9 files changed

+2967
-1857
lines changed

.storybook/addons.js

Lines changed: 0 additions & 1 deletion
This file was deleted.

.storybook/config.js

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
1-
import {addDecorator, configure} from '@storybook/react';
2-
import {withOptions} from '@storybook/addon-options';
1+
import {addParameters, configure} from '@storybook/react';
2+
import theme from './theme';
33

4-
addDecorator(
5-
withOptions({
6-
name: 'React Sortable HOC',
7-
url: 'https://github.com/clauderic/react-sortable-hoc',
4+
addParameters({
5+
options: {
86
showAddonPanel: false,
9-
}),
10-
);
7+
theme,
8+
},
9+
});
1110

1211
function loadStories() {
1312
require('../src/.stories/index.js');

.storybook/manager-head.html

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<link
2+
href="https://fonts.googleapis.com/css?family=Roboto:400,500,700"
3+
rel="stylesheet"
4+
/>

.storybook/theme.js

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
import {create} from '@storybook/theming';
2+
3+
export default create({
4+
base: 'light',
5+
6+
colorSecondary: '#9276ff',
7+
8+
// UI
9+
appBg: 'white',
10+
appContentBg: '#f9f9f9',
11+
appBorderColor: 'grey',
12+
appBorderRadius: 4,
13+
14+
// Typography
15+
fontBase: '"Roboto", Helvetica Neue, Helvetica, Arial, sans-serif',
16+
fontCode: 'monospace',
17+
18+
// Text colors
19+
textColor: '#364149',
20+
textInverseColor: 'rgba(255,255,255,0.9)',
21+
22+
// Toolbar default and active colors
23+
barTextColor: '#FFF',
24+
barSelectedColor: '#FFF',
25+
barBg: '#9276ff',
26+
27+
// Form colors
28+
inputBg: 'white',
29+
inputBorder: '#efefef',
30+
inputTextColor: '#364149',
31+
inputBorderRadius: 0,
32+
33+
brandTitle: 'React Sortable HOC',
34+
brandUrl: 'https://github.com/clauderic/react-sortable-hoc',
35+
brandImage:
36+
'https://d12c9k59mfk1gc.cloudfront.net/items/1T3k3f1s0v3K283t2W1s/react-sortable-hoc.svg',
37+
});

CHANGELOG.md

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,30 @@
22

33
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
44

5+
<a name="1.7.1"></a>
6+
7+
## [1.7.1](https://github.com/clauderic/react-sortable-hoc/compare/v1.1.0...v1.7.1) (2019-03-06)
8+
9+
### Bug Fixes
10+
11+
- updated the behaviour of disabled elements ([bd3d041](https://github.com/clauderic/react-sortable-hoc/commit/bd3d041))
12+
13+
<a name="1.7.0"></a>
14+
15+
# [1.7.0](https://github.com/clauderic/react-sortable-hoc/compare/v1.1.0...v1.7.0) (2019-03-06)
16+
17+
### Bug Fixes
18+
19+
- updated the behaviour of disabled elements ([bd3d041](https://github.com/clauderic/react-sortable-hoc/commit/bd3d041))
20+
21+
<a name="1.6.1"></a>
22+
23+
## [1.6.1](https://github.com/clauderic/react-sortable-hoc/compare/v1.6.0...v1.6.1) (2019-02-11)
24+
25+
### Bug Fixes
26+
27+
- omit disableAutoscroll prop ([#502](https://github.com/clauderic/react-sortable-hoc/issues/502)) ([e994e73](https://github.com/clauderic/react-sortable-hoc/commit/e994e73))
28+
529
<a name="1.6.0"></a>
630

731
# [1.6.0](https://github.com/clauderic/react-sortable-hoc/compare/v1.5.3...v1.6.0) (2019-02-07)

package.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "react-sortable-hoc",
3-
"version": "0.9.20",
3+
"version": "0.9.21",
44
"description": "Set of higher-order components to turn any list into a sortable, touch-friendly, animated list",
55
"author": {
66
"name": "Clauderic Demers",
@@ -65,8 +65,9 @@
6565
"@babel/plugin-transform-runtime": "^7.2.0",
6666
"@babel/preset-env": "^7.2.3",
6767
"@babel/preset-react": "^7.0.0",
68-
"@storybook/addon-options": "^4.1.4",
69-
"@storybook/react": "^4.1.4",
68+
"@storybook/addon-options": "^5.0.1",
69+
"@storybook/react": "^5.0.1",
70+
"@storybook/theming": "^5.0.1",
7071
"autoprefixer": "^6.3.6",
7172
"babel-loader": "^8.0.5",
7273
"babel-plugin-transform-async-to-promises": "^0.8.4",
@@ -90,6 +91,7 @@
9091
"react-infinite": "^0.13.0",
9192
"react-tiny-virtual-list": "^2.0.1",
9293
"react-virtualized": "^9.2.2",
94+
"react-window": "^1.6.2",
9395
"rollup": "^1.0.0",
9496
"rollup-plugin-babel": "^4.2.0",
9597
"rollup-plugin-commonjs": "^9.2.0",

src/.stories/Storybook.scss

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@
5656
display: block;
5757
width: 18px;
5858
height: 18px;
59-
background-image: url('data:image/svg+xml;charset=utf-8,<svg xmlns="http://www.w3.org/2000/svg" width="50" height="50" viewBox="0 0 50 50"><path d="M 0 7.5 L 0 12.5 L 50 12.5 L 50 7.5 L 0 7.5 z M 0 22.5 L 0 27.5 L 50 27.5 L 50 22.5 L 0 22.5 z M 0 37.5 L 0 42.5 L 50 42.5 L 50 37.5 L 0 37.5 z" color="#000"></path></svg>');
60-
background-size: contain;
61-
background-repeat: no-repeat;
6259
opacity: 0.25;
6360
margin-right: 20px;
6461
cursor: row-resize;

0 commit comments

Comments
 (0)