Skip to content

Commit

Permalink
Merge branch 'main' into feat/color-scheme-menu-item
Browse files Browse the repository at this point in the history
  • Loading branch information
larsrickert authored Jul 2, 2024
2 parents 98060a3 + 985c965 commit 7d7e68f
Show file tree
Hide file tree
Showing 31 changed files with 319 additions and 218 deletions.
5 changes: 5 additions & 0 deletions .changeset/fuzzy-hats-film.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"sit-onyx": patch
---

fix(OnyxSelect): Fix OnyxSelect opening on submit
1 change: 1 addition & 0 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,7 @@
"funny-avocados-drive",
"funny-socks-rhyme",
"fuzzy-beds-worry",
"fuzzy-hats-film",
"gentle-dingos-begin",
"giant-goats-care",
"giant-seas-know",
Expand Down
7 changes: 7 additions & 0 deletions apps/alpha-test-app/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# alpha-test-app

## 0.1.0-alpha.157

### Patch Changes

- Updated dependencies [cd4a885]
- [email protected]

## 0.1.0-alpha.156

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/alpha-test-app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "alpha-test-app",
"private": true,
"version": "0.1.0-alpha.156",
"version": "0.1.0-alpha.157",
"type": "module",
"scripts": {
"start": "pnpm run dev",
Expand Down
7 changes: 7 additions & 0 deletions apps/playground/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# playground

## 0.0.1-alpha.99

### Patch Changes

- Updated dependencies [cd4a885]
- [email protected]

## 0.0.1-alpha.98

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/playground/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "playground",
"version": "0.0.1-alpha.98",
"version": "0.0.1-alpha.99",
"description": "Playground for the onyx Vue components",
"type": "module",
"author": "Schwarz IT KG",
Expand Down
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"preinstall": "npx only-allow pnpm"
},
"devDependencies": {
"@changesets/cli": "^2.27.6",
"@changesets/cli": "^2.27.7",
"@microsoft/eslint-formatter-sarif": "^3.1.0",
"@playwright/experimental-ct-vue": "^1.45.0",
"@playwright/test": "^1.45.0",
Expand Down Expand Up @@ -49,7 +49,7 @@
"sass": "^1.77.6",
"simple-git-hooks": "^2.11.1",
"storybook": "^8.1.11",
"typescript": "~5.5.2",
"typescript": "~5.5.3",
"vite": "^5.3.2",
"vite-plugin-dts": "^3.9.1",
"vitest": "^1.6.0",
Expand Down
7 changes: 7 additions & 0 deletions packages/chartjs-plugin/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @sit-onyx/chartjs-plugin

## 1.0.0-alpha.116

### Patch Changes

- Updated dependencies [cd4a885]
- [email protected]

## 1.0.0-alpha.115

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/chartjs-plugin/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@sit-onyx/chartjs-plugin",
"description": "A Chart.js plugin for the onyx design system created by Schwarz IT",
"version": "1.0.0-alpha.115",
"version": "1.0.0-alpha.116",
"type": "module",
"author": "Schwarz IT KG",
"license": "Apache-2.0",
Expand Down
7 changes: 7 additions & 0 deletions packages/nuxt/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @sit-onyx/nuxt

## 1.0.0-alpha.42

### Patch Changes

- Updated dependencies [cd4a885]
- [email protected]

## 1.0.0-alpha.41

### Major Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/nuxt/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@sit-onyx/nuxt",
"version": "1.0.0-alpha.41",
"version": "1.0.0-alpha.42",
"description": "A Nuxt module to easily integrate onyx into Nuxt projects",
"author": "Schwarz IT KG",
"license": "Apache-2.0",
Expand Down
1 change: 1 addition & 0 deletions packages/sit-onyx/.eslintrc.cjs
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ module.exports = {
rules: {
"no-console": "error",
"no-debugger": "error",
"vue/html-button-has-type": "error",
"@sit-onyx/import-playwright-a11y": "error",
// disallow scoped or module CSS for components
// see https://github.com/SchwarzIT/onyx/wiki/Technical-Vision-&-Guidelines#css
Expand Down
6 changes: 6 additions & 0 deletions packages/sit-onyx/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# sit-onyx

## 1.0.0-alpha.160

### Patch Changes

- cd4a885: fix(OnyxSelect): Fix OnyxSelect opening on submit

## 1.0.0-alpha.159

### Major Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/sit-onyx/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "sit-onyx",
"description": "A design system and Vue.js component library created by Schwarz IT",
"version": "1.0.0-alpha.159",
"version": "1.0.0-alpha.160",
"type": "module",
"author": "Schwarz IT KG",
"license": "Apache-2.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ const gridElementClasses = computed(() =>
'onyx-grid-playground-element--selected': props.selected,
[gridElementClasses]: true,
}"
type="button"
>
<span v-for="(setting, i) in settings" :key="i">
{{ setting.breakpoint }}
Expand Down
14 changes: 10 additions & 4 deletions packages/sit-onyx/src/components/GridPlayground/GridPlayground.vue
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ const handleAddModifier = () => {
<fieldset class="onyx-grid-playground__settings">
<legend>Selected Grid Element options</legend>
<template v-if="selectedElement">
<button @click="deleteElement()">Delete Grid Element</button>
<button type="button" @click="deleteElement()">Delete Grid Element</button>
<div v-for="(props, i) in selectedElement" :key="i">
<label>
Breakpoint:
Expand All @@ -106,9 +106,9 @@ const handleAddModifier = () => {
:max="(props.breakpoint && BREAKPOINTS[props.breakpoint]?.cols) ?? 20"
/>
</label>
<button @click="handleDeleteModifier">Delete modifier</button>
<button type="button" @click="handleDeleteModifier">Delete modifier</button>
</div>
<button @click="handleAddModifier">Add Grid Modifier</button>
<button type="button" @click="handleAddModifier">Add Grid Modifier</button>
</template>
<template v-else>
<span>Click an existing grid element to change its properties</span>
Expand All @@ -135,7 +135,13 @@ const handleAddModifier = () => {
@click="selectedElement = elements[i]"
/>

<button class="onyx-grid-playground__add-new" @click="elements.push([{ spans: 4 }])">+</button>
<button
type="button"
class="onyx-grid-playground__add-new"
@click="elements.push([{ spans: 4 }])"
>
+
</button>
</main>
</template>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ const emit = defineEmits<{
class="onyx-icon-button"
:aria-label="props.label"
:title="props.label"
:type="props.type"
:class="[
`onyx-icon-button--${props.color}`,
{ 'onyx-icon-button--loading': props.loading },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ const { t } = injectI18n();

<template>
<OnyxTooltip class="onyx-info-tooltip" :text="props.text" :position="props.position">
<button :aria-label="props.label || t('showTooltip.info')" class="onyx-info-tooltip__trigger">
<button
type="button"
:aria-label="props.label || t('showTooltip.info')"
class="onyx-info-tooltip__trigger"
>
<OnyxIcon :icon="circleInformation" />
</button>
</OnyxTooltip>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ defineExpose({
<!-- We use `@click` here instead of `@mousedown` for the emit, as clear can change the width of the element.
When the actual width changes, this can cause the actual click to be triggered on an outside element. -->
<button
type="button"
class="onyx-mini-search__clear"
:aria-label="t('select.clearSearch')"
tabindex="-1"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ defineSlots<{
<template>
<div>
<button
type="button"
class="onyx-mobile-nav-button"
:class="{ 'onyx-mobile-nav-button--active': props.open }"
:aria-label="props.label"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ const buttonLabel = computed(() => props.label ?? t.value("navigation.goToHome")
</script>

<template>
<button class="onyx-nav-app-area" :aria-label="buttonLabel" @click="emit('click')">
<button type="button" class="onyx-nav-app-area" :aria-label="buttonLabel" @click="emit('click')">
<slot>
<!--
the width/height here is only to prevent layout shifts on initial load.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ const shouldShowExternalIcon = (args: OnyxNavButtonProps) => {
<template>
<OnyxFlyoutMenu class="onyx-nav-button">
<button
type="button"
class="onyx-nav-button__trigger onyx-text"
:class="{
'onyx-nav-button--active': props.active,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,7 @@ const blockTyping = (event: KeyboardEvent) => {

<button
class="onyx-select-input__button"
type="button"
:aria-label="t('select.toggleDropDown')"
tabindex="-1"
:disabled="props.readonly || props.disabled || props.loading"
Expand Down
1 change: 1 addition & 0 deletions packages/sit-onyx/src/components/OnyxToast/OnyxToast.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ const icon = computed(() => {

<button
v-if="!props.clickable"
type="button"
:aria-label="t('close')"
class="onyx-toast__close"
@click="emit('close')"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ const isMobile = inject(MOBILE_NAV_BAR_INJECTION_KEY);
:is-mobile="isMobile ?? false"
>
<template #button>
<button v-if="!isMobile" class="onyx-user-menu__trigger onyx-text">
<button v-if="!isMobile" class="onyx-user-menu__trigger onyx-text" type="button">
<OnyxAvatar v-bind="avatar" size="24px" />
<span class="onyx-truncation-ellipsis"> {{ props.username }}</span>
<OnyxIcon class="onyx-user-menu__chevron" :icon="chevronLeftSmall" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const avatar = computed(() => {
<template>
<div class="onyx-user-menu">
<OnyxFlyoutMenu class="onyx-user-menu__flyout" :aria-label="t('navigation.userMenuLabel')">
<button class="onyx-user-menu__trigger onyx-text">
<button class="onyx-user-menu__trigger onyx-text" type="button">
<OnyxAvatar v-bind="avatar" size="24px" />
<span class="onyx-truncation-ellipsis"> {{ props.username }}</span>
</button>
Expand Down
7 changes: 7 additions & 0 deletions packages/storybook-utils/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @sit-onyx/storybook-utils

## 1.0.0-alpha.167

### Patch Changes

- Updated dependencies [cd4a885]
- [email protected]

## 1.0.0-alpha.166

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/storybook-utils/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@sit-onyx/storybook-utils",
"description": "Storybook utilities for Vue",
"version": "1.0.0-alpha.166",
"version": "1.0.0-alpha.167",
"type": "module",
"author": "Schwarz IT KG",
"license": "Apache-2.0",
Expand Down
7 changes: 7 additions & 0 deletions packages/vitepress-theme/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# @sit-onyx/vitepress-theme

## 1.0.0-alpha.160

### Patch Changes

- Updated dependencies [cd4a885]
- [email protected]

## 1.0.0-alpha.159

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/vitepress-theme/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@sit-onyx/vitepress-theme",
"description": "VitePress theme that uses the onyx design system",
"version": "1.0.0-alpha.159",
"version": "1.0.0-alpha.160",
"type": "module",
"author": "Schwarz IT KG",
"license": "Apache-2.0",
Expand Down
Loading

0 comments on commit 7d7e68f

Please sign in to comment.