Skip to content

Commit

Permalink
Merge pull request #50 from totono/develop
Browse files Browse the repository at this point in the history
bugfix 0.4.3
  • Loading branch information
totono authored Apr 7, 2023
2 parents f12fd3f + 53e94f1 commit c2dfc48
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 37 deletions.
62 changes: 31 additions & 31 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,31 +1,31 @@
{
"name": "todo3",
"private": true,
"version": "0.0.0",
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"preview": "vite preview",
"tauri": "tauri"
},
"dependencies": {
"@ant-design/icons": "^5.0.1",
"@emotion/react": "^11.10.6",
"@tauri-apps/api": "^1.2.0",
"antd": "^5.3.0",
"dayjs": "^1.11.7",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-icons": "^4.8.0"
},
"devDependencies": {
"@tauri-apps/cli": "^1.2.2",
"@types/node": "^18.7.10",
"@types/react": "^18.0.15",
"@types/react-dom": "^18.0.6",
"@vitejs/plugin-react": "^3.0.0",
"typescript": "^4.6.4",
"vite": "^4.0.0"
}
}
{
"name": "todo3",
"private": true,
"version": "0.4.3",
"type": "module",
"scripts": {
"dev": "vite",
"build": "tsc && vite build",
"preview": "vite preview",
"tauri": "tauri"
},
"dependencies": {
"@ant-design/icons": "^5.0.1",
"@emotion/react": "^11.10.6",
"@tauri-apps/api": "^1.2.0",
"antd": "^5.3.0",
"dayjs": "^1.11.7",
"react": "^18.2.0",
"react-dom": "^18.2.0",
"react-icons": "^4.8.0"
},
"devDependencies": {
"@tauri-apps/cli": "^1.2.2",
"@types/node": "^18.7.10",
"@types/react": "^18.0.15",
"@types/react-dom": "^18.0.6",
"@vitejs/plugin-react": "^3.0.0",
"typescript": "^4.6.4",
"vite": "^4.0.0"
}
}
2 changes: 1 addition & 1 deletion src-tauri/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion src-tauri/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "todo"
version = "0.4.2"
version = "0.4.3"
description = "todo"
authors = ["totono"]
license = ""
Expand Down
2 changes: 1 addition & 1 deletion src-tauri/tauri.conf.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
},
"package": {
"productName": "todo",
"version": "0.4.2"
"version": "0.4.3"
},
"tauri": {
"systemTray": {
Expand Down
7 changes: 4 additions & 3 deletions src/components/elements/Input/DateTime/TimeForm.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ dayjs.extend(objectSupport);


const timeFormat = "HH:mm";
//const disabledTime = () => {
// return { disabledHours: () => [0, 1, 2, 3, 4, 5, 6, 7] }
//};
const disabledTime = () => {
return { disabledHours: () => [0, 1, 2, 3, 4, 5, 6, 7] }
};

type TimeFormProps = {
task: InputState;
Expand Down Expand Up @@ -48,6 +48,7 @@ export const TimeForm = ({task,setTask,value}:TimeFormProps) => {
onSelect={handleTimeInput}
onChange={handleTimeInput}
hideDisabledOptions={true}
disabledTime={disabledTime}
minuteStep={5}
format={timeFormat}
/>
Expand Down

0 comments on commit c2dfc48

Please sign in to comment.