Skip to content

Commit

Permalink
Merge branch 'main' of github.com:db-ui/mono into test-input-required…
Browse files Browse the repository at this point in the history
…-messages

# Conflicts:
#	showcases/screen-reader/default.ts
  • Loading branch information
nmerget committed Jul 25, 2024
2 parents 6510a60 + 66c9b34 commit db44d3b
Show file tree
Hide file tree
Showing 18 changed files with 103 additions and 116 deletions.
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 output/vue/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"test:components": "playwright test -c playwright.config.ts"
},
"dependencies": {
"vue": "^3.4.33"
"vue": "^3.4.34"
},
"devDependencies": {
"@playwright/experimental-ct-vue": "1.45.3",
Expand Down
138 changes: 69 additions & 69 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@
"lint-staged": "^15.2.7",
"markdownlint-cli": "^0.41.0",
"npm-run-all": "4.1.5",
"postcss": "^8.4.39",
"postcss": "^8.4.40",
"postcss-cli": "^11.0.0",
"prettier": "^3.3.3",
"prettier-plugin-pkg": "0.18.1",
Expand Down
4 changes: 2 additions & 2 deletions packages/components/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,8 @@
},
"devDependencies": {
"@builder.io/eslint-plugin-mitosis": "^0.0.16",
"@builder.io/mitosis": "^0.3.13",
"@builder.io/mitosis-cli": "^0.3.13",
"@builder.io/mitosis": "^0.3.14",
"@builder.io/mitosis-cli": "^0.3.14",
"@react-docgen/cli": "^2.0.3",
"cpr": "3.0.1",
"cssnano": "^7.0.4",
Expand Down
20 changes: 9 additions & 11 deletions packages/components/src/components/drawer/drawer.lite.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -94,17 +94,15 @@ export default function DBDrawer(props: DBDrawerProps) {
<div class="db-drawer-header-text">
<Slot name="drawerHeader" />
</div>
<Show when={props.withCloseButton}>
<DBButton
className="button-close-drawer"
id={props.closeButtonId}
icon="cross"
variant="ghost"
noText
onClick={() => state.handleClose('close')}>
{props.closeButtonText ?? DEFAULT_CLOSE_BUTTON}
</DBButton>
</Show>
<DBButton
className="button-close-drawer"
id={props.closeButtonId}
icon="cross"
variant="ghost"
noText
onClick={() => state.handleClose('close')}>
{props.closeButtonText ?? DEFAULT_CLOSE_BUTTON}
</DBButton>
</header>
<div class="db-drawer-content">{props.children}</div>
</article>
Expand Down
2 changes: 1 addition & 1 deletion packages/components/src/components/drawer/drawer.spec.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ const testAction = () => {
test(`should open and close drawer`, async ({ mount, page }) => {
let test: string = '';
const drawer: any = (
<DBDrawer onClose={() => (test = 'close')} withCloseButton={true}>
<DBDrawer onClose={() => (test = 'close')}>
<span data-testid="test">Test</span>
</DBDrawer>
);
Expand Down
5 changes: 0 additions & 5 deletions packages/components/src/components/drawer/model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,6 @@ export interface DBDrawerDefaultProps {
* The "end" depends on which direction you use.
*/
rounded?: boolean;

/**
* The withCloseButton attribute shows/hides the default close button.
*/
withCloseButton?: boolean;
}

export type DBDrawerProps = DBDrawerDefaultProps &
Expand Down
1 change: 0 additions & 1 deletion packages/components/src/components/header/header.lite.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ export default function DBHeader(props: DBHeaderProps) {
<DBDrawer
className="db-header-drawer"
rounded
withCloseButton
spacing="small"
open={props.drawerOpen}
onClose={() => state.toggle()}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
>
<db-drawer
[backdrop]="exampleProps?.backdrop"
[withCloseButton]="exampleProps?.withCloseButton"
[rounded]="exampleProps?.rounded"
[width]="exampleProps?.width"
[spacing]="exampleProps?.spacing"
Expand Down
2 changes: 1 addition & 1 deletion showcases/nuxt-showcase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
},
"dependencies": {
"nuxt": "^3.12.4",
"vue": "^3.4.33",
"vue": "^3.4.34",
"vue-router": "^4.4.0"
}
}
2 changes: 0 additions & 2 deletions showcases/react-showcase/src/components/drawer/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ const getDrawer = ({
id,
width,
rounded,
withCloseButton,
spacing,
openDrawer,
setOpenDrawer,
Expand All @@ -24,7 +23,6 @@ const getDrawer = ({
}: DBDrawerProps & AdditionalDrawerProperties) => (
<div>
<DBDrawer
withCloseButton={withCloseButton}
rounded={rounded}
width={width}
spacing={spacing}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["web dialog Close Button button article","Functional"]
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
["unknown. dialog. document. clickable, Close Button, button. dialog. button, Close Button","Functional"]
Loading

0 comments on commit db44d3b

Please sign in to comment.