Skip to content

Commit

Permalink
Merge branch 'develop' of https://github.com/public-ui/kolibri into 6…
Browse files Browse the repository at this point in the history
…627-abbr

Refs: #6627
  • Loading branch information
deleonio committed Nov 16, 2024
2 parents f62d4de + 758f809 commit b4252df
Show file tree
Hide file tree
Showing 444 changed files with 13,657 additions and 9,502 deletions.
2 changes: 1 addition & 1 deletion .github/dod.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ dod:
- Meaningful pull request title for the release notes
- Pull request is linked to an issue
- All changes relate to the issue
- No TODOs or commented out code in the final commit
- No commented out code in the final commit
- Tests to protect this code implemented (if applicable)
- Manual test performed successfully (if applicable)
- Documentation or migration has been updated (if applicable)
17 changes: 14 additions & 3 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,25 @@ on:
- dev
- next
- latest
- lts
version: # see https://github.com/lerna/lerna/tree/main/libs/commands/version#semver-bump
type: choice
description: Semver keyword for version bump
description: SemVer keyword for version bump
options:
- prerelease
- prepatch
- patch
- preminor
- minor
- premajor
- major
- prerelease
label: # see https://github.com/lerna/lerna/tree/main/libs/commands/version#--preid
type: choice
description: SemVer pre release label
options:
- rc
- beta
- alpha

jobs:
publish:
Expand Down Expand Up @@ -84,7 +95,7 @@ jobs:
git config --local user.name "${{ steps.app-token.outputs.app-slug }}[bot]"
- name: Bump Versions
run: 'HUSKY=0 npx lerna version ${{github.event.inputs.version}} --preid=rc --no-private --tag-version-prefix="" -m "chore: release %v" -y --force-publish'
run: 'HUSKY=0 npx lerna version ${{github.event.inputs.version}} --preid=${{github.event.inputs.label}} --no-private --tag-version-prefix="" -m "chore: release %v" -y --force-publish'

- name: Build
run: pnpm -r build
Expand Down
7 changes: 7 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,10 @@ dist/
node_modules/
*.log
*.tgz

/packages/components/src/components/*/readme.md
# Diese Readme's wurde nicht in die Doku übernommen.
!/packages/components/src/components/logo/readme.md
!/packages/components/src/components/symbol/readme.md
!/packages/components/src/components/table-stateful/readme.md
!/packages/components/src/components/table-stateful/readme.md
Binary file modified abgrenzung.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/abgrenzung.jpg
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 lerna.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,5 @@
"packages/tools/visual-tests"
],
"useNx": true,
"version": "2.1.9"
"version": "2.2.0-alpha.0"
}
2 changes: 1 addition & 1 deletion 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.1.9",
"version": "2.2.0-alpha.0",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion 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.1.9",
"version": "2.2.0-alpha.0",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/adapters/angular/v17/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/angular-v17",
"version": "2.1.9",
"version": "2.2.0-alpha.0",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/adapters/angular/v18/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@public-ui/angular-v18",
"version": "2.1.9",
"version": "2.2.0-alpha.0",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion 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.1.9",
"version": "2.2.0-alpha.0",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion 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.1.9",
"version": "2.2.0-alpha.0",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion 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.1.9",
"version": "2.2.0-alpha.0",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion 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.1.9",
"version": "2.2.0-alpha.0",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion 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.1.9",
"version": "2.2.0-alpha.0",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion 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.1.9",
"version": "2.2.0-alpha.0",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": {
Expand Down
6 changes: 3 additions & 3 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.1.9",
"version": "2.2.0-alpha.0",
"license": "EUPL-1.2",
"homepage": "https://public-ui.github.io",
"repository": {
Expand Down Expand Up @@ -73,7 +73,7 @@
},
"dependencies": {
"@floating-ui/dom": "1.6.11",
"adopted-style-sheets": "1.1.5-rc.4",
"adopted-style-sheets": "1.1.6-rc.6",
"clsx": "2.1.1",
"color-convert": "2.0.1",
"color-rgba": "2.4.0",
Expand Down Expand Up @@ -126,7 +126,7 @@
"typescript": "5.6.3"
},
"peerDependencies": {
"adopted-style-sheets": "1.1.5-rc.4"
"adopted-style-sheets": "1.1.6-rc.6"
},
"files": [
"assets",
Expand Down
Binary file modified packages/components/src/assets/images/abgrenzung.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
17 changes: 15 additions & 2 deletions packages/components/src/components/@deprecated/input/controller.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
import type { Generic } from 'adopted-style-sheets';

import type {
AccessKeyPropType,
AdjustHeightPropType,
ButtonProps,
HideErrorPropType,
InputTypeOnDefault,
LabelWithExpertSlotPropType,
MsgPropType,
ShortKeyPropType,
StencilUnknown,
Stringified,
TooltipAlignPropType,
Expand All @@ -18,6 +20,7 @@ import {
objectObjectHandler,
parseJson,
setState,
validateAccessKey,
validateAdjustHeight,
validateHideError,
validateHideLabel,
Expand All @@ -27,13 +30,15 @@ import {
validateTooltipAlign,
watchBoolean,
watchString,
validateShortKey,
} from '../../../schema';

import { stopPropagation, tryToDispatchKoliBriEvent } from '../../../utils/events';
import { ControlledInputController } from '../../input-adapter-leanup/controller';

import type { Props as AdapterProps } from '../../input-adapter-leanup/types';
import type { Props, Watches } from './types';
import { validateAccessAndShortKey } from '../../../schema/validators/access-and-short-key';

type ValueChangeListener = (value: StencilUnknown) => void;

Expand All @@ -47,8 +52,9 @@ export class InputController extends ControlledInputController implements Watche
this.component = component;
}

public validateAccessKey(value?: string): void {
watchString(this.component, '_accessKey', value);
public validateAccessKey(value?: AccessKeyPropType): void {
validateAccessKey(this.component, value);
validateAccessAndShortKey(value, this.component._shortKey);
}

public validateAdjustHeight(value?: AdjustHeightPropType): void {
Expand Down Expand Up @@ -127,6 +133,11 @@ export class InputController extends ControlledInputController implements Watche
}
}

public validateShortKey(value?: ShortKeyPropType): void {
validateShortKey(this.component, value);
validateAccessAndShortKey(this.component._accessKey, value);
}

public validateSmartButton(value?: ButtonProps | string): void {
objectObjectHandler(value, () => {
try {
Expand Down Expand Up @@ -155,9 +166,11 @@ export class InputController extends ControlledInputController implements Watche
this.validateHint(this.component._hint);
this.validateId(this.component._id);
this.validateLabel(this.component._label);
this.validateShortKey(this.component._shortKey);
this.validateSmartButton(this.component._smartButton);
this.validateOn(this.component._on);
this.validateTabIndex(this.component._tabIndex);
validateAccessAndShortKey(this.component._accessKey, this.component._shortKey);
}

protected onBlur(event: Event): void {
Expand Down
5 changes: 3 additions & 2 deletions packages/components/src/components/@deprecated/input/types.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
import type { ButtonProps, InputTypeOnDefault, MsgPropType, PropLabelWithExpertSlot, Stringified } from '../../../schema';
import type { AccessKeyPropType, ButtonProps, InputTypeOnDefault, MsgPropType, PropLabelWithExpertSlot, ShortKeyPropType, Stringified } from '../../../schema';
import type { Generic } from 'adopted-style-sheets';

type RequiredProps = NonNullable<unknown>;
type OptionalProps = PropLabelWithExpertSlot & {
accessKey: string;
accessKey: AccessKeyPropType;
adjustHeight: boolean;
disabled: boolean;
error: string;
Expand All @@ -13,6 +13,7 @@ type OptionalProps = PropLabelWithExpertSlot & {
id: string;
msg: MsgPropType;
on: InputTypeOnDefault;
shortKey: ShortKeyPropType;
smartButton: Stringified<ButtonProps>;
syncValueBySelector: string;
tabIndex: number;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import '../@shared/mixins';
@import '../style';
@import '../host-display-block';
@import '../tooltip/style.scss';

@mixin kol-alert-styles {
@layer kol-component {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@import '../@shared/mixins';
@import '../style';
@import '../host-display-block';
@import '../tooltip/style.scss';

@mixin kol-table-stateless-styles {
@layer kol-component {
Expand Down
43 changes: 0 additions & 43 deletions packages/components/src/components/abbr/readme.md

This file was deleted.

1 change: 1 addition & 0 deletions packages/components/src/components/abbr/style.scss
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
@import '../@shared/mixins';
@import '../style';
@import '../tooltip/style.scss';

@layer kol-component {
:host {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
// Jest Snapshot v1, https://goo.gl/fbAQLP

exports[`kol-abbr should render with _label="Text" 1`] = `
<kol-abbr class="kol-abbr">
<template shadowrootmode="open">
<abbr>
<slot></slot>
</abbr>
(Text)
</template>
</kol-abbr>
`;
21 changes: 0 additions & 21 deletions packages/components/src/components/abbr/test/html.mock.ts

This file was deleted.

29 changes: 4 additions & 25 deletions packages/components/src/components/abbr/test/snapshot.spec.tsx
Original file line number Diff line number Diff line change
@@ -1,28 +1,7 @@
import { executeTests } from 'stencil-awesome-test';

import { h } from '@stencil/core';
import { newSpecPage } from '@stencil/core/testing';

import { getAbbrHtml } from './html.mock';

import { KolAbbrTag } from '../../../core/component-names';
import type { AbbrProps } from '../../../schema';
import type { SpecPage } from '@stencil/core/testing';
import { executeSnapshotTests } from '../../../utils/testing';

import { KolAbbr } from '../shadow';

executeTests<AbbrProps>(
'Abbr',
async (props): Promise<SpecPage> => {
const page = await newSpecPage({
components: [KolAbbr],
template: () => <kol-abbr {...props} />,
});
return page;
},
{
_label: ['Text'],
},
getAbbrHtml,
{
execMode: 'default', // ready
},
);
executeSnapshotTests<AbbrProps>(KolAbbrTag, [KolAbbr], [{ _label: 'Text' }]);
Loading

0 comments on commit b4252df

Please sign in to comment.