eduvia/workavia-calendar-front
11
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix/time picker glitch (#542)

Browse Source 
* update twake-mui

* #537 fix time picker glitch
This commit is contained in:
lenhanphung
2026-02-12 17:03:55 +07:00
committed by GitHub
parent d275d62f06
commit 1e312c1c8b
4 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
__test__/features/Settings/SettingsPage.test.tsx
+3
View File
@@ -1,5 +1,6 @@
import SettingsPage from "@/features/Settings/SettingsPage"; import SettingsPage from "@/features/Settings/SettingsPage";
import { api } from "@/utils/apiUtils"; import { api } from "@/utils/apiUtils";
import * as timezoneUtils from "@/utils/timezone";
import "@testing-library/jest-dom"; import "@testing-library/jest-dom";
import { fireEvent, screen, waitFor } from "@testing-library/react"; import { fireEvent, screen, waitFor } from "@testing-library/react";
import { renderWithProviders } from "../../utils/Renderwithproviders"; import { renderWithProviders } from "../../utils/Renderwithproviders";
@@ -609,6 +610,8 @@ describe("SettingsPage", () => {
}, },
}; };
jest.spyOn(timezoneUtils, "getTimezoneOffset").mockReturnValue("UTC");
renderWithProviders(<SettingsPage />, stateWithoutTimeZone); renderWithProviders(<SettingsPage />, stateWithoutTimeZone);
const timezoneInput = screen.getByDisplayValue("UTC (UTC)"); const timezoneInput = screen.getByDisplayValue("UTC (UTC)");
package-lock.json
Generated
+4 -4
View File
@@ -17,7 +17,7 @@
"@fullcalendar/moment-timezone": "^6.1.19", "@fullcalendar/moment-timezone": "^6.1.19",
"@fullcalendar/react": "^6.1.17", "@fullcalendar/react": "^6.1.17",
"@fullcalendar/timegrid": "^6.1.17", "@fullcalendar/timegrid": "^6.1.17",
"@linagora/twake-mui": "1.1.8", "@linagora/twake-mui": "1.2.0",
"@lottiefiles/dotlottie-react": "^0.17.13", "@lottiefiles/dotlottie-react": "^0.17.13",
"@mui/icons-material": "^7.1.2", "@mui/icons-material": "^7.1.2",
"@mui/material": "^7.1.2", "@mui/material": "^7.1.2",
@@ -3143,9 +3143,9 @@
} }
}, },
"node_modules/@linagora/twake-mui": { "node_modules/@linagora/twake-mui": {
"version": "1.1.8", "version": "1.2.0",
"resolved": "https://npm.pkg.github.com/download/@linagora/twake-mui/1.1.8/e629a126e62dffd939a8d3d8de3ce024de5a2154", "resolved": "https://npm.pkg.github.com/download/@linagora/twake-mui/1.2.0/7b3eb115d70693ba2936ceaac70a8df3bae92672",
"integrity": "sha512-H2MxtZIy5w1A8VNTNAoM4Pjuph/et4YP8DfzQ+5HCsjRJn6SA/T3nZRZOqC26SxY9kl3XJCKIEKklL+x5af7Vg==", "integrity": "sha512-wKdkuJE48sFE5q2HWbrgI+FIZmBZefz5X5GAwiYHwvAD+9Fr/M+k973ZNSdaxwogWsQ604lZEBoIl13vKdc9EQ==",
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"react": "^18.2.0", "react": "^18.2.0",
package.json
+1 -1
View File
@@ -12,7 +12,7 @@
"@fullcalendar/moment-timezone": "^6.1.19", "@fullcalendar/moment-timezone": "^6.1.19",
"@fullcalendar/react": "^6.1.17", "@fullcalendar/react": "^6.1.17",
"@fullcalendar/timegrid": "^6.1.17", "@fullcalendar/timegrid": "^6.1.17",
"@linagora/twake-mui": "1.1.8", "@linagora/twake-mui": "1.2.0",
"@lottiefiles/dotlottie-react": "^0.17.13", "@lottiefiles/dotlottie-react": "^0.17.13",
"@mui/icons-material": "^7.1.2", "@mui/icons-material": "^7.1.2",
"@mui/material": "^7.1.2", "@mui/material": "^7.1.2",
src/components/Calendar/CustomCalendar.styl
-2
View File
@@ -367,8 +367,6 @@ tbody > tr.fc-scrollgrid-section:first-of-type .fc-scroller
li.MuiButtonBase-root.MuiMenuItem-root li.MuiButtonBase-root.MuiMenuItem-root
padding 8px 16px padding 8px 16px
font-size 14px font-size 14px
color #243B55
min-width 120px
&:hover &:hover
background #f6f6f7 background #f6f6f7