Skip to content

Commit

Permalink
Merge branch 'main' into feat-drawer-non-modal
Browse files Browse the repository at this point in the history
  • Loading branch information
mfranzke authored Nov 6, 2024
2 parents 47dfa39 + 7941ab5 commit c19fd66
Show file tree
Hide file tree
Showing 10 changed files with 1,940 additions and 806 deletions.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2,722 changes: 1,922 additions & 800 deletions package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion packages/components/src/components/tag/tag.scss
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
display: none;
}

> [class^="db-"] {
> :is([class="db-checkbox"], [class="db-radio"], [class="db-link"], [class="db-button"]) {
block-size: 100%;
}
}
Expand Down
1 change: 1 addition & 0 deletions packages/components/src/components/tooltip/tooltip.scss
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ $tooltip-arrow-shadow-size: variables.$db-sizing-2xs;
--default-card-border-radius: #{variables.$db-border-radius-xs};

@extend %db-overwrite-font-size-sm;
@extend %popover-center;
@extend %default-popover;

background-color: colors.$db-adaptive-bg-basic-level-1-default;
Expand Down
1 change: 0 additions & 1 deletion packages/components/src/styles/_popover-component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ $popover-gap-size: var(--db-popover-distance);
$popover-inset: calc(100% + #{$popover-gap-size} * var(--db-popover-gap, 0));
$popover-gap-inset: calc(-1 * #{$popover-gap-size});

// use this for popover but not for tooltip
%popover-center {
&:not([data-placement]),
&[data-placement="bottom"]:not([data-outside-vy]),
Expand Down
2 changes: 1 addition & 1 deletion showcases/angular-ssr-showcase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
"@angular/cli": "17.3.11",
"@angular/compiler-cli": "17.3.12",
"@types/express": "^5.0.0",
"@types/node": "^22.8.7",
"@types/node": "^22.9.0",
"cpr": "3.0.1",
"ng-packagr": "17.3.0",
"typescript": "^5.4.5"
Expand Down
2 changes: 1 addition & 1 deletion showcases/next-showcase/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"react-dom": "18.3.1"
},
"devDependencies": {
"@types/node": "^22.8.7",
"@types/node": "^22.9.0",
"@types/react": "^18.3.12",
"npm-run-all": "^4.1.5",
"open-cli": "^8.0.0",
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 @@ -11,7 +11,7 @@
"preview": "nuxt preview"
},
"dependencies": {
"nuxt": "^3.13.2",
"nuxt": "^3.14.0",
"vue": "^3.5.12",
"vue-router": "^4.4.5"
}
Expand Down
2 changes: 1 addition & 1 deletion showcases/patternhub/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"@mdx-js/react": "^3.1.0",
"@next/mdx": "^15.0.2",
"@types/dompurify": "3.0.5",
"@types/node": "22.8.7",
"@types/node": "22.9.0",
"@types/react": "18.3.12",
"@types/react-dom": "18.3.1",
"esbuild": "0.24.0",
Expand Down
12 changes: 12 additions & 0 deletions showcases/patternhub/scripts/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,18 @@ export const getCodeByFramework = (
return `<${tag}${className} ${attributes.join(' ')}${reactSlots}/>`;
}

// Workaround for tooltip
if (componentName === 'tooltip') {
return innerContent.replace(
'</',
`<${tag}${className} ${attributes
.filter((attr) => attr !== 'content')
.join(' ')}>${
attributes.find((attr) => attr === 'content') ?? ''
}</${tag}></`
);
}

return `<${tag}${className} ${attributes.join(' ')}${reactSlots}>
${otherSlots}${innerContent}
</${tag}>`;
Expand Down

0 comments on commit c19fd66

Please sign in to comment.