Skip to content

Commit

Permalink
Merge pull request #122 from technote-space/release/next-v0.14.19
Browse files Browse the repository at this point in the history
release: v0.14.20
  • Loading branch information
technote-space authored Sep 7, 2021
2 parents f0646df + 2ba76cf commit bf9c4e3
Show file tree
Hide file tree
Showing 6 changed files with 861 additions and 861 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[![npm version](https://badge.fury.io/js/%40technote-space%2Fga-framework.svg)](https://badge.fury.io/js/%40technote-space%2Fga-framework)
[![CI Status](https://github.com/technote-space/ga-framework/workflows/CI/badge.svg)](https://github.com/technote-space/ga-framework/actions)
[![CodeFactor](https://www.codefactor.io/repository/github/technote-space/ga-framework/badge)](https://www.codefactor.io/repository/github/technote-space/ga-framework)
[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/technote-space/ga-framework/blob/master/LICENSE)
[![License: MIT](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/technote-space/ga-framework/blob/main/LICENSE)

Genetic Algorithm Framework

Expand Down
46 changes: 23 additions & 23 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@technote-space/ga-framework",
"version": "0.14.19",
"version": "0.14.20",
"description": "GA Framework",
"keywords": [
"genetic algorithm"
Expand Down Expand Up @@ -40,51 +40,51 @@
},
"dependencies": {
"@egjs/hammerjs": "^2.0.17",
"@material-ui/core": "^4.11.4",
"@material-ui/core": "^4.12.3",
"@material-ui/icons": "^4.11.2",
"@mui-treasury/layout": "^4.5.0",
"@technote-space/genetic-algorithms-js": "^0.8.21",
"@technote-space/worker-controller": "^0.5.36",
"chart.js": "^3.4.0",
"@technote-space/genetic-algorithms-js": "^0.8.24",
"@technote-space/worker-controller": "^0.5.43",
"chart.js": "^3.5.1",
"clsx": "^1.1.1",
"keycharm": "^0.4.0",
"moment": "^2.29.1",
"react": "^17.0.2",
"react-dom": "^17.0.2",
"react-helmet": "^6.1.0",
"styled-components": "^5.3.0",
"styled-components": "^5.3.1",
"vis-data": "^7.1.2",
"vis-network": "^9.0.4",
"vis-network": "^9.1.0",
"vis-util": "^5.0.2"
},
"devDependencies": {
"@babel/core": "^7.14.6",
"@babel/core": "^7.15.5",
"@babel/plugin-proposal-class-properties": "^7.14.5",
"@babel/plugin-proposal-object-rest-spread": "^7.14.7",
"@babel/plugin-transform-react-inline-elements": "^7.14.5",
"@babel/preset-env": "^7.14.7",
"@babel/preset-env": "^7.15.4",
"@babel/preset-flow": "^7.14.5",
"@babel/preset-react": "^7.14.5",
"@babel/preset-typescript": "^7.14.5",
"@commitlint/cli": "^12.1.4",
"@commitlint/config-conventional": "^12.1.4",
"@types/node": "^16.0.0",
"@types/react-helmet": "^6.1.1",
"@types/styled-components": "^5.1.11",
"@typescript-eslint/eslint-plugin": "^4.28.1",
"@typescript-eslint/parser": "^4.28.1",
"@babel/preset-typescript": "^7.15.0",
"@commitlint/cli": "^13.1.0",
"@commitlint/config-conventional": "^13.1.0",
"@types/node": "^16.7.13",
"@types/react-helmet": "^6.1.2",
"@types/styled-components": "^5.1.14",
"@typescript-eslint/eslint-plugin": "^4.31.0",
"@typescript-eslint/parser": "^4.31.0",
"babel-plugin-react-html-attrs": "^3.0.5",
"babel-plugin-transform-class-properties": "^6.24.1",
"copy-webpack-plugin": "^9.0.1",
"eslint": "^7.30.0",
"eslint-plugin-react": "^7.24.0",
"eslint": "^7.32.0",
"eslint-plugin-react": "^7.25.1",
"eslint-plugin-react-hooks": "^4.2.0",
"html-webpack-plugin": "^5.3.2",
"husky": "^7.0.0",
"lint-staged": "^11.0.0",
"husky": "^7.0.2",
"lint-staged": "^11.1.2",
"pinst": "^2.1.6",
"typescript": "^4.3.5",
"webpack": "^5.42.0"
"typescript": "^4.4.2",
"webpack": "^5.52.0"
},
"publishConfig": {
"access": "public"
Expand Down
4 changes: 2 additions & 2 deletions src/app/App.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import {
Toolbar,
CssBaseline,
} from '@material-ui/core';
import {createMuiTheme, responsiveFontSizes, makeStyles, createStyles} from '@material-ui/core/styles';
import {createTheme, responsiveFontSizes, makeStyles, createStyles} from '@material-ui/core/styles';
import {useTheme} from './hooks';
import {
ContentEx,
Expand Down Expand Up @@ -75,7 +75,7 @@ const App: FC<{
const {store: {themeColor, reloadWorker}, store} = useStoreContext();
const {dispatch} = useDispatchContext();
const themeObject = useTheme(themeColor);
const theme = responsiveFontSizes(createMuiTheme(themeObject));
const theme = responsiveFontSizes(createTheme(themeObject));
const classes = useStyles({theme});

const title = useMemo(() => getTitle(options, store), [store]);
Expand Down
8 changes: 4 additions & 4 deletions src/app/components/List.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,10 +96,10 @@ const List: FC<{
const {dispatch} = useDispatchContext();

const emptyRows = rowsPerPage - Math.min(rowsPerPage, population.length - page * rowsPerPage);
const handleChangePage = (event, newPage) => {
const handlePageChange = (event, newPage) => {
dispatch({type: 'PAGINATION_PAGE', page: newPage});
};
const handleChangeRowsPerPage = (event) => {
const handleRowsPerPageChange = (event) => {
dispatch({type: 'PAGINATION_PER_PAGE', rowsPerPage: parseInt(event.target.value, 10)});
dispatch({type: 'PAGINATION_PAGE', page: 0});
};
Expand Down Expand Up @@ -145,8 +145,8 @@ const List: FC<{
inputProps: {'aria-label': 'rows per page'},
native: true,
}}
onChangePage={handleChangePage}
onChangeRowsPerPage={handleChangeRowsPerPage}
onPageChange={handlePageChange}
onRowsPerPageChange={handleRowsPerPageChange}
ActionsComponent={TablePaginationActions}
/>
</TableRow>
Expand Down
4 changes: 2 additions & 2 deletions src/app/hooks/useTheme.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type {Theme} from '@material-ui/core/styles';
import {useMemo} from 'react';
import {createMuiTheme} from '@material-ui/core/styles';
import {createTheme} from '@material-ui/core/styles';
import {blue, grey, pink} from '@material-ui/core/colors';
import useMediaQuery from '@material-ui/core/useMediaQuery';

Expand All @@ -12,7 +12,7 @@ const useTheme = (themeColor?: 'light' | 'dark'): Theme => {
const fgColor2 = colorMode === 'dark' ? grey[600] : grey[300];

return useMemo(() =>
createMuiTheme({
createTheme({
props: {
MuiContainer: {},
MuiButton: {
Expand Down
Loading

0 comments on commit bf9c4e3

Please sign in to comment.