Skip to content

Commit 8415b4c

Browse files
stanislavgeorgievstanislavgeorgiev
authored
Merge branch 'master' into issue-2479
2 parents 9a71739 + a373a30 commit 8415b4c

File tree

17 files changed

+112
-119
lines changed

17 files changed

+112
-119
lines changed

‎src/accordion/accordion.stories.ts‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,14 @@ storiesOf("Components|Accordion", module)
1717
.addDecorator(withKnobs)
1818
.add("Basic", () => ({
1919
template: `
20-
<a href="https://builder.carbondesignsystem.com/from-json/%7B%22title%22%3A%22Accordion%22&#13;
21-
%2C%22data%22%3A%7B%22items%22%3A%5B%7B%22type%22%3A%22accordion%22%2C%22align%22%3A%22&#13;
22-
end%22%2C%22size%22%3A%22md%22%2C%22items%22%3A%5B%7B%22type%22%3A%22accordion-item%22&#13;
23-
%2C%22title%22%3A%22Accordion%20item%22%2C%22items%22%3A%5B%5D%2C%22id%22%3A%223%22%2C&#13;
24-
%22codeContext%22%3A%7B%22name%22%3A%22accordion-item-3%22%7D%7D%5D%2C%22id%22%3A%222%&#13;
25-
22%2C%22codeContext%22%3A%7B%22name%22%3A%22accordion-2%22%7D%7D%5D%2C%22id%22%3A1%7D&#13;
26-
%2C%22allCssClasses%22%3A%5B%5D%7D" target="_blank">
20+
<a href="https://builder.carbondesignsystem.com/from-json/%7B%22title%22%&#13;
21+
3A%22AccordionFragment%22%2C%22data%22%3A%7B%22items%22%3A%5B%7B%22type%&#13;
22+
22%3A%22accordion%22%2C%22align%22%3A%22end%22%2C%22size%22%3A%22md%22%&#13;
23+
2C%22items%22%3A%5B%7B%22type%22%3A%22accordion-item%22%2C%22title%22%&#13;
24+
3A%22Accordion%20item%22%2C%22items%22%3A%5B%5D%2C%22id%22%3A%223%22%2C%&#13;
25+
22codeContext%22%3A%7B%22name%22%3A%22accordion-item-3%22%7D%7D%5D%2C%22id&#13;
26+
%22%3A%222%22%2C%22codeContext%22%3A%7B%22name%22%3A%22accordion-2%22&#13;
27+
%7D%7D%5D%2C%22id%22%3A1%7D%2C%22allCssClasses%22%3A%5B%5D%7D" target="_blank">
2728
Edit on Carbon UI Builder
2829
</a>
2930
<br><br>

‎src/breadcrumb/breadcrumb.stories.ts‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,14 @@ storiesOf("Components|Breadcrumb", module)
3333
.addDecorator(withKnobs)
3434
.add("Basic", () => ({
3535
template: `
36-
<a href="https://builder.carbondesignsystem.com/from-json/%7B%22title%22%3A%22&#13;
37-
Breadcrumb%22%2C%22data%22%3A%7B%22items%22%3A%5B%7B%22type%22%3A%22&#13;
38-
breadcrumb%22%2C%22noTrailingSlash%22%3Afalse%2C%22items%22%3A%5B%7B%22type%22%3A%22&#13;
39-
breadcrumb-item%22%2C%22label%22%3A%22Breadcrumb%201%22%2C%22href%22%3A%22%2F%22&#13;
40-
%2C%22id%22%3A%223%22%2C%22codeContext%22%3A%7B%22name%22%3A%22breadcrumb-item-3%22&#13;
41-
%7D%7D%2C%7B%22type%22%3A%22breadcrumb-item%22%2C%22label%22%3A%22Breadcrumb%202%22&#13;
42-
%2C%22href%22%3A%22%2F%22%2C%22id%22%3A%224%22%2C%22codeContext%22%3A%7B%22name%22&#13;
43-
%3A%22breadcrumb-item-4%22%7D%7D%2C%7B%22type%22%3A%22breadcrumb-item%22%2C%22&#13;
44-
label%22%3A%22Breadcrumb%203%22%2C%22href%22%3A%22%2F%22%2C%22id%22%3A%225%22&#13;
45-
%2C%22codeContext%22%3A%7B%22name%22%3A%22breadcrumb-item-5%22%7D%7D%5D%2C%22&#13;
46-
id%22%3A%222%22%2C%22codeContext%22%3A%7B%22name%22%3A%22breadcrumb-2%22&#13;
47-
%7D%7D%5D%2C%22id%22%3A1%7D%2C%22allCssClasses%22%3A%5B%5D%7D" target="_blank">
36+
<a href="https://builder.carbondesignsystem.com/from-json/%7B%22title%22&#13;
37+
%3A%22BreadcrumbFragment%22%2C%22data%22%3A%7B%22items%22%3A%5B%7B%22type&#13;
38+
%22%3A%22breadcrumb%22%2C%22noTrailingSlash%22%3Afalse%2C%22items%22%3A%5B%&#13;
39+
7B%22type%22%3A%22breadcrumb-item%22%2C%22label%22%3A%22Breadcrumb%22%2C%22&#13;
40+
href%22%3A%22%2F%22%2C%22id%22%3A%223%22%2C%22codeContext%22%3A%7B%22name%22&#13;
41+
%3A%22breadcrumb-item-3%22%7D%7D%5D%2C%22id%22%3A%222%22%2C%22codeContext%22&#13;
42+
%3A%7B%22name%22%3A%22breadcrumb-2%22%7D%7D%5D%2C%22id%22%3A1%7D%2C%22allCssClasses&#13;
43+
%22%3A%5B%5D%7D" target="_blank">
4844
Edit on Carbon UI Builder
4945
</a>
5046
<br><br>

‎src/button/button.stories.ts‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@ storiesOf("Components|Button", module)
1919
.addDecorator(withKnobs)
2020
.add("Basic", () => ({
2121
template: `
22-
<a href="https://builder.carbondesignsystem.com/from-json/%7B%22title%22&#13;
23-
%3A%22Button%22%2C%22data%22%3A%7B%22items%22%3A%5B%7B%22type%22%3A%22&#13;
24-
button%22%2C%22kind%22%3A%22primary%22%2C%22text%22%3A%22Button%22%2C%22&#13;
25-
size%22%3A%22%22%2C%22id%22%3A%222%22%2C%22codeContext%22%3A%7B%22name%22&#13;
26-
%3A%22button-2%22%7D%7D%5D%2C%22id%22%3A1%7D%2C%22allCssClasses%22%3A%5B%5D%7D" target="_blank">
22+
<a href="https://builder.carbondesignsystem.com/from-json/%7B%22&#13;
23+
title%22%3A%22ButtonFragment%22%2C%22data%22%3A%7B%22items%22%3A&#13;
24+
%5B%7B%22type%22%3A%22button%22%2C%22kind%22%3A%22primary%22%2C&#13;
25+
%22text%22%3A%22Button%22%2C%22size%22%3A%22%22%2C%22id%22%3A%222%22&#13;
26+
%2C%22codeContext%22%3A%7B%22name%22%3A%22button-2%22%7D%7D%5D%2C%22&#13;
27+
id%22%3A1%7D%2C%22allCssClasses%22%3A%5B%5D%7D" target="_blank">
2728
Edit on Carbon UI Builder
2829
</a>
2930
<br><br>

‎src/checkbox/checkbox.stories.ts‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ storiesOf("Components|Checkbox", module).addDecorator(
6060
.addDecorator(withKnobs)
6161
.add("Basic", () => ({
6262
template: `
63-
<a href="https://builder.carbondesignsystem.com/from-json/%7B%22title%22%3A%22&#13;
64-
Checkbox%22%2C%22data%22%3A%7B%22items%22%3A%5B%7B%22type%22%3A%22checkbox%22&#13;
65-
%2C%22label%22%3A%22Checkbox%22%2C%22id%22%3A%222%22%2C%22codeContext%22&#13;
66-
%3A%7B%22name%22%3A%22checkbox-2%22%7D%7D%5D%2C%22id%22%3A1%7D%2C%22&#13;
63+
<a href="https://builder.carbondesignsystem.com/from-json/%7B%22title%22&#13;
64+
%3A%22CheckboxFragment%22%2C%22data%22%3A%7B%22items%22%3A%5B%7B%22type%22&#13;
65+
%3A%22checkbox%22%2C%22label%22%3A%22Checkbox%22%2C%22id%22%3A%222%22%2C%22&#13;
66+
codeContext%22%3A%7B%22name%22%3A%22checkbox-2%22%7D%7D%5D%2C%22id%22%3A1%7D%2C%22&#13;
6767
allCssClasses%22%3A%5B%5D%7D" target="_blank">
6868
Edit on Carbon UI Builder
6969
</a>

‎src/code-snippet/code-snippet.stories.ts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -67,13 +67,11 @@ storiesOf("Components|Code Snippet", module).addDecorator(
6767
.addDecorator(withKnobs)
6868
.add("Basic", () => ({
6969
template: `
70-
<a href="https://builder.carbondesignsystem.com/from-json/%7B%22title%22%3A%22&#13;
71-
Code%20snippet%22%2C%22data%22%3A%7B%22items%22%3A%5B%7B%22type%22%3A%22&#13;
72-
code-snippet%22%2C%22variant%22%3A%22single%22%2C%22code%22%3A%22import&#13;
73-
%20%7B%20UIShellModule%20%7D%20from%20%27carbon-components-angular%27%3B%20&#13;
74-
%2F%2F%20Single%20line%20of%20code%22%2C%22id%22%3A%222%22%2C%22codeContext&#13;
75-
%22%3A%7B%22name%22%3A%22code-snippet-2%22%7D%7D%5D%2C%22id%22&#13;
76-
%3A1%7D%2C%22allCssClasses%22%3A%5B%5D%7D" target="_blank">
70+
<a href="https://builder.carbondesignsystem.com/from-json/%7B%22title%22&#13;
71+
%3A%22CodeSnippetFragment%22%2C%22data%22%3A%7B%22items%22%3A%5B%7B%22&#13;
72+
type%22%3A%22code-snippet%22%2C%22variant%22%3A%22single%22%2C%22code%22&#13;
73+
%3A%22%22%2C%22id%22%3A%222%22%2C%22codeContext%22%3A%7B%22name%22%3A%22&#13;
74+
code-snippet-2%22%7D%7D%5D%2C%22id%22%3A1%7D%2C%22allCssClasses%22%3A%5B%5D%7D" target="_blank">
7775
Edit on Carbon UI Builder
7876
</a>
7977
<br><br>

‎src/content-switcher/content-switcher.stories.ts‎

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,18 @@ storiesOf("Components|Content Switcher", module)
1818
.add("Basic", () => ({
1919
template: `
2020
<a href="https://builder.carbondesignsystem.com/from-json/%7B%22title%22&#13;
21-
%3A%22Content%20switcher%22%2C%22data%22%3A%7B%22items%22%3A%5B%7B%22&#13;
22-
type%22%3A%22content-switcher%22%2C%22size%22%3A%22sm%22%2C%22&#13;
23-
selectedIndex%22%3A0%2C%22items%22%3A%5B%7B%22name%22%3A%22&#13;
24-
first%22%2C%22text%22%3A%22First%20section%22%2C%22disabled%22%3Afalse%2C%22&#13;
25-
type%22%3A%22switch-item%22%2C%22id%22%3A%223%22%2C%22codeContext%22%3A%7B%22&#13;
26-
name%22%3A%22switch-item-3%22%7D%7D%2C%7B%22name%22%3A%22second%22%2C%22text%22&#13;
27-
%3A%22Second%20section%22%2C%22disabled%22%3Afalse%2C%22type%22%3A%22&#13;
28-
switch-item%22%2C%22id%22%3A%224%22%2C%22codeContext%22%3A%7B%22name%22%3A%22&#13;
29-
switch-item-4%22%7D%7D%2C%7B%22name%22%3A%22third%22%2C%22text%22%3A%22Third%20&#13;
21+
%3A%22ContentSwitcherFragment%22%2C%22data%22%3A%7B%22items%22%3A%5B%7B%22&#13;
22+
type%22%3A%22content-switcher%22%2C%22size%22%3A%22sm%22%2C%22selectedIndex%22&#13;
23+
%3A0%2C%22items%22%3A%5B%7B%22name%22%3A%22first%22%2C%22text%22%3A%22First%20&#13;
3024
section%22%2C%22disabled%22%3Afalse%2C%22type%22%3A%22switch-item%22%2C%22id%22&#13;
31-
%3A%225%22%2C%22codeContext%22%3A%7B%22name%22%3A%22switch-item-5%22%7D%7D%5D%2C&#13;
32-
%22id%22%3A%222%22%2C%22codeContext%22%3A%7B%22name%22%3A%22content-switcher-2%22&#13;
33-
%7D%2C%22cssClasses%22%3A%5B%5D%7D%5D%2C%22id%22%3A1%7D%2C%22cssClasses%22&#13;
34-
%3A%5B%5D%2C%22allCssClasses%22%3A%5B%5D%7D" target="_blank">
25+
%3A%223%22%2C%22codeContext%22%3A%7B%22name%22%3A%22switch-item-3%22%7D%7D%2C%7B%22&#13;
26+
name%22%3A%22second%22%2C%22text%22%3A%22Second%20section%22%2C%22disabled%22&#13;
27+
%3Afalse%2C%22type%22%3A%22switch-item%22%2C%22id%22%3A%224%22%2C%22codeContext%22&#13;
28+
%3A%7B%22name%22%3A%22switch-item-4%22%7D%7D%2C%7B%22name%22%3A%22third%22%2C%22text%22&#13;
29+
%3A%22Third%20section%22%2C%22disabled%22%3Afalse%2C%22type%22%3A%22switch-item%22&#13;
30+
%2C%22id%22%3A%225%22%2C%22codeContext%22%3A%7B%22name%22%3A%22switch-item-5%22&#13;
31+
%7D%7D%5D%2C%22id%22%3A%222%22%2C%22codeContext%22%3A%7B%22name%22%3A%22content-switcher-2%22&#13;
32+
%7D%7D%5D%2C%22id%22%3A1%7D%2C%22allCssClasses%22%3A%5B%5D%7D" target="_blank">
3533
Edit on Carbon UI Builder
3634
</a>
3735
<br><br>

‎src/dialog/dialog.directive.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ export class DialogDirective implements OnInit, OnDestroy, OnChanges {
155155
if (changes.isOpen) {
156156
if (changes.isOpen.currentValue) {
157157
this.open();
158-
} else {
158+
} else if (!changes.isOpen.firstChange) {
159159
this.close({
160160
reason: CloseReasons.programmatic
161161
});

‎src/dropdown/dropdown.stories.ts‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -178,15 +178,14 @@ storiesOf("Components|Dropdown", module)
178178
.addDecorator(withKnobs)
179179
.add("Basic", () => ({
180180
template: `
181-
<a href="https://builder.carbondesignsystem.com/from-json/%7B%22title%22&#13;
182-
%3A%22Dropdown%22%2C%22data%22%3A%7B%22items%22%3A%5B%7B%22type%22%3A%22&#13;
183-
dropdown%22%2C%22placeholder%22%3A%22placeholder%22%2C%22isMulti%22%3A&#13;
184-
false%2C%22isInline%22%3Afalse%2C%22selectionFeedback%22%3A%22top-after-reopen&#13;
185-
%22%2C%22direction%22%3A%22bottom%22%2C%22size%22%3A%22md%22%2C%22label%22%3A%22&#13;
186-
Label%22%2C%22helperText%22%3A%22Optional%20helper%20text%22%2C%22listItems%22&#13;
187-
%3A%5B%7B%22text%22%3A%22Text%22%7D%5D%2C%22id%22%3A%223%22%2C%22codeContext%22&#13;
188-
%3A%7B%22name%22%3A%22dropdown-3%22%7D%7D%5D%2C%22id%22%3A1%7D%2C%22&#13;
189-
allCssClasses%22%3A%5B%5D%7D" target="_blank">
181+
<a href="https://builder.carbondesignsystem.com/from-json/%7B%22title%22%3A%22&#13;
182+
DropdownFragment%22%2C%22data%22%3A%7B%22items%22%3A%5B%7B%22type%22%3A%22dropdown&#13;
183+
%22%2C%22placeholder%22%3A%22placeholder%22%2C%22isMulti%22%3Afalse%2C%22isInline&#13;
184+
%22%3Afalse%2C%22selectionFeedback%22%3A%22top-after-reopen%22%2C%22direction%22&#13;
185+
%3A%22bottom%22%2C%22size%22%3A%22md%22%2C%22label%22%3A%22Label%22%2C%22helperText&#13;
186+
%22%3A%22Optional%20helper%20text%22%2C%22listItems%22%3A%5B%7B%22text%22%3A%22Text&#13;
187+
%22%7D%5D%2C%22id%22%3A%222%22%2C%22codeContext%22%3A%7B%22name%22%3A%22dropdown-2&#13;
188+
%22%7D%7D%5D%2C%22id%22%3A1%7D%2C%22allCssClasses%22%3A%5B%5D%7D" target="_blank">
190189
Edit on Carbon UI Builder
191190
</a>
192191
<br><br>

‎src/grid/grid.stories.ts‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,20 @@ storiesOf("Components|Grid", module)
1414
.addDecorator(withKnobs)
1515
.add("Basic", () => ({
1616
template: `
17-
<a href="https://builder.carbondesignsystem.com/from-json/%7B%22title%22%3A%22Grid%22%2C%22data%22&#13;
18-
%3A%7B%22items%22%3A%5B%7B%22type%22%3A%22grid%22%2C%22outline%22%3Atrue%2C%22items%22%3A%5B%7B%22&#13;
19-
type%22%3A%22row%22%2C%22items%22%3A%5B%7B%22type%22%3A%22column%22%2C%22items%22%3A%5B%5D%2C%22id&#13;
20-
%22%3A%224%22%2C%22codeContext%22%3A%7B%22name%22%3A%22column-4%22%7D%7D%2C%7B%22type%22%3A%22colu&#13;
21-
mn%22%2C%22items%22%3A%5B%5D%2C%22id%22%3A%225%22%2C%22codeContext%22%3A%7B%22name%22%3A%22column-5&#13;
22-
%22%7D%7D%5D%2C%22id%22%3A%223%22%2C%22codeContext%22%3A%7B%22name%22%3A%22row-3%22%7D%7D%2C%7B%22&#13;
23-
type%22%3A%22row%22%2C%22items%22%3A%5B%7B%22type%22%3A%22column%22%2C%22items%22%3A%5B%5D%2C%22id&#13;
24-
%22%3A%227%22%2C%22codeContext%22%3A%7B%22name%22%3A%22column-7%22%7D%7D%2C%7B%22type%22%3A%22colu&#13;
25-
mn%22%2C%22items%22%3A%5B%5D%2C%22id%22%3A%228%22%2C%22codeContext%22%3A%7B%22name%22%3A%22column-8&#13;
26-
%22%7D%7D%5D%2C%22id%22%3A%226%22%2C%22codeContext%22%3A%7B%22name%22%3A%22row-6%22%7D%7D%5D%2C%22&#13;
27-
id%22%3A%222%22%2C%22codeContext%22%3A%7B%22name%22%3A%22grid-2%22%7D%2C%22cssClasses%22%3A%5B%5D&#13;
28-
%7D%5D%2C%22id%22%3A1%7D%2C%22cssClasses%22%3A%5B%5D%2C%22allCssClasses%22%3A%5B%5D%7D" target="_blank">
17+
<a href="https://builder.carbondesignsystem.com/from-json/%7B%22title%22%3A&#13;
18+
%22GridFragment%22%2C%22data%22%3A%7B%22items%22%3A%5B%7B%22type%22%3A%22&#13;
19+
grid%22%2C%22outline%22%3Atrue%2C%22items%22%3A%5B%7B%22type%22%3A%22row%22%2C&#13;
20+
%22items%22%3A%5B%7B%22type%22%3A%22column%22%2C%22items%22%3A%5B%5D%2C%22id%22&#13;
21+
%3A%225%22%2C%22codeContext%22%3A%7B%22name%22%3A%22column-5%22%7D%7D%2C%7B%22&#13;
22+
type%22%3A%22column%22%2C%22items%22%3A%5B%5D%2C%22id%22%3A%226%22%2C%22codeContext&#13;
23+
%22%3A%7B%22name%22%3A%22column-6%22%7D%7D%5D%2C%22id%22%3A%224%22%2C%22codeContext&#13;
24+
%22%3A%7B%22name%22%3A%22row-4%22%7D%7D%2C%7B%22type%22%3A%22row%22%2C%22items%22%&#13;
25+
3A%5B%7B%22type%22%3A%22column%22%2C%22items%22%3A%5B%5D%2C%22id%22%3A%228%22%2C%22&#13;
26+
codeContext%22%3A%7B%22name%22%3A%22column-8%22%7D%7D%2C%7B%22type%22%3A%22column%22&#13;
27+
%2C%22items%22%3A%5B%5D%2C%22id%22%3A%229%22%2C%22codeContext%22%3A%7B%22name%22%3A%22&#13;
28+
column-9%22%7D%7D%5D%2C%22id%22%3A%227%22%2C%22codeContext%22%3A%7B%22name%22%3A%22&#13;
29+
row-7%22%7D%7D%5D%2C%22id%22%3A%223%22%2C%22codeContext%22%3A%7B%22name%22%3A%22&#13;
30+
grid-3%22%7D%7D%5D%2C%22id%22%3A1%7D%2C%22allCssClasses%22%3A%5B%5D%7D" target="_blank">
2931
Edit on Carbon UI Builder
3032
</a>
3133
<br><br>

‎src/inline-loading/inline-loading.stories.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,9 @@ storiesOf("Components|Inline Loading", module)
4949
.add("Basic", () => ({
5050
template: `
5151
<a href="https://builder.carbondesignsystem.com/from-json/%7B%22&#13;
52-
title%22%3A%22Inline%20loading%22%2C%22data%22%3A%7B%22items%22%3A%5B&#13;
53-
%7B%22type%22%3A%22inline-loading%22%2C%22status%22%3A%22active%22%2C&#13;
54-
%22activeText%22%3A%22Loading...%22%2C%22successText%22%3A%22Finished.%22&#13;
52+
title%22%3A%22InlineLoadingFragment%22%2C%22data%22%3A%7B%22items%22&#13;
53+
%3A%5B%7B%22type%22%3A%22inline-loading%22%2C%22status%22%3A%22active%22&#13;
54+
%2C%22activeText%22%3A%22Loading...%22%2C%22successText%22%3A%22Finished.%22&#13;
5555
%2C%22errorText%22%3A%22Error%21%22%2C%22id%22%3A%222%22%2C%22codeContext%22&#13;
5656
%3A%7B%22name%22%3A%22inline-loading-2%22%7D%7D%5D%2C%22id%22%3A1%7D%2C%22&#13;
5757
allCssClasses%22%3A%5B%5D%7D" target="_blank">

0 commit comments

Comments
 (0)