Skip to content

Commit 7d4580e

Browse files
authored
Merge branch 'master' into dependabot/npm_and_yarn/integration/ng16/babel/traverse-7.23.2
2 parents 33f2e5e + 52a8585 commit 7d4580e

File tree

120 files changed

+7616
-6358
lines changed

Some content is hidden

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

120 files changed

+7616
-6358
lines changed

.storybook/main.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@ module.exports = {
1010
backgrounds: false
1111
}
1212
},
13-
"@storybook/addon-a11y"
13+
"@storybook/addon-a11y",
14+
"@storybook/addon-storysource"
1415
],
1516
framework: {
1617
name: "@storybook/angular",

.storybook/preview.scss

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,14 @@ html {
66
@include styles.theme(styles.$white);
77
}
88

9+
.innerZoomElementWrapper {
10+
min-width: 55rem;
11+
}
12+
13+
.docblock-argstable {
14+
margin-bottom: 10rem;
15+
}
16+
917
/*
1018
* Story batch styling, we are wrapping the storybook decorator function to ensure
1119
* styles do not leak to other components

integration/ng14/package-lock.json

Lines changed: 8 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package-lock.json

Lines changed: 6774 additions & 5925 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,13 @@
8686
"@commitlint/cli": "17.0.3",
8787
"@commitlint/config-conventional": "17.0.3",
8888
"@compodoc/compodoc": "1.1.21",
89-
"@storybook/addon-a11y": "7.0.18",
90-
"@storybook/addon-actions": "7.0.18",
91-
"@storybook/addon-essentials": "7.0.18",
92-
"@storybook/addon-links": "7.0.18",
93-
"@storybook/angular": "7.0.18",
94-
"@storybook/theming": "7.0.18",
89+
"@storybook/addon-a11y": "7.6.7",
90+
"@storybook/addon-actions": "7.6.7",
91+
"@storybook/addon-essentials": "7.6.7",
92+
"@storybook/addon-links": "7.6.7",
93+
"@storybook/addon-storysource": "7.6.7",
94+
"@storybook/angular": "7.6.7",
95+
"@storybook/theming": "7.6.7",
9596
"@types/jasmine": "3.8.0",
9697
"@types/node": "12.20.55",
9798
"@types/resize-observer-browser": "^0.1.7",
@@ -126,7 +127,7 @@
126127
"sass": "1.57.0",
127128
"sass-loader": "13.2.0",
128129
"semantic-release": "17.2.3",
129-
"storybook": "7.0.18",
130+
"storybook": "7.6.7",
130131
"ts-helpers": "1.1.2",
131132
"tslint": "6.1.3",
132133
"typescript": "4.6.4",

src/accordion/accordion.component.ts

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,12 @@ import {
88
import { AccordionItem } from "./accordion-item.component";
99

1010
/**
11+
* Get started with importing the module:
12+
*
13+
* ```typescript
14+
* import { AccordionModule } from 'carbon-components-angular';
15+
* ```
16+
*
1117
* [See demo](../../?path=/story/components-accordion--basic)
1218
*/
1319
@Component({

src/accordion/accordion.stories.ts

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* tslint:disable variable-name */
22

3-
import { moduleMetadata, Meta, Story } from "@storybook/angular";
3+
import { moduleMetadata, Meta } from "@storybook/angular";
44
import { DocumentationModule } from "../documentation-component/documentation.module";
55
import { AccordionModule, Accordion } from "./";
66

@@ -10,10 +10,11 @@ export default {
1010
moduleMetadata({
1111
imports: [AccordionModule, DocumentationModule]
1212
})
13-
]
13+
],
14+
component: Accordion
1415
} as Meta;
1516

16-
const Template: Story<Accordion> = (args) => ({
17+
const Template = (args) => ({
1718
props: args,
1819
template: `
1920
<cds-accordion [align]="align" [size]="size">
@@ -51,7 +52,7 @@ Basic.argTypes = {
5152
selected: { action: "Selected" }
5253
};
5354

54-
const WithTitleTemplate: Story<Accordion> = (args) => ({
55+
const WithTitleTemplate = (args) => ({
5556
props: args,
5657
template: `
5758
<div style="width: 500px">
@@ -85,7 +86,7 @@ WithTitle.parameters = {
8586
}
8687
};
8788

88-
const WithSkeleton: Story<Accordion> = (args) => ({
89+
const WithSkeleton = (args) => ({
8990
props: args,
9091
template: `
9192
<div style="width: 500px">

src/breadcrumb/breadcrumb.component.ts

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,13 @@ import { I18n } from "carbon-components-angular/i18n";
1818
const MINIMUM_OVERFLOW_THRESHOLD = 4;
1919

2020
/**
21-
* [See demo](../../?path=/story/components-breadcrumb--basic)
21+
* Get started with importing the module:
22+
*
23+
* ```typescript
24+
* import { BreadcrumbModule } from 'carbon-components-angular';
25+
* ```
26+
*
27+
* [See demo](../../?path=/story/components-breadcrumb--basic)
2228
*/
2329
@Component({
2430
selector: "cds-breadcrumb, ibm-breadcrumb",

src/breadcrumb/breadcrumb.stories.ts

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/* tslint:disable variable-name */
22

3-
import { moduleMetadata, Meta, Story } from "@storybook/angular";
3+
import { moduleMetadata, Meta } from "@storybook/angular";
44
import {
55
BreadcrumbModule,
66
Breadcrumb,
@@ -30,22 +30,24 @@ export default {
3030
imports: [BreadcrumbModule]
3131
})
3232
],
33+
args: {
34+
noTrailingSlash: true,
35+
skeleton: false
36+
},
3337
argTypes: {
3438
noTrailingSlash: {
35-
type: "boolean",
36-
defaultValue: true
39+
type: "boolean"
3740
},
3841
skeleton: {
3942
type: "boolean",
40-
defaultValue: false,
4143
control: false
4244
}
4345
},
4446
component: Breadcrumb,
4547
subcomponents: { BreadcrumbItemComponent }
4648
} as Meta;
4749

48-
const Template: Story<Breadcrumb> = (args) => ({
50+
const Template = (args) => ({
4951
props: args,
5052
template: `
5153
<cds-breadcrumb [noTrailingSlash]="noTrailingSlash">
@@ -63,7 +65,7 @@ const Template: Story<Breadcrumb> = (args) => ({
6365
});
6466
export const Basic = Template.bind({});
6567

66-
const CurrentPageTemplate: Story<Breadcrumb> = (args) => ({
68+
const CurrentPageTemplate = (args) => ({
6769
props: args,
6870
template: `
6971
<cds-breadcrumb>
@@ -86,7 +88,7 @@ CurrentPage.parameters = {
8688
}
8789
};
8890

89-
const ModelTemplate: Story<Breadcrumb> = (args) => ({
91+
const ModelTemplate = (args) => ({
9092
props: {
9193
...args,
9294
createBreadcrumbItems
@@ -107,7 +109,7 @@ Model.args = {
107109
content: "breadcrumb"
108110
};
109111

110-
const ModelWTemplate: Story<Breadcrumb> = (args) => ({
112+
const ModelWTemplate = (args) => ({
111113
props: {
112114
...args,
113115
createBreadcrumbItems,
@@ -132,7 +134,7 @@ ModelWithTemplate.args = {
132134
content: "breadcrumb"
133135
};
134136

135-
const WithSkeleton: Story<Breadcrumb> = (args) => ({
137+
const WithSkeleton = (args) => ({
136138
props: args,
137139
template: `
138140
<cds-breadcrumb skeleton="true" [noTrailingSlash]="noTrailingSlash">

src/button/button-set.component.ts

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,14 @@
11
import { Component, HostBinding } from "@angular/core";
22

3+
/**
4+
* Get started with importing the module:
5+
*
6+
* ```typescript
7+
* import { ButtonModule } from 'carbon-components-angular';
8+
* ```
9+
*
10+
* [See demo](../../?path=/story/components-button-button-set--basic)
11+
*/
312
@Component({
413
selector: "cds-button-set, ibm-button-set",
514
template: "<ng-content></ng-content>"

0 commit comments

Comments
 (0)