Compare commits

...

15 Commits

Author SHA1 Message Date
Benjamin Canac
1ecd7cefde chore(release): 1.2.7 2023-04-04 13:36:43 +02:00
Benjamin Canac
aafdfdb59c fix(useTimer): remaining after pause 2023-04-04 13:36:24 +02:00
Benjamin Canac
453ff6ca20 chore(release): 1.2.6 2023-04-04 11:26:00 +02:00
Benjamin Canac
55832b6b99 docs: ts ignore 2023-04-04 11:25:33 +02:00
Benjamin Canac
6b93bbe5cd chore(release): 1.2.5 2023-04-04 11:17:30 +02:00
Benjamin Canac
1402553145 chore(deps): bump 2023-04-04 11:17:14 +02:00
Benjamin Canac
5d84dfd05b chore(release): 1.2.4 2023-04-04 11:08:58 +02:00
Benjamin Canac
7dc59a05ec chore(useTimer): pass options to useTimestamp 2023-04-04 11:08:41 +02:00
Benjamin Canac
4bd994985d chore(release): 1.2.3 2023-03-22 16:21:49 +01:00
Benjamin Canac
c83d3b7147 chore(Avatar): remove useless chipVariant prop 2023-03-22 16:21:29 +01:00
Benjamin Canac
f022665351 chore(release): 1.2.2 2023-03-20 16:17:55 +01:00
Benjamin Canac
f29c325dc7 chore(deps): fix @headlessui/vue to 1.7.10 because of inert dialogs 2023-03-20 16:17:36 +01:00
Benjamin Canac
876f9578c2 chore(release): 1.2.1 2023-03-20 15:59:15 +01:00
Benjamin Canac
f69f584188 chore(deps): bump 2023-03-20 15:58:53 +01:00
Sylvain Marroufin
377b4189ca fix(defineShortcuts): shift + alphabetic character handling (#140) 2023-03-13 14:11:52 +01:00
8 changed files with 1105 additions and 738 deletions

View File

@@ -2,6 +2,30 @@
All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
### [1.2.7](https://github.com/nuxtlabs/ui/compare/v1.2.6...v1.2.7) (2023-04-04)
### Bug Fixes
* **useTimer:** remaining after pause ([aafdfdb](https://github.com/nuxtlabs/ui/commit/aafdfdb59c365c542f93703dd52b4306ac935040))
### [1.2.6](https://github.com/nuxtlabs/ui/compare/v1.2.5...v1.2.6) (2023-04-04)
### [1.2.5](https://github.com/nuxtlabs/ui/compare/v1.2.4...v1.2.5) (2023-04-04)
### [1.2.4](https://github.com/nuxtlabs/ui/compare/v1.2.3...v1.2.4) (2023-04-04)
### [1.2.3](https://github.com/nuxtlabs/ui/compare/v1.2.2...v1.2.3) (2023-03-22)
### [1.2.2](https://github.com/nuxtlabs/ui/compare/v1.2.1...v1.2.2) (2023-03-20)
### [1.2.1](https://github.com/nuxtlabs/ui/compare/v1.2.0...v1.2.1) (2023-03-20)
### Bug Fixes
* **defineShortcuts:** shift + alphabetic character handling ([#140](https://github.com/nuxtlabs/ui/issues/140)) ([377b418](https://github.com/nuxtlabs/ui/commit/377b4189ca85603db0b7f040949260ba7494c46f))
## [1.2.0](https://github.com/nuxtlabs/ui/compare/v1.1.4...v1.2.0) (2023-03-09) ## [1.2.0](https://github.com/nuxtlabs/ui/compare/v1.1.4...v1.2.0) (2023-03-09)

View File

@@ -10,6 +10,7 @@ export default defineNuxtConfig({
} }
} }
}, },
// @ts-ignore
modules: [ modules: [
// @ts-ignore // @ts-ignore
nuxtUI nuxtUI

View File

@@ -1,6 +1,6 @@
{ {
"name": "@nuxthq/ui", "name": "@nuxthq/ui",
"version": "1.2.0", "version": "1.2.7",
"repository": "https://github.com/nuxtlabs/ui", "repository": "https://github.com/nuxtlabs/ui",
"license": "MIT", "license": "MIT",
"exports": { "exports": {
@@ -28,13 +28,13 @@
"@egoist/tailwindcss-icons": "^1.0.7", "@egoist/tailwindcss-icons": "^1.0.7",
"@headlessui/vue": "1.7.10", "@headlessui/vue": "1.7.10",
"@iconify-json/heroicons": "^1.1.10", "@iconify-json/heroicons": "^1.1.10",
"@nuxt/kit": "^3.2.3", "@nuxt/kit": "^3.3.3",
"@nuxtjs/color-mode": "^3.2.0", "@nuxtjs/color-mode": "^3.2.0",
"@nuxtjs/tailwindcss": "^6.4.1", "@nuxtjs/tailwindcss": "^6.6.5",
"@popperjs/core": "^2.11.6", "@popperjs/core": "^2.11.7",
"@tailwindcss/aspect-ratio": "^0.4.2", "@tailwindcss/aspect-ratio": "^0.4.2",
"@tailwindcss/forms": "^0.5.3", "@tailwindcss/forms": "^0.5.3",
"@tailwindcss/line-clamp": "^0.4.2", "@tailwindcss/line-clamp": "^0.4.4",
"@tailwindcss/typography": "^0.5.9", "@tailwindcss/typography": "^0.5.9",
"@vueuse/core": "^9.13.0", "@vueuse/core": "^9.13.0",
"@vueuse/integrations": "^9.13.0", "@vueuse/integrations": "^9.13.0",
@@ -42,18 +42,18 @@
"defu": "^6.1.2", "defu": "^6.1.2",
"fuse.js": "^6.6.2", "fuse.js": "^6.6.2",
"lodash-es": "^4.17.21", "lodash-es": "^4.17.21",
"tailwindcss": "^3.2.7" "tailwindcss": "^3.3.1"
}, },
"devDependencies": { "devDependencies": {
"@iconify-json/mdi": "^1.1.49", "@iconify-json/mdi": "^1.1.50",
"@nuxt/module-builder": "^0.2.1", "@nuxt/module-builder": "^0.2.1",
"@nuxtjs/eslint-config-typescript": "^12.0.0", "@nuxtjs/eslint-config-typescript": "^12.0.0",
"@types/lodash-es": "^4.17.6", "@types/lodash-es": "^4.17.7",
"@types/node": "^18.14.5", "@types/node": "^18.15.11",
"eslint": "^8.35.0", "eslint": "^8.37.0",
"nuxt": "^3.2.3", "nuxt": "^3.3.3",
"standard-version": "^9.5.0", "standard-version": "^9.5.0",
"unbuild": "^1.1.2", "unbuild": "^1.2.0",
"vue-tsc": "^1.2.0" "vue-tsc": "^1.2.0"
} }
} }

View File

@@ -38,12 +38,8 @@ const props = defineProps({
default: true default: true
}, },
chip: { chip: {
type: Boolean,
default: false
},
chipVariant: {
type: String, type: String,
default: 'primary', default: null,
validator (value: string) { validator (value: string) {
return Object.keys($ui.avatar.chip.variant).includes(value) return Object.keys($ui.avatar.chip.variant).includes(value)
} }
@@ -92,8 +88,8 @@ const avatarClass = computed(() => {
const chipClass = computed(() => { const chipClass = computed(() => {
return classNames( return classNames(
$ui.avatar.chip.base, $ui.avatar.chip.base,
$ui.avatar.chip.variant[props.chip],
$ui.avatar.chip.position[props.chipPosition], $ui.avatar.chip.position[props.chipPosition],
$ui.avatar.chip.variant[props.chipVariant],
$ui.avatar.chip.size[props.size] $ui.avatar.chip.size[props.size]
) )
}) })

View File

@@ -32,7 +32,7 @@ export const defineShortcuts = (config: ShortcutsConfig) => {
let shortcuts: Shortcut[] = [] let shortcuts: Shortcut[] = []
const onKeyDown = (e: KeyboardEvent) => { const onKeyDown = (e: KeyboardEvent) => {
const alphabeticalKey = /^[a-z]{1}$/.test(e.key) const alphabeticalKey = /^[a-z]{1}$/i.test(e.key)
for (const shortcut of shortcuts) { for (const shortcut of shortcuts) {
if (e.key.toLowerCase() !== shortcut.key) { continue } if (e.key.toLowerCase() !== shortcut.key) { continue }

View File

@@ -1,16 +1,17 @@
import { ref, computed } from 'vue-demi' import { ref, computed } from 'vue-demi'
import { useTimestamp } from '@vueuse/core' import { useTimestamp } from '@vueuse/core'
import type { UseTimestampOptions } from '@vueuse/core'
export function useTimer (cb: (...args: unknown[]) => any, interval: number) { export function useTimer (cb: (...args: unknown[]) => any, interval: number, options?: UseTimestampOptions<true>) {
let timer: number | null = null let timer: number | null = null
const timestamp = useTimestamp({ controls: true }) const { pause: tPause, resume: tResume, timestamp } = useTimestamp({ ...(options || {}), controls: true })
const startTime = ref<number | null>(null) const startTime = ref<number | null>(null)
const remaining = computed(() => { const remaining = computed(() => {
if (!startTime.value) { if (!startTime.value) {
return return 0
} }
return interval - (timestamp.timestamp.value - startTime.value) return interval - (timestamp.value - startTime.value)
}) })
function set (...args: unknown[]) { function set (...args: unknown[]) {
@@ -37,18 +38,18 @@ export function useTimer (cb: (...args: unknown[]) => any, interval: number) {
function stop () { function stop () {
clear() clear()
timestamp.pause() tPause()
} }
function pause () { function pause () {
clear() clear()
timestamp.pause() tPause()
} }
function resume () { function resume () {
startTime.value = (startTime.value || 0) + (Date.now() - timestamp.timestamp.value)
timestamp.resume()
set() set()
tResume()
startTime.value = (startTime.value || 0) + (Date.now() - timestamp.value)
} }
start() start()

View File

@@ -4,7 +4,6 @@ export interface Avatar {
text: string text: string
size: string size: string
rounded: boolean rounded: boolean
chip: boolean chip: string
chipVariant: string
chipPosition: string chipPosition: string
} }

1764
yarn.lock

File diff suppressed because it is too large Load Diff