Skip to content

Commit 1659a82

Browse files
committed
Update Import.tsx
1 parent 560b869 commit 1659a82

File tree

1 file changed

+11
-29
lines changed

1 file changed

+11
-29
lines changed

.storybook/components/Import.tsx

Lines changed: 11 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,13 @@ interface FromPathPropTypes extends Pick<ImportStatementPropTypes, 'packageName'
2222
deepPath?: null | undefined | DeepPath;
2323
}
2424

25-
function FromPath({ packageName, deepPath }: FromPathPropTypes) {
25+
function FromPath({ packageName }: FromPathPropTypes) {
2626
return (
2727
<>
2828
<span style={{ color: 'rgb(0, 0, 136)', fontSize: '14px' }}>from</span>
2929
<span> </span>
30-
<span style={{ color: 'rgb(0, 136, 0)', fontSize: '14px' }}>
31-
{deepPath ? packageName.slice(0, -1) : packageName}
32-
{deepPath && deepPath.path}
33-
{deepPath && "'"}
34-
</span>
30+
<span style={{ color: 'rgb(0, 136, 0)', fontSize: '14px' }}>{packageName}</span>
3531
<span style={{ fontSize: '14px' }}>;</span>
36-
{deepPath && <br />}
3732
</>
3833
);
3934
}
@@ -44,8 +39,6 @@ export const ImportStatement = ({ moduleName, packageName, defaultImport }: Impo
4439
if (!moduleName) {
4540
return null;
4641
}
47-
const isCompat = packageName.includes('compat');
48-
const deepPath = isCompat ? { path: `/dist/components/${item}/index.js`, moduleName: item } : null;
4942

5043
return (
5144
<pre
@@ -62,27 +55,16 @@ export const ImportStatement = ({ moduleName, packageName, defaultImport }: Impo
6255
}}
6356
>
6457
<code style={{ whiteSpace: 'pre' }}>
65-
{!deepPath && <span style={{ color: 'rgb(0, 0, 136)', fontSize: '14px' }}>import</span>}
66-
{deepPath ? (
58+
<span style={{ color: 'rgb(0, 0, 136)', fontSize: '14px' }}>import</span>
59+
<span style={{ fontSize: '14px' }}>
60+
{!defaultImport && ' {'}
6761
<>
68-
<span style={{ color: 'rgb(0, 0, 136)', fontSize: '14px' }}>import</span>
69-
<span style={{ fontSize: '14px' }}>
70-
{' '}
71-
{'{'}&nbsp;{deepPath.moduleName}&nbsp;{'}'}{' '}
72-
</span>
73-
<FromPath packageName={packageName} deepPath={deepPath} />
62+
&nbsp;&nbsp;
63+
{moduleName}{' '}
7464
</>
75-
) : (
76-
<span style={{ fontSize: '14px' }}>
77-
{!defaultImport && ' {'}
78-
<>
79-
&nbsp;&nbsp;
80-
{moduleName}{' '}
81-
</>
82-
{!defaultImport && '} '}
83-
</span>
84-
)}
85-
{!deepPath && <FromPath packageName={packageName} />}
65+
{!defaultImport && '} '}
66+
</span>
67+
<FromPath packageName={packageName} />
8668
</code>
8769
</pre>
8870
);
@@ -106,7 +88,7 @@ export const Import = (props: ImportProps) => {
10688
return (
10789
<ImportStatement
10890
moduleName={moduleName}
109-
packageName={`'@ui5/webcomponents-react${isChart ? '-charts' : isCompat ? '-compat' : ''}'/${moduleName}`}
91+
packageName={`'@ui5/webcomponents-react${isChart ? '-charts' : isCompat ? '-compat' : ''}/${moduleName}'`}
11092
/>
11193
);
11294
};

0 commit comments

Comments
 (0)