Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export default function DBDivider(props: DBDividerProps) {
ref={component}
data-margin={props.margin}
data-variant={props.variant}
data-emphasis={props.emphasis}
class={cls('db-divider', props.className)}>
<Show when={state.stylePath}>
<link rel="stylesheet" href={state.stylePath} />
Expand Down
6 changes: 4 additions & 2 deletions packages/components/src/components/divider/model.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
import { GlobalProps, GlobalState } from '../../shared/model';
import { EmphasisProps, GlobalProps, GlobalState } from '../../shared/model';

export type DBDividerDefaultProps = {
margin?: 'none' | '_';
variant?: 'horizontal' | 'vertical';
};

export type DBDividerProps = DBDividerDefaultProps & GlobalProps;
export type DBDividerProps = DBDividerDefaultProps &
GlobalProps &
EmphasisProps;

export type DBDividerDefaultState = {};

Expand Down
5 changes: 5 additions & 0 deletions packages/foundations/scss/_variables.global.scss
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,11 @@ $db-colors-neutral-border-weak: var(
)
);

$db-colors-neutral-border: var(
--db-current-border-color,
var(--db-neutral-border-enabled, $db-colors-neutral-border-enabled)
);

// primary

$db-colors-primary: var(--db-primary-enabled, $db-colors-primary-enabled);
Expand Down
10 changes: 8 additions & 2 deletions packages/foundations/scss/helpers/_functions.scss
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
@use "sass:math";
@use "a11y" as *;
@use "clearfix" as *;
@use "../variables.global" as var;

@function to-rem($pxValue) {
@return #{$pxValue * 0.0625}rem;
Expand Down Expand Up @@ -41,12 +42,17 @@
// https://bugs.chromium.org/p/chromium/issues/detail?id=1274133
// https://github.com/WebKit/WebKit/commit/1890bfb551da24735804cb1a3d5f14b210f7c7b8
@mixin divider($position: "top", $slot: "before") {

--db-divider-bg-color: #{var.$db-colors-neutral-border-weak};
position: relative;

&[data-emphasis="strong"] {
--db-divider-bg-color: #{var.$db-colors-neutral-border};
}

&::#{$slot} {
content: "";
background-color: currentColor;
opacity: 0.16;
background-color: var(--db-divider-bg-color);

position: absolute;
@if $position == "top" {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,10 @@
<db-infotext size="small" variant="informational">
{{ exampleName }}</db-infotext
>
<db-divider [variant]="exampleProps.variant"> </db-divider>
<db-divider
[variant]="exampleProps.variant"
[emphasis]="exampleProps.emphasis"
>
</db-divider>
</ng-template>
</app-default-component>
4 changes: 2 additions & 2 deletions showcases/react-showcase/src/components/divider/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@ import defaultComponentVariants from '../../../../shared/divider.json';
import { type DBDividerProps } from '../../../../../output/react/src/components/divider/model';
import { getVariants } from '../data';

const getDivider = ({ variant, children }: DBDividerProps) => (
const getDivider = ({ variant, emphasis, children }: DBDividerProps) => (
<>
<DBInfotext size="small" variant="informational">
{children}
</DBInfotext>
<DBDivider variant={variant} />
<DBDivider variant={variant} emphasis={emphasis} />
</>
);

Expand Down
17 changes: 17 additions & 0 deletions showcases/shared/divider.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,5 +38,22 @@
}
}
]
},
{
"name": "Emphasis",
"examples": [
{
"name": "Weak (Default)",
"style": { "width": "200px" },
"props": {}
},
{
"name": "Strong",
"style": { "width": "200px" },
"props": {
"emphasis": "strong"
}
}
]
}
]
5 changes: 4 additions & 1 deletion showcases/vue-showcase/src/components/divider/Divider.vue
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@ import { DBDivider, DBInfotext } from "../../../../../output/vue/vue3/src";
<DBInfotext size="small" variant="informational">
{{ exampleName }}</DBInfotext
>
<DBDivider :variant="exampleProps.variant" />
<DBDivider
:variant="exampleProps.variant"
:emphasis="exampleProps.emphasis"
/>
</template>
</DefaultComponent>
</template>