Skip to content

Commit 8078c2a

Browse files
committed
Merge branch 'master' of https://github.com/IBM/carbon-components-angular into select
2 parents 03d1882 + 61ac981 commit 8078c2a

File tree

67 files changed

+4878
-2069
lines changed

Some content is hidden

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

67 files changed

+4878
-2069
lines changed

.storybook/experimental.component.ts

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,27 @@
1-
import { Component, AfterViewInit, OnDestroy } from "@angular/core";
1+
import {
2+
Component,
3+
AfterViewInit,
4+
OnDestroy,
5+
Input,
6+
Output,
7+
EventEmitter
8+
} from "@angular/core";
29
import { ExperimentalService } from "../src/experimental.module";
310

411
@Component({
512
selector: "app-experimental-component",
613
template: ``
714
})
815
export class ExperimentalComponenent implements AfterViewInit, OnDestroy {
16+
@Input() set isExperimental(value: boolean) {
17+
this.experimental.isExperimental = value;
18+
this.isExperimentalChange.emit(this.experimental.isExperimental);
19+
}
20+
@Output() isExperimentalChange = new EventEmitter();
21+
922
constructor(protected experimental: ExperimentalService) {
1023
experimental.isExperimental = false;
24+
this.isExperimentalChange.emit(this.isExperimental);
1125
}
1226

1327
ngAfterViewInit() {
@@ -30,5 +44,6 @@ export class ExperimentalComponenent implements AfterViewInit, OnDestroy {
3044
} else {
3145
this.experimental.isExperimental = false;
3246
}
47+
this.isExperimentalChange.emit(this.experimental.isExperimental);
3348
}
3449
}

.storybook/manager-head.html

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,20 @@
1+
<!-- Open Graph -->
12
<meta property="og:title" content="Carbon Components Angular">
23
<meta property="og:description" content="An Angular implementation of the Carbon Design System for IBM.">
34
<meta property="og:image" content="https://angular.carbondesignsystem.com/carbon.jpg">
45
<meta property="og:url" content="https://angular.carbondesignsystem.com">
56

7+
<!-- Social -->
68
<meta name="twitter:title" content="Carbon Components Angular">
79
<meta name="twitter:description" content="An Angular implementation of the Carbon Design System for IBM.">
810
<meta name="twitter:image" content="https://angular.carbondesignsystem.com/carbon.jpg">
911
<meta name="twitter:card" content="summary_large_image">
1012

13+
<!-- Storybook override -->
14+
<script>
15+
document.title = "Carbon Components Angular";
16+
</script>
17+
1118
<style id="iframestyle">
1219
.sb-show-main:not(.welcome) {
1320
padding: 3em;

.storybook/webpack.config.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
const path = require('path');
22

3-
module.exports = (baseConfig, env, defaultConfig) => {
4-
defaultConfig.module.rules.push({
3+
module.exports = ({config, mode}) => {
4+
config.module.rules.push({
55
test: [/\.stories\.tsx?$/, /index\.ts$/],
66
loaders: [
77
{
@@ -15,7 +15,7 @@ module.exports = (baseConfig, env, defaultConfig) => {
1515
enforce: 'pre',
1616
});
1717

18-
defaultConfig.mode = "development";
19-
defaultConfig.devtool = "source-map";
20-
return defaultConfig;
18+
config.mode = "development";
19+
config.devtool = "source-map";
20+
return config;
2121
};

0 commit comments

Comments
 (0)