Skip to content

Commit 168378b

Browse files
committed
release 1.2.7
1 parent a7cf517 commit 168378b

File tree

9 files changed

+187
-108
lines changed

9 files changed

+187
-108
lines changed
Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
name: Tests
1+
name: Chrome Tests
22

33
on: [push]
44

55
jobs:
6-
cypress-run:
6+
cypress-ct:
77
runs-on: ubuntu-latest
88
steps:
99
- uses: actions/checkout@v3
@@ -18,8 +18,5 @@ jobs:
1818
run_install: false
1919
- name: Install dependencies
2020
run: pnpm install
21-
- name: Tests
22-
uses: cypress-io/github-action@v5
23-
with:
24-
install: false
25-
component: true
21+
- name: Chrome tests
22+
run: pnpm run test:chrome

.github/workflows/firefox.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Firefox Tests
2+
3+
on: [push]
4+
5+
jobs:
6+
cypress-ct:
7+
runs-on: macos-latest
8+
steps:
9+
- uses: actions/checkout@v3
10+
- uses: actions/setup-node@v3
11+
with:
12+
node-version: '18'
13+
- uses: pnpm/action-setup@v2
14+
name: Install pnpm
15+
id: pnpm-install
16+
with:
17+
version: 8
18+
run_install: false
19+
- name: Install dependencies
20+
run: pnpm install
21+
- name: Firefox tests
22+
run: pnpm run test:firefox

.github/workflows/webkit.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Webkit Tests
2+
3+
on: [push]
4+
5+
jobs:
6+
cypress-ct:
7+
runs-on: macos-latest
8+
steps:
9+
- uses: actions/checkout@v3
10+
- uses: actions/setup-node@v3
11+
with:
12+
node-version: '18'
13+
- uses: pnpm/action-setup@v2
14+
name: Install pnpm
15+
id: pnpm-install
16+
with:
17+
version: 8
18+
run_install: false
19+
- name: Install dependencies
20+
run: pnpm install
21+
- name: Webkit tests
22+
run: pnpm run test:webkit

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
![npm](https://img.shields.io/npm/v/vue-collapsed?color=46c119) ![dependencies](https://img.shields.io/badge/dependencies-0-success) ![npm bundle size](https://img.shields.io/bundlephobia/minzip/vue-collapsed?color=success) ![downloads](https://img.shields.io/npm/dm/vue-collapsed) ![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/smastrom/vue-collapsed/tests.yml?branch=main&label=tests)
1+
![npm](https://img.shields.io/npm/v/vue-collapsed?color=46c119) ![dependencies](https://img.shields.io/badge/dependencies-0-success) ![npm bundle size](https://img.shields.io/bundlephobia/minzip/vue-collapsed?color=success) ![downloads](https://img.shields.io/npm/dm/vue-collapsed) ![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/smastrom/vue-collapsed/chrome.yml?branch=main&label=tests)
22

33
# Vue Collapsed
44

cypress/support/component.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,5 @@ export function getRandomIntInclusive(min: number, max: number) {
1818
}
1919

2020
Cypress.Commands.add('mount', mount)
21+
22+
export const isFirefox = Cypress.isBrowser('firefox')

package.json

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "vue-collapsed",
3-
"version": "1.2.6",
3+
"version": "1.2.7",
44
"private": false,
55
"description": "Dynamic CSS height transition from any to auto and vice versa for Vue 3. Accordion ready.",
66
"keywords": [
@@ -54,19 +54,19 @@
5454
"*.{ts,vue,md}": "prettier --write"
5555
},
5656
"devDependencies": {
57-
"@babel/types": "^7.22.5",
57+
"@babel/types": "^7.22.10",
5858
"@rollup/plugin-terser": "^0.4.3",
59-
"@types/node": "^18.17.1",
60-
"@vitejs/plugin-vue": "^4.2.3",
61-
"cypress": "^12.17.3",
59+
"@types/node": "^18.17.6",
60+
"@vitejs/plugin-vue": "^4.3.1",
61+
"cypress": "^12.17.4",
6262
"cypress-wait-frames": "^0.9.4",
6363
"husky": "^8.0.3",
64-
"lint-staged": "^13.2.3",
65-
"playwright-webkit": "^1.36.2",
64+
"lint-staged": "^13.3.0",
65+
"playwright-webkit": "^1.37.1",
6666
"prettier": "^2.8.8",
6767
"rimraf": "^4.4.1",
6868
"typescript": "^4.9.5",
69-
"vite": "^4.4.8",
69+
"vite": "^4.4.9",
7070
"vite-plugin-dts": "^1.7.3",
7171
"vue": "^3.3.4",
7272
"vue-tsc": "^1.8.8"

src/Collapse.vue

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,13 @@ onMounted(() => {
8484
if (!collapseRef.value) return
8585
if (!isExpanded.value && baseHeight.value === 0) style.value = VISUALLY_HIDDEN
8686
87-
autoDuration.value = getAutoDuration(collapseRef.value.scrollHeight - baseHeight.value)
87+
const _autoDuration = getAutoDuration(collapseRef.value.scrollHeight - baseHeight.value)
88+
89+
/**
90+
* Autoduration cannot be calculated if collapseRef or any ancestors
91+
* have 'display:none' on mount. In this case we cast it to 300ms.
92+
*/
93+
autoDuration.value = _autoDuration <= 0 ? 300 : _autoDuration
8894
style.value = isExpanded.value ? safeStyles : collapsedStyles.value
8995
})
9096

tests/App.vue

Lines changed: 24 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
<script lang="ts" setup>
22
import { Collapse } from '../src'
3-
import { ref } from 'vue'
3+
import { onMounted, ref } from 'vue'
44
55
const props = withDefaults(
6-
defineProps<{ initialValue: boolean; as: keyof HTMLElementTagNameMap; baseHeight: number }>(),
6+
defineProps<{
7+
initialValue: boolean
8+
as: keyof HTMLElementTagNameMap
9+
baseHeight: number
10+
hiddenOnMount: boolean
11+
}>(),
712
{
813
initialValue: false,
14+
hiddenOnMount: false,
915
as: 'div',
1016
baseHeight: 0,
1117
}
@@ -15,6 +21,16 @@ const isExpanded = ref(props.initialValue)
1521
1622
const baseHeight = ref(props.baseHeight)
1723
24+
const isHiddenOnMount = ref(props.hiddenOnMount)
25+
26+
onMounted(() => {
27+
if (props.hiddenOnMount) {
28+
setTimeout(() => {
29+
isHiddenOnMount.value = false
30+
}, 1000)
31+
}
32+
})
33+
1834
const countExpand = ref(0)
1935
const countExpanded = ref(0)
2036
const countCollapse = ref(0)
@@ -50,7 +66,12 @@ function decreaseBaseHeight() {
5066
</script>
5167

5268
<template>
53-
<section class="Wrapper">
69+
<section
70+
class="Wrapper"
71+
:style="{
72+
display: isHiddenOnMount ? 'none' : 'block',
73+
}"
74+
>
5475
<div id="CountExpand">{{ countExpand }}</div>
5576
<div id="CountExpanded">{{ countExpanded }}</div>
5677
<div id="CountCollapse">{{ countCollapse }}</div>

0 commit comments

Comments
 (0)