Skip to content

Commit

Permalink
Merge branch 'main' into 2731-fixbutton-small-icononly-variant-isnt-q…
Browse files Browse the repository at this point in the history
…uadratic
  • Loading branch information
mfranzke authored Sep 2, 2024
2 parents b5bfd57 + 40143c9 commit f6d4a1b
Show file tree
Hide file tree
Showing 15 changed files with 1,383 additions and 1,563 deletions.
2,876 changes: 1,344 additions & 1,532 deletions package-lock.json

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@
"showcase/*"
],
"devDependencies": {
"@commitlint/cli": "19.4.0",
"@commitlint/config-conventional": "19.2.2",
"@commitlint/cli": "19.4.1",
"@commitlint/config-conventional": "19.4.1",
"@typescript-eslint/eslint-plugin": "^7.14.1",
"@typescript-eslint/parser": "^7.14.1",
"concurrently": "8.2.2",
Expand All @@ -43,7 +43,7 @@
"eslint-plugin-storybook": "0.8.0",
"eslint-plugin-vue": "^9.24.0",
"find-versions-cli": "^5.0.0",
"husky": "9.1.2",
"husky": "9.1.5",
"iframe-resizer": "4.4.5",
"jest-config": "29.7.0",
"lint-staged": "^15.2.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/db-ui-elements-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"react": "18.3.1",
"react-dom": "18.3.1",
"rimraf": "6.0.1",
"rollup": "4.18.1",
"rollup": "4.21.2",
"rollup-plugin-node-resolve": "5.2.0"
}
}
2 changes: 1 addition & 1 deletion packages/db-ui-elements-stencil/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@
"jest": "29.7.0",
"jest-cli": "29.7.0",
"jest-junit": "16.0.0",
"puppeteer": "^22.12.1"
"puppeteer": "^23.2.1"
},
"dependencies": {
"@db-ui/core": "^2.22.0"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,16 +24,16 @@ describe('db-input', () => {
const page = await newSpecPage({
components: [DbInput],
html: `
<db-input ariainvalid="_ariainvalid_" ariarequired="true" autocomplete="on" autofocus dirname="_dirname_" disabled input_id="_input_id_" label="_label_" list="_list_" maxlength="2" minlength="5" name="_name_" pattern="_pattern_" placeholder="_placeholder_" readonly required size="2" value="_value_">
<db-input ariainvalid="_ariainvalid_" ariarequired="true" autocomplete="on" autofocus dirname="_dirname_" disabled input_id="_input_id_" label="_label_" list="_list_" maxlength="10" minlength="5" name="_name_" pattern="_pattern_" placeholder="_placeholder_" readonly required size="2" value="_value_">
<option>_option1_</option>
<option>_option2_</option>
</db-input>
`
});
expect(page.root).toEqualHtml(`
<db-input ariainvalid="_ariainvalid_" ariarequired="true" autocomplete="on" autofocus dirname="_dirname_" disabled input_id="_input_id_" label="_label_" list="_list_" maxlength="2" minlength="5" name="_name_" pattern="_pattern_" placeholder="_placeholder_" readonly required size="2" type='text' value="_value_" variant='semitransparent'>
<input aria-invalid="_ariainvalid_" aria-required="true" type="text" class="elm-input" id="_input_id_" autocomplete="on" autofocus data-dirname="_dirname_" disabled list="_list_" maxlength="2" minlength="5" name="_name_" pattern="_pattern_" placeholder="_placeholder_" readonly required size="2" value="_value_" aria-labelledby="_input_id_-label" data-variant='semitransparent' />
<label class="elm-label" htmlFor="_input_id_" aria-hidden="true" id="_input_id_-label">_label_</label><output htmlfor="_input_id_" id="_input_id_-result">0 / 2</output>
<db-input ariainvalid="_ariainvalid_" ariarequired="true" autocomplete="on" autofocus dirname="_dirname_" disabled input_id="_input_id_" label="_label_" list="_list_" maxlength="10" minlength="5" name="_name_" pattern="_pattern_" placeholder="_placeholder_" readonly required size="2" type='text' value="_value_" variant='semitransparent'>
<input aria-invalid="_ariainvalid_" aria-required="true" type="text" class="elm-input" id="_input_id_" autocomplete="on" autofocus data-dirname="_dirname_" disabled list="_list_" maxlength="10" minlength="5" name="_name_" pattern="_pattern_" placeholder="_placeholder_" readonly required size="2" value="_value_" aria-labelledby="_input_id_-label" data-variant='semitransparent' />
<label class="elm-label" htmlFor="_input_id_" aria-hidden="true" id="_input_id_-label">_label_</label><output htmlfor="_input_id_" id="_input_id_-result">7 / 10</output>
<datalist id="_list_">
<option>_option1_</option>
<option>_option2_</option>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
// eslint-disable-next-line @typescript-eslint/no-unused-vars
import { Component, Event, h, Host, Prop, State } from '@stencil/core';
import { uuid } from '../../utils/utils';

Expand All @@ -9,6 +10,8 @@ import { uuid } from '../../utils/utils';
export class DbInput {
@State() valueSize = 0;

private inputElement!: HTMLInputElement;

/**
* The ariainvalid attribute is used to indicate that the value entered into an input field does not conform to the format expected by the application.
*/
Expand Down Expand Up @@ -151,6 +154,10 @@ export class DbInput {
*/
@Event() dbChange;

componentDidRender() {
this.valueSize = this.inputElement?.value?.length || 0;
}

render() {
return (
<Host>
Expand Down Expand Up @@ -183,6 +190,7 @@ export class DbInput {
onInput={(event) => {
this.valueSize = (event.target as HTMLInputElement).value.length;
}}
ref={(el) => (this.inputElement = el as HTMLInputElement)}
/>

<label
Expand Down
2 changes: 1 addition & 1 deletion packages/db-ui-elements-vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
],
"devDependencies": {
"rimraf": "6.0.1",
"rollup": "4.18.1",
"rollup": "4.21.2",
"rollup-plugin-node-resolve": "5.2.0",
"vue": "3.4.32"
}
Expand Down
24 changes: 12 additions & 12 deletions showcase/angular-active-showcase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,22 +9,22 @@
},
"private": true,
"dependencies": {
"@angular/animations": "18.1.4",
"@angular/common": "18.1.4",
"@angular/compiler": "18.1.4",
"@angular/core": "18.1.4",
"@angular/forms": "18.1.4",
"@angular/platform-browser": "18.1.4",
"@angular/platform-browser-dynamic": "18.1.4",
"@angular/router": "18.1.4",
"@angular/animations": "18.2.2",
"@angular/common": "18.2.2",
"@angular/compiler": "18.2.2",
"@angular/core": "18.2.2",
"@angular/forms": "18.2.2",
"@angular/platform-browser": "18.2.2",
"@angular/platform-browser-dynamic": "18.2.2",
"@angular/router": "18.2.2",
"rxjs": "7.8.1",
"tslib": "2.6.3",
"tslib": "2.7.0",
"zone.js": "0.14.10"
},
"devDependencies": {
"@angular-devkit/build-angular": "18.1.4",
"@angular/cli": "18.1.4",
"@angular/compiler-cli": "18.1.4",
"@angular-devkit/build-angular": "18.2.2",
"@angular/cli": "18.2.2",
"@angular/compiler-cli": "18.2.2",
"domhandler": "^5.0.3",
"injection-js": "2.4.0",
"typescript": "5.4.5"
Expand Down
2 changes: 1 addition & 1 deletion showcase/angular-active-showcase/src/app/app.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ main {
}

main form ol {
list-style-type: none;
list-style-type: '';
padding-left: 0;
}

Expand Down
4 changes: 2 additions & 2 deletions showcase/angular-lts-showcase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"@angular/platform-browser-dynamic": "17.3.11",
"@angular/router": "17.3.11",
"rxjs": "7.8.1",
"tslib": "2.6.3",
"zone.js": "0.14.8"
"tslib": "2.7.0",
"zone.js": "0.14.10"
},
"devDependencies": {
"@angular-devkit/build-angular": "17.3.8",
Expand Down
2 changes: 1 addition & 1 deletion showcase/angular-lts-showcase/src/app/app.component.css
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ main {
}

main form ol {
list-style-type: none;
list-style-type: '';
padding-left: 0;
}

Expand Down
2 changes: 1 addition & 1 deletion showcase/playground-showcase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"react": "18.3.1",
"react-ace": "11.0.1",
"react-dom": "18.3.1",
"react-router-dom": "6.24.1"
"react-router-dom": "6.26.1"
},
"devDependencies": {
"@types/dompurify": "^3.0.5",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -329,7 +329,7 @@ legend {
ol,
ul,
menu {
list-style: none;
list-style-type: '';
margin: 0;
padding: 0;
}
Expand Down
2 changes: 1 addition & 1 deletion showcase/react-showcase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dependencies": {
"react": "18.3.1",
"react-dom": "18.3.1",
"react-router-dom": "6.24.1",
"react-router-dom": "6.26.1",
"@vitejs/plugin-react": "^4.2.1",
"vite": "^5.3.4"
},
Expand Down
4 changes: 2 additions & 2 deletions showcase/vue-showcase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
},
"dependencies": {
"vue": "3.4.32",
"vue-router": "4.4.0"
"vue-router": "4.4.3"
},
"devDependencies": {
"@vitejs/plugin-vue": "5.0.5",
"@vitejs/plugin-vue": "5.1.2",
"@vue/tsconfig": "0.5.1",
"vite": "^5.3.4",
"vue-tsc": "2.0.29"
Expand Down

0 comments on commit f6d4a1b

Please sign in to comment.