Skip to content

Commit fd04b5c

Browse files
Merge pull request #148 from technote-space/release/next-v0.15.0
release: v0.15.1
2 parents acc81d2 + a4b9646 commit fd04b5c

File tree

6 files changed

+113
-117
lines changed

6 files changed

+113
-117
lines changed

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@technote-space/ga-framework",
3-
"version": "0.15.0",
3+
"version": "0.15.1",
44
"description": "GA Framework",
55
"keywords": [
66
"genetic algorithm"
@@ -44,7 +44,7 @@
4444
"@emotion/styled": "^11.10.5",
4545
"@mui-treasury/layout": "^5.0.0",
4646
"@mui/icons-material": "^5.11.0",
47-
"@mui/material": "^5.11.1",
47+
"@mui/material": "^5.11.2",
4848
"@technote-space/genetic-algorithms-js": "^0.8.27",
4949
"@technote-space/worker-controller": "^0.5.56",
5050
"chart.js": "^4.1.1",
@@ -69,11 +69,11 @@
6969
"@babel/preset-typescript": "^7.18.6",
7070
"@commitlint/cli": "^17.3.0",
7171
"@commitlint/config-conventional": "^17.3.0",
72-
"@types/node": "^18.11.17",
72+
"@types/node": "^18.11.18",
7373
"@types/react-helmet": "^6.1.6",
7474
"@types/styled-components": "^5.1.26",
75-
"@typescript-eslint/eslint-plugin": "^5.47.0",
76-
"@typescript-eslint/parser": "^5.47.0",
75+
"@typescript-eslint/eslint-plugin": "^5.47.1",
76+
"@typescript-eslint/parser": "^5.47.1",
7777
"babel-plugin-react-html-attrs": "^3.0.5",
7878
"babel-plugin-transform-class-properties": "^6.24.1",
7979
"copy-webpack-plugin": "^11.0.0",

src/app/components/Graph.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const Graph: FC<{
2727
);
2828
}, [nodes, edges, options]);
2929

30-
return <Box sx={{ height: '100%', padding: 20 }} ref={container}/>;
30+
return <Box sx={{ height: '100%', padding: '20px' }} ref={container}/>;
3131
});
3232

3333
Graph.displayName = 'Graph';

src/app/components/Timeline.tsx

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import type { FC } from 'react';
22
import type { ScatterDataPoint } from 'chart.js';
33
import React, { memo, useRef, useState, useEffect } from 'react';
4-
import Box from '@mui/material/Box';
5-
import { Chart } from 'chart.js';
4+
import { Chart, registerables } from 'chart.js';
65
import useTheme from '@/hooks/useTheme';
76
import { useStoreContext } from '@/Store';
87

8+
Chart.register(...registerables);
9+
910
const Timeline: FC<{
1011
data: Array<ScatterDataPoint>;
1112
}> = memo(({ data }) => {
@@ -82,9 +83,7 @@ const Timeline: FC<{
8283
}
8384
}, [data]);
8485

85-
return <Box sx={{ paddingY: 0, paddingX: 2 }}>
86-
<canvas ref={container}/>
87-
</Box>;
86+
return <canvas ref={container} style={{ padding: '0', paddingRight: 16, paddingLeft: 16 }}/>;
8887
});
8988

9089
Timeline.displayName = 'Timeline';

src/app/templates/HeaderEx.tsx

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,8 @@ const HeaderEx: FC<{
1616
minWidth: 0,
1717
fontSize: 18,
1818
display: {
19-
display: 'none',
20-
md: {
21-
display: 'inherit',
22-
},
19+
xs: 'none',
20+
md: 'inherit',
2321
},
2422
}}>{title}</Typography>, []);
2523
const beforeHeaderTitle = useMemo(() => options.parts?.beforeHeaderTitle ? options.parts.beforeHeaderTitle() : null, []);

src/app/templates/NavContentEx.tsx

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,23 +57,22 @@ const NavContentEx: FC<{
5757
useEffect(() => {
5858
if (worker) {
5959
setController(<Box sx={{
60-
background: 'background.default',
6160
color: 'secondary.contrastText',
62-
marginTop: 10,
63-
padding: 5,
61+
marginTop: '10px',
62+
padding: '5px',
6463
}}>
6564
<Box sx={{ textAlign: 'center' }}>
6665
<Button
67-
sx={{ margin: 5 }}
66+
sx={{ margin: '5px' }}
6867
onClick={control.reset(store)}
6968
disabled={status === 'disabled' || (status !== 'initialized' && status !== 'finished' && status !== 'canceled')}
7069
>
7170
Reset
7271
</Button>
73-
<Button sx={{ margin: 5 }} onClick={control.start(store)} disabled={status === 'disabled' || (status !== 'initialized' && status !== 'canceled')}>
72+
<Button sx={{ margin: '5px' }} onClick={control.start(store)} disabled={status === 'disabled' || (status !== 'initialized' && status !== 'canceled')}>
7473
Start
7574
</Button>
76-
<Button sx={{ margin: 5 }} onClick={control.stop(store)} disabled={status === 'disabled' || status !== 'started'}>
75+
<Button sx={{ margin: '5px' }} onClick={control.stop(store)} disabled={status === 'disabled' || status !== 'started'}>
7776
Stop
7877
</Button>
7978
</Box>

0 commit comments

Comments
 (0)