Skip to content

Commit

Permalink
[25-26] Fix VLDatePicker year/month dropdown disappearing + Fix VLCru…
Browse files Browse the repository at this point in the history
…d editItem function definition (#27)

* Force display inline (rather than none) when selecting a year/month

* Add highlight color to year and month selection

* Fix editItem function definition

* Bump version + update primevue dependency

* Update shoelace version

* Bump minor version
  • Loading branch information
AAndonio authored May 21, 2024
1 parent 1239d10 commit ef1d7d7
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 18 deletions.
20 changes: 10 additions & 10 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@skillbill/vuelace-3",
"version": "1.0.10",
"version": "1.1.0",
"private": false,
"author": "skillbill",
"license": "MIT",
Expand Down Expand Up @@ -89,9 +89,9 @@
},
"peerDependencies": {
"@mdi/svg": "^7.4.47",
"@shoelace-style/shoelace": "^2.13.0",
"@shoelace-style/shoelace": "^2.15.1",
"pinia": "^2.1.7",
"primevue": "^3.51.0",
"primevue": "^3.52.0",
"vue": "^3.4.25"
}
}
4 changes: 2 additions & 2 deletions src/components/VLCrud/VLCrud.vue
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,8 @@ const editAction = {
}
} as VLCrudActionType
const onEdit = async (id: any, data: any) => {
await props.editItem?.(id, data)
const onEdit = async (data: any) => {
await props.editItem?.(data)
await onConfirm()
}
Expand Down
2 changes: 1 addition & 1 deletion src/components/VLCrud/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ export interface VLCrudProps {
| undefined
>
addItem?: (item: any) => any
editItem?: (id: any, item: any) => any
editItem?: (item: any) => any
translationFn?: (key: string, props?: { [key: string]: any }) => string
onFetchError?: () => void
onError?: (error: VLFileInputErrorEvent) => void
Expand Down
6 changes: 4 additions & 2 deletions src/components/VLDatePicker/VLDatePicker.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
:maxDate="maxDate"
:showTime="withTime"
:date-select="atDateSelect"
panelClass="min-w-min"
panelClass="min-w-min !inline"
/>
</sl-dropdown>
</template>
Expand Down Expand Up @@ -145,7 +145,9 @@ defineExpose({
</script>

<style scoped>
:deep(.p-datepicker table td > span.p-highlight) {
:deep(.p-datepicker table td > span.p-highlight),
:deep(.p-datepicker > .p-yearpicker .p-yearpicker-year.p-highlight),
:deep(.p-datepicker > .p-monthpicker .p-monthpicker-month.p-highlight) {
color: var(--sl-color-primary-500);
background: var(--sl-color-primary-100);
}
Expand Down

0 comments on commit ef1d7d7

Please sign in to comment.