Skip to content

Commit 996c582

Browse files
Merge pull request #2886 from input-output-hk/chore/ddw-984-fix-storybook-daedalus-menu
[DDW-984] Fix storybook Daedalus menu (theme + language selection)
2 parents e7fa5ef + bd59c65 commit 996c582

File tree

6 files changed

+224
-117
lines changed

6 files changed

+224
-117
lines changed

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,10 @@
1212
- Fixed main container zIndex ([PR 2863](https://github.com/input-output-hk/daedalus/pull/2863))
1313
- Fixed ui overlap issues ([PR 2881](https://github.com/input-output-hk/daedalus/pull/2881))
1414

15+
### Chores
16+
17+
- Fixed Daedalus menu in Storybook used for theme and language selection ([PR 2886](https://github.com/input-output-hk/daedalus/pull/2886))
18+
1519
## 4.9.0-FC1
1620

1721
### Features

package.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -83,12 +83,12 @@
8383
"@babel/preset-typescript": "^7.16.7",
8484
"@babel/register": "7.0.0",
8585
"@dump247/storybook-state": "1.6.1",
86-
"@storybook/addon-actions": "5.3.14",
87-
"@storybook/addon-knobs": "5.3.14",
88-
"@storybook/addon-links": "5.3.14",
89-
"@storybook/addons": "5.3.14",
90-
"@storybook/core": "5.3.14",
91-
"@storybook/react": "5.3.14",
86+
"@storybook/addon-actions": "5.3.21",
87+
"@storybook/addon-knobs": "5.3.21",
88+
"@storybook/addon-links": "5.3.21",
89+
"@storybook/addons": "5.3.22",
90+
"@storybook/core": "5.3.21",
91+
"@storybook/react": "5.3.21",
9292
"@testing-library/jest-dom": "5.15.1",
9393
"@testing-library/react": "12.1.2",
9494
"@types/aes-js": "^3.1.1",

storybook/addons.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
import '@storybook/addon-knobs/register';
22
import '@storybook/addon-actions/register';
3-
import '@storybook/addon-links/register'; // import './addons/DaedalusMenu/register';
3+
import '@storybook/addon-links/register';
4+
import './addons/DaedalusMenu/register';

storybook/presets.ts

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
import path from 'path';
2+
3+
// This preset fixes loading DaedalusMenu addon
4+
// https://github.com/storybookjs/storybook/issues/7196#issuecomment-505858914
5+
export default [path.resolve(__dirname, './ts-preset')];

storybook/ts-preset.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
async function managerWebpack(baseConfig) {
2+
baseConfig.resolve.extensions.push('.ts', '.tsx');
3+
baseConfig.module.rules.push({ test: /\.tsx?$/, use: 'babel-loader' });
4+
return baseConfig;
5+
}
6+
7+
export default { managerWebpack };

0 commit comments

Comments
 (0)