From 7fdcd7d4d1664d2f5e4553d62f2694f320ebee2b Mon Sep 17 00:00:00 2001 From: atanasster Date: Wed, 24 Jun 2020 14:10:41 -0400 Subject: [PATCH] chore: rename componentsLookup --- core/core/src/stories.ts | 2 +- core/store/src/serialization/load-store.ts | 2 +- core/store/src/serialization/smart-controls.ts | 4 ++-- ui/blocks/src/Search/Search.tsx | 2 +- ui/blocks/src/context/block/BlockDataContext.tsx | 8 ++++---- ui/blocks/src/test/storyStore.tsx | 4 ++-- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/core/core/src/stories.ts b/core/core/src/stories.ts index 76420a82c..375b6e2ef 100644 --- a/core/core/src/stories.ts +++ b/core/core/src/stories.ts @@ -217,7 +217,7 @@ export interface Document { * since multiple components of the same name can be used * example: ['Button']: 'c:/myapp/Button.tsx' */ - components: { + componentsLookup: { [name: string]: string; }; diff --git a/core/store/src/serialization/load-store.ts b/core/store/src/serialization/load-store.ts index ce4375834..cff9eef91 100644 --- a/core/store/src/serialization/load-store.ts +++ b/core/store/src/serialization/load-store.ts @@ -53,7 +53,7 @@ export const loadStoryStore = ( source, component, fileName, - components, + componentsLookup, package: docPackage, ...otherDocProps } = doc; diff --git a/core/store/src/serialization/smart-controls.ts b/core/store/src/serialization/smart-controls.ts index aa3a21c32..7386631a2 100644 --- a/core/store/src/serialization/smart-controls.ts +++ b/core/store/src/serialization/smart-controls.ts @@ -30,13 +30,13 @@ export const addSmartControls = ( let componentName = getComponentName(storyComponent); if ( !componentName || - (!components[doc.components[componentName]] && + (!components[doc.componentsLookup[componentName]] && typeof doc.component === 'string') ) { componentName = doc.component as string; } if (componentName) { - const component = components[doc.components[componentName]]; + const component = components[doc.componentsLookup[componentName]]; if (component?.info) { const newControls = controlsFromProps(component.info.props); diff --git a/ui/blocks/src/Search/Search.tsx b/ui/blocks/src/Search/Search.tsx index 34eec5e93..ea7a5a706 100644 --- a/ui/blocks/src/Search/Search.tsx +++ b/ui/blocks/src/Search/Search.tsx @@ -46,7 +46,7 @@ export const Search = () => { stories: page.stories ?.map(story => story.split('-').join(' ')) .join(' '), - component: Object.keys(page.components).join(' '), + component: Object.keys(page.componentsLookup).join(' '), }); }); }); diff --git a/ui/blocks/src/context/block/BlockDataContext.tsx b/ui/blocks/src/context/block/BlockDataContext.tsx index ac4d797f4..0cce49370 100644 --- a/ui/blocks/src/context/block/BlockDataContext.tsx +++ b/ui/blocks/src/context/block/BlockDataContext.tsx @@ -94,8 +94,8 @@ export const BlockDataContextProvider: React.FC = ({ const componentName = getComponentName(storyComponent); const component = - componentName && doc && doc.components[componentName] - ? store.components[doc.components[componentName]] + componentName && doc && doc.componentsLookup[componentName] + ? store.components[doc.componentsLookup[componentName]] : undefined; const docPackage = doc && doc.package ? store.packages[doc.package] : undefined; @@ -117,8 +117,8 @@ export const BlockDataContextProvider: React.FC = ({ const name = getComponentName(components[key]); const component = name && - doc?.components[name] && - store?.components[doc.components[name]]; + doc?.componentsLookup[name] && + store?.components[doc.componentsLookup[name]]; if (component) { return { ...acc, [key]: component }; } else { diff --git a/ui/blocks/src/test/storyStore.tsx b/ui/blocks/src/test/storyStore.tsx index 6248681a2..fe8bb6242 100644 --- a/ui/blocks/src/test/storyStore.tsx +++ b/ui/blocks/src/test/storyStore.tsx @@ -305,7 +305,7 @@ and a [link](https://google.com) date: new Date('2020-01-01'), dateModified: new Date('2020-03-31'), package: 'test-package', - components: { + componentsLookup: { ArrowButton: '/Users/atanasster/component-controls/core/instrument/test/fixtures/components/button-default-arrow-func.js', Button: @@ -324,7 +324,7 @@ and a [link](https://google.com) }, mdxStory: { title: 'MDX Story', - components: {}, + componentsLookup: {}, author: 'atanasster', MDXPage: () => , stories: ['mdx-story'],