Skip to content

Commit 928b5f2

Browse files
committed
Merge branch 'addons+querry'
2 parents 1bc4630 + afc593c commit 928b5f2

File tree

8 files changed

+79
-9
lines changed

8 files changed

+79
-9
lines changed

.storybook/addons.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import '../setup/register';
1+
import '../setAddon/register';
22
import '@kadira/storybook-addon-knobs/register'
33
import '@kadira/storybook/addons';
4-
import '@kadira/storybook-addon-options/register';
4+
import '@kadira/storybook-addon-options/register';

.storybook/config.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
import * as storybook from '@kadira/storybook';
22
import { setOptions } from '@kadira/storybook-addon-options';
33
import infoAddon from '@kadira/react-storybook-addon-info';
4+
import querryAddon from '../setAddon';
45

56
storybook.setAddon(infoAddon);
7+
storybook.setAddon(querryAddon);
68

79
setOptions({
810
name: 'React Theming',

develop/stories/index.js

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ import { muiTheme } from 'storybook-addon-material-ui';
88
import { WithNotes } from '@kadira/storybook-addon-notes';
99
import { withKnobs, text, boolean, number } from '@kadira/storybook-addon-knobs';
1010

11-
//import decorator from '../../src/store/decorator';
12-
import { addonDecorator, globalDecorator } from '../../setup/';
13-
1411
import App from '../App';
1512
import Header from '../Header';
1613
import Intro from '../Intro';
@@ -29,7 +26,6 @@ reqThemes.keys().forEach((filename) => {
2926
* You can pass a single object or an array of themes
3027
*/
3128

32-
globalDecorator('Global decorator');
3329

3430
storiesOf('No decorator', module)
3531
.add('Example1', () => (
@@ -42,9 +38,10 @@ storiesOf('No decorator', module)
4238
<Button title="no decor 2" />
4339
</div>
4440
))
41+
.querry()
42+
4543

4644
storiesOf('Podda App1', module)
47-
.addDecorator(addonDecorator('Decor111'))
4845
.add('Example1', () => (
4946
<div className="example-component">
5047
<Button title="Example 1" />
@@ -57,7 +54,6 @@ storiesOf('Podda App1', module)
5754
));
5855

5956
storiesOf('Podda App2', module)
60-
.addDecorator(addonDecorator('Decor222'))
6157
.add('Example3', () => (
6258
<div className="example-component">
6359
<Button title="Example 3" />

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "storybook-adk",
3-
"version": "0.7.5",
3+
"version": "0.7.6",
44
"description": "React Storybook Addon Development Kit",
55
"main": "dist/index.js",
66
"scripts": {

setAddon/addon_querry.js

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
import React from 'react';
2+
import { initStore } from '../src';
3+
import { ENQ_ASK } from '../src/store/store';
4+
5+
import config from './config';
6+
7+
const storeEnv = initStore(config);
8+
const setupChannel = storeEnv.channelInit(ENQ_ASK, 'ad02');
9+
const stopChannel = setupChannel();
10+
console.log(storeEnv);
11+
const store = storeEnv.addonStore.getAll();
12+
console.log('store:', store);
13+
let querry = {
14+
chapter: 'undef',
15+
};
16+
const stopQuerySubscription = storeEnv.addonStore.watch('queryData', (data) => {
17+
// console.info('queryData in addon:', data)
18+
querry = data;
19+
});
20+
21+
const querryManager = {
22+
qIndex: 0,
23+
getInd() {
24+
return querryManager.qIndex++;
25+
},
26+
}
27+
28+
const addons = {
29+
querry() {
30+
console.log('store querry:', storeEnv.addonStore.getAll());
31+
this.add('querry addon', () => {
32+
console.log('store select:', storeEnv.addonStore.getAll());
33+
// storeEnv.addonStore.set('queryData', {chapter: 'lalala'});
34+
return (<div>
35+
It is a test querry addon: {`#${querry.chapter}`}
36+
</div>)
37+
})
38+
}
39+
}
40+
41+
export default addons;

setAddon/config.js

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
const ADDON_ID = 'querry';
2+
const config = {
3+
ADDON_ID,
4+
ADDON_TITLE: 'Q',
5+
PANEL_ID: `${ADDON_ID}/no_panels_here`,
6+
EVENT_ID_INIT: `${ADDON_ID}/q/init`,
7+
EVENT_ID_DATA: `${ADDON_ID}/q/data`,
8+
CSS_CLASS: 'addon-querry',
9+
};
10+
export default {
11+
initData: 'QQQ - this is init data',
12+
config,
13+
queryParams: {
14+
chapter: 'no',
15+
},
16+
};

setAddon/index.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
import querryAddon from './addon_querry';
2+
export default querryAddon ;

setAddon/register.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import { register } from '../src';
2+
import { ENQ_SEND } from '../src/store/store';
3+
//import addonApi from './api';
4+
import config from './config';
5+
//import defaultData from './defaultData';
6+
//import panelRoutes from './panelRoutes';
7+
8+
9+
register(config, (env) => {
10+
console.log(env);
11+
const setupChannel = env.channelInit(ENQ_SEND, 'qq01');
12+
const stopChannel = setupChannel();
13+
});

0 commit comments

Comments
 (0)