From 2decf470d21a15729ae65a5a3775d98d54681419 Mon Sep 17 00:00:00 2001 From: j3rem1e Date: Thu, 1 Apr 2021 21:02:17 +0200 Subject: [PATCH] Revert "Svelte - Fix async loaders and docs" This reverts commit 5c1e2b458abda5e1740b83de1f2145b99fda86d6. --- addons/docs/src/frameworks/svelte/HOC.svelte | 9 +++--- .../src/frameworks/svelte/prepareForInline.ts | 32 +++++-------------- .../__snapshots__/loaders.stories.storyshot | 21 ------------ .../src/stories/loaders.stories.js | 16 ---------- 4 files changed, 12 insertions(+), 66 deletions(-) delete mode 100644 examples/svelte-kitchen-sink/src/stories/__snapshots__/loaders.stories.storyshot delete mode 100644 examples/svelte-kitchen-sink/src/stories/loaders.stories.js diff --git a/addons/docs/src/frameworks/svelte/HOC.svelte b/addons/docs/src/frameworks/svelte/HOC.svelte index 137494418c8..0b6c3618701 100644 --- a/addons/docs/src/frameworks/svelte/HOC.svelte +++ b/addons/docs/src/frameworks/svelte/HOC.svelte @@ -1,8 +1,7 @@ - + \ No newline at end of file diff --git a/addons/docs/src/frameworks/svelte/prepareForInline.ts b/addons/docs/src/frameworks/svelte/prepareForInline.ts index c0a0feb9f40..4d5b6640363 100644 --- a/addons/docs/src/frameworks/svelte/prepareForInline.ts +++ b/addons/docs/src/frameworks/svelte/prepareForInline.ts @@ -1,36 +1,20 @@ -import { StoryContext, StoryFn } from '@storybook/addons'; +import { StoryFn } from '@storybook/addons'; import React from 'react'; // @ts-ignore import HOC from './HOC.svelte'; -export const prepareForInline = (storyFn: StoryFn, context: StoryContext) => { +export const prepareForInline = (storyFn: StoryFn) => { const el = React.useRef(null); React.useEffect(() => { - let cancelled = false; - const { applyLoaders, unboundStoryFn } = context; - - let cpn: any; - - applyLoaders().then((storyContext: StoryContext) => { - if (!cancelled) { - cpn = new HOC({ - target: el.current, - props: { - storyContext, - unboundStoryFn, - }, - }); - } + const root = new HOC({ + target: el.current, + props: { + storyFn, + }, }); - - return () => { - cancelled = true; - if (cpn) { - cpn.$destroy(); - } - }; + return () => root.$destroy(); }); return React.createElement('div', { ref: el }); diff --git a/examples/svelte-kitchen-sink/src/stories/__snapshots__/loaders.stories.storyshot b/examples/svelte-kitchen-sink/src/stories/__snapshots__/loaders.stories.storyshot deleted file mode 100644 index 185a476aee8..00000000000 --- a/examples/svelte-kitchen-sink/src/stories/__snapshots__/loaders.stories.storyshot +++ /dev/null @@ -1,21 +0,0 @@ -// Jest Snapshot v1, https://goo.gl/fbAQLP - -exports[`Storyshots Async Loaders Async Loaders 1`] = ` -
- -
-`; diff --git a/examples/svelte-kitchen-sink/src/stories/loaders.stories.js b/examples/svelte-kitchen-sink/src/stories/loaders.stories.js deleted file mode 100644 index 0712d795aff..00000000000 --- a/examples/svelte-kitchen-sink/src/stories/loaders.stories.js +++ /dev/null @@ -1,16 +0,0 @@ -import Button from '../components/Button.svelte'; - -export default { - title: 'Async Loaders', - component: Button, -}; - -export const AsyncLoaders = (args, { loaded: { text } = {} }) => ({ - Component: Button, - props: { - ...args, - text, - }, -}); - -AsyncLoaders.loaders = [async () => ({ text: 'asynchronous value' })];