GitHub/storybook
1
0
Fork 0
mirror of https://github.com/storybookjs/storybook.git synced 2025-04-06 23:51:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Removed unnecessary function; updated marked dependencies

Browse Source
This commit is contained in:
Kai Röder 2018-12-06 23:08:14 +01:00
parent 5e84f3bd8f
commit 852973f03f
4 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/notes/package.json
View File

@ -28,10 +28,10 @@
"dependencies": { "dependencies": {
"@emotion/styled": "^0.10.6", "@emotion/styled": "^0.10.6",
"@storybook/addons": "4.1.0-alpha.1", "@storybook/addons": "4.1.0-alpha.1",
"marked": "^0.5.1" "marked": "^0.5.2"
}, },
"devDependencies": { "devDependencies": {
"@types/marked": "^0.4.2" "@types/marked": "^0.5.0"
}, },
"peerDependencies": { "peerDependencies": {
"react": "*" "react": "*"

8
addons/notes/src/addon.ts
View File

@ -1,11 +1,5 @@
import addons, { makeDecorator } from '@storybook/addons'; import addons, { makeDecorator } from '@storybook/addons';
import { MarkedOptions, parse as marked } from 'marked'; import { parse as renderMarkdown } from 'marked';
// todo why not just calling marked directly instead of wrapping it?
// todo removed { marked.defaults, options } merge. I believe this was not necessary, have to check
function renderMarkdown(text: string, options?: MarkedOptions) {
return marked(text, options);
}
export const withNotes = makeDecorator({ export const withNotes = makeDecorator({
name: 'withNotes', name: 'withNotes',

14
addons/notes/src/register.tsx
View File

@ -23,6 +23,7 @@ interface NotesProps {
interface NotesState { interface NotesState {
text: string; text: string;
someDate: Date;
} }
const Panel = styled.div({ const Panel = styled.div({
@ -37,9 +38,9 @@ export class Notes extends React.Component<NotesProps, NotesState> {
stopListeningOnStory: any; // todo check correct definition stopListeningOnStory: any; // todo check correct definition
unmounted: any; // todo check correct definition unmounted: any; // todo check correct definition
constructor(...args: any) { constructor(args: any) {
super(args /* todo: This was ...args before, check if this was a bug */); super(args);
this.state = { text: '' }; this.state = { text: 'add', someDate: new Date() };
this.onAddNotes = this.onAddNotes.bind(this); this.onAddNotes = this.onAddNotes.bind(this);
} }
@ -74,9 +75,9 @@ export class Notes extends React.Component<NotesProps, NotesState> {
const { text } = this.state; const { text } = this.state;
const textAfterFormatted = text const textAfterFormatted = text
? text ? text
.trim() .trim()
.replace(/(<\S+.*>)\n/g, '$1') .replace(/(<\S+.*>)\n/g, '$1')
.replace(/\n/g, '<br />') .replace(/\n/g, '<br />')
: ''; : '';
return active ? ( return active ? (
@ -88,7 +89,6 @@ export class Notes extends React.Component<NotesProps, NotesState> {
} }
} }
addons.register('storybook/notes', api => { addons.register('storybook/notes', api => {
const channel = addons.getChannel(); const channel = addons.getChannel();
addons.addPanel('storybook/notes/panel', { addons.addPanel('storybook/notes/panel', {

16
yarn.lock
View File

@ -2017,10 +2017,10 @@
resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"
integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4= integrity sha1-7ihweulOEdK4J7y+UnC86n8+ce4=
"@types/marked@^0.4.2": "@types/marked@^0.5.0":
version "0.4.2" version "0.5.0"
resolved "https://registry.yarnpkg.com/@types/marked/-/marked-0.4.2.tgz#64a89e53ea37f61cc0f3ee1732c555c2dbf6452f" resolved "https://registry.yarnpkg.com/@types/marked/-/marked-0.5.0.tgz#4b91c66ee8cf0abb6938e02fdec207279959962e"
integrity sha512-cDB930/7MbzaGF6U3IwSQp6XBru8xWajF5PV2YZZeV8DyiliTuld11afVztGI9+yJZ29il5E+NpGA6ooV/Cjkg== integrity sha512-5uRumM3yeMj+JcvWGku/FRJJCmSWZczLd8FJf76a90YCltRHVpjF2gKHiL6U+pi4qyATn7HvxR0Mk7mDySwaOQ==
"@types/node@*", "@types/node@~10.12.1": "@types/node@*", "@types/node@~10.12.1":
version "10.12.1" version "10.12.1"
@ -14590,10 +14590,10 @@ marked@^0.3.12:
resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.19.tgz#5d47f709c4c9fc3c216b6d46127280f40b39d790" resolved "https://registry.yarnpkg.com/marked/-/marked-0.3.19.tgz#5d47f709c4c9fc3c216b6d46127280f40b39d790"
integrity sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg== integrity sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg==
marked@^0.5.1: marked@^0.5.2:
version "0.5.1" version "0.5.2"
resolved "https://registry.yarnpkg.com/marked/-/marked-0.5.1.tgz#062f43b88b02ee80901e8e8d8e6a620ddb3aa752" resolved "https://registry.yarnpkg.com/marked/-/marked-0.5.2.tgz#3efdb27b1fd0ecec4f5aba362bddcd18120e5ba9"
integrity sha512-iUkBZegCZou4AdwbKTwSW/lNDcz5OuRSl3qdcl31Ia0B2QPG0Jn+tKblh/9/eP9/6+4h27vpoh8wel/vQOV0vw== integrity sha512-fdZvBa7/vSQIZCi4uuwo2N3q+7jJURpMVCcbaX0S1Mg65WZ5ilXvC67MviJAsdjqqgD+CEq4RKo5AYGgINkVAA==
marko-loader@^1.3.3: marko-loader@^1.3.3:
version "1.3.3" version "1.3.3"