Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[atable] don't set header width until rows are loaded #223

Merged
merged 3 commits into from
Dec 17, 2024
Merged

[atable] don't set header width until rows are loaded #223

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0deaf04
fix: don't set header width until rows are loaded
Dec 17, 2024
afa8056
fix: add changelogs
Dec 17, 2024
0484e4f
test: allow datepicker test to pass in December
Dec 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion aform/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
"dependencies": {
"@stonecrop/themes": "workspace:*",
"@stonecrop/utilities": "workspace:*",
"@vueuse/core": "^11.1.0",
"@vueuse/core": "^12.0.0",
"vue": "^3.5.11"
},
"devDependencies": {
Expand Down
66 changes: 34 additions & 32 deletions aform/src/components/form/ADatePicker.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,38 +1,40 @@
<template>
<div class="adatepicker" tabindex="0" ref="datepicker">
<table>
<tr>
<td id="previous-month-btn" @click="previousMonth" :tabindex="-1">&lt;</td>
<th colspan="5" :tabindex="-1">{{ monthAndYear }}</th>
<td id="next-month-btn" @click="nextMonth" :tabindex="-1">&gt;</td>
</tr>
<tr class="days-header">
<td>M</td>
<td>T</td>
<td>W</td>
<td>T</td>
<td>F</td>
<td>S</td>
<td>S</td>
</tr>
<tr v-for="rowNo in numberOfRows" :key="rowNo">
<!-- the 'ref' key is currently only used for test references -->
<td
v-for="colNo in numberOfColumns"
ref="celldate"
:key="getCurrentCell(rowNo, colNo)"
:contenteditable="false"
:spellcheck="false"
:tabindex="0"
@click.prevent.stop="selectDate(getCurrentCell(rowNo, colNo))"
@keydown.enter="selectDate(getCurrentCell(rowNo, colNo))"
:class="{
todaysDate: isTodaysDate(getCurrentDate(rowNo, colNo)),
selectedDate: isSelectedDate(getCurrentDate(rowNo, colNo)),
}">
{{ new Date(getCurrentDate(rowNo, colNo)).getDate() }}
</td>
</tr>
<tbody>
<tr>
<td id="previous-month-btn" @click="previousMonth" :tabindex="-1">&lt;</td>
<th colspan="5" :tabindex="-1">{{ monthAndYear }}</th>
<td id="next-month-btn" @click="nextMonth" :tabindex="-1">&gt;</td>
</tr>
<tr class="days-header">
<td>M</td>
<td>T</td>
<td>W</td>
<td>T</td>
<td>F</td>
<td>S</td>
<td>S</td>
</tr>
<tr v-for="rowNo in numberOfRows" :key="rowNo">
<!-- the 'ref' key is currently only used for test references -->
<td
v-for="colNo in numberOfColumns"
ref="celldate"
:key="getCurrentCell(rowNo, colNo)"
:contenteditable="false"
:spellcheck="false"
:tabindex="0"
@click.prevent.stop="selectDate(getCurrentCell(rowNo, colNo))"
@keydown.enter="selectDate(getCurrentCell(rowNo, colNo))"
:class="{
todaysDate: isTodaysDate(getCurrentDate(rowNo, colNo)),
selectedDate: isSelectedDate(getCurrentDate(rowNo, colNo)),
}">
{{ new Date(getCurrentDate(rowNo, colNo)).getDate() }}
</td>
</tr>
</tbody>
</table>
</div>
</template>
Expand Down
2 changes: 1 addition & 1 deletion aform/tests/datepicker.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ describe('datepicker component', () => {

const $prevMonthBtn = wrapper.find('#next-month-btn')
await $prevMonthBtn.trigger('click')
expect(wrapper.vm.currentMonth).toBe(new Date().getMonth() + 1)
expect(wrapper.vm.currentMonth).toBe((new Date().getMonth() + 1) % 12)
})

it('select next year', async () => {
Expand Down
4 changes: 2 additions & 2 deletions atable/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
"dependencies": {
"@stonecrop/themes": "workspace:*",
"@stonecrop/utilities": "workspace:*",
"@vueuse/components": "^10.11.0",
"@vueuse/core": "^11.1.0",
"@vueuse/components": "^12.0.0",
"@vueuse/core": "^12.0.0",
"pinia": "^2.3.0",
"vue": "^3.5.11"
},
Expand Down
4 changes: 1 addition & 3 deletions atable/src/components/ACell.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
@input="updateCellData"
@click="showModal"
class="atable-cell"
:class="pinned ? 'sticky-column' : ''"
v-on-click-outside="store.closeModal">
:class="pinned ? 'sticky-column' : ''">
<component
v-if="column.cellComponent"
:is="column.cellComponent"
Expand All @@ -28,7 +27,6 @@

<script setup lang="ts">
import { KeypressHandlers, defaultKeypressHandlers, useKeyboardNav } from '@stonecrop/utilities'
import { vOnClickOutside } from '@vueuse/components'
import { useElementBounding } from '@vueuse/core'
import { computed, CSSProperties, ref, useTemplateRef } from 'vue'

Expand Down
9 changes: 7 additions & 2 deletions atable/src/components/ATable.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<template>
<table ref="table" class="atable" :style="{ width: store.config.fullWidth ? '100%' : 'auto' }">
<table
ref="table"
class="atable"
:style="{ width: store.config.fullWidth ? '100%' : 'auto' }"
v-on-click-outside="store.closeModal">
<slot name="header" :data="store">
<ATableHeader :columns="store.columns" :store="store" />
</slot>
Expand Down Expand Up @@ -53,6 +57,7 @@
</template>

<script setup lang="ts">
import { vOnClickOutside } from '@vueuse/components'
import { useMutationObserver } from '@vueuse/core'
import { nextTick, watch, onMounted, useTemplateRef } from 'vue'

Expand Down Expand Up @@ -121,7 +126,7 @@ const assignStickyCellWidths = () => {
const firstDataRow = table.rows[1]
const headerCells = headerRow ? Array.from(headerRow.cells) : []
for (const [index, headerCell] of headerCells.entries()) {
const rowCell = firstDataRow.cells[index]
const rowCell = firstDataRow?.cells[index]
if (rowCell) {
headerCell.style.width = `${rowCell.offsetWidth}px`
}
Expand Down
2 changes: 1 addition & 1 deletion beam/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
"test:ui": "vitest --ui"
},
"dependencies": {
"@vueuse/core": "^11.1.0",
"@vueuse/core": "^12.0.0",
"mqtt": "^5.10.1",
"onscan.js": "^1.5.2",
"vue": "^3.5.11"
Expand Down
10 changes: 10 additions & 0 deletions common/changes/@stonecrop/aform/fix-atable-cells-error_2024-12-17-07-46.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@stonecrop/aform",
"comment": "update deps",
"type": "patch"
}
],
"packageName": "@stonecrop/aform"
}
10 changes: 10 additions & 0 deletions common/changes/@stonecrop/atable/fix-atable-cells-error_2024-12-17-07-46.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@stonecrop/atable",
"comment": "don't set header width until rows are loaded",
"type": "patch"
}
],
"packageName": "@stonecrop/atable"
}
10 changes: 10 additions & 0 deletions common/changes/@stonecrop/beam/fix-atable-cells-error_2024-12-17-07-46.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@stonecrop/beam",
"comment": "update deps",
"type": "patch"
}
],
"packageName": "@stonecrop/beam"
}
10 changes: 10 additions & 0 deletions common/changes/@stonecrop/utilities/fix-atable-cells-error_2024-12-17-07-46.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"changes": [
{
"packageName": "@stonecrop/utilities",
"comment": "update deps",
"type": "patch"
}
],
"packageName": "@stonecrop/utilities"
}
67 changes: 32 additions & 35 deletions common/config/rush/pnpm-lock.yaml
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion common/config/rush/version-policies.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"definitionName": "lockStepVersion",
"policyName": "stonecrop",
"version": "0.3.0",
"nextBump": "minor"
"nextBump": "patch"
}
// {
// /**
Expand Down
2 changes: 1 addition & 1 deletion utilities/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"preview": "vite preview"
},
"dependencies": {
"@vueuse/core": "^11.1.0",
"@vueuse/core": "^12.0.0",
"vue": "^3.5.11"
},
"devDependencies": {
Expand Down
Loading