Skip to content

Commit

Permalink
Merge branch 'develop' into feature/buttonFontSize
Browse files Browse the repository at this point in the history
Signed-off-by: Christian Dornbusch <christian.dornbusch@nortal.com>
  • Loading branch information
Chrisdo82 authored Nov 6, 2023
2 parents 41189d1 + 0e9893b commit 1f0d37f
Show file tree
Hide file tree
Showing 137 changed files with 359 additions and 278 deletions.
2 changes: 1 addition & 1 deletion lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,5 @@
"packages/tools/visual-tests"
],
"useNx": true,
"version": "2.0.0-rc.7"
"version": "2.0.0-rc.8"
}
6 changes: 3 additions & 3 deletions packages/adapters/angular/v11/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/angular-v11",
"version": "2.0.0-rc.7",
"version": "2.0.0-rc.8",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": "https://github.com/public-ui/kolibri",
Expand Down Expand Up @@ -66,7 +66,7 @@
"@angular/compiler": "11.2.14",
"@angular/compiler-cli": "11.2.14",
"@angular/core": "11.2.14",
"@public-ui/components": "2.0.0-rc.7",
"@public-ui/components": "2.0.0-rc.8",
"@types/minimatch": "5.1.2",
"@types/minimist": "1.2.4",
"@types/node": "ts4.1",
Expand All @@ -80,7 +80,7 @@
},
"peerDependencies": {
"@angular/core": "^11",
"@public-ui/components": "2.0.0-rc.7"
"@public-ui/components": "2.0.0-rc.8"
},
"files": [
"dist"
Expand Down
6 changes: 3 additions & 3 deletions packages/adapters/angular/v12/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/angular-v12",
"version": "2.0.0-rc.7",
"version": "2.0.0-rc.8",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": "https://github.com/public-ui/kolibri",
Expand Down Expand Up @@ -66,7 +66,7 @@
"@angular/compiler": "12.2.17",
"@angular/compiler-cli": "12.2.17",
"@angular/core": "12.2.17",
"@public-ui/components": "2.0.0-rc.7",
"@public-ui/components": "2.0.0-rc.8",
"@types/minimatch": "5.1.2",
"@types/minimist": "1.2.4",
"@types/node": "ts4.3",
Expand All @@ -80,7 +80,7 @@
},
"peerDependencies": {
"@angular/core": "^12",
"@public-ui/components": "2.0.0-rc.7"
"@public-ui/components": "2.0.0-rc.8"
},
"files": [
"dist"
Expand Down
6 changes: 3 additions & 3 deletions packages/adapters/angular/v13/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/angular-v13",
"version": "2.0.0-rc.7",
"version": "2.0.0-rc.8",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": "https://github.com/public-ui/kolibri",
Expand Down Expand Up @@ -66,7 +66,7 @@
"@angular/compiler": "13.4.0",
"@angular/compiler-cli": "13.4.0",
"@angular/core": "13.4.0",
"@public-ui/components": "2.0.0-rc.7",
"@public-ui/components": "2.0.0-rc.8",
"@types/minimatch": "5.1.2",
"@types/minimist": "1.2.4",
"@types/node": "ts4.6",
Expand All @@ -80,7 +80,7 @@
},
"peerDependencies": {
"@angular/core": "^13",
"@public-ui/components": "2.0.0-rc.7"
"@public-ui/components": "2.0.0-rc.8"
},
"files": [
"dist"
Expand Down
6 changes: 3 additions & 3 deletions packages/adapters/angular/v14/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/angular-v14",
"version": "2.0.0-rc.7",
"version": "2.0.0-rc.8",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": "https://github.com/public-ui/kolibri",
Expand Down Expand Up @@ -66,7 +66,7 @@
"@angular/compiler": "14.3.0",
"@angular/compiler-cli": "14.3.0",
"@angular/core": "14.3.0",
"@public-ui/components": "2.0.0-rc.7",
"@public-ui/components": "2.0.0-rc.8",
"@types/minimatch": "5.1.2",
"@types/minimist": "1.2.4",
"@types/node": "ts4.8",
Expand All @@ -80,7 +80,7 @@
},
"peerDependencies": {
"@angular/core": "^14",
"@public-ui/components": "2.0.0-rc.7"
"@public-ui/components": "2.0.0-rc.8"
},
"files": [
"dist"
Expand Down
6 changes: 3 additions & 3 deletions packages/adapters/angular/v15/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/angular-v15",
"version": "2.0.0-rc.7",
"version": "2.0.0-rc.8",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": "https://github.com/public-ui/kolibri",
Expand Down Expand Up @@ -66,7 +66,7 @@
"@angular/compiler": "15.2.10",
"@angular/compiler-cli": "15.2.10",
"@angular/core": "15.2.10",
"@public-ui/components": "2.0.0-rc.7",
"@public-ui/components": "2.0.0-rc.8",
"@types/minimatch": "5.1.2",
"@types/minimist": "1.2.4",
"@types/node": "ts4.9",
Expand All @@ -80,7 +80,7 @@
},
"peerDependencies": {
"@angular/core": "^15",
"@public-ui/components": "2.0.0-rc.7"
"@public-ui/components": "2.0.0-rc.8"
},
"files": [
"dist"
Expand Down
6 changes: 3 additions & 3 deletions packages/adapters/angular/v16/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/angular-v16",
"version": "2.0.0-rc.7",
"version": "2.0.0-rc.8",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": "https://github.com/public-ui/kolibri",
Expand Down Expand Up @@ -66,7 +66,7 @@
"@angular/compiler": "16.2.11",
"@angular/compiler-cli": "16.2.11",
"@angular/core": "16.2.11",
"@public-ui/components": "2.0.0-rc.7",
"@public-ui/components": "2.0.0-rc.8",
"@types/minimatch": "5.1.2",
"@types/minimist": "1.2.4",
"@types/node": "ts5.1",
Expand All @@ -80,7 +80,7 @@
},
"peerDependencies": {
"@angular/core": "^16",
"@public-ui/components": "2.0.0-rc.7"
"@public-ui/components": "2.0.0-rc.8"
},
"files": [
"dist"
Expand Down
6 changes: 3 additions & 3 deletions packages/adapters/hydrate/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/hydrate",
"version": "2.0.0-rc.7",
"version": "2.0.0-rc.8",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": "https://github.com/public-ui/kolibri",
Expand Down Expand Up @@ -46,11 +46,11 @@
"prepack": "npm run build"
},
"devDependencies": {
"@public-ui/components": "2.0.0-rc.7",
"@public-ui/components": "2.0.0-rc.8",
"rimraf": "3.0.2"
},
"peerDependencies": {
"@public-ui/components": "2.0.0-rc.7"
"@public-ui/components": "2.0.0-rc.8"
},
"sideEffects": false,
"type": "commonjs",
Expand Down
6 changes: 3 additions & 3 deletions packages/adapters/preact/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/preact",
"version": "2.0.0-rc.7",
"version": "2.0.0-rc.8",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": "https://github.com/public-ui/kolibri",
Expand Down Expand Up @@ -46,10 +46,10 @@
"prepack": "unbuild"
},
"dependencies": {
"@public-ui/react": "2.0.0-rc.7"
"@public-ui/react": "2.0.0-rc.8"
},
"devDependencies": {
"@public-ui/components": "2.0.0-rc.7",
"@public-ui/components": "2.0.0-rc.8",
"react": "18.2.0",
"react-dom": "18.2.0",
"typescript": "5.2.2",
Expand Down
6 changes: 3 additions & 3 deletions packages/adapters/react-standalone/kolibri-rock's.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<script crossorigin src="https://unpkg.com/react-dom@18/umd/react-dom.production.min.js"></script>

<!-- KoliBri -->
<script crossorigin src="https://unpkg.com/@public-ui/components@2.0.0-rc.7/dist/kolibri/kolibri.esm.js" type="module"></script>
<script crossorigin src="https://unpkg.com/@public-ui/react-standalone@2.0.0-rc.7/dist/index.mjs" type="module"></script>
<script crossorigin src="https://unpkg.com/@public-ui/components@2.0.0-rc.8/dist/kolibri/kolibri.esm.js" type="module"></script>
<script crossorigin src="https://unpkg.com/@public-ui/react-standalone@2.0.0-rc.8/dist/index.mjs" type="module"></script>

<!-- Babel -->
<script src="https://unpkg.com/@babel/standalone/babel.min.js"></script>
Expand All @@ -23,7 +23,7 @@
<main id="app"></main>

<script type="module">
import { register } from 'https://unpkg.com/@public-ui/components@2.0.0-rc.7/dist/esm/index.js';
import { register } from 'https://unpkg.com/@public-ui/components@2.0.0-rc.8/dist/esm/index.js';
import { DEFAULT } from 'https://unpkg.com/@public-ui/themes/dist/index.mjs';
register(DEFAULT, []).catch(console.warn);
</script>
Expand Down
6 changes: 3 additions & 3 deletions packages/adapters/react-standalone/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/react-standalone",
"version": "2.0.0-rc.7",
"version": "2.0.0-rc.8",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": "https://github.com/public-ui/kolibri",
Expand Down Expand Up @@ -47,12 +47,12 @@
"prepack": "pnpm build"
},
"devDependencies": {
"@public-ui/react": "2.0.0-rc.7",
"@public-ui/react": "2.0.0-rc.8",
"cpy-cli": "5.0.0",
"rimraf": "3.0.2"
},
"peerDependencies": {
"@public-ui/components": "2.0.0-rc.7",
"@public-ui/components": "2.0.0-rc.8",
"react": ">=16.14.0",
"react-dom": ">=16.14.0"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/adapters/react/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/react",
"version": "2.0.0-rc.7",
"version": "2.0.0-rc.8",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": "https://github.com/public-ui/kolibri",
Expand Down Expand Up @@ -46,7 +46,7 @@
"prepack": "unbuild"
},
"devDependencies": {
"@public-ui/components": "2.0.0-rc.7",
"@public-ui/components": "2.0.0-rc.8",
"@types/minimatch": "5.1.2",
"@types/minimist": "1.2.4",
"@types/node": "ts5.1",
Expand All @@ -59,7 +59,7 @@
"unbuild": "1.2.1"
},
"peerDependencies": {
"@public-ui/components": "2.0.0-rc.7",
"@public-ui/components": "2.0.0-rc.8",
"react": ">=16.14.0",
"react-dom": ">=16.14.0"
},
Expand Down
6 changes: 3 additions & 3 deletions packages/adapters/solid/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/solid",
"version": "2.0.0-rc.7",
"version": "2.0.0-rc.8",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": "https://github.com/public-ui/kolibri",
Expand Down Expand Up @@ -46,7 +46,7 @@
"prepack": "unbuild"
},
"devDependencies": {
"@public-ui/components": "2.0.0-rc.7",
"@public-ui/components": "2.0.0-rc.8",
"@types/minimatch": "5.1.2",
"@types/minimist": "1.2.4",
"@types/node": "ts5.1",
Expand All @@ -56,7 +56,7 @@
"unbuild": "1.2.1"
},
"peerDependencies": {
"@public-ui/components": "2.0.0-rc.7",
"@public-ui/components": "2.0.0-rc.8",
"solid-js": ">=1.2.0"
},
"sideEffects": false,
Expand Down
6 changes: 3 additions & 3 deletions packages/adapters/vue/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/vue",
"version": "2.0.0-rc.7",
"version": "2.0.0-rc.8",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": "https://github.com/public-ui/kolibri",
Expand Down Expand Up @@ -47,7 +47,7 @@
},
"devDependencies": {
"@babel/types": "7.23.0",
"@public-ui/components": "2.0.0-rc.7",
"@public-ui/components": "2.0.0-rc.8",
"@types/minimatch": "5.1.2",
"@types/minimist": "1.2.4",
"@types/node": "ts5.1",
Expand All @@ -57,7 +57,7 @@
"vue": "3.3.7"
},
"peerDependencies": {
"@public-ui/components": "2.0.0-rc.7",
"@public-ui/components": "2.0.0-rc.8",
"vue": ">=3"
},
"sideEffects": false,
Expand Down
4 changes: 2 additions & 2 deletions packages/components/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/components",
"version": "2.0.0-rc.7",
"version": "2.0.0-rc.8",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": "https://github.com/public-ui/kolibri",
Expand Down Expand Up @@ -69,7 +69,7 @@
"dependencies": {
"@a11y-ui/core": "1.0.7",
"@floating-ui/dom": "1.5.3",
"@public-ui/schema": "2.0.0-rc.7",
"@public-ui/schema": "2.0.0-rc.8",
"i18next": "23.6.0",
"markdown-it": "13.0.2"
},
Expand Down
11 changes: 9 additions & 2 deletions packages/components/src/components/accordion/component.tsx
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
// https://codepen.io/mbxtr/pen/OJPOYg?html-preprocessor=haml

import { Component, h, Host, JSX, Prop, State, Watch } from '@stencil/core';
import { Component, Element, h, Host, JSX, Prop, State, Watch } from '@stencil/core';

import { HeadingLevel } from '../../types/heading-level';
import { LabelPropType, validateLabel } from '../../types/props/label';
import { OpenPropType, validateOpen } from '../../types/props/open';
import { featureHint } from '../../utils/a11y.tipps';
import { nonce } from '../../utils/dev.utils';
import { setState } from '../../utils/prop.validators';
import { propagateFocus } from '../../utils/reuse';
import { watchHeadingLevel } from '../heading/validation';
import { API, KoliBriAccordionCallbacks, States } from './types';

Expand All @@ -30,8 +31,13 @@ featureHint(`[KolAccordion] Tab-Sperre des Inhalts im geschlossenen Zustand.`);
shadow: true,
})
export class KolAccordion implements API {
@Element() private readonly host?: HTMLKolDetailsElement;
private readonly nonce = nonce();

private readonly catchRef = (ref?: HTMLKolButtonWcElement) => {
propagateFocus(this.host, ref);
};

public render(): JSX.Element {
return (
<Host>
Expand All @@ -43,7 +49,8 @@ export class KolAccordion implements API {
>
<kol-heading-wc _label="" _level={this.state._level}>
<kol-button-wc
// slot="expert"
ref={this.catchRef}
slot="expert"
_ariaControls={this.nonce}
_ariaExpanded={this.state._open}
_icons={this.state._open ? 'codicon codicon-remove' : 'codicon codicon-add'}
Expand Down
4 changes: 1 addition & 3 deletions packages/components/src/components/button-link/component.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,9 @@ import { AccessKeyPropType } from '../../types/props/access-key';
})
export class KolButtonLink implements Props {
@Element() private readonly host?: HTMLKolButtonLinkElement;
private ref?: HTMLKolButtonWcElement;

private readonly catchRef = (ref?: HTMLKolButtonWcElement) => {
this.ref = ref;
propagateFocus(this.host, this.ref);
propagateFocus(this.host, ref);
};

public render(): JSX.Element {
Expand Down
Loading

0 comments on commit 1f0d37f

Please sign in to comment.