Skip to content

Commit

Permalink
Merge branch 'main' into feat/2140-implement-onyxAccordion-component
Browse files Browse the repository at this point in the history
  • Loading branch information
ChristianBusshoff authored Dec 28, 2024
2 parents 5a8c20c + acb5826 commit 682f7b0
Show file tree
Hide file tree
Showing 30 changed files with 298 additions and 74 deletions.
2 changes: 2 additions & 0 deletions .changeset/pre.json
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@
"smooth-lions-speak",
"smooth-onions-clap",
"soft-maps-jump",
"soft-rocks-move",
"sour-birds-kneel",
"sour-candles-beam",
"sour-ties-impress",
Expand Down Expand Up @@ -383,6 +384,7 @@
"unlucky-jars-chew",
"unlucky-otters-marry",
"violet-chairs-relate",
"violet-turkeys-relate",
"warm-readers-exercise",
"warm-seals-approve",
"wicked-sloths-obey",
Expand Down
13 changes: 13 additions & 0 deletions .changeset/soft-rocks-move.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
"@sit-onyx/icons": minor
---

feat: update icons

#### New icons

- browser-domain

#### Modified icons

- key-settings
13 changes: 13 additions & 0 deletions .changeset/violet-turkeys-relate.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
---
"@sit-onyx/icons": minor
---

feat: update icons

#### New icons

- browser-domain

#### Modified icons

- key-settings
16 changes: 16 additions & 0 deletions apps/demo-app/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# demo-app

## 1.0.0-beta.104

### Patch Changes

- Updated dependencies [ad447e9]
- @sit-onyx/icons@1.0.0-beta.10
- sit-onyx@1.0.0-beta.104

## 1.0.0-beta.103

### Patch Changes

- Updated dependencies [ee0fcd2]
- @sit-onyx/icons@1.0.0-beta.9
- sit-onyx@1.0.0-beta.103

## 1.0.0-beta.102

### Patch Changes
Expand Down
2 changes: 1 addition & 1 deletion apps/demo-app/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "demo-app",
"private": true,
"version": "1.0.0-beta.102",
"version": "1.0.0-beta.104",
"type": "module",
"scripts": {
"dev": "turbo run turbo:dev --filter=.",
Expand Down
9 changes: 9 additions & 0 deletions apps/demo-app/src/views/HomeView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
OnyxAccordionItem,
OnyxAvatar,
OnyxBadge,
OnyxBottomBar,
OnyxButton,
OnyxCheckboxGroup,
OnyxDatePicker,
Expand Down Expand Up @@ -355,6 +356,14 @@ const selectedDate = ref<DateValue>();
<!-- Add new components alphabetically. -->
</div>
</div>
<template #footer>
<OnyxBottomBar>
<template #right>
<OnyxButton label="Button" mode="plain" color="neutral"></OnyxButton>
<OnyxButton label="Button"></OnyxButton>
</template>
</OnyxBottomBar>
</template>
</OnyxPageLayout>
</template>

Expand Down
16 changes: 16 additions & 0 deletions apps/playground/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,21 @@
# playground

## 1.0.0-beta.104

### Patch Changes

- Updated dependencies [ad447e9]
- @sit-onyx/icons@1.0.0-beta.10
- sit-onyx@1.0.0-beta.104

## 1.0.0-beta.103

### Patch Changes

- Updated dependencies [ee0fcd2]
- @sit-onyx/icons@1.0.0-beta.9
- sit-onyx@1.0.0-beta.103

## 1.0.0-beta.102

### 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": "1.0.0-beta.102",
"version": "1.0.0-beta.104",
"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 @@ -29,8 +29,8 @@
"@playwright/test": "^1.49.1",
"@storybook/addon-essentials": "8.5.0-beta.4",
"@storybook/blocks": "8.5.0-beta.2",
"@storybook/vue3": "8.5.0-beta.2",
"@storybook/vue3-vite": "8.5.0-beta.2",
"@storybook/vue3": "8.5.0-beta.6",
"@storybook/vue3-vite": "8.5.0-beta.6",
"@tsconfig/node22": "^22.0.0",
"@types/eslint": "^9.6.1",
"@types/jsdom": "^21.1.7",
Expand Down
12 changes: 12 additions & 0 deletions packages/chartjs-plugin/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# @sit-onyx/chartjs-plugin

## 1.0.0-beta.104

### Patch Changes

- sit-onyx@1.0.0-beta.104

## 1.0.0-beta.103

### Patch Changes

- sit-onyx@1.0.0-beta.103

## 1.0.0-beta.102

### 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-beta.102",
"version": "1.0.0-beta.104",
"type": "module",
"author": "Schwarz IT KG",
"license": "Apache-2.0",
Expand Down
28 changes: 28 additions & 0 deletions packages/icons/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,33 @@
# @sit-onyx/icons

## 1.0.0-beta.10

### Minor Changes

- ad447e9: feat: update icons

#### New icons

- browser-domain

#### Modified icons

- key-settings

## 1.0.0-beta.9

### Minor Changes

- ee0fcd2: feat: update icons

#### New icons

- browser-domain

#### Modified icons

- key-settings

## 1.0.0-beta.8

### Minor Changes
Expand Down
2 changes: 1 addition & 1 deletion packages/icons/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@sit-onyx/icons",
"description": "SVG icons for the onyx design system",
"version": "1.0.0-beta.8",
"version": "1.0.0-beta.10",
"type": "module",
"license": "Apache-2.0",
"repository": {
Expand Down
1 change: 1 addition & 0 deletions packages/icons/src/assets/browser-domain.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion packages/icons/src/assets/key-settings.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 5 additions & 1 deletion packages/icons/src/metadata.json
Original file line number Diff line number Diff line change
Expand Up @@ -213,6 +213,10 @@
"category": "Objects",
"aliases": ["Besen", "aufräumen", "entleeren", "tidyup"]
},
"browser-domain": {
"category": "Network & Infrastructure",
"aliases": []
},
"browser-globe": {
"category": "Network & Infrastructure",
"aliases": ["internet-explorer", "web-world", "nternet-Browser", "Web-Welt"]
Expand Down Expand Up @@ -1345,7 +1349,7 @@
},
"key-settings": {
"category": "Software & Services",
"aliases": ["KMS", "configuration", "key-management", "Schlüssel", "Zahnrad"]
"aliases": []
},
"key-shield": {
"category": "Security & Protection",
Expand Down
12 changes: 12 additions & 0 deletions packages/nuxt/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,17 @@
# @sit-onyx/nuxt

## 1.0.0-beta.105

### Patch Changes

- sit-onyx@1.0.0-beta.104

## 1.0.0-beta.104

### Patch Changes

- sit-onyx@1.0.0-beta.103

## 1.0.0-beta.103

### Patch 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-beta.103",
"version": "1.0.0-beta.105",
"description": "A Nuxt module to easily integrate onyx into Nuxt projects",
"author": "Schwarz IT KG",
"license": "Apache-2.0",
Expand Down
14 changes: 14 additions & 0 deletions packages/sit-onyx/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# sit-onyx

## 1.0.0-beta.104

### Patch Changes

- Updated dependencies [ad447e9]
- @sit-onyx/icons@1.0.0-beta.10

## 1.0.0-beta.103

### Patch Changes

- Updated dependencies [ee0fcd2]
- @sit-onyx/icons@1.0.0-beta.9

## 1.0.0-beta.102

### Minor Changes
Expand Down
4 changes: 2 additions & 2 deletions 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-beta.102",
"version": "1.0.0-beta.104",
"type": "module",
"author": "Schwarz IT KG",
"license": "Apache-2.0",
Expand Down Expand Up @@ -55,7 +55,7 @@
"@sit-onyx/playwright-utils": "workspace:^",
"@sit-onyx/storybook-utils": "workspace:^",
"@storybook/addon-a11y": "8.5.0-beta.2",
"@storybook/addon-actions": "8.5.0-beta.2",
"@storybook/addon-actions": "8.5.0-beta.6",
"@vue/compiler-dom": "catalog:",
"axe-core": "^4.10.2",
"eslint-plugin-vue-scoped-css": "^2.9.0",
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
import { test } from "../../playwright/a11y";
import { executeMatrixScreenshotTest } from "../../playwright/screenshots";
import OnyxButton from "../OnyxButton/OnyxButton.vue";
import OnyxBottomBar from "./OnyxBottomBar.vue";

test.describe("Screenshot tests", () => {
executeMatrixScreenshotTest({
name: "Bottom Bar",
columns: ["default", "hidden-border"],
rows: ["right", "left", "left-and-right"],
component: (column, row) =>
row === "left-and-right" ? (
<OnyxBottomBar hideBorder={column === "hidden-border"}>
<template v-slot:left>
<OnyxButton label="Button"></OnyxButton>
</template>
<template v-slot:right>
<OnyxButton label="Button" mode="plain" color="neutral"></OnyxButton>
<OnyxButton label="Button"></OnyxButton>
</template>
</OnyxBottomBar>
) : row === "right" ? (
<OnyxBottomBar hideBorder={column === "hidden-border"}>
<template v-slot:right>
<OnyxButton label="Button" mode="plain" color="neutral"></OnyxButton>
<OnyxButton label="Button"></OnyxButton>
</template>
</OnyxBottomBar>
) : (
<OnyxBottomBar hideBorder={column === "hidden-border"}>
<template v-slot:left>
<OnyxButton label="Button" mode="plain" color="neutral"></OnyxButton>
<OnyxButton label="Button"></OnyxButton>
</template>
</OnyxBottomBar>
),
hooks: {
beforeEach: async (component, page) => {
await component.evaluate((element) => {
element.style.padding = "5rem 0";
element.style.paddingRight = "25rem";
});
await page.setViewportSize({ width: 400, height: 100 });
},
},
});
});
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ const { densityClass } = useDensity(props);
.onyx-bottom-bar {
@include layers.component() {
position: fixed;
position: sticky;
bottom: 0;
width: 100%;
margin-inline: var(--onyx-grid-margin-inline);
Expand Down
14 changes: 14 additions & 0 deletions packages/storybook-utils/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,19 @@
# @sit-onyx/storybook-utils

## 1.0.0-beta.77

### Patch Changes

- Updated dependencies [ad447e9]
- @sit-onyx/icons@1.0.0-beta.10

## 1.0.0-beta.76

### Patch Changes

- Updated dependencies [ee0fcd2]
- @sit-onyx/icons@1.0.0-beta.9

## 1.0.0-beta.75

### Patch Changes
Expand Down
4 changes: 2 additions & 2 deletions 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-beta.75",
"version": "1.0.0-beta.77",
"type": "module",
"author": "Schwarz IT KG",
"license": "Apache-2.0",
Expand Down Expand Up @@ -42,7 +42,7 @@
"devDependencies": {
"@sit-onyx/icons": "workspace:^",
"@sit-onyx/shared": "workspace:^",
"@storybook/addon-actions": "8.5.0-beta.2",
"@storybook/addon-actions": "8.5.0-beta.6",
"storybook": "8.5.0-beta.2",
"vue": "catalog:",
"vue-component-type-helpers": "^2.1.10"
Expand Down
Loading

0 comments on commit 682f7b0

Please sign in to comment.