Skip to content

Commit 4806020

Browse files
author
Amber Febbraro
authored
Merge pull request #4069 from sparkdesignsystem/staging
Publish - 8-30-2021
2 parents 6668d13 + 473a5e6 commit 4806020

File tree

206 files changed

+24443
-21892
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

206 files changed

+24443
-21892
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# These owners will be the default owners for everything in
22
# the repo. Unless a later match takes precedence,
3-
# @afebbraro and @guern1kn will be requested for
3+
# @afebbraro will be requested for
44
# review when someone opens a pull request.
5-
* @afebbraro @guern1kn @yodasw16
5+
* @afebbraro @yodasw16

angular/.storybook/addons.js

Lines changed: 0 additions & 6 deletions
This file was deleted.

angular/.storybook/helpers/storyWrapper.js

Lines changed: 0 additions & 11 deletions
This file was deleted.

angular/.storybook/main.js

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
module.exports = {
2+
addons: [
3+
'@storybook/addon-docs',
4+
'@storybook/preset-scss',
5+
'@storybook/addon-a11y',
6+
'@storybook/addon-jest',
7+
'@storybook/addon-google-analytics',
8+
],
9+
stories: ['../projects/spark-angular/src/lib/**/*.stories.ts'],
10+
features: {
11+
postcss: false,
12+
},
13+
};

angular/.storybook/manager.js

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import { addons } from '@storybook/addons';
2+
import sparkTheme from '../../storybook-utilities/storybook-theming/storybook-spark-theme';
3+
4+
addons.setConfig({
5+
sidebar: {
6+
showRoots: true,
7+
},
8+
theme: sparkTheme,
9+
});
10+
11+
window.STORYBOOK_GA_ID = 'UA-113915182-1';
12+
window.STORYBOOK_REACT_GA_OPTIONS = {};

angular/.storybook/presets.js

Lines changed: 0 additions & 4 deletions
This file was deleted.
Lines changed: 49 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,100 +1,110 @@
11
import React from 'react';
2-
import { configure, addDecorator, addParameters } from '@storybook/angular';
3-
import { withA11y } from '@storybook/addon-a11y';
4-
import sparkTheme from "../../storybook-utilities/storybook-theming/storybook-spark-theme";
2+
import { addDecorator } from '@storybook/angular';
53
import '../src/polyfills';
64
import { withTests } from '@storybook/addon-jest';
75
import results from '../src/.jest-test-results.json';
86
import '!style-loader!css-loader!sass-loader!../../storybook-utilities/storybook-theming/font-loader.scss';
97
import '../../storybook-utilities/icon-utilities/icon-loader';
108
import { setCompodocJson, extractProps } from '@storybook/addon-docs/angular';
119
import docJson from '../documentation.json';
12-
import { DocsContainer } from '@storybook/addon-docs/blocks';
10+
import { DocsContainer } from '@storybook/addon-docs';
1311
import SprkTable from '../../react/src/base/tables/SprkTable';
1412
import { configClassModifierJsonProcessor } from '../../storybook-utilities/configClassModifierJsonProcessor';
1513
import AdditionalInputInfo from '../../storybook-utilities/components/AdditionalInputInfo';
14+
import sparkTheme from '../../storybook-utilities/storybook-theming/storybook-spark-theme';
1615

1716
const classModifierJSON = require('../../src/data/sass-modifiers.json');
1817

1918
setCompodocJson(docJson);
20-
addDecorator(withA11y);
2119
addDecorator(
2220
withTests({
2321
filesExt: '.spec.ts',
24-
results
25-
}
26-
));
27-
addParameters({
22+
results,
23+
}),
24+
);
25+
26+
export const parameters = {
27+
a11y: {
28+
element: '#root',
29+
config: {},
30+
options: {},
31+
manual: false,
32+
},
33+
viewMode: 'docs',
34+
previewTabs: { 'storybook/docs/panel': { index: -1 } },
2835
options: {
29-
theme: sparkTheme,
30-
showRoots: true,
3136
storySort: (a, b) =>
32-
a[1].kind === b[1].kind ? 0 : a[1].id.localeCompare(b[1].id, { numeric: true }),
37+
a[1].kind === b[1].kind
38+
? 0
39+
: a[1].id.localeCompare(b[1].id, { numeric: true }),
3340
},
34-
});
35-
36-
addParameters({
3741
docs: {
38-
extractComponentDescription: (component, { info }) => {
39-
if (info) {
40-
return typeof info === 'string' ? info : info.markdown || info.text;
41-
}
42-
return null;
42+
source: {
43+
type: 'code',
4344
},
45+
inlineStories: true,
46+
theme: sparkTheme,
4447
container: ({ children, context }) => {
4548
const componentName = context.kind.split('/')[1];
46-
const isInputStory = (componentName === 'Input');
47-
const processedJson = configClassModifierJsonProcessor(classModifierJSON, componentName);
49+
const isInputStory = componentName === 'Input';
50+
const processedJson = configClassModifierJsonProcessor(
51+
classModifierJSON,
52+
componentName,
53+
);
4854
if (processedJson) {
4955
return (
5056
<DocsContainer context={context}>
5157
<div>
5258
{children}
5359

54-
{isInputStory &&
60+
{isInputStory && (
5561
<AdditionalInputInfo
56-
additionalHeaderClasses='sprk-u-mbm'
57-
additionalListClasses='sprk-u-mbm'
62+
additionalHeaderClasses="sprk-u-mbm"
63+
additionalListClasses="sprk-u-mbm"
5864
/>
59-
}
65+
)}
6066

61-
<h4 className="sprk-u-mbm" id="class-modifiers">Class Modifiers for {componentName}</h4>
67+
<h4 className="sprk-u-mbm" id="class-modifiers">
68+
Class Modifiers for {componentName}
69+
</h4>
6270
<SprkTable
6371
additionalTableClasses="sprk-b-Table--spacing-medium sprk-b-Table--secondary sprk-b-Table--striped"
64-
columns = {[
72+
columns={[
6573
{
6674
name: 'selector',
67-
header: 'Class'
75+
header: 'Class',
6876
},
6977
{
7078
name: 'description',
71-
header: 'Description'
79+
header: 'Description',
7280
},
7381
]}
74-
rows = {processedJson}
82+
rows={processedJson}
7583
/>
7684
</div>
7785
</DocsContainer>
78-
)
86+
);
7987
} else {
8088
return (
8189
<DocsContainer context={context}>
8290
<div>
8391
{children}
8492

85-
{isInputStory &&
93+
{isInputStory && (
8694
<AdditionalInputInfo
87-
additionalHeaderClasses='sprk-u-mbm'
88-
additionalListClasses='sprk-u-mbm'
95+
additionalHeaderClasses="sprk-u-mbm"
96+
additionalListClasses="sprk-u-mbm"
8997
/>
90-
}
98+
)}
9199
</div>
92100
</DocsContainer>
93-
)
101+
);
94102
}
95103
},
96104
extractProps,
97105
},
98-
});
106+
};
99107

100-
configure(require.context('../projects/spark-angular/src/lib', true, /\.stories\.(js|ts|tsx|mdx)$/), module);
108+
// TODO: Watch this issue for an update for bug fix
109+
// that prevents first load going to doc page
110+
// https://github.com/storybookjs/storybook/issues/13128

0 commit comments

Comments
 (0)