MirrorSave
/
budibase
mirror of https://github.com/Budibase/budibase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:Budibase/budibase into bug-crusher-9000

This commit is contained in:
Andrew Kingston 2024-05-02 15:34:06 +01:00
parent f0c44fadde 7b57595a1e
commit 329201569d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lerna.json
View File

@ -1,5 +1,5 @@
{ {
"version": "2.24.0", "version": "2.24.1",
"npmClient": "yarn", "npmClient": "yarn",
"packages": [ "packages": [
"packages/*", "packages/*",

5
packages/bbui/src/Form/Core/DatePicker/Calendar.svelte
View File

@ -4,6 +4,9 @@
import dayjs from "dayjs" import dayjs from "dayjs"
import NumberInput from "./NumberInput.svelte" import NumberInput from "./NumberInput.svelte"
import { createEventDispatcher } from "svelte" import { createEventDispatcher } from "svelte"
import isoWeek from "dayjs/plugin/isoWeek"
dayjs.extend(isoWeek)
export let value export let value
@ -43,7 +46,7 @@
return [] return []
} }
let monthEnd = monthStart.endOf("month") let monthEnd = monthStart.endOf("month")
let calendarStart = monthStart.startOf("week") let calendarStart = monthStart.startOf("isoWeek")
const numWeeks = Math.ceil((monthEnd.diff(calendarStart, "day") + 1) / 7) const numWeeks = Math.ceil((monthEnd.diff(calendarStart, "day") + 1) / 7)
let mondays = [] let mondays = []