Skip to content

Commit b052551

Browse files
authored
Merge branch 'master' into dependabot/npm_and_yarn/socket.io-4.7.5
2 parents b0351f8 + be60707 commit b052551

File tree

3 files changed

+63
-32
lines changed

3 files changed

+63
-32
lines changed

integration/ng14/package-lock.json

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

integration/ng16/package-lock.json

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

src/ui-shell/ui-shell.stories.ts

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ export default {
2828
path: "foo",
2929
component: FooComponent
3030
}
31-
]))
31+
], { useHash: true }))
3232
]
3333
}),
3434
moduleMetadata({
@@ -197,10 +197,10 @@ const HeaderWithTemplate = (args) => ({
197197
});
198198
export const HeaderWithTemp = HeaderWithTemplate.bind({});
199199
HeaderWithTemp.storyName = "Header with template";
200-
Header.args = {
200+
HeaderWithTemp.args = {
201201
hasHamburger: true
202202
};
203-
Header.argTypes = {
203+
HeaderWithTemp.argTypes = {
204204
expanded: {
205205
action: "Menu clicked!"
206206
}
@@ -229,7 +229,7 @@ const HeaderRouterTemplate = (args) => ({
229229
`
230230
});
231231
export const HeaderWithRouter = HeaderRouterTemplate.bind({});
232-
Header.argTypes = {
232+
HeaderWithRouter.argTypes = {
233233
expanded: {
234234
action: "Menu clicked!"
235235
}
@@ -301,7 +301,7 @@ const SideNavigationRouterTemplate = (args) => ({
301301
</cds-sidenav-menu>
302302
</cds-sidenav>
303303
</div>
304-
<div>
304+
<div style="margin-left: 18rem">
305305
<router-outlet></router-outlet>
306306
</div>
307307
`
@@ -559,7 +559,7 @@ const ModelTemplate = (args) => ({
559559
`
560560
});
561561
export const WithModel = ModelTemplate.bind({});
562-
SideNavigationRail.args = {
562+
WithModel.args = {
563563
options: [
564564
{
565565
content: "Option 1",
@@ -607,7 +607,7 @@ SideNavigationRail.args = {
607607
]
608608
}]
609609
};
610-
SideNavigationRail.argTypes = {
610+
WithModel.argTypes = {
611611
options: {
612612
control: false
613613
},

0 commit comments

Comments
 (0)